Changeset 4128

Timestamp:

Dec 12, 2007, 3:21:11 AM (14 years ago)

Author:

livings124

Message:

use 10.5's built-in ability to generate the textured bottom border instead of a custom view with images

Location:

trunk

Files:

• Transmission.xcodeproj/project.pbxproj (modified) (9 diffs)
• macosx/BottomBarView.h (deleted)
• macosx/BottomBarView.m (deleted)
• macosx/Controller.m (modified) (2 diffs)
• macosx/English.lproj/Localizable.strings (modified) (5 diffs)
• macosx/English.lproj/MainMenu.nib/classes.nib (modified) (3 diffs)
• macosx/English.lproj/MainMenu.nib/info.nib (modified) (1 diff)
• macosx/English.lproj/MainMenu.nib/keyedobjects.nib (modified) (previous)
• macosx/Images/BottomBack.png (deleted)
• macosx/Images/BottomBackInactive.png (deleted)

trunk/Transmission.xcodeproj/project.pbxproj

@@ -88 +88 @@
                 A226FDAC0D0CDF20005A7F71 /* libnatpmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3C7A118D0D0B2EB800B5701F /* libnatpmp.a */; };
                 A22A8D560AEEAFA5007E9CB9 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = A22A8D540AEEAFA5007E9CB9 /* Localizable.strings */; };
-                A22BC9A30C5BBCF100F5FB72 /* BottomBack.png in Resources */ = {isa = PBXBuildFile; fileRef = A22BC9A20C5BBCF100F5FB72 /* BottomBack.png */; };
                 A22D3AA60D00D1790079CFED /* Turtle.png in Resources */ = {isa = PBXBuildFile; fileRef = A22D3AA30D00D1790079CFED /* Turtle.png */; };
                 A22D3AA70D00D1790079CFED /* TurtleBlue.png in Resources */ = {isa = PBXBuildFile; fileRef = A22D3AA40D00D1790079CFED /* TurtleBlue.png */; };
-                A22D3ABA0D00D31F0079CFED /* BottomBackInactive.png in Resources */ = {isa = PBXBuildFile; fileRef = A22D3AB90D00D31F0079CFED /* BottomBackInactive.png */; };
                 A232D29E0A70903E00973B12 /* Filter.png in Resources */ = {isa = PBXBuildFile; fileRef = A232D29D0A70903E00973B12 /* Filter.png */; };
                 A234D0D20C79FB3600A82373 /* NSMenuAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = A234D0D00C79FB3600A82373 /* NSMenuAdditions.m */; };
@@ -123 +121 @@
                 A277DA0B0C693D9C00DA2CD4 /* ActionOn.png in Resources */ = {isa = PBXBuildFile; fileRef = A277DA090C693D9C00DA2CD4 /* ActionOn.png */; };
                 A277DA0C0C693D9C00DA2CD4 /* ActionOff.png in Resources */ = {isa = PBXBuildFile; fileRef = A277DA0A0C693D9C00DA2CD4 /* ActionOff.png */; };
-                A28E1DBA0CFFD41800E16385 /* BottomBarView.m in Sources */ = {isa = PBXBuildFile; fileRef = A28E1DB80CFFD41800E16385 /* BottomBarView.m */; };
                 A2912C540A2956E80097A0CA /* PrefsWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = A2912C520A2956E80097A0CA /* PrefsWindow.nib */; };
                 A29AF4F70D01BADC00D097EC /* DownArrow.png in Resources */ = {isa = PBXBuildFile; fileRef = A29AF4F60D01BADC00D097EC /* DownArrow.png */; };
