Changeset 13184

Timestamp:

Jan 30, 2012, 12:14:43 AM (7 years ago)

Author:

livings124

Message:

Sort the Sort menu items on launch, since the main menu is now localized through a strings file.

Location:

trunk/macosx

Files:

• Controller.h (modified) (1 diff)
• Controller.m (modified) (1 diff)
• en.lproj/MainMenu.xib (modified) (5 diffs)

trunk/macosx/Controller.h

@@ -80 +80 @@
     IBOutlet NSMenuItem             * fNextInfoTabItem, * fPrevInfoTabItem;
     
+    IBOutlet NSMenu                 * fSortMenu;
+    
     IBOutlet NSMenu                 * fActionMenu;
     

trunk/macosx/Controller.m

@@ -403 +403 @@
     [fTableView registerForDraggedTypes: [NSArray arrayWithObject: TORRENT_TABLE_VIEW_DATA_TYPE]];
     [fWindow registerForDraggedTypes: [NSArray arrayWithObjects: NSFilenamesPboardType, NSURLPboardType, nil]];
+    
+    //sort the sort menu items (localization is from strings file)
+    NSMutableArray * sortMenuItems = [NSMutableArray arrayWithCapacity: 7];
+    NSUInteger sortMenuIndex = 0;
+    BOOL foundSortItem = NO;
+    for (NSMenuItem * item in [fSortMenu itemArray])
+    {
+        if ([item action] == @selector(setSort:) && [item tag] != SORT_ORDER_TAG)
+        {
+            [sortMenuItems addObject: item];
+            [fSortMenu removeItemAtIndex: sortMenuIndex];
+            foundSortItem = YES;
+        }
+        else
+        {
+            if (foundSortItem)
+                break;
+            ++sortMenuIndex;
+        }
+    }
+    
+    [sortMenuItems sortUsingDescriptors: [NSArray arrayWithObject: [NSSortDescriptor sortDescriptorWithKey: @"title" ascending: YES selector: @selector(localizedCompare:)]]];
+    
+    for (NSMenuItem * item in sortMenuItems)
+        [fSortMenu insertItem: item atIndex: sortMenuIndex++];
     
     //you would think this would be called later in this method from updateUI, but it's not reached in awakeFromNib

trunk/macosx/en.lproj/MainMenu.xib

@@ -149 +149 @@
                                                         <reference key="NSSuperview" ref="303120456"/>
                                                         <reference key="NSWindow"/>
-                                                        <reference key="NSNextKeyView"/>
                                                         <bool key="NSEnabled">YES</bool>
                                                         <object class="NSTextFieldCell" key="NSCell" id="696487414">
@@ -195 +194 @@
                                                                                         <reference key="NSSuperview" ref="306237956"/>
                                                                                         <reference key="NSWindow"/>
-                                                                                        <reference key="NSNextKeyView" ref="1068338331"/>
+                                                                                        <reference key="NSNextKeyView" ref="365285506"/>
                                                                                         <bool key="NSEnabled">YES</bool>
                                                                                         <object class="_NSCornerView" key="NSCornerView">
@@ -668 +667 @@
                                                         <reference key="NSSuperview" ref="303120456"/>
                                                         <reference key="NSWindow"/>
-                                                        <reference key="NSNextKeyView" ref="365285506"/>
+                                                        <reference key="NSNextKeyView" ref="306237956"/>
                                                         <int key="NSsFlags">133648</int>
                                                         <reference key="NSVScroller" ref="1068338331"/>
@@ -5732 +5731 @@
                                                 <string key="fPrevInfoTabItem">NSMenuItem</string>
                                                 <string key="fRatioStopMenu">NSMenu</string>
+                                                <string key="fSortMenu">NSMenu</string>
                                                 <string key="fSpeedLimitButton">NSButton</string>
                                                 <string key="fTableView">TorrentTableView</string>
@@ -5799 +5799 @@
                                                 <object class="IBToOneOutletInfo" key="fRatioStopMenu">
                                                         <string key="name">fRatioStopMenu</string>
+                                                        <string key="candidateClassName">NSMenu</string>
+                                                </object>
+                                                <object class="IBToOneOutletInfo" key="fSortMenu">
+                                                        <string key="name">fSortMenu</string>
                                                         <string key="candidateClassName">NSMenu</string>
                                                 </object>