Changeset 661 for trunk

Timestamp:

Jul 22, 2006, 6:47:21 PM (16 years ago)

Author:

livings124

Message:

Stop weird behavior and remove workaround code with the status bar background.

Location:

trunk

Files:

• Transmission.xcodeproj/project.pbxproj (modified) (8 diffs)
• macosx/Controller.m (modified) (1 diff)
• macosx/Images/StatusBarBackground.png (added)
• macosx/Images/StatusBorder.png (deleted)

trunk/Transmission.xcodeproj/project.pbxproj

@@ -117 +117 @@
                 A27431DB0A68538400FA780A /* BarButton.m in Sources */ = {isa = PBXBuildFile; fileRef = A27431D90A68538400FA780A /* BarButton.m */; };
                 A27A53570A06A76400E1F16F /* StatusSep.png in Resources */ = {isa = PBXBuildFile; fileRef = A27A53560A06A76400E1F16F /* StatusSep.png */; };
-                A27A53660A06AEDB00E1F16F /* StatusBorder.png in Resources */ = {isa = PBXBuildFile; fileRef = A27A53650A06AEDB00E1F16F /* StatusBorder.png */; };
                 A27ABC240A6ADE410020EC71 /* ImageBackgroundView.m in Sources */ = {isa = PBXBuildFile; fileRef = A27ABC220A6ADE410020EC71 /* ImageBackgroundView.m */; };
                 A289EB0C0A33C56D00B082A3 /* ButtonBorder.png in Resources */ = {isa = PBXBuildFile; fileRef = A289EB0B0A33C56D00B082A3 /* ButtonBorder.png */; };
@@ -123 +122 @@
                 A28DBADC0A33C1D800F4B4A7 /* ActionButton.png in Resources */ = {isa = PBXBuildFile; fileRef = A28DBADB0A33C1D800F4B4A7 /* ActionButton.png */; };
                 A2912C540A2956E80097A0CA /* PrefsWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = A2912C520A2956E80097A0CA /* PrefsWindow.nib */; };
+                A29597350A72A9E10057248B /* StatusBarBackground.png in Resources */ = {isa = PBXBuildFile; fileRef = A29597340A72A9E10057248B /* StatusBarBackground.png */; };
                 A2AF1C390A3D0F6200F1575D /* FileTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = A2AF1C370A3D0F6200F1575D /* FileTableView.m */; };
                 A2BD40070A09BBEA008CCE96 /* bencode.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D1838B709DEC0430047D688 /* bencode.h */; };
@@ -316 +316 @@
                 A27A53420A06A62500E1F16F /* StatusSep.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = StatusSep.png; path = macosx/Images/StatusSep.png; sourceTree = "<group>"; };
                 A27A53560A06A76400E1F16F /* StatusSep.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = StatusSep.png; path = macosx/Images/StatusSep.png; sourceTree = "<group>"; };
-                A27A53640A06AED200E1F16F /* StatusBorder.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = StatusBorder.png; path = macosx/Images/StatusBorder.png; sourceTree = "<group>"; };
-                A27A53650A06AEDB00E1F16F /* StatusBorder.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = StatusBorder.png; path = macosx/Images/StatusBorder.png; sourceTree = "<group>"; };
                 A27ABC210A6ADE410020EC71 /* ImageBackgroundView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ImageBackgroundView.h; path = macosx/ImageBackgroundView.h; sourceTree = "<group>"; };
                 A27ABC220A6ADE410020EC71 /* ImageBackgroundView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = ImageBackgroundView.m; path = macosx/ImageBackgroundView.m; sourceTree = "<group>"; };
@@ -324 +322 @@
                 A28DBADB0A33C1D800F4B4A7 /* ActionButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ActionButton.png; path = macosx/Images/ActionButton.png; sourceTree = "<group>"; };
                 A2912C530A2956E80097A0CA /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = macosx/English.lproj/PrefsWindow.nib; sourceTree = "<group>"; };
+                A29597340A72A9E10057248B /* StatusBarBackground.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = StatusBarBackground.png; path = macosx/Images/StatusBarBackground.png; sourceTree = "<group>"; };
                 A2A84AD20A04FCDC00C898D4 /* BottomBorder.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = BottomBorder.png; path = macosx/Images/BottomBorder.png; sourceTree = "<group>"; };
                 A2AF1C360A3D0F6200F1575D /* FileTableView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = FileTableView.h; path = macosx/FileTableView.h; sourceTree = "<group>"; };
@@ -440 +439 @@
                                 A2D0E0480A54A97C003C72CF /* Bandwidth.png */,
                                 A21DFF0F0A292B2B007C5F76 /* Transfers.png */,
-                                A27A53640A06AED200E1F16F /* StatusBorder.png */,
                                 A27A53420A06A62500E1F16F /* StatusSep.png */,
                                 A2A84AD20A04FCDC00C898D4 /* BottomBorder.png */,
@@ -476 +474 @@
                                 A2F6DB070A55F31C0058D1E5 /* SpeedLimitButton.png */,
                                 A246004C0A6DCE4600D19088 /* SpeedLimitButtonPressed.png */,
+                                A29597340A72A9E10057248B /* StatusBarBackground.png */,
                                 A27A53560A06A76400E1F16F /* StatusSep.png */,
-                                A27A53650A06AEDB00E1F16F /* StatusBorder.png */,
                                 A232D29D0A70903E00973B12 /* Filter.png */,
                                 A253F6F20A698970008EE24F /* FilterBarBackground.png */,
@@ -718 +716 @@
                                 A2C655650A04FEDC00E9FD82 /* BottomBorder.png in Resources */,
                                 A27A53570A06A76400E1F16F /* StatusSep.png in Resources */,
-                                A27A53660A06AEDB00E1F16F /* StatusBorder.png in Resources */,
                                 A21DFF100A292B2B007C5F76 /* Transfers.png in Resources */,
                                 A2912C540A2956E80097A0CA /* PrefsWindow.nib in Resources */,
@@ -756 +753 @@
                                 A24600520A6DCE6600D19088 /* SpeedLimitButtonGraphite.png in Resources */,
                                 A232D29E0A70903E00973B12 /* Filter.png in Resources */,
+                                A29597350A72A9E10057248B /* StatusBarBackground.png in Resources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;

trunk/macosx/Controller.m

@@ -103 +103 @@
     [fPrefsController setPrefs: fLib];
     
-    #warning remove eventually
-    NSImage * image = [NSImage imageNamed: @"StatusBorder.png"];
-    [image setName: nil];
-    [fStatusBar setBackgroundImage: [NSImage imageNamed: @"StatusBorder.png"]];
+    [fStatusBar setBackgroundImage: [NSImage imageNamed: @"StatusBarBackground.png"]];
     [fFilterBar setBackgroundImage: [NSImage imageNamed: @"FilterBarBackground.png"]];