Changeset 649 for trunk


Ignore:
Timestamp:
Jul 20, 2006, 9:58:25 PM (16 years ago)
Author:
livings124
Message:

Remove filter hide and show buttons from the bars and instead have a toolbar item for it.
Smoother Bandwidth prefs icon.

Location:
trunk
Files:
2 added
4 deleted
7 edited

Legend:

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

    r644 r649  
    9292                A2305AAC0A3DCCEF00AB2D77 /* ProgressBarEndGreen.png in Resources */ = {isa = PBXBuildFile; fileRef = A2305AA70A3DCCEF00AB2D77 /* ProgressBarEndGreen.png */; };
    9393                A2305AAD0A3DCCEF00AB2D77 /* ProgressBarEndGray.png in Resources */ = {isa = PBXBuildFile; fileRef = A2305AA80A3DCCEF00AB2D77 /* ProgressBarEndGray.png */; };
    94                 A24600400A6DB58600D19088 /* RevealCircleButtonPressed.png in Resources */ = {isa = PBXBuildFile; fileRef = A246003E0A6DB58600D19088 /* RevealCircleButtonPressed.png */; };
    95                 A24600410A6DB58600D19088 /* RevealCircleButton.png in Resources */ = {isa = PBXBuildFile; fileRef = A246003F0A6DB58600D19088 /* RevealCircleButton.png */; };
    9694                A246004D0A6DCE4600D19088 /* SpeedLimitButtonPressed.png in Resources */ = {isa = PBXBuildFile; fileRef = A246004C0A6DCE4600D19088 /* SpeedLimitButtonPressed.png */; };
    9795                A24600510A6DCE6600D19088 /* SpeedLimitButtonBlue.png in Resources */ = {isa = PBXBuildFile; fileRef = A246004F0A6DCE6600D19088 /* SpeedLimitButtonBlue.png */; };
     
    109107                A253F72B0A699373008EE24F /* FilterButtonSelectedMain.png in Resources */ = {isa = PBXBuildFile; fileRef = A253F7280A699373008EE24F /* FilterButtonSelectedMain.png */; };
    110108                A253F72C0A699373008EE24F /* FilterButtonSelectedRight.png in Resources */ = {isa = PBXBuildFile; fileRef = A253F7290A699373008EE24F /* FilterButtonSelectedRight.png */; };
     109                A25A5FF20A70290900E099DE /* FilterHide.png in Resources */ = {isa = PBXBuildFile; fileRef = A25A5FF00A70290900E099DE /* FilterHide.png */; };
     110                A25A5FF30A70290900E099DE /* FilterShow.png in Resources */ = {isa = PBXBuildFile; fileRef = A25A5FF10A70290900E099DE /* FilterShow.png */; };
    111111                A25FCDDF0A37695F002BCBBE /* PauseSelected.png in CopyFiles */ = {isa = PBXBuildFile; fileRef = A25FCDDD0A37695F002BCBBE /* PauseSelected.png */; };
    112112                A25FCDE00A37695F002BCBBE /* ResumeSelected.png in CopyFiles */ = {isa = PBXBuildFile; fileRef = A25FCDDE0A37695F002BCBBE /* ResumeSelected.png */; };
     
    120120                A27A53660A06AEDB00E1F16F /* StatusBorder.png in Resources */ = {isa = PBXBuildFile; fileRef = A27A53650A06AEDB00E1F16F /* StatusBorder.png */; };
    121121                A27ABC240A6ADE410020EC71 /* ImageBackgroundView.m in Sources */ = {isa = PBXBuildFile; fileRef = A27ABC220A6ADE410020EC71 /* ImageBackgroundView.m */; };
    122                 A27ABC8B0A6B317D0020EC71 /* CloseCircleButton.png in Resources */ = {isa = PBXBuildFile; fileRef = A27ABC890A6B317D0020EC71 /* CloseCircleButton.png */; };
    123                 A27ABC8C0A6B317D0020EC71 /* CloseCircleButtonPressed.png in Resources */ = {isa = PBXBuildFile; fileRef = A27ABC8A0A6B317D0020EC71 /* CloseCircleButtonPressed.png */; };
    124122                A289EB0C0A33C56D00B082A3 /* ButtonBorder.png in Resources */ = {isa = PBXBuildFile; fileRef = A289EB0B0A33C56D00B082A3 /* ButtonBorder.png */; };
    125123                A28C43F40A4A5D700091A302 /* Transmission Help in Resources */ = {isa = PBXBuildFile; fileRef = A28C43EB0A4A5D700091A302 /* Transmission Help */; };
     
    297295                A2305AA70A3DCCEF00AB2D77 /* ProgressBarEndGreen.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ProgressBarEndGreen.png; path = macosx/Images/ProgressBarEndGreen.png; sourceTree = "<group>"; };
    298296                A2305AA80A3DCCEF00AB2D77 /* ProgressBarEndGray.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ProgressBarEndGray.png; path = macosx/Images/ProgressBarEndGray.png; sourceTree = "<group>"; };
    299                 A246003E0A6DB58600D19088 /* RevealCircleButtonPressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = RevealCircleButtonPressed.png; path = macosx/Images/RevealCircleButtonPressed.png; sourceTree = "<group>"; };
    300                 A246003F0A6DB58600D19088 /* RevealCircleButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = RevealCircleButton.png; path = macosx/Images/RevealCircleButton.png; sourceTree = "<group>"; };
    301297                A246004C0A6DCE4600D19088 /* SpeedLimitButtonPressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = SpeedLimitButtonPressed.png; path = macosx/Images/SpeedLimitButtonPressed.png; sourceTree = "<group>"; };
    302298                A246004F0A6DCE6600D19088 /* SpeedLimitButtonBlue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = SpeedLimitButtonBlue.png; path = macosx/Images/SpeedLimitButtonBlue.png; sourceTree = "<group>"; };
     
    313309                A253F7280A699373008EE24F /* FilterButtonSelectedMain.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = FilterButtonSelectedMain.png; path = macosx/Images/FilterButtonSelectedMain.png; sourceTree = "<group>"; };
    314310                A253F7290A699373008EE24F /* FilterButtonSelectedRight.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = FilterButtonSelectedRight.png; path = macosx/Images/FilterButtonSelectedRight.png; sourceTree = "<group>"; };
     311                A25A5FF00A70290900E099DE /* FilterHide.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = FilterHide.png; path = macosx/Images/FilterHide.png; sourceTree = "<group>"; };
     312                A25A5FF10A70290900E099DE /* FilterShow.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = FilterShow.png; path = macosx/Images/FilterShow.png; sourceTree = "<group>"; };
    315313                A25FCDDD0A37695F002BCBBE /* PauseSelected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = PauseSelected.png; path = macosx/Images/PauseSelected.png; sourceTree = "<group>"; };
    316314                A25FCDDE0A37695F002BCBBE /* ResumeSelected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ResumeSelected.png; path = macosx/Images/ResumeSelected.png; sourceTree = "<group>"; };
     
    324322                A27ABC210A6ADE410020EC71 /* ImageBackgroundView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ImageBackgroundView.h; path = macosx/ImageBackgroundView.h; sourceTree = "<group>"; };
    325323                A27ABC220A6ADE410020EC71 /* ImageBackgroundView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = ImageBackgroundView.m; path = macosx/ImageBackgroundView.m; sourceTree = "<group>"; };
    326                 A27ABC890A6B317D0020EC71 /* CloseCircleButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = CloseCircleButton.png; path = macosx/Images/CloseCircleButton.png; sourceTree = "<group>"; };
    327                 A27ABC8A0A6B317D0020EC71 /* CloseCircleButtonPressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = CloseCircleButtonPressed.png; path = macosx/Images/CloseCircleButtonPressed.png; sourceTree = "<group>"; };
    328324                A289EB0B0A33C56D00B082A3 /* ButtonBorder.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ButtonBorder.png; path = macosx/Images/ButtonBorder.png; sourceTree = "<group>"; };
    329325                A28C43EB0A4A5D700091A302 /* Transmission Help */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "Transmission Help"; path = "macosx/Transmission Help"; sourceTree = "<group>"; };
     
    484480                                A27A53560A06A76400E1F16F /* StatusSep.png */,
    485481                                A27A53650A06AEDB00E1F16F /* StatusBorder.png */,
    486                                 A27ABC890A6B317D0020EC71 /* CloseCircleButton.png */,
    487                                 A27ABC8A0A6B317D0020EC71 /* CloseCircleButtonPressed.png */,
    488                                 A246003E0A6DB58600D19088 /* RevealCircleButtonPressed.png */,
    489                                 A246003F0A6DB58600D19088 /* RevealCircleButton.png */,
     482                                A25A5FF00A70290900E099DE /* FilterHide.png */,
     483                                A25A5FF10A70290900E099DE /* FilterShow.png */,
    490484                                A253F6F20A698970008EE24F /* FilterBarBackground.png */,
    491485                                A253F7080A6990EB008EE24F /* FilterButtonOverMain.png */,
     
    761755                                A253F72B0A699373008EE24F /* FilterButtonSelectedMain.png in Resources */,
    762756                                A253F72C0A699373008EE24F /* FilterButtonSelectedRight.png in Resources */,
    763                                 A27ABC8B0A6B317D0020EC71 /* CloseCircleButton.png in Resources */,
    764                                 A27ABC8C0A6B317D0020EC71 /* CloseCircleButtonPressed.png in Resources */,
    765                                 A24600400A6DB58600D19088 /* RevealCircleButtonPressed.png in Resources */,
    766                                 A24600410A6DB58600D19088 /* RevealCircleButton.png in Resources */,
    767757                                A246004D0A6DCE4600D19088 /* SpeedLimitButtonPressed.png in Resources */,
    768758                                A24600510A6DCE6600D19088 /* SpeedLimitButtonBlue.png in Resources */,
    769759                                A24600520A6DCE6600D19088 /* SpeedLimitButtonGraphite.png in Resources */,
     760                                A25A5FF20A70290900E099DE /* FilterHide.png in Resources */,
     761                                A25A5FF30A70290900E099DE /* FilterShow.png in Resources */,
    770762                        );
    771763                        runOnlyForDeploymentPostprocessing = 0;
  • trunk/macosx/Controller.h

    r644 r649  
    6161    BOOL                            fStatusBarVisible;
    6262    IBOutlet NSTextField            * fTotalDLField, * fTotalULField, * fTotalTorrentsField;
    63     IBOutlet NSButton               * fShowFilterButton;
    6463   
    6564    NSString                        * fSortType;
     
    7372                                    * fSeedFilterButton, * fDownloadFilterButton;
    7473    IBOutlet NSSearchField          * fSearchFilterField;
    75     IBOutlet NSButton               * fHideFilterButton;
    7674                               
    7775    IBOutlet NSMenuItem             * fNextInfoTabItem, * fPrevInfoTabItem;
  • trunk/macosx/Controller.m

    r646 r649  
    4141#define TOOLBAR_PAUSE_SELECTED  @"Toolbar Pause Selected"
    4242#define TOOLBAR_RESUME_SELECTED @"Toolbar Resume Selected"
     43#define TOOLBAR_FILTER   @"Toolbar Toggle Filter"
    4344
    4445#define TORRENT_TABLE_VIEW_DATA_TYPE    @"TorrentTableViewDataType"
     
    143144    //set up filter bar
    144145    NSView * contentView = [fWindow contentView];
    145     [fHideFilterButton setToolTip: @"Hide Filter Bar"];
    146146    [fFilterBar setHidden: YES];
    147147   
     
    158158    //set up status bar
    159159    fStatusBarVisible = NO;
    160     [fShowFilterButton setToolTip: @"Show Filter Bar"];
    161160    [fStatusBar setHidden: YES];
    162161   
     
    16571656    }
    16581657   
    1659     //enable show filter button in status bar
    1660     [fShowFilterButton setEnabled: !show];
     1658    //change toolbar filter image
     1659    NSEnumerator * enumerator = [[[fWindow toolbar] items] objectEnumerator];
     1660    NSToolbarItem * toolbarItem;
     1661    while ((toolbarItem = [enumerator nextObject]))
     1662        if ([[toolbarItem itemIdentifier] isEqualToString: TOOLBAR_FILTER])
     1663        {
     1664            [toolbarItem setImage: show ? [NSImage imageNamed: @"FilterShow.png"]
     1665                                        : [NSImage imageNamed: @"FilterHide.png"]];
     1666            break;
     1667        }
    16611668   
    16621669    //reset tracking rects for filter buttons
     
    17021709    {
    17031710        [item setLabel: @"Inspector"];
    1704         [item setPaletteLabel: @"Show/Hide Inspector"];
    1705         [item setToolTip: @"Display torrent inspector"];
     1711        [item setPaletteLabel: @"Toggle Inspector"];
     1712        [item setToolTip: @"Toggle the torrent inspector"];
    17061713        [item setImage: [NSImage imageNamed: @"Info.png"]];
    17071714        [item setTarget: self];
     
    17441751        [item setAction: @selector(resumeSelectedTorrents:)];
    17451752    }
     1753    else if ([ident isEqualToString: TOOLBAR_FILTER])
     1754    {
     1755        [item setLabel: @"Filter Bar"];
     1756        [item setPaletteLabel: @"Toggle Filter Bar"];
     1757        [item setToolTip: @"Toggle the filter bar"];
     1758        [item setImage: [NSImage imageNamed: @"FilterHide.png"]];
     1759        [item setTarget: self];
     1760        [item setAction: @selector(toggleFilterBar:)];
     1761    }
    17461762    else
    17471763    {
     
    17581774            TOOLBAR_OPEN, TOOLBAR_REMOVE,
    17591775            TOOLBAR_PAUSE_SELECTED, TOOLBAR_RESUME_SELECTED,
    1760             TOOLBAR_PAUSE_ALL, TOOLBAR_RESUME_ALL, TOOLBAR_INFO,
     1776            TOOLBAR_PAUSE_ALL, TOOLBAR_RESUME_ALL, TOOLBAR_FILTER, TOOLBAR_INFO,
    17611777            NSToolbarSeparatorItemIdentifier,
    17621778            NSToolbarSpaceItemIdentifier,
     
    17721788            TOOLBAR_PAUSE_ALL, TOOLBAR_RESUME_ALL,
    17731789            NSToolbarFlexibleSpaceItemIdentifier,
    1774             TOOLBAR_INFO, nil];
     1790            TOOLBAR_FILTER, TOOLBAR_INFO, nil];
    17751791}
    17761792
  • trunk/macosx/English.lproj/MainMenu.nib/classes.nib

    r641 r649  
    4646                fDownloadNoLimitItem = NSMenuItem;
    4747                fFilterBar = ImageBackgroundView;
    48                 fHideFilterButton = NSButton;
    4948                fNameSortItem = NSMenuItem;
    5049                fNextInfoTabItem = NSMenuItem;
     
    5958                fSearchFilterField = NSSearchField;
    6059                fSeedFilterButton = BarButton;
    61                 fShowFilterButton = NSButton;
    6260                fSmallViewItem = NSMenuItem;
    6361                fSpeedLimitButton = NSButton;
  • trunk/macosx/English.lproj/MainMenu.nib/info.nib

    r644 r649  
    1010                <string>344 478 208 99 0 0 1152 842 </string>
    1111                <key>1480</key>
    12                 <string>358 399 420 63 0 0 1152 842 </string>
     12                <string>366 546 420 63 0 0 1152 842 </string>
    1313                <key>1603</key>
    1414                <string>337 544 477 67 0 0 1152 842 </string>
     
    3232        <key>IBOpenObjects</key>
    3333        <array>
     34                <integer>21</integer>
     35                <integer>1480</integer>
    3436                <integer>29</integer>
    35                 <integer>21</integer>
     37                <integer>1603</integer>
    3638        </array>
    3739        <key>IBSystem Version</key>
Note: See TracChangeset for help on using the changeset viewer.