Changeset 7672

Timestamp:

Jan 11, 2009, 9:17:05 PM (12 years ago)

Author:

livings124

Message:

(1.5x) #1533 Remember selected preferences view across sessions

Location:

branches/1.5x/macosx

Files:

• PrefsController.m (modified) (1 diff)
• PrefsWindow.m (modified) (1 diff)

branches/1.5x/macosx/PrefsController.m

@@ -1063 +1063 @@
 - (void) setPrefView: (id) sender
 {
-    NSView * view = fGeneralView;
+    NSString * identifier;
     if (sender)
     {
-        NSString * identifier = [sender itemIdentifier];
-        if ([identifier isEqualToString: TOOLBAR_TRANSFERS])
-            view = fTransfersView;
-        else if ([identifier isEqualToString: TOOLBAR_BANDWIDTH])
-            view = fBandwidthView;
-        else if ([identifier isEqualToString: TOOLBAR_PEERS])
-            view = fPeersView;
-        else if ([identifier isEqualToString: TOOLBAR_NETWORK])
-            view = fNetworkView;
-        else if ([identifier isEqualToString: TOOLBAR_REMOTE])
-            view = fRemoteView;
-        else; //general view already selected
-    }
+        identifier = [sender itemIdentifier];
+        [[NSUserDefaults standardUserDefaults] setObject: identifier forKey: @"SelectedPrefView"];
+    }
+    else
+        identifier = [[NSUserDefaults standardUserDefaults] stringForKey: @"SelectedPrefView"];
+    
+    NSView * view;
+    if ([identifier isEqualToString: TOOLBAR_TRANSFERS])
+        view = fTransfersView;
+    else if ([identifier isEqualToString: TOOLBAR_BANDWIDTH])
+        view = fBandwidthView;
+    else if ([identifier isEqualToString: TOOLBAR_PEERS])
+        view = fPeersView;
+    else if ([identifier isEqualToString: TOOLBAR_NETWORK])
+        view = fNetworkView;
+    else if ([identifier isEqualToString: TOOLBAR_REMOTE])
+        view = fRemoteView;
+    else
+    {
+        identifier = TOOLBAR_GENERAL; //general view is the default selected
+        view = fGeneralView;
+    }
+    
+    [[[self window] toolbar] setSelectedItemIdentifier: identifier];
     
     NSWindow * window = [self window];

branches/1.5x/macosx/PrefsWindow.m

@@ -29 +29 @@
 - (void) keyDown: (NSEvent *) event
 {
-    [super keyDown: event];
     if ([event keyCode] == 53) //esc key
         [self close];
+    else
+        [super keyDown: event];
 }