@@ -441 +438 @@
                 A2265F3F0B5EF5F40093DDA5 /* FileNameCell.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = FileNameCell.h; path = macosx/FileNameCell.h; sourceTree = "<group>"; };
                 A2265F400B5EF5F40093DDA5 /* FileNameCell.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = FileNameCell.m; path = macosx/FileNameCell.m; sourceTree = "<group>"; };
-                A22BC9A20C5BBCF100F5FB72 /* BottomBack.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = BottomBack.png; path = macosx/Images/BottomBack.png; sourceTree = "<group>"; };
                 A22D3AA30D00D1790079CFED /* Turtle.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Turtle.png; path = macosx/Images/Turtle.png; sourceTree = "<group>"; };
                 A22D3AA40D00D1790079CFED /* TurtleBlue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = TurtleBlue.png; path = macosx/Images/TurtleBlue.png; sourceTree = "<group>"; };
-                A22D3AB90D00D31F0079CFED /* BottomBackInactive.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = BottomBackInactive.png; path = macosx/Images/BottomBackInactive.png; sourceTree = "<group>"; };
                 A232D29D0A70903E00973B12 /* Filter.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Filter.png; path = macosx/Images/Filter.png; sourceTree = "<group>"; };
                 A234D0CF0C79FB3600A82373 /* NSMenuAdditions.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = NSMenuAdditions.h; path = macosx/NSMenuAdditions.h; sourceTree = "<group>"; };
@@ -500 +495 @@
                 A277DA090C693D9C00DA2CD4 /* ActionOn.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ActionOn.png; path = macosx/Images/ActionOn.png; sourceTree = "<group>"; };
                 A277DA0A0C693D9C00DA2CD4 /* ActionOff.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ActionOff.png; path = macosx/Images/ActionOff.png; sourceTree = "<group>"; };
-                A28E1DB80CFFD41800E16385 /* BottomBarView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BottomBarView.m; path = macosx/BottomBarView.m; sourceTree = "<group>"; };
-                A28E1DD50CFFD8A700E16385 /* BottomBarView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BottomBarView.h; path = macosx/BottomBarView.h; sourceTree = "<group>"; };
                 A28E1DDF0CFFD8EC00E16385 /* ButtonToolbarItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ButtonToolbarItem.h; path = macosx/ButtonToolbarItem.h; sourceTree = "<group>"; };
                 A29AF4F60D01BADC00D097EC /* DownArrow.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = DownArrow.png; path = macosx/Images/DownArrow.png; sourceTree = "<group>"; };
@@ -814 +807 @@
                                 A2ED7D8D0CEF431B00970975 /* FilterButton.h */,
                                 A2ED7D8E0CEF431B00970975 /* FilterButton.m */,
-                                A28E1DB80CFFD41800E16385 /* BottomBarView.m */,
-                                A28E1DD50CFFD8A700E16385 /* BottomBarView.h */,
                                 A2C89D5F0CFCBF57004CC2BC /* ButtonToolbarItem.m */,
                                 A28E1DDF0CFFD8EC00E16385 /* ButtonToolbarItem.h */,
@@ -929 +920 @@
                                 A25FCDDD0A37695F002BCBBE /* PauseSelected.png */,
                                 A25FCDDE0A37695F002BCBBE /* ResumeSelected.png */,
-                                A22BC9A20C5BBCF100F5FB72 /* BottomBack.png */,
-                                A22D3AB90D00D31F0079CFED /* BottomBackInactive.png */,
                                 A2F151210CD438DE001F3B0E /* InfoTabBorder.png */,
                                 A2F151220CD438DE001F3B0E /* InfoTabBack.png */,
@@ -1553 +1542 @@
                                 A20B6FAE0C4D9B040034AB1D /* PriorityNormal.png in Resources */,
                                 A2085E3F0C53C949000BC3B7 /* LICENSE in Resources */,
-                                A22BC9A30C5BBCF100F5FB72 /* BottomBack.png in Resources */,
                                 A2AE68330C628A35008753C9 /* Creator.nib in Resources */,
                                 A277DA0B0C693D9C00DA2CD4 /* ActionOn.png in Resources */,
@@ -1578 +1566 @@
                                 A22D3AA60D00D1790079CFED /* Turtle.png in Resources */,
                                 A22D3AA70D00D1790079CFED /* TurtleBlue.png in Resources */,
-                                A22D3ABA0D00D31F0079CFED /* BottomBackInactive.png in Resources */,
                                 A29AF4F70D01BADC00D097EC /* DownArrow.png in Resources */,
                                 A29AF4F90D01BAEB00D097EC /* UpArrow.png in Resources */,
@@ -1727 +1714 @@
                                 A25892640CF1F7E800CCCDDF /* StatsWindowController.m in Sources */,
                                 A2C89D600CFCBF57004CC2BC /* ButtonToolbarItem.m in Sources */,
-                                A28E1DBA0CFFD41800E16385 /* BottomBarView.m in Sources */,
                                 A219798B0D07B78400438EA7 /* GroupToolbarItem.m in Sources */,
                                 A20BFFB70D091CC700CE5D2B /* ToolbarSegmentedCell.m in Sources */,

trunk/macosx/Controller.m

@@ -248 +248 @@
     [fWindow setContentMinSize: contentMinSize];
     
