From 609f1994e1c424fd1652bdda00a38f3719f055bf Mon Sep 17 00:00:00 2001 From: Mitchell Livingston Date: Fri, 16 Apr 2010 02:07:57 +0000 Subject: [PATCH] small design changes to the add windows, mainly placing the location, group, priority, and verify options into a box --- macosx/AddMagnetWindowController.h | 2 +- macosx/AddMagnetWindowController.m | 3 +- macosx/AddWindowController.m | 1 + macosx/en.lproj/AddMagnetWindow.xib | 777 +++++++++++++----------- macosx/en.lproj/AddWindow.xib | 886 +++++++++++++++------------- 5 files changed, 908 insertions(+), 761 deletions(-) diff --git a/macosx/AddMagnetWindowController.h b/macosx/AddMagnetWindowController.h index 6c17aa51e..5ae8ca244 100644 --- a/macosx/AddMagnetWindowController.h +++ b/macosx/AddMagnetWindowController.h @@ -29,7 +29,7 @@ @interface AddMagnetWindowController : NSWindowController { - IBOutlet NSImageView * fIconView, * fLocationImageView; + IBOutlet NSImageView * fLocationImageView; IBOutlet NSTextField * fNameField, * fLocationField; IBOutlet NSButton * fStartCheck; IBOutlet NSPopUpButton * fGroupPopUp, * fPriorityPopUp; diff --git a/macosx/AddMagnetWindowController.m b/macosx/AddMagnetWindowController.m index 30076058e..5602d21b9 100644 --- a/macosx/AddMagnetWindowController.m +++ b/macosx/AddMagnetWindowController.m @@ -72,8 +72,7 @@ NSString * name = [fTorrent name]; [[self window] setTitle: name]; [fNameField setStringValue: name]; - - [fIconView setImage: [fTorrent icon]]; + [fNameField setToolTip: name]; [self setGroupsMenu]; [fGroupPopUp selectItemWithTag: fGroupValue]; diff --git a/macosx/AddWindowController.m b/macosx/AddWindowController.m index bdacac889..24e56ec91 100644 --- a/macosx/AddWindowController.m +++ b/macosx/AddWindowController.m @@ -92,6 +92,7 @@ NSString * name = [fTorrent name]; [[self window] setTitle: name]; [fNameField setStringValue: name]; + [fNameField setToolTip: name]; [fIconView setImage: [fTorrent icon]]; diff --git a/macosx/en.lproj/AddMagnetWindow.xib b/macosx/en.lproj/AddMagnetWindow.xib index e25865538..2c1e96a35 100644 --- a/macosx/en.lproj/AddMagnetWindow.xib +++ b/macosx/en.lproj/AddMagnetWindow.xib @@ -12,7 +12,7 @@ YES - + YES @@ -41,13 +41,13 @@ 15 2 - {{173, 755}, {400, 167}} + {{173, 705}, {406, 233}} 1613234176 Window NSWindow - {9999, 167} - {400, 167} + {9999, 233} + {400, 233} 256 @@ -68,15 +68,15 @@ NeXT TIFF v4.0 pasteboard type - {{20, 125}, {32, 32}} + {{20, 207}, {16, 16}} YES 130560 33554432 - + NSImage - NSApplicationIcon + Magnet 0 1 @@ -88,7 +88,7 @@ 266 - {{57, 130}, {323, 22}} + {{17, 177}, {372, 22}} YES @@ -121,113 +121,21 @@ - - - 265 - {{307, 85}, {78, 28}} - - YES - - 67239424 - 134348800 - Change… - - LucidaGrande - 11 - 3100 - - - -2038284033 - 1 - - LucidaGrande - 11 - 16 - - - - - - 200 - 25 - - - - - 268 - {{17, 92}, {88, 17}} - - YES - - 67239424 - 272629760 - Download to: - - LucidaGrande - 13 - 1044 - - - - - - - - - 268 - - YES - - YES - Apple PDF pasteboard type - Apple PICT pasteboard type - Apple PNG pasteboard type - NSFilenamesPboardType - NeXT Encapsulated PostScript v1.2 pasteboard type - NeXT TIFF v4.0 pasteboard type - - - {{110, 92}, {16, 16}} - - YES - - 130560 - 33554432 - - 0 - 1 - 0 - NO - - YES - - - - 266 - {{131, 93}, {176, 14}} - - YES - - 67239488 - 272763392 - File - - - - - - 292 - {{18, 18}, {132, 18}} + {{18, 21}, {132, 18}} YES -2080244224 0 Start when added - + + LucidaGrande + 13 + 1044 + 1211912703 2 @@ -243,7 +151,7 @@ 289 - {{306, 12}, {80, 32}} + {{312, 12}, {80, 32}} YES @@ -268,7 +176,7 @@ 289 - {{229, 12}, {82, 32}} + {{235, 12}, {82, 32}} YES @@ -286,160 +194,318 @@ 25 - + - 289 - {{258, 52}, {125, 26}} + 268 + {{41, 206}, {87, 17}} YES - - -2076049856 - 2048 - - - 109199615 - 1 - - - 400 - 75 - - YES - - OtherViews - - YES - + + 68288064 + 272630784 + Magnet Link + + LucidaGrande-Bold + 13 + 16 - -1 - 1 - YES - YES - 2 - - - - - 289 - {{208, 58}, {48, 17}} - - YES - - 67239424 - 272629760 - Group: - - + - + - 292 - {{17, 58}, {54, 17}} - - YES - - 67239424 - 272629760 - Priority: - - - - - - - - - 292 - {{73, 52}, {125, 26}} - - YES - - -2076049856 - 2048 - - - 109199615 - 1 - - - 400 - 75 - - - Low - - 2147483647 - 1 - - NSImage - PriorityLow - - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - - _popUpItemAction: - 2 - - - YES - - OtherViews - + 26 + + YES + + + 256 + YES - - - High - - 2147483647 - - NSImage - PriorityHigh + + + 268 + {{71, 47}, {125, 26}} + + YES + + -2076049856 + 2048 + + + 109199615 + 1 + + + 400 + 75 + + YES + + OtherViews + + YES + + + -1 + 1 + YES + YES + 2 - - - _popUpItemAction: - - - - Normal - - 2147483647 - - NSImage - PriorityNormal + + + 265 + {{279, 74}, {78, 28}} + + YES + + 67239424 + 134348800 + Change… + + LucidaGrande + 11 + 3100 + + + -2038284033 + 1 + + LucidaGrande + 11 + 16 + + + + + + 200 + 25 - - - _popUpItemAction: - 1 - - + + + 268 + {{15, 81}, {88, 17}} + + YES + + 67239424 + 272629760 + Download to: + + + + + + + + + 266 + {{132, 82}, {147, 14}} + + YES + + 67239488 + 272763392 + File + + + + + + + + + 268 + {{15, 25}, {54, 17}} + + YES + + 67239424 + 272629760 + Priority: + + + + + + + + + 264 + + YES + + YES + Apple PDF pasteboard type + Apple PICT pasteboard type + Apple PNG pasteboard type + NSFilenamesPboardType + NeXT Encapsulated PostScript v1.2 pasteboard type + NeXT TIFF v4.0 pasteboard type + + + {{110, 81}, {16, 16}} + + YES + + 130560 + 33554432 + + NSImage + NSApplicationIcon + + 0 + 1 + 0 + NO + + YES + + + + 268 + {{71, 19}, {125, 26}} + + YES + + -2076049856 + 2048 + + + 109199615 + 1 + + + 400 + 75 + + + Low + + 2147483647 + 1 + + NSImage + PriorityLow + + + NSImage + NSMenuCheckmark + + + NSImage + NSMenuMixedState + + _popUpItemAction: + 2 + + + YES + + OtherViews + + YES + + + High + + 2147483647 + + NSImage + PriorityHigh + + + + _popUpItemAction: + + + + + Normal + + 2147483647 + + NSImage + PriorityNormal + + + + _popUpItemAction: + 1 + + + + + + 2 + 1 + YES + YES + 2 + + + + + 268 + {{21, 53}, {48, 17}} + + YES + + 67239424 + 272629760 + Group: + + + + + + + + {{1, 1}, {370, 109}} + + + + {{17, 52}, {372, 111}} + + {0, 0} + + 67239424 + 0 + Box + + + 6 + System + textBackgroundColor + + 3 + MQA - 2 - 1 - YES - YES - 2 + + 3 + MCAwLjgwMDAwMDAxMTkAA + + + 1 + 0 + 0 + NO - {400, 167} + {406, 233} {{0, 0}, {1680, 1028}} - {400, 189} - {9999, 189} + {400, 255} + {9999, 255} AddMagnetWindow @@ -470,14 +536,6 @@ 26 - - - fIconView - - - - 27 - fLocationImageView @@ -593,19 +651,13 @@ YES - - - - - - - - + + + - - + @@ -637,62 +689,6 @@ - - 9 - - - YES - - - - - - 10 - - - YES - - - - - - 11 - - - YES - - - - - - 12 - - - YES - - - - - - 13 - - - - - 14 - - - - - 15 - - - - - 16 - - - 17 @@ -735,6 +731,36 @@ + + 100 + + + YES + + + + + + 101 + + + + + 102 + + + YES + + + + + + + + + + + 33 @@ -742,7 +768,7 @@ YES - + 34 @@ -756,24 +782,49 @@ 35 - - YES - - 40 - + 9 + YES - + - + - 41 - - + 16 + + + + + 10 + + + YES + + + + + + 15 + + + + + 12 + + + YES + + + + + + 13 + + 84 @@ -782,7 +833,26 @@ YES - + + + + 91 + + + + + 11 + + + YES + + + + + + 14 + + 85 @@ -791,7 +861,7 @@ YES - + 86 @@ -807,15 +877,15 @@ YES - - + + - 88 - + 90 + @@ -824,14 +894,23 @@ - 90 - + 88 + - 91 - - + 40 + + + YES + + + + + + 41 + + @@ -852,6 +931,8 @@ 1.windowTemplate.minSize 10.IBPluginDependency 10.ImportedFromIB2 + 100.IBPluginDependency + 101.IBPluginDependency 11.IBPluginDependency 11.ImportedFromIB2 12.IBPluginDependency @@ -901,19 +982,21 @@ YES com.apple.InterfaceBuilder.CocoaPlugin - {{173, 764}, {400, 167}} + {{521, 720}, {406, 233}} com.apple.InterfaceBuilder.CocoaPlugin - {{173, 764}, {400, 167}} + {{521, 720}, {406, 233}} {196, 240} {{186, 418}, {414, 493}} - {9999, 167} - {400, 167} + {9999, 233} + {400, 233} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -976,7 +1059,7 @@ - 99 + 102 @@ -1006,7 +1089,6 @@ YES fGroupPopUp - fIconView fLocationField fLocationImageView fNameField @@ -1016,7 +1098,6 @@ YES NSPopUpButton - NSImageView NSTextField NSImageView NSTextField @@ -1111,6 +1192,14 @@ AppKit.framework/Headers/NSUserInterfaceItemSearching.h + + NSBox + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSBox.h + + NSButton NSControl @@ -1646,6 +1735,7 @@ YES YES + Magnet NSApplicationIcon NSMenuCheckmark NSMenuMixedState @@ -1655,6 +1745,7 @@ YES + {32, 32} {512, 512} {9, 8} {7, 2} diff --git a/macosx/en.lproj/AddWindow.xib b/macosx/en.lproj/AddWindow.xib index 5b8263913..222352ef0 100644 --- a/macosx/en.lproj/AddWindow.xib +++ b/macosx/en.lproj/AddWindow.xib @@ -12,7 +12,7 @@ YES - + YES @@ -41,13 +41,13 @@ 15 2 - {{132, 402}, {414, 493}} + {{132, 369}, {433, 526}} 1613234176 Window NSWindow {1.79769e+308, 1.79769e+308} - {380, 300} + {422, 300} 256 @@ -68,7 +68,7 @@ NeXT TIFF v4.0 pasteboard type - {{20, 419}, {64, 64}} + {{20, 452}, {64, 64}} YES @@ -88,7 +88,7 @@ 266 - {{89, 427}, {308, 17}} + {{89, 460}, {327, 17}} YES @@ -124,7 +124,7 @@ 266 - {{89, 452}, {305, 22}} + {{89, 485}, {324, 22}} YES @@ -141,98 +141,6 @@ - - - 265 - {{321, 387}, {78, 28}} - - YES - - 67239424 - 134348800 - Change… - - LucidaGrande - 11 - 3100 - - - -2038284033 - 1 - - LucidaGrande - 11 - 16 - - - - - - 200 - 25 - - - - - 268 - {{17, 394}, {88, 17}} - - YES - - 67239424 - 272629760 - Download to: - - - - - - - - - 268 - - YES - - YES - Apple PDF pasteboard type - Apple PICT pasteboard type - Apple PNG pasteboard type - NSFilenamesPboardType - NeXT Encapsulated PostScript v1.2 pasteboard type - NeXT TIFF v4.0 pasteboard type - - - {{110, 394}, {16, 16}} - - YES - - 130560 - 33554432 - - 0 - 1 - 0 - NO - - YES - - - - 266 - {{131, 395}, {190, 14}} - - YES - - 67239488 - 272763392 - File - - - - - - 292 @@ -259,7 +167,7 @@ 289 - {{320, 12}, {80, 32}} + {{339, 12}, {80, 32}} YES @@ -284,7 +192,7 @@ 289 - {{243, 12}, {82, 32}} + {{262, 12}, {82, 32}} YES @@ -302,54 +210,6 @@ 25 - - - 289 - {{272, 88}, {125, 26}} - - YES - - -2076049856 - 2048 - - - 109199615 - 1 - - - 400 - 75 - - YES - - OtherViews - - YES - - - -1 - 1 - YES - YES - 2 - - - - - 289 - {{222, 94}, {48, 17}} - - YES - - 67239424 - 272629760 - Group: - - - - - - 274 @@ -363,7 +223,7 @@ 256 - {357, 249} + {376, 242} YES @@ -375,14 +235,18 @@ YES Name - 295.59910000000002 + 314.59910000000002 38.599119999999999 1000 75628096 2048 Name - + + LucidaGrande + 11 + 3100 + 3 MC4zMzMzMzI5OQA @@ -501,7 +365,7 @@ 0 - {{1, 1}, {357, 249}} + {{1, 1}, {376, 242}} @@ -511,11 +375,12 @@ 256 - {{358, 1}, {15, 249}} + {{377, 1}, {15, 242}} _doScroller: - 0.99586776859504134 + 0.05439330543933054 + 0.98999999999999999 @@ -525,10 +390,11 @@ 257 _doScroller: + 0.009433962264150943 0.95348829999999996 - {{20, 128}, {374, 251}} + {{20, 192}, {393, 244}} 18 @@ -562,140 +428,316 @@ 25 - + - 292 - {{14, 85}, {146, 32}} - - YES - - 67239424 - 134217728 - Verify Local Data - - - -2038284033 - 129 - - - 200 - 25 - - - - - 1316 - - {{162, 94}, {16, 16}} - - 28936 - 1 - - - - 289 - {{216, 66}, {54, 17}} - - YES - - 67239424 - 272629760 - Priority: - - - - - - - - - 289 - {{272, 60}, {125, 26}} - - YES - - -2076049856 - 2048 - - - 109199615 - 1 - - - 400 - 75 - - - Low - - 2147483647 - 1 - - NSImage - PriorityLow - - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - - _popUpItemAction: - 2 - - - YES - - OtherViews - + 34 + + YES + + + 256 + YES - - - High - - 2147483647 - - NSImage - PriorityHigh + + + 265 + {{254, 19}, {125, 26}} + + YES + + -2076049856 + 2048 + + + 109199615 + 1 + + + 400 + 75 + + + Low + + 2147483647 + 1 + + NSImage + PriorityLow + + + NSImage + NSMenuCheckmark + + + NSImage + NSMenuMixedState + + _popUpItemAction: + 2 + + + YES + + OtherViews + + YES + + + High + + 2147483647 + + NSImage + PriorityHigh + + + + _popUpItemAction: + + + + + Normal + + 2147483647 + + NSImage + PriorityNormal + + + + _popUpItemAction: + 1 + + + + + + 2 + 1 + YES + YES + 2 - - - _popUpItemAction: - - - - Normal - - 2147483647 - - NSImage - PriorityNormal + + + 265 + {{204, 53}, {48, 17}} + + YES + + 67239424 + 272629760 + Group: + + + + + + + + + 265 + {{254, 47}, {125, 26}} + + YES + + -2076049856 + 2048 + + + 109199615 + 1 + + + 400 + 75 + + YES + + OtherViews + + YES + + + -1 + 1 + YES + YES + 2 + + + + + 1292 + + {{160, 52}, {16, 16}} + + 28936 + 1 + + + + 265 + {{198, 25}, {54, 17}} + + YES + + 67239424 + 272629760 + Priority: + + + + + + + + + 268 + {{12, 43}, {146, 32}} + + YES + + 67239424 + 134217728 + Verify Local Data + + + -2038284033 + 129 + + + 200 + 25 + + + + + 265 + {{303, 74}, {78, 28}} + + YES + + 67239424 + 134348800 + Change… + + + -2038284033 + 1 + + LucidaGrande + 11 + 16 + + + + + + 200 + 25 + + + + + 268 + {{15, 81}, {88, 17}} + + YES + + 67239424 + 272629760 + Download to: + + + + + + + + + 268 + + YES + + YES + Apple PDF pasteboard type + Apple PICT pasteboard type + Apple PNG pasteboard type + NSFilenamesPboardType + NeXT Encapsulated PostScript v1.2 pasteboard type + NeXT TIFF v4.0 pasteboard type + + + {{108, 81}, {16, 16}} + + YES + + 130560 + 33554432 + + 0 + 1 + 0 + NO + + YES + + + + 266 + {{129, 82}, {174, 14}} + + YES + + 67239488 + 272763392 + File + + + + - - - _popUpItemAction: - 1 - - + {{1, 1}, {394, 109}} + - 2 - 1 - YES - YES - 2 + {{17, 68}, {396, 111}} + + {0, 0} + + 67239424 + 0 + Box + + + 6 + System + textBackgroundColor + + + + 3 + MCAwLjgwMDAwMDAxMTkAA + + + + 1 + 0 + 0 + NO - {414, 493} + {433, 526} {{0, 0}, {1680, 1028}} - {380, 322} + {422, 322} {1.79769e+308, 1.79769e+308} AddWindow @@ -920,21 +962,12 @@ - - - - - - - - - - + @@ -980,62 +1013,6 @@ - - 9 - - - YES - - - - - - 10 - - - YES - - - - - - 11 - - - YES - - - - - - 12 - - - YES - - - - - - 13 - - - - - 14 - - - - - 15 - - - - - 16 - - - 17 @@ -1078,46 +1055,6 @@ - - 33 - - - YES - - - - - - 34 - - - YES - - - - - - 35 - - - YES - - - - - 40 - - - YES - - - - - - 41 - - - 42 @@ -1213,30 +1150,20 @@ - 65 - + 100 + YES - - - - - - 66 - - - - - 68 - - - - - 84 - - - YES - + + + + + + + + + + @@ -1247,7 +1174,7 @@ YES - + 86 @@ -1263,15 +1190,15 @@ YES - - + + - 88 - + 90 + @@ -1280,15 +1207,136 @@ - 90 - + 88 + + + 40 + + + YES + + + + + + 41 + + + + + 33 + + + YES + + + + + + 34 + + + YES + + + + + + 35 + + + + + 68 + + + + + 84 + + + YES + + + + 91 + + 65 + + + YES + + + + + + 66 + + + + + 9 + + + YES + + + + + + 16 + + + + + 10 + + + YES + + + + + + 15 + + + + + 11 + + + YES + + + + + + 14 + + + + + 12 + + + YES + + + + + + 13 + + + @@ -1386,16 +1434,16 @@ YES com.apple.InterfaceBuilder.CocoaPlugin - {{81, 433}, {414, 493}} + {{81, 400}, {433, 526}} com.apple.InterfaceBuilder.CocoaPlugin - {{81, 433}, {414, 493}} + {{81, 400}, {433, 526}} {196, 240} {{186, 418}, {414, 493}} - {414, 493} - {380, 300} + {422, 493} + {422, 300} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -1490,7 +1538,7 @@ - 99 + 100 @@ -1672,6 +1720,14 @@ AppKit.framework/Headers/NSUserInterfaceItemSearching.h + + NSBox + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSBox.h + + NSButton NSControl