Changeset 4088


Ignore:
Timestamp:
Dec 7, 2007, 6:27:42 AM (14 years ago)
Author:
livings124
Message:

when the toolbar is set to small size, don't make the group items small

Location:
trunk
Files:
4 added
2 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Transmission.xcodeproj/project.pbxproj

    r4081 r4088  
    7171                A20B6FA50C4D97840034AB1D /* PriorityNone.png in Resources */ = {isa = PBXBuildFile; fileRef = A20B6FA40C4D97840034AB1D /* PriorityNone.png */; };
    7272                A20B6FAE0C4D9B040034AB1D /* PriorityNormal.png in Resources */ = {isa = PBXBuildFile; fileRef = A20B6FAD0C4D9B040034AB1D /* PriorityNormal.png */; };
     73                A20BFFB70D091CC700CE5D2B /* ToolbarSegmentedCell.m in Sources */ = {isa = PBXBuildFile; fileRef = A20BFFB60D091CC700CE5D2B /* ToolbarSegmentedCell.m */; };
    7374                A21282A80CA6C66800EAEE0F /* StatusBarView.m in Sources */ = {isa = PBXBuildFile; fileRef = A21282A60CA6C66800EAEE0F /* StatusBarView.m */; };
    7475                A21567ED0A9A5034004DECD6 /* MessageWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = A21567EB0A9A5034004DECD6 /* MessageWindow.nib */; };
    7576                A215760B0C0D449A0057A26A /* NSBezierPathAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = A21576090C0D449A0057A26A /* NSBezierPathAdditions.m */; };
    76                 A219798B0D07B78400438EA7 /* ButtonGroupToolbarItem.m in Sources */ = {isa = PBXBuildFile; fileRef = A219798A0D07B78400438EA7 /* ButtonGroupToolbarItem.m */; };
     77                A219798B0D07B78400438EA7 /* GroupToolbarItem.m in Sources */ = {isa = PBXBuildFile; fileRef = A219798A0D07B78400438EA7 /* GroupToolbarItem.m */; };
    7778                A21DFF100A292B2B007C5F76 /* Transfers.png in Resources */ = {isa = PBXBuildFile; fileRef = A21DFF0F0A292B2B007C5F76 /* Transfers.png */; };
    7879                A21F5B890AF25FB6008CE5CE /* ActionMenuRatioToDisplayRatioTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = A21F5B870AF25FB6008CE5CE /* ActionMenuRatioToDisplayRatioTransformer.m */; };
     
    404405                A20B6FA40C4D97840034AB1D /* PriorityNone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = PriorityNone.png; path = macosx/Images/PriorityNone.png; sourceTree = "<group>"; };
    405406                A20B6FAD0C4D9B040034AB1D /* PriorityNormal.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = PriorityNormal.png; path = macosx/Images/PriorityNormal.png; sourceTree = "<group>"; };
     407                A20BFFB50D091CC700CE5D2B /* ToolbarSegmentedCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ToolbarSegmentedCell.h; path = macosx/ToolbarSegmentedCell.h; sourceTree = "<group>"; };
     408                A20BFFB60D091CC700CE5D2B /* ToolbarSegmentedCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ToolbarSegmentedCell.m; path = macosx/ToolbarSegmentedCell.m; sourceTree = "<group>"; };
    406409                A21282A50CA6C66800EAEE0F /* StatusBarView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = StatusBarView.h; path = macosx/StatusBarView.h; sourceTree = "<group>"; };
    407410                A21282A60CA6C66800EAEE0F /* StatusBarView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = StatusBarView.m; path = macosx/StatusBarView.m; sourceTree = "<group>"; };
    408411                A21576090C0D449A0057A26A /* NSBezierPathAdditions.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = NSBezierPathAdditions.m; path = macosx/NSBezierPathAdditions.m; sourceTree = "<group>"; };
    409412                A215760A0C0D449A0057A26A /* NSBezierPathAdditions.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = NSBezierPathAdditions.h; path = macosx/NSBezierPathAdditions.h; sourceTree = "<group>"; };
    410                 A21979890D07B78400438EA7 /* ButtonGroupToolbarItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ButtonGroupToolbarItem.h; path = macosx/ButtonGroupToolbarItem.h; sourceTree = "<group>"; };
    411                 A219798A0D07B78400438EA7 /* ButtonGroupToolbarItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ButtonGroupToolbarItem.m; path = macosx/ButtonGroupToolbarItem.m; sourceTree = "<group>"; };
     413                A21979890D07B78400438EA7 /* GroupToolbarItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GroupToolbarItem.h; path = macosx/GroupToolbarItem.h; sourceTree = "<group>"; };
     414                A219798A0D07B78400438EA7 /* GroupToolbarItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GroupToolbarItem.m; path = macosx/GroupToolbarItem.m; sourceTree = "<group>"; };
    412415                A21DFF0F0A292B2B007C5F76 /* Transfers.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Transfers.png; path = macosx/Images/Transfers.png; sourceTree = "<group>"; };
    413416                A21F5B860AF25FB6008CE5CE /* ActionMenuRatioToDisplayRatioTransformer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ActionMenuRatioToDisplayRatioTransformer.h; path = macosx/ActionMenuRatioToDisplayRatioTransformer.h; sourceTree = "<group>"; };
     
    784787                                A2C89D5F0CFCBF57004CC2BC /* ButtonToolbarItem.m */,
    785788                                A28E1DDF0CFFD8EC00E16385 /* ButtonToolbarItem.h */,
    786                                 A21979890D07B78400438EA7 /* ButtonGroupToolbarItem.h */,
    787                                 A219798A0D07B78400438EA7 /* ButtonGroupToolbarItem.m */,
     789                                A21979890D07B78400438EA7 /* GroupToolbarItem.h */,
     790                                A219798A0D07B78400438EA7 /* GroupToolbarItem.m */,
     791                                A20BFFB50D091CC700CE5D2B /* ToolbarSegmentedCell.h */,
     792                                A20BFFB60D091CC700CE5D2B /* ToolbarSegmentedCell.m */,
    788793                                A257C17F0CAD3003004E121C /* PeerTableView.h */,
    789794                                A257C1800CAD3003004E121C /* PeerTableView.m */,
     
    16391644                                A28E1DBA0CFFD41800E16385 /* BottomBarView.m in Sources */,
    16401645                                A28E1E160D00574A00E16385 /* ActionPopUpButton.m in Sources */,
    1641                                 A219798B0D07B78400438EA7 /* ButtonGroupToolbarItem.m in Sources */,
     1646                                A219798B0D07B78400438EA7 /* GroupToolbarItem.m in Sources */,
     1647                                A20BFFB70D091CC700CE5D2B /* ToolbarSegmentedCell.m in Sources */,
    16421648                        );
    16431649                        runOnlyForDeploymentPostprocessing = 0;
  • trunk/macosx/Controller.m

    r4087 r4088  
    3333#import "AboutWindowController.h"
    3434#import "ButtonToolbarItem.h"
    35 #import "ButtonGroupToolbarItem.h"
     35#import "GroupToolbarItem.h"
     36#import "ToolbarSegmentedCell.h"
    3637#import "NSApplicationAdditions.h"
    3738#import "NSStringAdditions.h"
     
    27222723    else if ([ident isEqualToString: TOOLBAR_PAUSE_RESUME_ALL])
    27232724    {
    2724         ButtonGroupToolbarItem * groupItem = [[ButtonGroupToolbarItem alloc] initWithItemIdentifier: ident];
     2725        GroupToolbarItem * groupItem = [[GroupToolbarItem alloc] initWithItemIdentifier: ident];
    27252726       
    27262727        NSSegmentedControl * segmentedControl = [[NSSegmentedControl alloc] initWithFrame: NSZeroRect];
     2728        [segmentedControl setCell: [[ToolbarSegmentedCell alloc] init]];
    27272729        [groupItem setView: segmentedControl];
    27282730        NSSegmentedCell * segmentedCell = (NSSegmentedCell *)[segmentedControl cell];
     
    27612763    else if ([ident isEqualToString: TOOLBAR_PAUSE_RESUME_SELECTED])
    27622764    {
    2763         ButtonGroupToolbarItem * groupItem = [[ButtonGroupToolbarItem alloc] initWithItemIdentifier: ident];
     2765        GroupToolbarItem * groupItem = [[GroupToolbarItem alloc] initWithItemIdentifier: ident];
    27642766       
    27652767        NSSegmentedControl * segmentedControl = [[NSSegmentedControl alloc] initWithFrame: NSZeroRect];
     2768        [segmentedControl setCell: [[ToolbarSegmentedCell alloc] init]];
    27662769        [groupItem setView: segmentedControl];
    27672770        NSSegmentedCell * segmentedCell = (NSSegmentedCell *)[segmentedControl cell];
Note: See TracChangeset for help on using the changeset viewer.