Changeset 3150

Timestamp:

Sep 23, 2007, 4:21:03 PM (15 years ago)

Author:

livings124

Message:

when the main window isn't the key window, make the status bar show the normal window background

Location:

trunk

Files:

• Transmission.xcodeproj/project.pbxproj (modified) (17 diffs)
• macosx/Controller.m (modified) (2 diffs)
• macosx/FilterBarView.m (modified) (2 diffs)
• macosx/StatusBarView.h (added)
• macosx/StatusBarView.m (added)
• macosx/Torrent.m (modified) (1 diff)
• macosx/en.lproj/MainMenu.nib/classes.nib (modified) (1 diff)
• macosx/en.lproj/MainMenu.nib/info.nib (modified) (2 diffs)
• macosx/en.lproj/MainMenu.nib/keyedobjects.nib (modified) (previous)

trunk/Transmission.xcodeproj/project.pbxproj

@@ -76 +76 @@
                 A20B6FA50C4D97840034AB1D /* PriorityNone.png in Resources */ = {isa = PBXBuildFile; fileRef = A20B6FA40C4D97840034AB1D /* PriorityNone.png */; };
                 A20B6FAE0C4D9B040034AB1D /* PriorityNormal.png in Resources */ = {isa = PBXBuildFile; fileRef = A20B6FAD0C4D9B040034AB1D /* PriorityNormal.png */; };
+                A21282A70CA6C66800EAEE0F /* StatusBarView.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = A21282A50CA6C66800EAEE0F /* StatusBarView.h */; };
+                A21282A80CA6C66800EAEE0F /* StatusBarView.m in Sources */ = {isa = PBXBuildFile; fileRef = A21282A60CA6C66800EAEE0F /* StatusBarView.m */; };
                 A21567ED0A9A5034004DECD6 /* MessageWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = A21567EB0A9A5034004DECD6 /* MessageWindow.nib */; };
                 A215760B0C0D449A0057A26A /* NSBezierPathAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = A21576090C0D449A0057A26A /* NSBezierPathAdditions.m */; };
@@ -281 +283 @@
                                 A261F1E40A69A1B10002815A /* Growl.framework in CopyFiles */,
                                 A24F19210A3A796800C9C145 /* Sparkle.framework in CopyFiles */,
+                                A21282A70CA6C66800EAEE0F /* StatusBarView.h in CopyFiles */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -374 +377 @@
                 A20B6FA40C4D97840034AB1D /* PriorityNone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = PriorityNone.png; path = macosx/Images/PriorityNone.png; sourceTree = "<group>"; };
                 A20B6FAD0C4D9B040034AB1D /* PriorityNormal.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = PriorityNormal.png; path = macosx/Images/PriorityNormal.png; sourceTree = "<group>"; };
+                A21282A50CA6C66800EAEE0F /* StatusBarView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = StatusBarView.h; path = macosx/StatusBarView.h; sourceTree = "<group>"; };
+                A21282A60CA6C66800EAEE0F /* StatusBarView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = StatusBarView.m; path = macosx/StatusBarView.m; sourceTree = "<group>"; };
                 A21576090C0D449A0057A26A /* NSBezierPathAdditions.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = NSBezierPathAdditions.m; path = macosx/NSBezierPathAdditions.m; sourceTree = "<group>"; };
                 A215760A0C0D449A0057A26A /* NSBezierPathAdditions.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = NSBezierPathAdditions.h; path = macosx/NSBezierPathAdditions.h; sourceTree = "<group>"; };
@@ -712 +717 @@
                                 E138A9720C04D88F00C5426C /* CTGradient */,
                                 E1B6FBEB0C0D70AC0015FE4D /* UKKQueue */,
+                                A21282A50CA6C66800EAEE0F /* StatusBarView.h */,
+                                A21282A60CA6C66800EAEE0F /* StatusBarView.m */,
                         );
                         name = Sources;
@@ -1480 +1487 @@
                                 A2085DDC0C53BC74000BC3B7 /* AboutWindowController.m in Sources */,
                                 A234D0D20C79FB3600A82373 /* NSMenuAdditions.m in Sources */,
+                                A21282A80CA6C66800EAEE0F /* StatusBarView.m in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -1590 +1598 @@
                         isa = PBXVariantGroup;
                         children = (
+                                A2FA34650CA323EA00C432EE /* en */,
                                 A22BC9B10C5C505200F5FB72 /* Korean */,
                                 A22BCA310C5D5CDA00F5FB72 /* Italian */,
@@ -1596 +1605 @@
                                 A2603A010C6338FB00F5FDFD /* Spanish */,
                                 A2C19EDE0C676F5200E0B235 /* French */,
-                                A2FA34650CA323EA00C432EE /* en */,
                         );
                         name = MainMenu.nib;
@@ -1604 +1612 @@
                         isa = PBXVariantGroup;
                         children = (
+                                A2FA34630CA323EA00C432EE /* en */,
                                 A22BC9AF0C5C505200F5FB72 /* Korean */,
                                 A22BCA2F0C5D5CDA00F5FB72 /* Italian */,
@@ -1610 +1619 @@
                                 A26039FF0C6338FB00F5FDFD /* Spanish */,
                                 A2C19EDC0C676F5200E0B235 /* French */,
-                                A2FA34630CA323EA00C432EE /* en */,
                         );
                         name = InfoWindow.nib;
@@ -1618 +1626 @@
                         isa = PBXVariantGroup;
                         children = (
+                                A2FA345C0CA323DC00C432EE /* en */,
                                 A22BC9AD0C5C505200F5FB72 /* Korean */,
                                 A22BCA2D0C5D5CDA00F5FB72 /* Italian */,
@@ -1624 +1633 @@
                                 A26039FC0C6338FB00F5FDFD /* Spanish */,
                                 A2C19EDA0C676F5200E0B235 /* French */,
-                                A2FA345C0CA323DC00C432EE /* en */,
                         );
                         name = AboutWindow.nib;
