Use OSEDefaults and OSEFileManager classes.

trunkmaster · Jan 3, 2025 · c069315 · c069315
1 parent 8945649
commit c069315
Show file tree

Hide file tree

Showing 63 changed files with 182 additions and 1,203 deletions.
diff --git a/Applications/Login/Controller.h b/Applications/Login/Controller.h
@@ -27,7 +27,7 @@
 #import <GNUstepGUI/GSDisplayServer.h>
 #import <AppKit/AppKit.h>
 
-#import <DesktopKit/NXTDefaults.h>
+#import <SystemKit/OSEDefaults.h>
 #import <DesktopKit/NXTAlert.h>
 #import <SystemKit/OSEScreen.h>
 #import <SystemKit/OSEPower.h>
@@ -72,7 +72,7 @@ extern LoginExitCode panelExitCode;
   OSEPower             *systemPower;
 
   // Preferences
-  NXTDefaults           *prefs;
+  OSEDefaults           *prefs;
 
   // User sessions
   NSArray              *mainThreadPorts;

diff --git a/Applications/Login/Controller.m b/Applications/Login/Controller.m
@@ -562,7 +562,7 @@ - (void)awakeFromNib
   [panelImageView setRefusesFirstResponder:YES];
 
   // Open preferences
-  prefs = [[NXTDefaults alloc] initWithSystemDefaults];
+  prefs = [[OSEDefaults alloc] initWithSystemDefaults];
 
   [hostnameField retain];
   [self displayHostname];

diff --git a/Applications/Login/Login_main.m b/Applications/Login/Login_main.m
@@ -28,15 +28,15 @@
 #include <X11/extensions/Xrandr.h>
 
 #import <AppKit/NSApplication.h>
-#import <DesktopKit/NXTDefaults.h>
+#import <SystemKit/OSEDefaults.h>
 #import <SystemKit/OSEScreen.h>
 #import <SystemKit/OSEDisplay.h>
 #import <SystemKit/OSEPower.h>
 
 #import "Controller.h"
 
 static NSTask      *xorgTask = nil;
-static NXTDefaults *loginDefaults = nil;
+static OSEDefaults *loginDefaults = nil;
 
 //-----------------------------------------------------------------------------
 // --- Plymouth
@@ -218,9 +218,9 @@ static void handleSignal(int sig)
   [NSApp stop:nil];
 }
 
-NXTDefaults *getDefaults(NSString *appPath)
+OSEDefaults *getDefaults(NSString *appPath)
 {
-  NXTDefaults  *systemDefaults;
+  OSEDefaults  *systemDefaults;
   id           serverCommand;
   NSString     *defaultsPath;
   NSDictionary *defaults;
@@ -230,7 +230,7 @@ static void handleSignal(int sig)
     return loginDefaults;
   }
 
-  systemDefaults = [NXTDefaults systemDefaults];
+  systemDefaults = [OSEDefaults systemDefaults];
   serverCommand = [systemDefaults objectForKey:@"WindowServerCommand"];
 
   // User defaults is not correct

diff --git a/Applications/Login/Preferences/Login.h b/Applications/Login/Preferences/Login.h
@@ -25,7 +25,7 @@
 #import <AppKit/NSTextField.h>
 #import <AppKit/NSImageView.h>
 
-#import <DesktopKit/NXTDefaults.h>
+#import <SystemKit/OSEDefaults.h>
 
 #import <Preferences.h>
 
@@ -47,8 +47,8 @@
   IBOutlet NSButton	*displayHostname;
   IBOutlet NSButton	*saveLastLoggedIn;
 
-  NXTDefaults           *defaults;
-  NXTDefaults           *systemDefaults;
+  OSEDefaults           *defaults;
+  OSEDefaults           *systemDefaults;
   BOOL                  isAdminUser;
 }
 

diff --git a/Applications/Login/Preferences/Login.m b/Applications/Login/Preferences/Login.m
@@ -100,7 +100,7 @@ - (id)init
 
   self = [super init];
 
