Changeset 4005

Timestamp:

Nov 29, 2007, 1:05:11 AM (15 years ago)

Author:

livings124

Message:

make toolbar buttons leopard-like; icons are placeholders

Location:

trunk

Files:

• Transmission.xcodeproj/project.pbxproj (modified) (9 diffs)
• macosx/ButtonToolbarItem.h (added)
• macosx/ButtonToolbarItem.m (added)
• macosx/Controller.m (modified) (13 diffs)
• macosx/InfoWindowController.m (modified) (2 diffs)

trunk/Transmission.xcodeproj/project.pbxproj

@@ -135 +135 @@
                 A2BE9C530C1E4AF7002D16E6 /* makemeta.h in Headers */ = {isa = PBXBuildFile; fileRef = A2BE9C4F0C1E4ADA002D16E6 /* makemeta.h */; };
                 A2BF07910B066E0800757C92 /* SpeedLimitToTurtleIconTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = A2BF078F0B066E0800757C92 /* SpeedLimitToTurtleIconTransformer.m */; };
+                A2C89D600CFCBF57004CC2BC /* ButtonToolbarItem.m in Sources */ = {isa = PBXBuildFile; fileRef = A2C89D5F0CFCBF57004CC2BC /* ButtonToolbarItem.m */; };
                 A2D0E0490A54A97C003C72CF /* Bandwidth.png in Resources */ = {isa = PBXBuildFile; fileRef = A2D0E0480A54A97C003C72CF /* Bandwidth.png */; };
                 A2DA362A0CBC674900C2ED41 /* InfoActivity.png in Resources */ = {isa = PBXBuildFile; fileRef = A2DA36270CBC674900C2ED41 /* InfoActivity.png */; };
@@ -140 +141 @@
                 A2DA362C0CBC674900C2ED41 /* InfoPeers.png in Resources */ = {isa = PBXBuildFile; fileRef = A2DA36290CBC674900C2ED41 /* InfoPeers.png */; };
                 A2DF37070C220D03006523C1 /* CreatorWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = A2DF37050C220D03006523C1 /* CreatorWindowController.m */; };
+                A2E165BC0CFE44250047F575 /* QuittingWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = A2E165BB0CFE44250047F575 /* QuittingWindowController.m */; };
+                A2E165C80CFE45AF0047F575 /* QuittingWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = A2E165C70CFE45AF0047F575 /* QuittingWindow.xib */; };
                 A2E23AC60CB5E1930002BB25 /* InfoTabButtonCell.m in Sources */ = {isa = PBXBuildFile; fileRef = A2E23AC40CB5E1930002BB25 /* InfoTabButtonCell.m */; };
                 A2E9AA760C249AF400085DCF /* Create.png in Resources */ = {isa = PBXBuildFile; fileRef = A2E9AA750C249AF400085DCF /* Create.png */; };
