mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2025-02-25 07:22:38 +00:00
Code Issues Releases Wiki Activity

simplify how the icons are set for the inspector tabs

Browse source
This commit is contained in:
Mitchell Livingston 2010-03-14 15:03:14 +00:00
parent baab619c93
commit 8e529921d7
3 changed files with 43 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
macosx/InfoTabButtonCell.m
View file

@ -35,6 +35,10 @@
name: NSControlTintDidChangeNotification object: NSApp]; name: NSControlTintDidChangeNotification object: NSApp];
fSelected = NO; fSelected = NO;
//expects the icon to currently be set as the image
fIcon = [[self image] retain];
[self setSelectedTab: fSelected];
} }
- (void) dealloc - (void) dealloc
@ -45,14 +49,6 @@
[super dealloc]; [super dealloc];
} }
- (void) setIcon: (NSImage *) image
{
[fIcon release];
fIcon = [image retain];
[self setSelectedTab: fSelected];
}
- (void) setSelectedTab: (BOOL) selected - (void) setSelectedTab: (BOOL) selected
{ {
fSelected = selected; fSelected = selected;

54
macosx/InfoWindow.xib
View file

@ -12,7 +12,7 @@
</object> </object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<integer value="931"/> <integer value="6"/>
</object> </object>
<object class="NSArray" key="IBDocument.PluginDependencies"> <object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
@ -156,15 +156,19 @@
<object class="NSButtonCell" id="120462994"> <object class="NSButtonCell" id="120462994">
<int key="NSCellFlags">67239424</int> <int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">0</int> <int key="NSCellFlags2">0</int>
<string key="NSContents">General Info</string> <string key="NSContents"/>
<object class="NSFont" key="NSSupport" id="737793924"> <object class="NSFont" key="NSSupport" id="737793924">
<string key="NSName">LucidaGrande</string> <string key="NSName">LucidaGrande</string>
<double key="NSSize">13</double> <double key="NSSize">13</double>
<int key="NSfFlags">1044</int> <int key="NSfFlags">1044</int>
</object> </object>
<reference key="NSControlView" ref="1020839921"/> <reference key="NSControlView" ref="1020839921"/>
<int key="NSButtonFlags">104612095</int> <int key="NSButtonFlags">108282111</int>
<int key="NSButtonFlags2">6</int> <int key="NSButtonFlags2">6</int>
<object class="NSCustomResource" key="NSNormalImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">InfoGeneral</string>
</object>
<string key="NSAlternateContents"/> <string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/> <string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">200</int> <int key="NSPeriodicDelay">200</int>
@ -173,12 +177,16 @@
<object class="NSButtonCell" id="308477966"> <object class="NSButtonCell" id="308477966">
<int key="NSCellFlags">67239424</int> <int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">0</int> <int key="NSCellFlags2">0</int>
<string key="NSContents">Activity</string> <string key="NSContents"/>
<reference key="NSSupport" ref="737793924"/> <reference key="NSSupport" ref="737793924"/>
<reference key="NSControlView" ref="1020839921"/> <reference key="NSControlView" ref="1020839921"/>
<int key="NSTag">1</int> <int key="NSTag">1</int>
<int key="NSButtonFlags">104612095</int> <int key="NSButtonFlags">108282111</int>
<int key="NSButtonFlags2">6</int> <int key="NSButtonFlags2">6</int>
<object class="NSCustomResource" key="NSNormalImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">InfoActivity</string>
</object>
<string key="NSAlternateContents"/> <string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/> <string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">400</int> <int key="NSPeriodicDelay">400</int>
@ -187,12 +195,16 @@
<object class="NSButtonCell" id="570838979"> <object class="NSButtonCell" id="570838979">
<int key="NSCellFlags">67239424</int> <int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">0</int> <int key="NSCellFlags2">0</int>
<string key="NSContents">Tracker</string> <string key="NSContents"/>
<reference key="NSSupport" ref="737793924"/> <reference key="NSSupport" ref="737793924"/>
<reference key="NSControlView" ref="1020839921"/> <reference key="NSControlView" ref="1020839921"/>
<int key="NSTag">2</int> <int key="NSTag">2</int>
<int key="NSButtonFlags">104612095</int> <int key="NSButtonFlags">108282111</int>
<int key="NSButtonFlags2">6</int> <int key="NSButtonFlags2">6</int>
<object class="NSCustomResource" key="NSNormalImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">InfoTracker</string>
</object>
<string key="NSAlternateContents"/> <string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/> <string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">400</int> <int key="NSPeriodicDelay">400</int>
@ -201,12 +213,16 @@
<object class="NSButtonCell" id="38805807"> <object class="NSButtonCell" id="38805807">
<int key="NSCellFlags">67239424</int> <int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">0</int> <int key="NSCellFlags2">0</int>
<string key="NSContents">Peers</string> <string key="NSContents"/>
<reference key="NSSupport" ref="737793924"/> <reference key="NSSupport" ref="737793924"/>
<reference key="NSControlView" ref="1020839921"/> <reference key="NSControlView" ref="1020839921"/>
<int key="NSTag">3</int> <int key="NSTag">3</int>
<int key="NSButtonFlags">104612095</int> <int key="NSButtonFlags">108282111</int>
<int key="NSButtonFlags2">6</int> <int key="NSButtonFlags2">6</int>
<object class="NSCustomResource" key="NSNormalImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">InfoPeers</string>
</object>
<string key="NSAlternateContents"/> <string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/> <string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">400</int> <int key="NSPeriodicDelay">400</int>
@ -215,12 +231,16 @@
<object class="NSButtonCell" id="530185020"> <object class="NSButtonCell" id="530185020">
<int key="NSCellFlags">67239424</int> <int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">0</int> <int key="NSCellFlags2">0</int>
<string key="NSContents">Files</string> <string key="NSContents"/>
<reference key="NSSupport" ref="737793924"/> <reference key="NSSupport" ref="737793924"/>
<reference key="NSControlView" ref="1020839921"/> <reference key="NSControlView" ref="1020839921"/>
<int key="NSTag">4</int> <int key="NSTag">4</int>
<int key="NSButtonFlags">104612095</int> <int key="NSButtonFlags">108806399</int>
<int key="NSButtonFlags2">6</int> <int key="NSButtonFlags2">6</int>
<object class="NSCustomResource" key="NSNormalImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">InfoFiles</string>
</object>
<string key="NSAlternateContents"/> <string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/> <string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">400</int> <int key="NSPeriodicDelay">400</int>
@ -229,12 +249,16 @@
<object class="NSButtonCell" id="219666447"> <object class="NSButtonCell" id="219666447">
<int key="NSCellFlags">-2080244224</int> <int key="NSCellFlags">-2080244224</int>
<int key="NSCellFlags2">0</int> <int key="NSCellFlags2">0</int>
<string key="NSContents">Options</string> <string key="NSContents"/>
<reference key="NSSupport" ref="737793924"/> <reference key="NSSupport" ref="737793924"/>
<reference key="NSControlView" ref="1020839921"/> <reference key="NSControlView" ref="1020839921"/>
<int key="NSTag">5</int> <int key="NSTag">5</int>
<int key="NSButtonFlags">-2042871553</int> <int key="NSButtonFlags">-2038677249</int>
<int key="NSButtonFlags2">6</int> <int key="NSButtonFlags2">6</int>
<object class="NSCustomResource" key="NSNormalImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">InfoOptions</string>
</object>
<int key="NSPeriodicDelay">400</int> <int key="NSPeriodicDelay">400</int>
<int key="NSPeriodicInterval">75</int> <int key="NSPeriodicInterval">75</int>
</object> </object>
@ -714,9 +738,9 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
<string>InfoTextField</string> <string>InfoTextField</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/> <integer value="1"/>
<string>{{897, 867}, {403, 75}}</string> <string>{{500, 881}, {403, 75}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{897, 867}, {403, 75}}</string> <string>{{500, 881}, {403, 75}}</string>
<integer value="1"/> <integer value="1"/>
<string>{{687, 827}, {350, 75}}</string> <string>{{687, 827}, {350, 75}}</string>
<boolean value="NO"/> <boolean value="NO"/>

9
macosx/InfoWindowController.m
View file

@ -78,7 +78,6 @@ typedef enum
const CGFloat windowHeight = NSHeight([window frame]); const CGFloat windowHeight = NSHeight([window frame]);
#warning check if this is still needed
[window setFrameAutosaveName: @"InspectorWindow"]; [window setFrameAutosaveName: @"InspectorWindow"];
[window setFrameUsingName: @"InspectorWindow"]; [window setFrameUsingName: @"InspectorWindow"];
@ -89,14 +88,6 @@ typedef enum
[window setBecomesKeyOnlyIfNeeded: YES]; [window setBecomesKeyOnlyIfNeeded: YES];
//set tab images
[[fTabMatrix cellWithTag: TAB_GENERAL_TAG] setIcon: [NSImage imageNamed: @"InfoGeneral.png"]];
[[fTabMatrix cellWithTag: TAB_ACTIVITY_TAG] setIcon: [NSImage imageNamed: @"InfoActivity.png"]];
[[fTabMatrix cellWithTag: TAB_TRACKERS_TAG] setIcon: [NSImage imageNamed: @"InfoTracker.png"]];
[[fTabMatrix cellWithTag: TAB_PEERS_TAG] setIcon: [NSImage imageNamed: @"InfoPeers.png"]];
[[fTabMatrix cellWithTag: TAB_FILE_TAG] setIcon: [NSImage imageNamed: @"InfoFiles.png"]];
[[fTabMatrix cellWithTag: TAB_OPTIONS_TAG] setIcon: [NSImage imageNamed: @"InfoOptions.png"]];
//set tab tooltips //set tab tooltips
[fTabMatrix setToolTip: NSLocalizedString(@"General Info", "Inspector -> tab") forCell: [fTabMatrix cellWithTag: TAB_GENERAL_TAG]]; [fTabMatrix setToolTip: NSLocalizedString(@"General Info", "Inspector -> tab") forCell: [fTabMatrix cellWithTag: TAB_GENERAL_TAG]];
[fTabMatrix setToolTip: NSLocalizedString(@"Activity", "Inspector -> tab") forCell: [fTabMatrix cellWithTag: TAB_ACTIVITY_TAG]]; [fTabMatrix setToolTip: NSLocalizedString(@"Activity", "Inspector -> tab") forCell: [fTabMatrix cellWithTag: TAB_ACTIVITY_TAG]];