From 7bcafd7149c9c6d816dab1f80cca8dc1db3b2d77 Mon Sep 17 00:00:00 2001 From: Mitchell Livingston Date: Sun, 28 Oct 2012 23:57:08 +0000 Subject: [PATCH] #4373 In the file list, swap the priority switch and download check, so that the scrollbar doesn't appear above the high priority switch --- macosx/InfoFileView.xib | 128 ++++++------ macosx/en.lproj/AddWindow.xib | 377 +++++++++++----------------------- 2 files changed, 187 insertions(+), 318 deletions(-) diff --git a/macosx/InfoFileView.xib b/macosx/InfoFileView.xib index 64be73dee..c0c61f68b 100644 --- a/macosx/InfoFileView.xib +++ b/macosx/InfoFileView.xib @@ -2,26 +2,26 @@ 1060 - 11E53 - 2182 - 1138.47 - 569.00 + 12C60 + 2843 + 1187.34 + 625.00 com.apple.InterfaceBuilder.CocoaPlugin - 2182 + 2843 - NSTextFieldCell + NSButton + NSButtonCell + NSCustomObject + NSCustomView NSOutlineView NSScrollView + NSScroller NSSearchField - NSButton - NSCustomView - NSButtonCell - NSTableColumn NSSearchFieldCell - NSScroller - NSCustomObject + NSTableColumn + NSTextFieldCell com.apple.InterfaceBuilder.CocoaPlugin @@ -54,7 +54,7 @@ _NS:9 YES - -2080244224 + -2080374784 134348800 All @@ -64,13 +64,14 @@ _NS:9 - -2038152961 + -2038153216 164 400 75 + NO @@ -82,19 +83,20 @@ _NS:9 YES - -2080244224 + -2080374784 134348800 None _NS:9 - -2038152961 + -2038153216 164 400 75 + NO @@ -112,6 +114,8 @@ YES + NO + YES 256 @@ -120,11 +124,11 @@ Name - 256.59910000000002 + 244 38.599119999999999 1000 - 75628096 + 75497536 2048 Name @@ -143,7 +147,7 @@ - 337772096 + 337641536 2048 Text Cell @@ -172,15 +176,15 @@ YES - - Check - 18 + + Priority + 34 10 1000 - 75628096 + 75497536 2048 - DL + Rank 6 @@ -193,8 +197,32 @@ + + 337641536 + 134219776 + Text Cell + + + + + + + + + Check + 31 + 10 + 1000 + + 75497536 + 2048 + DL + + + + - 67239424 + 67108864 150994944 @@ -203,7 +231,7 @@ 16 - 1211912703 + 1211912448 2 NSSwitch @@ -215,30 +243,6 @@ - - Priority - 34 - 10 - 1000 - - 75628096 - 2048 - Rank - - - - - - 337772096 - 134219776 - Text Cell - - - - - - - 3 2 @@ -275,10 +279,11 @@ 256 - {{304, 1}, {15, 324}} + {{303, 1}, {16, 324}} + NO _doScroller: 0.99692307692307691 @@ -290,6 +295,7 @@ + NO 1 _doScroller: @@ -305,6 +311,9 @@ QSAAAEEgAABCEAAAQhAAAA + 0.25 + 4 + 1 @@ -315,7 +324,7 @@ YES - 343014976 + 342884416 268567552 @@ -331,20 +340,20 @@ - 130560 + 0 0 search _searchFieldSearch: - 138690815 + 138690560 0 400 75 - 130560 + 0 0 clear @@ -356,7 +365,7 @@ _searchFieldCancel: - 138690815 + 138690560 0 400 @@ -364,6 +373,7 @@ 255 + NO {340, 365} @@ -540,8 +550,8 @@ 7 - + @@ -656,7 +666,7 @@ - 32 + 34 @@ -748,7 +758,7 @@ com.apple.InterfaceBuilder.CocoaPlugin.macosx - + YES 3 diff --git a/macosx/en.lproj/AddWindow.xib b/macosx/en.lproj/AddWindow.xib index 775707723..a5149caf0 100644 --- a/macosx/en.lproj/AddWindow.xib +++ b/macosx/en.lproj/AddWindow.xib @@ -2,36 +2,36 @@ 1060 - 11E53 - 2182 - 1138.47 - 569.00 + 12C60 + 2843 + 1187.34 + 625.00 com.apple.InterfaceBuilder.CocoaPlugin - 2182 + 2843 - NSMenu + NSBox NSButton + NSButtonCell NSCustomObject - NSImageView NSImageCell - NSTextField + NSImageView + NSMenu + NSMenuItem + NSOutlineView + NSPopUpButton + NSPopUpButtonCell + NSProgressIndicator + NSScrollView + NSScroller NSSearchField NSSearchFieldCell - NSWindowTemplate - NSTextFieldCell - NSButtonCell NSTableColumn - NSBox - NSPopUpButtonCell - NSOutlineView + NSTextField + NSTextFieldCell NSView - NSScrollView - NSProgressIndicator - NSScroller - NSPopUpButton - NSMenuItem + NSWindowTemplate com.apple.InterfaceBuilder.CocoaPlugin @@ -77,11 +77,10 @@ {{20, 452}, {64, 64}} - YES - 130560 + 134217728 33554432 NSImage @@ -92,6 +91,7 @@ 0 NO + NO YES @@ -99,11 +99,10 @@ 266 {{89, 460}, {327, 17}} - YES - 67239488 + 67108928 4196928 status info @@ -131,17 +130,17 @@ + NO 266 {{89, 485}, {324, 22}} - YES - 67239488 + 67108928 4196928 File Name @@ -153,22 +152,22 @@ + NO 292 {{18, 18}, {132, 18}} - YES - -2080244224 + -2080374784 0 Start when added - 1211912703 + 1211912448 2 NSSwitch @@ -178,17 +177,17 @@ 200 25 + NO 289 {{339, 12}, {80, 32}} - YES - 67239424 + 67108864 134217728 Add @@ -197,7 +196,7 @@ 16 - -2038284033 + -2038284288 1 @@ -205,22 +204,22 @@ 200 25 + NO 289 {{257, 12}, {82, 32}} - YES - 67239424 + 67108864 134217728 Cancel - -2038284033 + -2038284288 1 @@ -228,6 +227,7 @@ 200 25 + NO @@ -242,9 +242,10 @@ 256 {391, 220} - YES + NO + YES 256 @@ -253,11 +254,11 @@ Name - 329.59910000000002 + 317 38.599119999999999 1000 - 75628096 + 75497536 2048 Name @@ -277,7 +278,7 @@ - 337772096 + 337641536 2048 Text Cell @@ -294,15 +295,15 @@ YES - - Check - 18 + + Priority + 34 10 1000 - 75628096 + 75497536 2048 - DL + Rank 6 @@ -315,8 +316,32 @@ + + 337641536 + 134219776 + Text Cell + + + + + + + + + Check + 31 + 10 + 1000 + + 75497536 + 2048 + DL + + + + - 67239424 + 67108864 150994944 @@ -325,7 +350,7 @@ 16 - 1211912703 + 1211912448 2 @@ -335,30 +360,6 @@ - - Priority - 34 - 10 - 1000 - - 75628096 - 2048 - Rank - - - - - - 337772096 - 134219776 - Text Cell - - - - - - - 3 2 @@ -386,7 +387,6 @@ {{1, 1}, {391, 220}} - @@ -395,10 +395,10 @@ 256 - {{377, 1}, {15, 220}} + {{376, 1}, {16, 220}} - + NO _doScroller: 0.05439330543933054 @@ -409,8 +409,8 @@ -2147483392 {{-100, -100}, {328, 15}} - + NO 1 _doScroller: @@ -420,77 +420,78 @@ {{20, 214}, {393, 222}} - 133138 QSAAAEEgAABCEAAAQhAAAA + 0.25 + 4 + 1 289 {{371, 190}, {42, 17}} - _NS:9 YES - -1543373312 + -1543503872 134348800 None _NS:9 - -2038152961 + -2038153216 164 400 75 + NO 289 {{321, 190}, {42, 17}} - _NS:9 YES - -1543373312 + -1543503872 134348800 All _NS:9 - -2038152961 + -2038153216 164 400 75 + NO 292 {{18, 40}, {129, 18}} - YES - -2080244224 + -2080374784 0 Trash torrent file - 1211912703 + 1211912448 2 NSImage @@ -502,6 +503,7 @@ 200 25 + NO @@ -516,15 +518,14 @@ 265 {{257, 19}, {125, 26}} - YES - -2076049856 + -2076180416 2048 - 109199615 + 109199360 1 @@ -594,17 +595,17 @@ YES 2 + NO 265 {{207, 53}, {48, 17}} - YES - 67239424 + 67108864 272629760 Group: @@ -612,21 +613,21 @@ + NO 265 {{257, 47}, {125, 26}} - YES - -2076049856 + -2076180416 2048 - 109199615 + 109199360 1 @@ -644,14 +645,13 @@ YES 2 + NO 1292 - {{18, 31}, {135, 12}} - 24842 1 @@ -661,11 +661,10 @@ 265 {{201, 25}, {54, 17}} - YES - 67239424 + 67108864 272629760 Priority: @@ -673,44 +672,44 @@ + NO 268 {{12, 43}, {146, 32}} - YES - 67239424 + 67108864 134217728 Verify Local Data - -2038284033 + -2038284288 129 200 25 + NO 265 {{306, 76}, {78, 28}} - YES - 67239424 + 67108864 134348800 Change… - -2038284033 + -2038284288 1 LucidaGrande @@ -724,17 +723,17 @@ 200 25 + NO 268 {{15, 83}, {88, 17}} - YES - 67239424 + 67108864 272629760 Download to: @@ -742,6 +741,7 @@ + NO @@ -756,11 +756,10 @@ 266 {{33, 8}, {151, 14}} - YES - 67239488 + 67108928 4328000 File @@ -768,6 +767,7 @@ + NO @@ -782,11 +782,10 @@ {{12, 7}, {16, 16}} - YES - 130560 + 134217728 33554432 0 @@ -794,22 +793,21 @@ 0 NO + NO YES {{1, 1}, {199, 28}} - {{105, 75}, {201, 30}} - {0, 0} - 67239424 + 67108864 0 @@ -833,17 +831,15 @@ {{1, 1}, {397, 114}} - {{17, 68}, {399, 116}} - {0, 0} - 67239424 + 67108864 0 Box @@ -864,11 +860,10 @@ 292 {{20, 190}, {110, 19}} - YES - 343014976 + 342884416 268567552 @@ -879,20 +874,20 @@ - 130560 + 0 0 search _searchFieldSearch: - 138690815 + 138690560 0 400 75 - 130560 + 0 0 clear @@ -904,7 +899,7 @@ _searchFieldCancel: - 138690815 + 138690560 0 400 @@ -912,11 +907,11 @@ 255 + NO {433, 526} - {{0, 0}, {2560, 1440}} @@ -1312,8 +1307,8 @@ 46 - + @@ -1677,143 +1672,7 @@ 116 - - - - AddWindowController - NSWindowController - - id - id - id - - - - checkAll: - id - - - setFileFilterText: - id - - - uncheckAll: - id - - - - NSButton - NSButton - FileOutlineController - NSTextField - NSScrollView - NSPopUpButton - NSImageView - NSTextField - NSImageView - NSTextField - NSPopUpButton - NSButton - NSTextField - NSButton - NSProgressIndicator - - - - fCheckAllButton - NSButton - - - fDeleteCheck - NSButton - - - fFileController - FileOutlineController - - - fFileFilterField - NSTextField - - - fFileScrollView - NSScrollView - - - fGroupPopUp - NSPopUpButton - - - fIconView - NSImageView - - - fLocationField - NSTextField - - - fLocationImageView - NSImageView - - - fNameField - NSTextField - - - fPriorityPopUp - NSPopUpButton - - - fStartCheck - NSButton - - - fStatusField - NSTextField - - - fUncheckAllButton - NSButton - - - fVerifyIndicator - NSProgressIndicator - - - - IBProjectSource - ./Classes/AddWindowController.h - - - - FileOutlineController - NSObject - - fOutline - FileOutlineView - - - fOutline - - fOutline - FileOutlineView - - - - IBProjectSource - ./Classes/FileOutlineController.h - - - - FileOutlineView - NSOutlineView - - IBProjectSource - ./Classes/FileOutlineView.h - - - - + 0 IBCocoaFramework @@ -1822,7 +1681,7 @@ com.apple.InterfaceBuilder.CocoaPlugin.macosx - + YES 3 -- 2.49.0