Changeset 3655

Timestamp:

Oct 30, 2007, 7:55:47 PM (15 years ago)

Author:

livings124

Message:

phase 1 of updating menu items to remove bindings

Location:

trunk/macosx

Files:

• Controller.m (modified) (7 diffs)
• English.lproj/MainMenu.nib/classes.nib (modified) (1 diff)
• English.lproj/MainMenu.nib/info.nib (modified) (1 diff)
• English.lproj/MainMenu.nib/keyedobjects.nib (modified) (previous)
• TorrentTableView.m (modified) (1 diff)

trunk/macosx/Controller.m

@@ -257 +257 @@
     [fTableView setTorrents: fDisplayedTorrents];
     [[fTableView tableColumnWithIdentifier: @"Torrent"] setDataCell: [[TorrentCell alloc] init]];
-
+    
     [fTableView registerForDraggedTypes: [NSArray arrayWithObject: TORRENT_TABLE_VIEW_DATA_TYPE]];
     [fWindow registerForDraggedTypes: [NSArray arrayWithObjects: NSFilenamesPboardType, NSURLPboardType, nil]];
@@ -1805 +1805 @@
 - (void) setSortReverse: (id) sender
 {
+    [fDefaults setBool: ![fDefaults boolForKey: @"SortReverse"] forKey: @"SortReverse"];
     [self sortTorrents];
 }
@@ -2266 +2267 @@
 }
 
-- (BOOL) tableView: (NSTableView *) tableView writeRowsWithIndexes: (NSIndexSet *) indexes
-    toPasteboard: (NSPasteboard *) pasteboard
+#warning not working in Leopard
+- (BOOL) tableView: (NSTableView *) tableView writeRowsWithIndexes: (NSIndexSet *) indexes toPasteboard: (NSPasteboard *) pasteboard
 {
     //only allow reordering of rows if sorting by order with no filter
-    if ([[fDefaults stringForKey: @"Sort"] isEqualToString: @"Order"]
-        && [[fDefaults stringForKey: @"Filter"] isEqualToString: @"None"]
+    if ([[fDefaults stringForKey: @"Sort"] isEqualToString: SORT_ORDER]
+        && [[fDefaults stringForKey: @"Filter"] isEqualToString: FILTER_NONE]
         && [[fSearchFilterField stringValue] length] == 0)
     {
@@ -2475 +2476 @@
 {
     BOOL makeSmall = ![fDefaults boolForKey: @"SmallView"];
-    if (![NSApp isOnLeopardOrBetter])
-        makeSmall != makeSmall;
+    [fDefaults setBool: makeSmall forKey: @"SmallView"];
     
     [fTableView setRowHeight: makeSmall ? ROW_HEIGHT_SMALL : ROW_HEIGHT_REGULAR];
@@ -2849 +2849 @@
 {
     SEL action = [menuItem action];
-
+    
     //only enable some items if it is in a context menu or the window is useable
     BOOL canUseTable = [fWindow isKeyWindow] || [[menuItem menu] supermenu] != [NSApp mainMenu];
@@ -2858 +2858 @@
     
     //enable sort and advanced bar items
-    if (action == @selector(setSort:) || /*action == @selector(toggleAdvancedBar:) ||*/ action == @selector(toggleSmallView:))
+    if (action == @selector(setSort:) /*|| action == @selector(toggleAdvancedBar:) ||*/)
         return [fWindow isVisible];
+    
+    if (action == @selector(toggleSmallView:))
+    {
+        [menuItem setState: [fDefaults boolForKey: @"SmallView"] ? NSOnState : NSOffState];
+        return [fWindow isVisible];
+    }
 
     //enable show info
@@ -3051 +3057 @@
     //enable reverse sort item
     if (action == @selector(setSortReverse:))
-        return ![[fDefaults stringForKey: @"Sort"] isEqualToString: @"Order"];
+    {
+        [menuItem setState: [fDefaults boolForKey: @"SortReverse"] ? NSOnState : NSOffState];
+        return ![[fDefaults stringForKey: @"Sort"] isEqualToString: SORT_ORDER];
+    }
     
     //check proper filter search item

trunk/macosx/English.lproj/MainMenu.nib/classes.nib

@@ -23 +23 @@
                         <key>SUPERCLASS</key>
                         <string>ImageBackgroundView</string>
+                </dict>
+                <dict>
+                        <key>CLASS</key>
+                        <string>NSApplication</string>
+                        <key>LANGUAGE</key>
+                        <string>ObjC</string>
+                        <key>SUPERCLASS</key>
+                        <string>NSResponder</string>
                 </dict>
                 <dict>

trunk/macosx/English.lproj/MainMenu.nib/info.nib

@@ -11 +11 @@
         <key>IBOpenObjects</key>
         <array>
-                <integer>21</integer>
+                <integer>1639</integer>
         </array>
         <key>IBSystem Version</key>

trunk/macosx/TorrentTableView.m

@@ -116 +116 @@
 - (void) mouseDown: (NSEvent *) event
 {
-    //NSLog(@"down");
     fClickPoint = [self convertPoint: [event locationInWindow] fromView: nil];