diff --git a/macosx/TorrentCell.m b/macosx/TorrentCell.m index 469c9f6bd..09165667a 100644 --- a/macosx/TorrentCell.m +++ b/macosx/TorrentCell.m @@ -488,8 +488,6 @@ NSColor * priorityColor = [self backgroundStyle] == NSBackgroundStyleDark ? [NSColor whiteColor] : [NSColor darkGrayColor]; NSImage * priorityImage = [[NSImage imageNamed: ([torrent priority] == TR_PRI_HIGH ? @"PriorityHighTemplate.png" : @"PriorityLowTemplate.png")] imageWithColor: priorityColor]; - - [priorityImage drawInRect: priorityRect fromRect: NSZeroRect operation: NSCompositeSourceOver fraction: 1.0 respectFlipped: YES hints: nil]; } diff --git a/macosx/en.lproj/MainMenu.xib b/macosx/en.lproj/MainMenu.xib index b626ba8f3..fc35f199e 100644 --- a/macosx/en.lproj/MainMenu.xib +++ b/macosx/en.lproj/MainMenu.xib @@ -2,13 +2,13 @@ 1060 - 11B26 - 1617 - 1138 - 566.00 + 11C74 + 1938 + 1138.23 + 567.00 com.apple.InterfaceBuilder.CocoaPlugin - 1617 + 1938 NSTableColumn @@ -30,7 +30,10 @@ com.apple.InterfaceBuilder.CocoaPlugin - + + PluginDependencyRecalculationVersion + + NSApplication @@ -392,9 +395,9 @@ dBtdylsFt0VNsgjojBuwipKts4jFtBtdwtjNrF0lw9tdxdsNxtyzItyV11192F2IjjiVkFswoIjDiVtd AD4AAAECAAMAAAAEAAAkvAEDAAMAAAABAAUAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAESAAMAAAAB AAEAAAEVAAMAAAABAAQAAAEWAAMAAAABAD4AAAEXAAQAAAABAAAj+gEcAAMAAAABAAEAAAE9AAMAAAAB AAIAAAFSAAMAAAABAAEAAAFTAAMAAAAEAAAkxIdzAAcAAAw4AAAkzAAAAAAACAAIAAgACAABAAEAAQAB -AAAMOGFwcGwCEAAAbW50clJHQiBYWVogB9sACAAQABIADAAIYWNzcEFQUEwAAAAAAAAAAAAAAAAAAAAA +AAAMOGFwcGwCEAAAbW50clJHQiBYWVogB9sACgAMABMALgAZYWNzcEFQUEwAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAPbWAAEAAAAA0y1hcHBsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAARZGVzYwAAAVAAAABiZHNjbQAAAbQAAAEgY3BydAAAAtQAAAAjd3RwdAAAAvgAAAAU +AAAAAAAAAAAAAAARZGVzYwAAAVAAAABiZHNjbQAAAbQAAAEgY3BydAAAAtQAAAAkd3RwdAAAAvgAAAAU clhZWgAAAwwAAAAUZ1hZWgAAAyAAAAAUYlhZWgAAAzQAAAAUclRSQwAAA0gAAAgMYWFyZwAAC1QAAAAg dmNndAAAC3QAAAAwbmRpbgAAC6QAAAA+Y2hhZAAAC+QAAAAsbW1vZAAADBAAAAAoYlRSQwAAA0gAAAgM Z1RSQwAAA0gAAAgMYWFiZwAAC1QAAAAgYWFnZwAAC1QAAAAgZGVzYwAAAAAAAAAIRGlzcGxheQAAAAAA @@ -2380,7 +2383,7 @@ AAAAAAAAAAA 2147483647 NSImage - PriorityHigh + PriorityHighTemplate @@ -2393,7 +2396,7 @@ AAAAAAAAAAA 2147483647 NSImage - PriorityNormal + PriorityNormalTemplate @@ -2406,7 +2409,7 @@ AAAAAAAAAAA 2147483647 NSImage - PriorityLow + PriorityLowTemplate @@ -2625,6 +2628,22 @@ AAAAAAAAAAA 153 + + + delegate + + + + 207 + + + + terminate: + + + + 614 + cut: @@ -2666,12 +2685,100 @@ AAAAAAAAAAA 193 - - delegate - - + + toggleToolbarShown: + + - 207 + 1251 + + + + runToolbarCustomizationPalette: + + + + 1252 + + + + revealFile: + + + + 1543 + + + + showHelp: + + + + 1562 + + + + deselectAll: + + + + 1677 + + + + arrangeInFront: + + + + 1689 + + + + performZoom: + + + + 1690 + + + + performMiniaturize: + + + + 1691 + + + + delete: + + + + 1767 + + + + undo: + + + + 3323 + + + + redo: + + + + 3402 + + + + menu + + + + 2687 @@ -2721,14 +2828,6 @@ AAAAAAAAAAA 612 - - - terminate: - - - - 614 - toggleStatusBar: @@ -2737,22 +2836,6 @@ AAAAAAAAAAA 1224 - - - toggleToolbarShown: - - - - 1251 - - - - runToolbarCustomizationPalette: - - - - 1252 - showPreferenceWindow: @@ -2873,14 +2956,6 @@ AAAAAAAAAAA 1538 - - - revealFile: - - - - 1543 - removeNoDelete: @@ -2921,14 +2996,6 @@ AAAAAAAAAAA 1560 - - - showHelp: - - - - 1562 - toggleSmallView: @@ -3017,14 +3084,6 @@ AAAAAAAAAAA 1657 - - - deselectAll: - - - - 1677 - openShowSheet: @@ -3041,30 +3100,6 @@ AAAAAAAAAAA 1682 - - - arrangeInFront: - - - - 1689 - - - - performZoom: - - - - 1690 - - - - performMiniaturize: - - - - 1691 - setInfoTab: @@ -3105,14 +3140,6 @@ AAAAAAAAAAA 1704 - - - delete: - - - - 1767 - showMessageWindow: @@ -3169,14 +3196,6 @@ AAAAAAAAAAA 1809 - - - checkForUpdates: - - - - 1814 - openURLShowSheet: @@ -3361,14 +3380,6 @@ AAAAAAAAAAA 2327 - - - menu - - - - 2687 - fTotalTorrentsField @@ -3385,14 +3396,6 @@ AAAAAAAAAAA 2703 - - - delegate - - - - 2842 - fGroupsSetMenu @@ -3401,14 +3404,6 @@ AAAAAAAAAAA 2843 - - - delegate - - - - 2854 - fGroupsSetContextMenu @@ -3449,6 +3444,206 @@ AAAAAAAAAAA 3044 + + + fRatioStopMenu + + + + 3076 + + + + setSortByGroup: + + + + 3079 + + + + setSortByGroup: + + + + 3081 + + + + fTableView + + + + 3118 + + + + verifySelectedTorrents: + + + + 3147 + + + + moveDataFilesSelected: + + + + 3153 + + + + toggleStatusString: + + + + 3165 + + + + toggleQuickLook: + + + + 3168 + + + + linkTrac: + + + + 3171 + + + + speedLimitChanged: + + + + 3180 + + + + copyTorrentFiles: + + + + 3208 + + + + moveDataFilesSelected: + + + + 3210 + + + + linkDonate: + + + + 3213 + + + + copyMagnetLinks: + + + + 3217 + + + + copyMagnetLinks: + + + + 3219 + + + + setSortReverse: + + + + 3404 + + + + setSortReverse: + + + + 3406 + + + + clearCompleted: + + + + 3409 + + + + clearCompleted: + + + + 3424 + + + + fClearCompletedButton + + + + 3425 + + + + setSort: + + + + 3431 + + + + setSort: + + + + 3433 + + + + fActionMenu + + + + 3434 + + + + fActionButton + + + + 3438 + + + + showGlobalPopover: + + + + 3439 + delegate @@ -3473,29 +3668,77 @@ AAAAAAAAAAA 3075 + + + checkForUpdates: + + + + 1814 + - fRatioStopMenu - - + delegate + + - 3076 + 3120 - - setSortByGroup: - - + + delegate + + - 3079 + 3121 - - setSortByGroup: - - + + delegate + + - 3081 + 3122 + + + + delegate + + + + 3123 + + + + value: values.SpeedLimit + + + + + + value: values.SpeedLimit + value + values.SpeedLimit + 2 + + + 3179 + + + + delegate + + + + 2842 + + + + delegate + + + + 2854 @@ -3617,110 +3860,6 @@ AAAAAAAAAAA 3117 - - - fTableView - - - - 3118 - - - - delegate - - - - 3120 - - - - delegate - - - - 3121 - - - - delegate - - - - 3122 - - - - delegate - - - - 3123 - - - - verifySelectedTorrents: - - - - 3147 - - - - moveDataFilesSelected: - - - - 3153 - - - - toggleStatusString: - - - - 3165 - - - - toggleQuickLook: - - - - 3168 - - - - linkTrac: - - - - 3171 - - - - value: values.SpeedLimit - - - - - - value: values.SpeedLimit - value - values.SpeedLimit - 2 - - - 3179 - - - - speedLimitChanged: - - - - 3180 - setGlobalLimit: @@ -3777,142 +3916,6 @@ AAAAAAAAAAA 3205 - - - copyTorrentFiles: - - - - 3208 - - - - moveDataFilesSelected: - - - - 3210 - - - - linkDonate: - - - - 3213 - - - - copyMagnetLinks: - - - - 3217 - - - - copyMagnetLinks: - - - - 3219 - - - - undo: - - - - 3323 - - - - redo: - - - - 3402 - - - - setSortReverse: - - - - 3404 - - - - setSortReverse: - - - - 3406 - - - - clearCompleted: - - - - 3409 - - - - clearCompleted: - - - - 3424 - - - - fClearCompletedButton - - - - 3425 - - - - setSort: - - - - 3431 - - - - setSort: - - - - 3433 - - - - fActionMenu - - - - 3434 - - - - fActionButton - - - - 3438 - - - - showGlobalPopover: - - - - 3439 - @@ -5959,19 +5962,19 @@ AAAAAAAAAAA com.apple.InterfaceBuilder.CocoaPlugin.macosx - + YES 3 - {18, 18} + {128, 128} {15, 15} {9, 8} {7, 2} - {14, 14} - {14, 14} - {14, 14} - {64, 64} + {128, 128} + {128, 128} + {128, 128} + {128, 128}