Changeset 5665

Timestamp:

Apr 22, 2008, 1:25:53 PM (15 years ago)

Author:

livings124

Message:

revert the last commit

Location:

trunk

Files:

• Transmission.xcodeproj/project.pbxproj (modified) (4 diffs)
• macosx/Controller.m (modified) (3 diffs)
• macosx/ToolbarSegmentedCell.h (copied) (copied from trunk/macosx/ToolbarSegmentedCell.h)
• macosx/ToolbarSegmentedCell.m (copied) (copied from trunk/macosx/ToolbarSegmentedCell.m) (1 diff)

trunk/Transmission.xcodeproj/project.pbxproj

@@ -79 +79 @@
                 A20B6FA50C4D97840034AB1D /* PriorityNone.png in Resources */ = {isa = PBXBuildFile; fileRef = A20B6FA40C4D97840034AB1D /* PriorityNone.png */; };
                 A20B6FAE0C4D9B040034AB1D /* PriorityNormal.png in Resources */ = {isa = PBXBuildFile; fileRef = A20B6FAD0C4D9B040034AB1D /* PriorityNormal.png */; };
+                A20BFFB70D091CC700CE5D2B /* ToolbarSegmentedCell.m in Sources */ = {isa = PBXBuildFile; fileRef = A20BFFB60D091CC700CE5D2B /* ToolbarSegmentedCell.m */; };
                 A21282A80CA6C66800EAEE0F /* StatusBarView.m in Sources */ = {isa = PBXBuildFile; fileRef = A21282A60CA6C66800EAEE0F /* StatusBarView.m */; };
                 A215760B0C0D449A0057A26A /* NSBezierPathAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = A21576090C0D449A0057A26A /* NSBezierPathAdditions.m */; };
@@ -448 +449 @@
                 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>"; };
+                A20BFFB50D091CC700CE5D2B /* ToolbarSegmentedCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ToolbarSegmentedCell.h; path = macosx/ToolbarSegmentedCell.h; sourceTree = "<group>"; };
+                A20BFFB60D091CC700CE5D2B /* ToolbarSegmentedCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ToolbarSegmentedCell.m; path = macosx/ToolbarSegmentedCell.m; 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>"; };
@@ -882 +885 @@
                                 A21979890D07B78400438EA7 /* GroupToolbarItem.h */,
                                 A219798A0D07B78400438EA7 /* GroupToolbarItem.m */,
+                                A20BFFB50D091CC700CE5D2B /* ToolbarSegmentedCell.h */,
+                                A20BFFB60D091CC700CE5D2B /* ToolbarSegmentedCell.m */,
                                 A22180960D148A71007D09ED /* GroupsWindowController.h */,
                                 A22180970D148A71007D09ED /* GroupsWindowController.m */,
@@ -1854 +1859 @@
                                 A2C89D600CFCBF57004CC2BC /* ButtonToolbarItem.m in Sources */,
                                 A219798B0D07B78400438EA7 /* GroupToolbarItem.m in Sources */,
+                                A20BFFB70D091CC700CE5D2B /* ToolbarSegmentedCell.m in Sources */,
                                 3C7A11950D0B2EE300B5701F /* getgateway.c in Sources */,
                                 3C7A11960D0B2EE300B5701F /* natpmp.c in Sources */,

trunk/macosx/Controller.m

@@ -36 +36 @@
 #import "ButtonToolbarItem.h"
 #import "GroupToolbarItem.h"
+#import "ToolbarSegmentedCell.h"
 #import "NSApplicationAdditions.h"
 #import "NSStringAdditions.h"
@@ -3092 +3093 @@
         GroupToolbarItem * groupItem = [[GroupToolbarItem alloc] initWithItemIdentifier: ident];
         
-        NSSegmentedControl * segmentedControl = [[NSSegmentedControl alloc] init];
+        NSSegmentedControl * segmentedControl = [[NSSegmentedControl alloc] initWithFrame: NSZeroRect];
+        [segmentedControl setCell: [[[ToolbarSegmentedCell alloc] init] autorelease]];
         [groupItem setView: segmentedControl];
         NSSegmentedCell * segmentedCell = (NSSegmentedCell *)[segmentedControl cell];
@@ -3130 +3132 @@
         GroupToolbarItem * groupItem = [[GroupToolbarItem alloc] initWithItemIdentifier: ident];
         
-        NSSegmentedControl * segmentedControl = [[NSSegmentedControl alloc] init];
+        NSSegmentedControl * segmentedControl = [[NSSegmentedControl alloc] initWithFrame: NSZeroRect];
+        [segmentedControl setCell: [[[ToolbarSegmentedCell alloc] init] autorelease]];
         [groupItem setView: segmentedControl];
         NSSegmentedCell * segmentedCell = (NSSegmentedCell *)[segmentedControl cell];

trunk/macosx/ToolbarSegmentedCell.m

@@ -27 +27 @@
 @implementation ToolbarSegmentedCell
 
+//when the toolbar is set to small size, don't make the group items small
 - (NSControlSize) controlSize
 {