@@ -502 +505 @@
                 A2BF078E0B066E0800757C92 /* SpeedLimitToTurtleIconTransformer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SpeedLimitToTurtleIconTransformer.h; path = macosx/SpeedLimitToTurtleIconTransformer.h; sourceTree = "<group>"; };
                 A2BF078F0B066E0800757C92 /* SpeedLimitToTurtleIconTransformer.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = SpeedLimitToTurtleIconTransformer.m; path = macosx/SpeedLimitToTurtleIconTransformer.m; sourceTree = "<group>"; };
+                A2C89D5E0CFCBF57004CC2BC /* ButtonToolbarItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ButtonToolbarItem.h; path = macosx/ButtonToolbarItem.h; sourceTree = "<group>"; };
+                A2C89D5F0CFCBF57004CC2BC /* ButtonToolbarItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ButtonToolbarItem.m; path = macosx/ButtonToolbarItem.m; sourceTree = "<group>"; };
                 A2D0E0480A54A97C003C72CF /* Bandwidth.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Bandwidth.png; path = macosx/Images/Bandwidth.png; sourceTree = "<group>"; };
                 A2D688850CB4984B009BEC3A /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = macosx/English.lproj/MainMenu.nib; sourceTree = "<group>"; };
@@ -515 +520 @@
                 A2DF37040C220D03006523C1 /* CreatorWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CreatorWindowController.h; path = macosx/CreatorWindowController.h; sourceTree = "<group>"; };
                 A2DF37050C220D03006523C1 /* CreatorWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CreatorWindowController.m; path = macosx/CreatorWindowController.m; sourceTree = "<group>"; };
+                A2E165BA0CFE44250047F575 /* QuittingWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = QuittingWindowController.h; path = macosx/QuittingWindowController.h; sourceTree = "<group>"; };
+                A2E165BB0CFE44250047F575 /* QuittingWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = QuittingWindowController.m; path = macosx/QuittingWindowController.m; sourceTree = "<group>"; };
+                A2E165C70CFE45AF0047F575 /* QuittingWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = QuittingWindow.xib; path = macosx/QuittingWindow.xib; sourceTree = "<group>"; };
                 A2E23AC30CB5E1930002BB25 /* InfoTabButtonCell.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = InfoTabButtonCell.h; path = macosx/InfoTabButtonCell.h; sourceTree = "<group>"; };
                 A2E23AC40CB5E1930002BB25 /* InfoTabButtonCell.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = InfoTabButtonCell.m; path = macosx/InfoTabButtonCell.m; sourceTree = "<group>"; };
@@ -751 +759 @@
                                 A25E74470AF5089E006F11AE /* ExpandedPathToIconTransformer.h */,
                                 A25E74460AF5089E006F11AE /* ExpandedPathToIconTransformer.m */,
+                                A2C89D5E0CFCBF57004CC2BC /* ButtonToolbarItem.h */,
+                                A2C89D5F0CFCBF57004CC2BC /* ButtonToolbarItem.m */,
                                 4DE5CCA50980735700BE280E /* Badger.h */,
                                 4DE5CCA60980735700BE280E /* Badger.m */,
@@ -763 +773 @@
                                 A2085DD90C53BC74000BC3B7 /* AboutWindowController.h */,
                                 A2085DDA0C53BC74000BC3B7 /* AboutWindowController.m */,
+                                A2E165BA0CFE44250047F575 /* QuittingWindowController.h */,
+                                A2E165BB0CFE44250047F575 /* QuittingWindowController.m */,
                                 A234D0D40C79FB6000A82373 /* Additions */,
                                 E1B6FBF80C0D719B0015FE4D /* Info Window */,
@@ -828 +840 @@
                                 A25892750CF1FCE800CCCDDF /* StatsWindow.xib */,
                                 A2A6E39F0CA7E4C900F10FEF /* AboutWindow.nib */,
+                                A2E165C70CFE45AF0047F575 /* QuittingWindow.xib */,
                                 A20B6FA40C4D97840034AB1D /* PriorityNone.png */,
                                 A20B6F8B0C4D90980034AB1D /* PriorityMixed.png */,
@@ -1493 +1506 @@
                                 A2F151260CD438DE001F3B0E /* InfoTabBackBlue.png in Resources */,
                                 A25892770CF1FCE800CCCDDF /* StatsWindow.xib in Resources */,
+                                A2E165C80CFE45AF0047F575 /* QuittingWindow.xib in Resources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -1626 +1640 @@
                                 A2ED7D8F0CEF431B00970975 /* FilterButton.m in Sources */,
                                 A25892640CF1F7E800CCCDDF /* StatsWindowController.m in Sources */,