+    if ([NSApp isOnLeopardOrBetter])
+        [fWindow setContentBorderThickness: [[fTableView enclosingScrollView] frame].origin.y forEdge: NSMinYEdge];
+    
     //set info and filter keyboard shortcuts
     unichar rightChar = NSRightArrowFunctionKey, leftChar = NSLeftArrowFunctionKey;
@@ -301 +304 @@
     statusBarFrame.size.width = windowSize.width;
     [fStatusBar setFrame: statusBarFrame];
-
+    
     [contentView addSubview: fStatusBar];
     [fStatusBar setFrameOrigin: NSMakePoint(0, NSMaxY([contentView frame]))];

trunk/macosx/English.lproj/Localizable.strings

@@ -249 +249 @@
 "Create a Torrent File" = "Create a Torrent File";
 
+/* Create toolbar item -> tooltip */
+"Create torrent file" = "Create torrent file";
+
 /* Create torrent -> select file
    Create toolbar item -> palette label */
 "Create Torrent File" = "Create Torrent File";
 
-/* Create toolbar item -> tooltip */
-"Create torrent file" = "Create torrent file";
-
 /* Create torrent -> failed -> title */
 "Creation of \"%@\" failed." = "Creation of \"%@\" failed.";
 
-/* status bar -> status label (3 spaces between) */
-"DL: %@   UL: %@" = "DL: %1$@   UL: %2$@";
+/* status bar -> status label (2 spaces between) */
+"DL: %@  UL: %@" = "DL: %1$@  UL: %2$@";
 
 /* Torrent -> status string */
@@ -303 +303 @@
 "Encrypted Connection" = "Encrypted Connection";
 
+/* Torrent -> status string */
+"Error" = "Error";
+
 /* Ratio invalid
    Transfer speed invalid */
 "error" = "error";
-
-/* Torrent -> status string */
-"Error" = "Error";
 
 /* Torrent -> status string */
@@ -421 +421 @@
 "Open" = "Open";
 
+/* Open toolbar item -> tooltip */
+"Open torrent files" = "Open torrent files";
+
 /* Open toolbar item -> palette label */
 "Open Torrent Files" = "Open Torrent Files";
-
-/* Open toolbar item -> tooltip */
-"Open torrent files" = "Open torrent files";
 
 /* Inspector -> title */
@@ -547 +547 @@
 "Seeding" = "Seeding";
 
-/* Torrent -> status string */
-"Seeding complete" = "Seeding complete";
-
 /* Growl notification title */
 "Seeding Complete" = "Seeding Complete";
+
+/* Torrent -> status string */
+"Seeding complete" = "Seeding complete";
 
 /* Torrent -> status string */
@@ -584 +584 @@
 "Select the new folder for \"%@\"." = "Select the new folder for \"%@\".";
 
-/* Torrent Table -> tooltip */
-"Shortcut for changing transfer settings." = "Shortcut for changing transfer settings.";
-
 /* Main window -> 1st bottom left button (action) tooltip */
 "Shortcuts for changing global settings." = "Shortcuts for changing global settings.";
+
+/* Torrent Table -> tooltip */
+"Shortcuts for changing transfer settings." = "Shortcuts for changing transfer settings.";
 
 /* View menu -> Filter Bar */

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

@@ -12 +12 @@
                         <key>SUPERCLASS</key>
                         <string>NSResponder</string>
-                </dict>
-                <dict>
-                        <key>CLASS</key>
-                        <string>BottomBarView</string>
-                        <key>LANGUAGE</key>
-                        <string>ObjC</string>
-                        <key>SUPERCLASS</key>
-                        <string>NSView</string>
                 </dict>
                 <dict>
@@ -242 +234 @@
                 </dict>
                 <dict>
-                        <key>CLASS</key>
-                        <string>FilterButton</string>
-                        <key>LANGUAGE</key>
-                        <string>ObjC</string>
-                        <key>SUPERCLASS</key>
-                        <string>NSButton</string>
-                </dict>
-                <dict>
                         <key>ACTIONS</key>
                         <dict>
@@ -286 +270 @@
                         <key>SUPERCLASS</key>
                         <string>NSTableView</string>
+                </dict>
+                <dict>
+                        <key>CLASS</key>
+                        <string>FilterButton</string>
+                        <key>LANGUAGE</key>
+                        <string>ObjC</string>
+                        <key>SUPERCLASS</key>
+                        <string>NSButton</string>
                 </dict>
                 <dict>

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

@@ -11 +11 @@
         <key>IBOpenObjects</key>
         <array>
-                <integer>1041</integer>
-                <integer>2351</integer>
+                <integer>2</integer>
         </array>
         <key>IBSystem Version</key>