Changeset 13184
- Timestamp:
- Jan 30, 2012, 12:14:43 AM (11 years ago)
- Location:
- trunk/macosx
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/macosx/Controller.h
r13163 r13184 80 80 IBOutlet NSMenuItem * fNextInfoTabItem, * fPrevInfoTabItem; 81 81 82 IBOutlet NSMenu * fSortMenu; 83 82 84 IBOutlet NSMenu * fActionMenu; 83 85 -
trunk/macosx/Controller.m
r13178 r13184 403 403 [fTableView registerForDraggedTypes: [NSArray arrayWithObject: TORRENT_TABLE_VIEW_DATA_TYPE]]; 404 404 [fWindow registerForDraggedTypes: [NSArray arrayWithObjects: NSFilenamesPboardType, NSURLPboardType, nil]]; 405 406 //sort the sort menu items (localization is from strings file) 407 NSMutableArray * sortMenuItems = [NSMutableArray arrayWithCapacity: 7]; 408 NSUInteger sortMenuIndex = 0; 409 BOOL foundSortItem = NO; 410 for (NSMenuItem * item in [fSortMenu itemArray]) 411 { 412 if ([item action] == @selector(setSort:) && [item tag] != SORT_ORDER_TAG) 413 { 414 [sortMenuItems addObject: item]; 415 [fSortMenu removeItemAtIndex: sortMenuIndex]; 416 foundSortItem = YES; 417 } 418 else 419 { 420 if (foundSortItem) 421 break; 422 ++sortMenuIndex; 423 } 424 } 425 426 [sortMenuItems sortUsingDescriptors: [NSArray arrayWithObject: [NSSortDescriptor sortDescriptorWithKey: @"title" ascending: YES selector: @selector(localizedCompare:)]]]; 427 428 for (NSMenuItem * item in sortMenuItems) 429 [fSortMenu insertItem: item atIndex: sortMenuIndex++]; 405 430 406 431 //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
r13024 r13184 149 149 <reference key="NSSuperview" ref="303120456"/> 150 150 <reference key="NSWindow"/> 151 <reference key="NSNextKeyView"/>152 151 <bool key="NSEnabled">YES</bool> 153 152 <object class="NSTextFieldCell" key="NSCell" id="696487414"> … … 195 194 <reference key="NSSuperview" ref="306237956"/> 196 195 <reference key="NSWindow"/> 197 <reference key="NSNextKeyView" ref=" 1068338331"/>196 <reference key="NSNextKeyView" ref="365285506"/> 198 197 <bool key="NSEnabled">YES</bool> 199 198 <object class="_NSCornerView" key="NSCornerView"> … … 668 667 <reference key="NSSuperview" ref="303120456"/> 669 668 <reference key="NSWindow"/> 670 <reference key="NSNextKeyView" ref="3 65285506"/>669 <reference key="NSNextKeyView" ref="306237956"/> 671 670 <int key="NSsFlags">133648</int> 672 671 <reference key="NSVScroller" ref="1068338331"/> … … 5732 5731 <string key="fPrevInfoTabItem">NSMenuItem</string> 5733 5732 <string key="fRatioStopMenu">NSMenu</string> 5733 <string key="fSortMenu">NSMenu</string> 5734 5734 <string key="fSpeedLimitButton">NSButton</string> 5735 5735 <string key="fTableView">TorrentTableView</string> … … 5799 5799 <object class="IBToOneOutletInfo" key="fRatioStopMenu"> 5800 5800 <string key="name">fRatioStopMenu</string> 5801 <string key="candidateClassName">NSMenu</string> 5802 </object> 5803 <object class="IBToOneOutletInfo" key="fSortMenu"> 5804 <string key="name">fSortMenu</string> 5801 5805 <string key="candidateClassName">NSMenu</string> 5802 5806 </object>
Note: See TracChangeset
for help on using the changeset viewer.