#3669 Streamline the bottom-left buttons, removing the button borders and using an updated turtle image. There is glue-code for this to work on localizations until they update the xib files.

This commit is contained in:
Mitchell Livingston 2010-10-24 19:19:21 +00:00
parent 363e83ffec
commit 05175c8100
6 changed files with 972 additions and 65 deletions

View File

@ -16,6 +16,7 @@ Project Contributors
Malcolm Jarvis <mjarvis@transmissionbt.com> (Web client)
Rashid Eissing (Mac OS X Transfers preferences icon)
Hugo van Heuven, madebysofa (Main icon design)
Dean Ostetto (Mac OS X Turtle image)
Rick Patrick (Mac OS X images)
Jonas Rask (Mac OS X Globe icon)
Erick Turnquist (IPv6 code, support)

View File

@ -409,6 +409,12 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
if ([fDefaults boolForKey: @"SmallView"])
[fTableView setRowHeight: ROW_HEIGHT_SMALL];
#warning remove once localizations are updated for 2.2
[fActionButton setBordered: NO];
[fActionButton setFrame: NSMakeRect(8.0, 2.0, 36.0, 18.0)];
[fSpeedLimitButton setBordered: NO];
[fSpeedLimitButton setFrame: NSMakeRect(47.0, 2.0, 36.0, 18.0)];
//window min height
NSSize contentMinSize = [fWindow contentMinSize];
contentMinSize.height = [[fWindow contentView] frame].size.height - [[fTableView enclosingScrollView] frame].size.height

View File

@ -57,6 +57,9 @@ Lead Developers
Hugo van Heuven, madebysofa
\fs20 \cf2 (Main icon design)\
\fs24 \cf0 Dean Ostetto
\fs20 \cf2 (Mac OS X Turtle image)\
\fs24 \cf0 Rick Patrick
\fs20 \cf2 (Mac OS X images)\

Binary file not shown.

Before

Width:  |  Height:  |  Size: 356 B

After

Width:  |  Height:  |  Size: 4.1 KiB

File diff suppressed because it is too large Load Diff

View File

