Changeset 4136

Timestamp:

Dec 12, 2007, 3:53:37 PM (14 years ago)

Author:

livings124

Message:

on tiger the "ying-yang" status field does not have the strange glow, but as a result won't have any hilighting like on leopard

Location:

trunk

Files:

• Transmission.xcodeproj/project.pbxproj (modified) (4 diffs)
• macosx/Controller.h (modified) (2 diffs)
• macosx/Controller.m (modified) (2 diffs)
• macosx/English.lproj/MainMenu.nib/classes.nib (modified) (2 diffs)
• macosx/English.lproj/MainMenu.nib/info.nib (modified) (1 diff)
• macosx/English.lproj/MainMenu.nib/keyedobjects.nib (modified) (previous)
• macosx/MenuLabel.h (added)
• macosx/MenuLabel.m (added)

trunk/Transmission.xcodeproj/project.pbxproj

@@ -106 +106 @@
                 A25892770CF1FCE800CCCDDF /* StatsWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = A25892750CF1FCE800CCCDDF /* StatsWindow.xib */; };
                 A259317E0A73B2CC002F4FE7 /* TransmissionHelp in Resources */ = {isa = PBXBuildFile; fileRef = A259316A0A73B2CC002F4FE7 /* TransmissionHelp */; };
+                A25AFDE90D1038AD0092A1BA /* MenuLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = A25AFDE80D1038AD0092A1BA /* MenuLabel.m */; };
                 A25D2CBD0CF4C73E0096A262 /* stats.c in Sources */ = {isa = PBXBuildFile; fileRef = A25D2CBB0CF4C7190096A262 /* stats.c */; };
                 A25D2CBE0CF4C73E0096A262 /* stats.h in Headers */ = {isa = PBXBuildFile; fileRef = A25D2CBA0CF4C7190096A262 /* stats.h */; };
@@ -470 +471 @@
                 A25892760CF1FCE800CCCDDF /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = macosx/English.lproj/StatsWindow.xib; sourceTree = "<group>"; };
                 A259316A0A73B2CC002F4FE7 /* TransmissionHelp */ = {isa = PBXFileReference; lastKnownFileType = folder; name = TransmissionHelp; path = macosx/TransmissionHelp; sourceTree = "<group>"; };
+                A25AFDE70D1038AD0092A1BA /* MenuLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MenuLabel.h; path = macosx/MenuLabel.h; sourceTree = "<group>"; };
+                A25AFDE80D1038AD0092A1BA /* MenuLabel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MenuLabel.m; path = macosx/MenuLabel.m; sourceTree = "<group>"; };
                 A25D2CBA0CF4C7190096A262 /* stats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = stats.h; path = libtransmission/stats.h; sourceTree = "<group>"; };
                 A25D2CBB0CF4C7190096A262 /* stats.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = stats.c; path = libtransmission/stats.c; sourceTree = "<group>"; };
@@ -773 +776 @@
                                 4DCCBB3D09C3D71100D3CABF /* TorrentCell.h */,
                                 4DCCBB3C09C3D71100D3CABF /* TorrentCell.m */,
+                                A25AFDE70D1038AD0092A1BA /* MenuLabel.h */,
+                                A25AFDE80D1038AD0092A1BA /* MenuLabel.m */,
                                 A26397530D0F714300D36DF2 /* ActionPopUpButton.h */,
                                 A26397540D0F714300D36DF2 /* ActionPopUpButton.m */,
@@ -1719 +1724 @@
                                 3C7A11960D0B2EE300B5701F /* natpmp.c in Sources */,
                                 A26397550D0F714300D36DF2 /* ActionPopUpButton.m in Sources */,
+                                A25AFDE90D1038AD0092A1BA /* MenuLabel.m in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;

trunk/macosx/Controller.h

@@ -32 +32 @@
 #import "StatusBarView.h"
 #import "FilterButton.h"
+#import "MenuLabel.h"
 #import "IPCController.h"
 
@@ -63 +64 @@
     IBOutlet StatusBarView          * fStatusBar;
     IBOutlet NSButton               * fStatusButton;
+    IBOutlet MenuLabel              * fStatusTigerField;
+    IBOutlet NSImageView            * fStatusTigerImageView;
     IBOutlet NSTextField            * fTotalDLField, * fTotalULField;
     

trunk/macosx/Controller.m

@@ -291 +291 @@
     //set up status bar
     [fStatusBar setHidden: YES];
-    [fStatusBar setShowOnTiger: YES];
+    
+    if (![NSApp isOnLeopardOrBetter])
+    {
+        [fStatusBar setShowOnTiger: YES];
+        
+        [fStatusButton setHidden: YES];
+        [fStatusTigerField setHidden: NO];
+        [fStatusTigerImageView setHidden: NO];
+    }
     
     [fTotalDLField setToolTip: NSLocalizedString(@"Total download speed", "Status Bar -> speed tooltip")];
@@ -1476 +1484 @@
                 [fStatusButton sizeToFit];
                 
+                [fStatusTigerField setStringValue: statusString];
+                [fStatusTigerField sizeToFit];
+                
                 //width ends up being too long
                 NSRect statusFrame = [fStatusButton frame];

trunk/macosx/English.lproj/MainMenu.nib/classes.nib

@@ -12 +12 @@
                         <key>SUPERCLASS</key>
                         <string>NSResponder</string>
+                </dict>
+                <dict>
+                        <key>CLASS</key>
+                        <string>MenuLabel</string>
+                        <key>LANGUAGE</key>
+                        <string>ObjC</string>
+                        <key>SUPERCLASS</key>
+                        <string>NSTextField</string>
                 </dict>
                 <dict>
@@ -194 +202 @@
                                 <key>fStatusButton</key>
                                 <string>NSButton</string>
+                                <key>fStatusTigerField</key>
+                                <string>MenuLabel</string>
+                                <key>fStatusTigerImageView</key>
+                                <string>NSImageView</string>
                                 <key>fTableView</key>
                                 <string>TorrentTableView</string>

trunk/macosx/English.lproj/MainMenu.nib/info.nib

@@ -11 +11 @@
         <key>IBOpenObjects</key>
         <array>
-                <integer>1684</integer>
+                <integer>1480</integer>
         </array>
         <key>IBSystem Version</key>