+                                A2C89D600CFCBF57004CC2BC /* ButtonToolbarItem.m in Sources */,
+                                A2E165BC0CFE44250047F575 /* QuittingWindowController.m in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;

trunk/macosx/Controller.m

@@ -32 +32 @@
 #import "StatsWindowController.h"
 #import "AboutWindowController.h"
+#import "ButtonToolbarItem.h"
 #import "NSApplicationAdditions.h"
 #import "NSStringAdditions.h"
@@ -2565 +2566 @@
 - (void) doNothing: (id) sender {}
 
-- (NSToolbarItem *) toolbar: (NSToolbar *) t itemForItemIdentifier: (NSString *) ident willBeInsertedIntoToolbar: (BOOL) flag
-{
-    NSToolbarItem * item = [[NSToolbarItem alloc] initWithItemIdentifier: ident];
-
+- (NSToolbarItem *) toolbar: (NSToolbar *) toolbar itemForItemIdentifier: (NSString *) ident willBeInsertedIntoToolbar: (BOOL) flag
+{
+    ButtonToolbarItem * item = [[ButtonToolbarItem alloc] initWithItemIdentifier: ident];
+    
+    NSButton * button = [[NSButton alloc] initWithFrame: NSZeroRect];
+    [item setView: button];
+    
+    [button setBezelStyle: NSTexturedRoundedBezelStyle];
+    [button setStringValue: @""];
+    
+    NSSize buttonSize = NSMakeSize(35.0, 25.0);
+    [item setMinSize: buttonSize];
+    [item setMaxSize: buttonSize];
+    
+    NSImage * image;
+    
     if ([ident isEqualToString: TOOLBAR_CREATE])
     {
@@ -2574 +2587 @@
         [item setPaletteLabel: NSLocalizedString(@"Create Torrent File", "Create toolbar item -> palette label")];
         [item setToolTip: NSLocalizedString(@"Create torrent file", "Create toolbar item -> tooltip")];
-        [item setImage: [NSImage imageNamed: @"Create.png"]];
+        image = [NSImage imageNamed: @"Create.png"];
         [item setTarget: self];
         [item setAction: @selector(createFile:)];
@@ -2584 +2597 @@
         [item setPaletteLabel: NSLocalizedString(@"Open Torrent Files", "Open toolbar item -> palette label")];
         [item setToolTip: NSLocalizedString(@"Open torrent files", "Open toolbar item -> tooltip")];
-        [item setImage: [NSImage imageNamed: @"Open.png"]];
+        image = [NSImage imageNamed: @"Open.png"];
         [item setTarget: self];
         [item setAction: @selector(openShowSheet:)];
@@ -2594 +2607 @@
         [item setPaletteLabel: NSLocalizedString(@"Remove Selected", "Remove toolbar item -> palette label")];
         [item setToolTip: NSLocalizedString(@"Remove selected transfers", "Remove toolbar item -> tooltip")];
-        [item setImage: [NSImage imageNamed: @"Remove.png"]];
+        image = [NSImage imageNamed: @"Remove.png"];
         [item setTarget: self];
         [item setAction: @selector(removeNoDelete:)];
@@ -2603 +2616 @@
         [item setPaletteLabel: NSLocalizedString(@"Toggle Inspector", "Inspector toolbar item -> palette label")];
         [item setToolTip: NSLocalizedString(@"Toggle the torrent inspector", "Inspector toolbar item -> tooltip")];
-        [item setImage: [NSImage imageNamed: @"Info.png"]];
+        image = [NSImage imageNamed: @"Info.png"];
         [item setTarget: self];
         [item setAction: @selector(showInfo:)];
@@ -2613 +2626 @@
         [item setPaletteLabel: [item label]];
         [item setToolTip: NSLocalizedString(@"Pause all transfers", "Pause All toolbar item -> tooltip")];
-        [item setImage: [NSImage imageNamed: @"PauseAll.png"]];
+        image = [NSImage imageNamed: @"PauseAll.png"];
         [item setTarget: self];
         [item setAction: @selector(stopAllTorrents:)];
@@ -2622 +2635 @@
         [item setPaletteLabel: [item label]];
         [item setToolTip: NSLocalizedString(@"Resume all transfers", "Resume All toolbar item -> tooltip")];
-        [item setImage: [NSImage imageNamed: @"ResumeAll.png"]];
+        image = [NSImage imageNamed: @"ResumeAll.png"];
         [item setTarget: self];
         [item setAction: @selector(resumeAllTorrents:)];
@@ -2631 +2644 @@
         [item setPaletteLabel: NSLocalizedString(@"Pause Selected", "Pause toolbar item -> palette label")];
         [item setToolTip: NSLocalizedString(@"Pause selected transfers", "Pause toolbar item -> tooltip")];
-        [item setImage: [NSImage imageNamed: @"PauseSelected.png"]];
+        image = [NSImage imageNamed: @"PauseSelected.png"];
         [item setTarget: self];
         [item setAction: @selector(stopSelectedTorrents:)];
@@ -2640 +2653 @@
         [item setPaletteLabel: NSLocalizedString(@"Resume Selected", "Resume toolbar item -> palette label")];
         [item setToolTip: NSLocalizedString(@"Resume selected transfers", "Resume toolbar item -> tooltip")];
-        [item setImage: [NSImage imageNamed: @"ResumeSelected.png"]];
+        image = [NSImage imageNamed: @"ResumeSelected.png"];
         [item setTarget: self];
         [item setAction: @selector(resumeSelectedTorrents:)];
@@ -2649 +2662 @@
         [item setPaletteLabel: NSLocalizedString(@"Toggle Filter", "Filter toolbar item -> palette label")];
         [item setToolTip: NSLocalizedString(@"Toggle the filter bar", "Filter toolbar item -> tooltip")];
-        [item setImage: [NSImage imageNamed: @"Filter.png"]];
+        image = [NSImage imageNamed: @"Filter.png"];
         [item setTarget: self];
         [item setAction: @selector(toggleFilterBar:)];
@@ -2656 +2669 @@
     else
     {
+        [button release];
         [item release];
         return nil;
     }
+    
+    [image setScalesWhenResized: YES];
+    [image setSize: NSMakeSize(16.0, 16.0)];
+    [button setImage: image];
+    
+    [button release];
 
     return [item autorelease];
 }
 
-- (NSArray *) toolbarAllowedItemIdentifiers: (NSToolbar *) t
+- (NSArray *) toolbarAllowedItemIdentifiers: (NSToolbar *) toolbar
 {
     return [NSArray arrayWithObjects:
@@ -2675 +2695 @@
 }
 
-- (NSArray *) toolbarDefaultItemIdentifiers: (NSToolbar *) t
+- (NSArray *) toolbarDefaultItemIdentifiers: (NSToolbar *) toolbar
 {
     return [NSArray arrayWithObjects:

trunk/macosx/InfoWindowController.m

@@ -865 +865 @@
         int status = [[peer objectForKey: @"Status"] intValue];
         if (status & TR_PEER_STATUS_HANDSHAKE)
-            [components addObject: NSLocalizedString(@"Handshaking", "peer -> status")];
+            [components addObject: NSLocalizedString(@"Handshaking", "Inspector -> peer -> status")];
         else
         {
             NSString * firstString;
             if (status & TR_PEER_STATUS_CLIENT_IS_SENDING)
-                firstString = NSLocalizedString(@"Uploading to peer", "peer -> status");
+                firstString = NSLocalizedString(@"Uploading to peer", "Inspector -> peer -> status");
             else if (status & TR_PEER_STATUS_PEER_IS_INTERESTED)
-                firstString = NSLocalizedString(@"Peer wants our data", "peer -> status");
+                firstString = NSLocalizedString(@"Peer wants our data", "Inspector -> peer -> status");
             else if (status & TR_PEER_STATUS_PEER_IS_CHOKED)
-                firstString = NSLocalizedString(@"Refusing to send data to peer", "peer -> status");
+                firstString = NSLocalizedString(@"Refusing to send data to peer", "Inspector -> peer -> status");
             else
                 firstString = @"";
@@ -880 +880 @@
             NSString * secondString;
             if (status & TR_PEER_STATUS_PEER_IS_SENDING)
-                secondString = NSLocalizedString(@"Downloading from peer", "peer -> status");
+                secondString = NSLocalizedString(@"Downloading from peer", "Inspector -> peer -> status");
             else if (status & TR_PEER_STATUS_CLIENT_SENT_REQUEST)
-                secondString = NSLocalizedString(@"Requesting data from peer", "peer -> status");
+                secondString = NSLocalizedString(@"Requesting data from peer", "Inspector -> peer -> status");
             else if (status & TR_PEER_STATUS_CLIENT_IS_INTERESTED)
-                secondString = NSLocalizedString(@"Waiting to request data from peer", "peer -> status");
+                secondString = NSLocalizedString(@"Waiting to request data from peer", "Inspector -> peer -> status");
             else if (status & TR_PEER_STATUS_CLIENT_IS_CHOKED)
-                secondString = NSLocalizedString(@"Peer will not send us data", "peer -> status");
+                secondString = NSLocalizedString(@"Peer will not send us data", "Inspector -> peer -> status");
             else
                 secondString = @"";