@ -12,7 +12,7 @@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
<integer value="256"/>
<integer value="153"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@ -58,7 +58,7 @@
<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
</object>
<object class="NSCustomView" id="249126185">
<reference key="NSNextResponder"/>
<nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@ -67,7 +67,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{52, 78}, {137, 17}}</string>
<reference key="NSSuperview" ref="249126185"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="819203889">
<int key="NSCellFlags">67239424</int>
@ -104,7 +103,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{192, 160}, {181, 18}}</string>
<reference key="NSSuperview" ref="249126185"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="114288993">
<int key="NSCellFlags">67239424</int>
@ -132,7 +130,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{192, 200}, {193, 18}}</string>
<reference key="NSSuperview" ref="249126185"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="1341189">
<int key="NSCellFlags">67239424</int>
@ -155,7 +152,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{81, 201}, {108, 17}}</string>
<reference key="NSSuperview" ref="249126185"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="184036008">
<int key="NSCellFlags">67239424</int>
@ -172,7 +168,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{45, 257}, {144, 17}}</string>
<reference key="NSSuperview" ref="249126185"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="811813130">
<int key="NSCellFlags">67239424</int>
@ -189,7 +184,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{192, 256}, {149, 18}}</string>
<reference key="NSSuperview" ref="249126185"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="284839720">
<int key="NSCellFlags">67239424</int>
@ -212,7 +206,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{192, 236}, {131, 18}}</string>
<reference key="NSSuperview" ref="249126185"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="556408151">
<int key="NSCellFlags">67239424</int>
@ -235,7 +228,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{211, 180}, {258, 18}}</string>
<reference key="NSSuperview" ref="249126185"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="263018774">
<int key="NSCellFlags">67239424</int>
@ -258,7 +250,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{211, 140}, {258, 18}}</string>
<reference key="NSSuperview" ref="249126185"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="718603970">
<int key="NSCellFlags">67239424</int>
@ -281,7 +272,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{109, 294}, {80, 17}}</string>
<reference key="NSSuperview" ref="249126185"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="1017981285">
<int key="NSCellFlags">67239424</int>
@ -298,7 +288,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{192, 293}, {303, 18}}</string>
<reference key="NSSuperview" ref="249126185"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="37001111">
<int key="NSCellFlags">67239424</int>
@ -321,7 +310,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{188, 68}, {185, 32}}</string>
<reference key="NSSuperview" ref="249126185"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="891757673">
<int key="NSCellFlags">67239424</int>
@ -345,7 +333,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{291, 108}, {82, 32}}</string>
<reference key="NSSuperview" ref="249126185"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="983781505">
<int key="NSCellFlags">67239424</int>
@ -369,7 +356,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{191, 118}, {101, 17}}</string>
<reference key="NSSuperview" ref="249126185"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="765517424">
<int key="NSCellFlags">67239424</int>
@ -386,7 +372,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{192, 38}, {183, 18}}</string>
<reference key="NSSuperview" ref="249126185"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="687318378">
<int key="NSCellFlags">67239424</int>
@ -409,7 +394,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{192, 18}, {155, 18}}</string>
<reference key="NSSuperview" ref="249126185"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="794987986">
<int key="NSCellFlags">67239424</int>
@ -432,7 +416,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{72, 39}, {117, 17}}</string>
<reference key="NSSuperview" ref="249126185"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="450175985">
<int key="NSCellFlags">67239424</int>
@ -446,13 +429,11 @@
</object>
</object>
<string key="NSFrameSize">{542, 331}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<string key="NSClassName">NSView</string>
<string key="NSExtension">NSResponder</string>
</object>
<object class="NSCustomView" id="314557528">
<reference key="NSNextResponder"/>
<nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@ -1762,12 +1743,11 @@
</object>
</object>
<string key="NSFrameSize">{542, 331}</string>
<reference key="NSSuperview"/>
<string key="NSClassName">NSView</string>
<string key="NSExtension">NSResponder</string>
</object>
<object class="NSCustomView" id="284666863">
<reference key="NSNextResponder"/>
<nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@ -1786,7 +1766,6 @@
<int key="NSvFlags">4352</int>
<string key="NSFrameSize">{141, 169}</string>
<reference key="NSSuperview" ref="568562479"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="_NSCornerView" key="NSCornerView">
<nil key="NSNextResponder"/>
@ -2040,7 +2019,6 @@ AAAAAAAAA</bytes>
</object>
<string key="NSFrame">{{1, 1}, {141, 169}}</string>
<reference key="NSSuperview" ref="544077474"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="638525082"/>
<reference key="NSDocView" ref="638525082"/>
<reference key="NSBGColor" ref="729660797"/>
@ -2051,7 +2029,6 @@ AAAAAAAAA</bytes>
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{184, 1}, {15, 188}}</string>
<reference key="NSSuperview" ref="544077474"/>
<reference key="NSWindow"/>
<reference key="NSTarget" ref="544077474"/>
<string key="NSAction">_doScroller:</string>
<double key="NSPercent">0.99492380000000002</double>
@ -2061,7 +2038,6 @@ AAAAAAAAA</bytes>
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{-100, -100}, {470, 15}}</string>
<reference key="NSSuperview" ref="544077474"/>
<reference key="NSWindow"/>
<int key="NSsFlags">1</int>
<reference key="NSTarget" ref="544077474"/>
<string key="NSAction">_doScroller:</string>
@ -2071,7 +2047,6 @@ AAAAAAAAA</bytes>
</object>
<string key="NSFrame">{{20, 49}, {143, 171}}</string>
<reference key="NSSuperview" ref="284666863"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="568562479"/>
<int key="NSsFlags">530</int>
<reference key="NSVScroller" ref="287972127"/>
@ -2084,7 +2059,6 @@ AAAAAAAAA</bytes>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{20, 19}, {67, 23}}</string>
<reference key="NSSuperview" ref="284666863"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSSegmentedCell" key="NSCell" id="116288466">
<int key="NSCellFlags">67239424</int>
@ -2123,7 +2097,6 @@ AAAAAAAAA</bytes>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{231, 173}, {291, 22}}</string>
<reference key="NSSuperview" ref="284666863"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="227628947">
<int key="NSCellFlags">-1804468671</int>
@ -2141,7 +2114,6 @@ AAAAAAAAA</bytes>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{228, 203}, {88, 17}}</string>
<reference key="NSSuperview" ref="284666863"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="810991095">
<int key="NSCellFlags">68288064</int>
@ -2165,7 +2137,6 @@ AAAAAAAAA</bytes>
</object>
<string key="NSFrame">{{171, 173}, {52, 47}}</string>
<reference key="NSSuperview" ref="284666863"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<bool key="NSIsBordered">YES</bool>
<object class="NSColor" key="NSColor">
@ -2178,7 +2149,6 @@ AAAAAAAAA</bytes>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{302, 136}, {182, 26}}</string>
<reference key="NSSuperview" ref="284666863"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="1012387126">
<int key="NSCellFlags">-2076049856</int>
@ -2251,7 +2221,6 @@ AAAAAAAAA</bytes>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{169, 141}, {130, 18}}</string>
<reference key="NSSuperview" ref="284666863"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="725735591">
<int key="NSCellFlags">67239424</int>
@ -2274,7 +2243,6 @@ AAAAAAAAA</bytes>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{187, 121}, {292, 14}}</string>
<reference key="NSSuperview" ref="284666863"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="12341917">
<int key="NSCellFlags">67239424</int>
@ -2291,7 +2259,6 @@ AAAAAAAAA</bytes>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{169, 85}, {323, 18}}</string>
<reference key="NSSuperview" ref="284666863"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="23936638">
<int key="NSCellFlags">-2080244224</int>
@ -2314,7 +2281,6 @@ AAAAAAAAA</bytes>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{400, 47}, {96, 32}}</string>
<reference key="NSSuperview" ref="284666863"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="565625533">
<int key="NSCellFlags">67239424</int>
@ -2335,7 +2301,6 @@ AAAAAAAAA</bytes>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{187, 51}, {214, 28}}</string>
<reference key="NSSuperview" ref="284666863"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="660134747">
<int key="NSCellFlags">67239424</int>
@ -2349,12 +2314,10 @@ AAAAAAAAA</bytes>
</object>
</object>
<string key="NSFrameSize">{542, 240}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<string key="NSClassName">NSView</string>
</object>
<object class="NSCustomView" id="352903881">
<nil key="NSNextResponder"/>
<reference key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@ -2809,7 +2772,7 @@ AAAAAAAAA</bytes>
<string>NeXT TIFF v4.0 pasteboard type</string>
</object>
</object>
<string key="NSFrame">{{35, 119}, {20, 14}}</string>
<string key="NSFrame">{{30, 117}, {18, 18}}</string>
<reference key="NSSuperview" ref="352903881"/>
<bool key="NSEnabled">YES</bool>
<object class="NSImageCell" key="NSCell" id="916608870">
@ -2820,7 +2783,7 @@ AAAAAAAAA</bytes>
<string key="NSResourceName">TurtleTemplate</string>
</object>
<int key="NSAlign">0</int>
<int key="NSScale">1</int>
<int key="NSScale">3</int>
<int key="NSStyle">0</int>
<bool key="NSAnimates">NO</bool>
</object>
@ -3101,6 +3064,7 @@ AAABAAAAAQ</bytes>
</object>
</object>
<string key="NSFrameSize">{542, 227}</string>
<reference key="NSSuperview"/>
<string key="NSClassName">NSView</string>
<string key="NSExtension">NSResponder</string>
</object>
@ -8697,12 +8661,12 @@ AAABAAAAAQ</bytes>
<reference ref="680684601"/>
<reference ref="55562493"/>
<reference ref="767699022"/>
<reference ref="871760904"/>
<reference ref="49689562"/>
<reference ref="161729812"/>
<reference ref="401711944"/>
<reference ref="497078689"/>
<reference ref="290463241"/>
<reference ref="871760904"/>
</object>
<reference key="parent" ref="0"/>
<string key="objectName">Bandwidth</string>
@ -14077,7 +14041,7 @@ AAABAAAAAQ</bytes>
<string>{7, 2}</string>
<string>{8, 8}</string>
<string>{15, 15}</string>
<string>{20, 14}</string>
<string>{64, 64}</string>
<string>{16, 16}</string>
</object>
</object>