@@ -1632 +1640 @@
                         isa = PBXVariantGroup;
                         children = (
+                                A2FA34660CA323EA00C432EE /* en */,
                                 A22BC9B20C5C505300F5FB72 /* Korean */,
                                 A22BCA320C5D5CDA00F5FB72 /* Italian */,
@@ -1638 +1647 @@
                                 A2603A020C6338FB00F5FDFD /* Spanish */,
                                 A2C19EDF0C676F5200E0B235 /* French */,
-                                A2FA34660CA323EA00C432EE /* en */,
                         );
                         name = MessageWindow.nib;
@@ -1660 +1668 @@
                         isa = PBXVariantGroup;
                         children = (
+                                A2FA34670CA323EA00C432EE /* en */,
                                 A22BC9B30C5C505300F5FB72 /* Korean */,
                                 A22BCA330C5D5CDA00F5FB72 /* Italian */,
@@ -1666 +1675 @@
                                 A2603A030C6338FB00F5FDFD /* Spanish */,
                                 A2C19EE00C676F5200E0B235 /* French */,
-                                A2FA34670CA323EA00C432EE /* en */,
                         );
                         name = PrefsWindow.nib;
@@ -1674 +1682 @@
                         isa = PBXVariantGroup;
                         children = (
+                                A2FA34610CA323EA00C432EE /* en */,
                                 A2AE68360C628A58008753C9 /* Korean */,
                                 A2AE68370C628A5E008753C9 /* Italian */,
@@ -1680 +1689 @@
                                 A26039FD0C6338FB00F5FDFD /* Spanish */,
                                 A2C19EDB0C676F5200E0B235 /* French */,
-                                A2FA34610CA323EA00C432EE /* en */,
                         );
                         name = Creator.nib;

trunk/macosx/Controller.m

@@ -225 +225 @@
 {
     [fBottomBar setBackgroundImage: [NSImage imageNamed: @"BottomBorder.png"]];
-    [fStatusBar setBackgroundImage: [NSImage imageNamed: @"StatusBarBackground.png"]];
-    [fFilterBar setBackgroundImage: [NSImage imageNamed: @"FilterBarBackground.png"]];
     
     NSToolbar * toolbar = [[NSToolbar alloc] initWithIdentifier: @"Transmission Toolbar"];
@@ -3219 +3217 @@
 - (void) windowDidBecomeKey: (NSNotification *) notification
 {
+    [fStatusBar setNeedsDisplay: YES];
+    
     [fBadger clearCompleted];
+}
+
+- (void) windowDidResignKey: (NSNotification *) notification
+{
+    [fStatusBar setNeedsDisplay: YES];
 }
 

trunk/macosx/FilterBarView.m

@@ -33 +33 @@
 - (void) awakeFromNib
 {
+    [self setBackgroundImage: [NSImage imageNamed: @"FilterBarBackground.png"]];
+    
     [fNoFilterButton setTitle: NSLocalizedString(@"All", @"Filter Bar Button -> title")];
     [fDownloadFilterButton setTitle: NSLocalizedString(@"Downloading", @"Filter Bar Button -> title")];
@@ -47 +49 @@
     [fSeedFilterButton setFrameOrigin: NSMakePoint(NSMaxX([fDownloadFilterButton frame]) + PADDING_HORIZONTAL, ORIGIN_VERTICAL)];
     [fPauseFilterButton setFrameOrigin: NSMakePoint(NSMaxX([fSeedFilterButton frame]) + PADDING_HORIZONTAL, ORIGIN_VERTICAL)];
-    
-    [self setNeedsDisplay: YES];
 }
 

trunk/macosx/Torrent.m

@@ -281 +281 @@
     {
         if ([fDefaults boolForKey: @"DisplayStatusProgressSelected"])
+        {
+            uint64_t downloadedValid = [self downloadedValid];
             [progressString appendFormat: NSLocalizedString(@"%@ of %@ selected (%.2f%%)", "Torrent -> progress string"),
-                            [NSString stringForFileSize: [self downloadedValid]],
-                            [NSString stringForFileSize: [self downloadedValid] + fStat->left], 100.0 * [self progressDone]];
+                            [NSString stringForFileSize: downloadedValid],
+                            [NSString stringForFileSize: downloadedValid + fStat->left], 100.0 * [self progressDone]];
+        }
         else
             [progressString appendFormat: NSLocalizedString(@"%@ of %@ (%.2f%%)", "Torrent -> progress string"),

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

@@ -180 +180 @@
             SUPERCLASS = NSObject; 
         }, 
+        {CLASS = StatusBarView; LANGUAGE = ObjC; SUPERCLASS = ImageBackgroundView; }, 
         {
             ACTIONS = {

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

@@ -10 +10 @@
                 <string>480 344 208 149 0 0 1680 1028 </string>
                 <key>1480</key>
-                <string>630 671 420 63 0 0 1680 1028 </string>
+                <string>640 533 420 63 0 0 1680 1028 </string>
                 <key>1603</key>
                 <string>601 669 477 67 0 0 1680 1028 </string>
@@ -36 +36 @@
         <key>IBOpenObjects</key>
         <array>
-                <integer>29</integer>
                 <integer>2043</integer>
                 <integer>1603</integer>
                 <integer>21</integer>
                 <integer>1480</integer>
+                <integer>29</integer>
         </array>
         <key>IBSystem Version</key>