-  defaults = [[NXTDefaults alloc] initDefaultsWithPath:NSUserDomainMask
+  defaults = [[OSEDefaults alloc] initDefaultsWithPath:NSUserDomainMask
                                                 domain:@"Login"];
 
   bundle = [NSBundle bundleForClass:[self class]];
@@ -135,7 +135,7 @@ - (BOOL)_isAdminUser
 
 - (void)awakeFromNib
 {
-  systemDefaults = [[NXTDefaults alloc]
+  systemDefaults = [[OSEDefaults alloc]
                      initDefaultsWithPath:NSSystemDomainMask
                                    domain:@"Login"];
 

diff --git a/Applications/Preferences/AppController.m b/Applications/Preferences/AppController.m
@@ -19,7 +19,7 @@
 // Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA.
 //
 
-#import <DesktopKit/NXTDefaults.h>
+#import <SystemKit/OSEDefaults.h>
 #import <SystemKit/OSEKeyboard.h>
 #import <SystemKit/OSEMouse.h>
 #import <SystemKit/OSEScreen.h>
@@ -77,7 +77,7 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotif
   // NSApplication removed arguments (-NXAutoLaunch YES) to omit flickering.
   // We've just finished launching and not active == we've autolaunched
   if ([NSApp isActive] == NO) {
-    NXTDefaults *defs = [NXTDefaults globalUserDefaults];
+    OSEDefaults *defs = [OSEDefaults globalUserDefaults];
 
     NSLog(@"Configuring Keyboard...");
     [OSEKeyboard configureWithDefaults:defs];
@@ -106,7 +106,7 @@ - (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sende
 
 - (void)applicationWillTerminate:(NSNotification *)aNotif
 {
-  [[NXTDefaults globalUserDefaults] synchronize];
+  [[OSEDefaults globalUserDefaults] synchronize];
   [prefsController release];
   [clockView removeFromSuperviewWithoutNeedingDisplay];
 }

diff --git a/Applications/Preferences/Modules/Date/Date.h b/Applications/Preferences/Modules/Date/Date.h
@@ -22,7 +22,7 @@
 
 #import <AppKit/AppKit.h>
 #import <DesktopKit/NXTClockView.h>
-#import <DesktopKit/NXTDefaults.h>
+#import <SystemKit/OSEDefaults.h>
 #import <Preferences.h>
 #import "Calendar.h"
 
@@ -41,7 +41,7 @@
   NSImage *image;
   NSImage *handImage;
 
-  NXTDefaults	*defaults;
+  OSEDefaults	*defaults;
 }
 
 @end
diff --git a/Applications/Preferences/Modules/Date/Date.m b/Applications/Preferences/Modules/Date/Date.m
@@ -35,7 +35,7 @@ - (id)init
   imagePath = [bundle pathForResource:@"Date" ofType:@"tiff"];
   image = [[NSImage alloc] initWithContentsOfFile:imagePath];
 
-  defaults = [NXTDefaults globalUserDefaults];
+  defaults = [OSEDefaults globalUserDefaults];
 
   return self;
 }

diff --git a/Applications/Preferences/Modules/Display/Display.m b/Applications/Preferences/Modules/Display/Display.m
@@ -30,7 +30,7 @@
 #import <AppKit/NSMatrix.h>
 #import <AppKit/NSSlider.h>
 
-#import <DesktopKit/NXTDefaults.h>
+#import <SystemKit/OSEDefaults.h>
 #import <DesktopKit/NXTNumericField.h>
 
 #import <SystemKit/OSEScreen.h>
@@ -336,7 +336,7 @@ - (IBAction)backgroundChanged:(id)sender
   if ([systemScreen setBackgroundColorRed:[rgbColor redComponent]
                                     green:[rgbColor greenComponent]
                                      blue:[rgbColor blueComponent]] == YES) {
-    NXTDefaults   *defs = [NXTDefaults globalUserDefaults];
+    OSEDefaults   *defs = [OSEDefaults globalUserDefaults];
     NSDictionary *dBack;
 
     dBack = @{@"Red":   [NSNumber numberWithFloat:[color redComponent]],

diff --git a/Applications/Preferences/Modules/Expert/Expert.h b/Applications/Preferences/Modules/Expert/Expert.h
@@ -22,7 +22,7 @@
 #import <AppKit/NSImage.h>
 #import <Preferences.h>
 
-#import <DesktopKit/NXTDefaults.h>
+#import <SystemKit/OSEDefaults.h>
 
 @interface Expert: NSObject <PrefsModule>
 {
@@ -34,7 +34,7 @@
   id privateWindowServerBtn;
   id privateSoundServerBtn;
 
-  NXTDefaults	*defaults;
+  OSEDefaults	*defaults;
   NSImage	*image;
 }
 

diff --git a/Applications/Preferences/Modules/Expert/Expert.m b/Applications/Preferences/Modules/Expert/Expert.m
@@ -20,7 +20,7 @@
 //
 
 #import <AppKit/AppKit.h>
-#import <DesktopKit/NXTFileManager.h>
+#import <SystemKit/OSEFileManager.h>
 
 #import "Expert.h"
 
@@ -30,7 +30,7 @@ - (id)init
 {
   self = [super init];
 
-  defaults = [NXTDefaults globalUserDefaults];
+  defaults = [OSEDefaults globalUserDefaults];
   NSBundle *bundle = [NSBundle bundleForClass:[self class]];
   NSString *imagePath = [bundle pathForResource:@"Expert" ofType:@"tiff"];
   image = [[NSImage alloc] initWithContentsOfFile:imagePath];
@@ -59,9 +59,9 @@ - (void)awakeFromNib
   [privateSoundServerBtn setRefusesFirstResponder:YES];
 
   [sortByBtn
-    selectItemWithTag:[[NXTFileManager defaultManager] sortFilesBy]];
+    selectItemWithTag:[[OSEFileManager defaultManager] sortFilesBy]];
   [showHiddenFilesBtn
-    setState:[[NXTFileManager defaultManager] isShowHiddenFiles]];
+    setState:[[OSEFileManager defaultManager] isShowHiddenFiles]];
 }
 
 - (NSView *)view
@@ -94,12 +94,12 @@ - (NSImage *)buttonImage
 
 - (void)setSortBy:(id)sender
 {
-  [[NXTFileManager defaultManager] setSortFilesBy:[[sender selectedItem] tag]];
+  [[OSEFileManager defaultManager] setSortFilesBy:[[sender selectedItem] tag]];
 }
 
 - (void)setShowHiddenFiles:(id)sender
 {
-  [[NXTFileManager defaultManager] setShowHiddenFiles:[sender state]];
+  [[OSEFileManager defaultManager] setShowHiddenFiles:[sender state]];
 }
 
 @end

diff --git a/Applications/Preferences/Modules/Keyboard/Keyboard.m b/Applications/Preferences/Modules/Keyboard/Keyboard.m
@@ -31,21 +31,21 @@
 #import <AppKit/NSMatrix.h>
 #import <AppKit/NSWindow.h>
 
-#import <DesktopKit/NXTDefaults.h>
+#import <SystemKit/OSEDefaults.h>
 #import <SystemKit/OSEKeyboard.h>
 
 #import "Keyboard.h"
 
 @implementation Keyboard
 
 static NSBundle    *bundle = nil;
-static NXTDefaults *defaults = nil;
+static OSEDefaults *defaults = nil;
 
 - (id)init
 {
   self = [super init];
 
-  defaults = [NXTDefaults globalUserDefaults];
+  defaults = [OSEDefaults globalUserDefaults];
 
   bundle = [NSBundle bundleForClass:[self class]];
   NSString *imagePath = [bundle pathForResource:@"Keyboard" ofType:@"tiff"];
@@ -294,7 +294,7 @@ - (NSString *)_optionWithType:(NSString *)type
 
 - (BOOL)_setOption:(NSString *)option
 {
-  NXTDefaults		*defs = [NXTDefaults globalUserDefaults];
+  OSEDefaults		*defs = [OSEDefaults globalUserDefaults];
   NSMutableArray	*mOptions = [options mutableCopy];
   NSArray		*optComponents;
   NSString		*savedOption;
@@ -335,7 +335,7 @@ @implementation Keyboard (KeyRepeat)
 
 - (void)repeatAction:(id)sender
 {
-  NXTDefaults	*defs = [NXTDefaults globalUserDefaults];
+  OSEDefaults	*defs = [OSEDefaults globalUserDefaults];
 
   if (sender == initialRepeatMtrx)
     { // NXKeyboard-InitialKeyRepeat - delay in milliseconds before repeat
@@ -357,7 +357,7 @@ @implementation Keyboard (Layouts)
 
 - (void)updateLayouts
 {
-  NXTDefaults *defs = [NXTDefaults globalUserDefaults];
+  OSEDefaults *defs = [OSEDefaults globalUserDefaults];
 
   if (layouts) {
     [layouts release];
@@ -473,7 +473,7 @@ - (void)initSwitchLayoutShortcuts
     [layoutShortcutBtn selectItemWithTitle:@"None"];
 
   // Refresh defaults with actual X11 settings
-  [[NXTDefaults globalUserDefaults] setObject:options forKey:OSEKeyboardOptions];
+  [[OSEDefaults globalUserDefaults] setObject:options forKey:OSEKeyboardOptions];
 }
 
 - (void)updateSwitchLayoutShortcuts
@@ -498,7 +498,7 @@ - (void)updateSwitchLayoutShortcuts
 // Replaces "NXKeyboardOptions" array item that contains "grp:" substring.
 - (void)setLayoutShortcut:(id)sender
 {
-  NXTDefaults		*defs = [NXTDefaults globalUserDefaults];
+  OSEDefaults		*defs = [OSEDefaults globalUserDefaults];
   NSMutableArray	*mOptions = [options mutableCopy];
   id			selectedOption;
   BOOL			isOptionReplaced = NO;
@@ -577,7 +577,7 @@ - (void)initNumpad
 
   NSInteger numLockState;
 
-  numLockState = [[NXTDefaults globalUserDefaults] integerForKey:OSEKeyboardNumLockState];
+  numLockState = [[OSEDefaults globalUserDefaults] integerForKey:OSEKeyboardNumLockState];
   [numLockStateMtrx selectCellWithTag:numLockState];
   if ([[numpadMtrx selectedCell] tag] != 2 )
     [keyboard setNumLockState:numLockState];
@@ -621,7 +621,7 @@ - (void)numpadMtrxClicked:(id)sender
 
 - (void)numLockMtrxClicked:(id)sender
 {
-  [[NXTDefaults globalUserDefaults] setInteger:[[sender selectedCell] tag]
+  [[OSEDefaults globalUserDefaults] setInteger:[[sender selectedCell] tag]
                                        forKey:OSEKeyboardNumLockState];
   [keyboard setNumLockState:[[sender selectedCell] tag]];
 }
@@ -872,7 +872,7 @@ - (void)modelBrowserClicked:(id)sender
     [modelDescription setStringValue:model[modelKey]];
     // Save setting to NXGlobalDomain
     [keyboard setModel:modelKey];
-    [[NXTDefaults globalUserDefaults] setObject:modelKey
+    [[OSEDefaults globalUserDefaults] setObject:modelKey
                                          forKey:OSEKeyboardModel];
   }
   else {

diff --git a/Applications/Preferences/Modules/Sound/Sound.h b/Applications/Preferences/Modules/Sound/Sound.h
@@ -20,14 +20,14 @@
 //
 
 #import <AppKit/NSImage.h>
-#import <DesktopKit/NXTDefaults.h>
+#import <SystemKit/OSEDefaults.h>
 #import <SoundKit/SoundKit.h>
 
 #import <Preferences.h>
 
 @interface Sound: NSObject <PrefsModule>
 {
-  NXTDefaults	*defaults;
+  OSEDefaults	*defaults;
   NSImage	*image;
   SNDServer	*soundServer;
   SNDOut	*soundOut;

diff --git a/Applications/Preferences/Modules/Sound/Sound.m b/Applications/Preferences/Modules/Sound/Sound.m
@@ -53,7 +53,7 @@ - (id)init
 
   self = [super init];
 
-  defaults = [NXTDefaults globalUserDefaults];
+  defaults = [OSEDefaults globalUserDefaults];
 
   bundle = [NSBundle bundleForClass:[self class]];
   imagePath = [bundle pathForResource:@"Sound" ofType:@"tiff"];

diff --git a/Applications/Preferences/PrefsController.m b/Applications/Preferences/PrefsController.m
@@ -31,7 +31,7 @@
 #import <AppKit/NSScroller.h>
 #import <AppKit/NSButton.h>
 
-#import <DesktopKit/NXTDefaults.h>
+#import <SystemKit/OSEDefaults.h>
 #import <DesktopKit/NXTBundle.h>
 
 #import "PrefsController.h"