Changeset 624


Ignore:
Timestamp:
Jul 16, 2006, 9:02:29 PM (16 years ago)
Author:
livings124
Message:

Turn multiple classes into a generic class for image backgrounds.

Location:
trunk
Files:
2 added
4 deleted
6 edited

Legend:

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

    r623 r624  
    7979                A200B9B60A22893D007BBB1E /* InfoWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = A200B9620A227FD0007BBB1E /* InfoWindow.nib */; };
    8080                A20AB97B0A5C622A004F81FA /* SmallTurtle.png in Resources */ = {isa = PBXBuildFile; fileRef = A20AB97A0A5C622A004F81FA /* SmallTurtle.png */; };
    81                 A20B26170A6961780096C9DA /* FilterBarView.m in Sources */ = {isa = PBXBuildFile; fileRef = A20B26150A6961780096C9DA /* FilterBarView.m */; };
    8281                A21610FC0A050B1700E8E4C1 /* MenuButton.m in Sources */ = {isa = PBXBuildFile; fileRef = A21610FB0A050B1700E8E4C1 /* MenuButton.m */; };
    8382                A2173E1C0A33C1B300B0D8AB /* ActionButtonPressed.png in Resources */ = {isa = PBXBuildFile; fileRef = A2173E1B0A33C1B300B0D8AB /* ActionButtonPressed.png */; };
     
    9594                A24F19080A3A790800C9C145 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A24F19070A3A790800C9C145 /* Sparkle.framework */; };
    9695                A24F19210A3A796800C9C145 /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = A24F19070A3A790800C9C145 /* Sparkle.framework */; };
    97                 A2519D490A2FADFC00479D0C /* SmoothAquaView.m in Sources */ = {isa = PBXBuildFile; fileRef = A2519D470A2FADFC00479D0C /* SmoothAquaView.m */; };
    9896                A253F6F30A698970008EE24F /* FilterBarBackground.png in Resources */ = {isa = PBXBuildFile; fileRef = A253F6F20A698970008EE24F /* FilterBarBackground.png */; };
    9997                A253F70B0A6990EB008EE24F /* FilterButtonOverMain.png in Resources */ = {isa = PBXBuildFile; fileRef = A253F7080A6990EB008EE24F /* FilterButtonOverMain.png */; };
     
    120118                A27A53570A06A76400E1F16F /* StatusSep.png in Resources */ = {isa = PBXBuildFile; fileRef = A27A53560A06A76400E1F16F /* StatusSep.png */; };
    121119                A27A53660A06AEDB00E1F16F /* StatusBorder.png in Resources */ = {isa = PBXBuildFile; fileRef = A27A53650A06AEDB00E1F16F /* StatusBorder.png */; };
     120                A27ABC230A6ADE410020EC71 /* ImageBackgroundView.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = A27ABC210A6ADE410020EC71 /* ImageBackgroundView.h */; };
     121                A27ABC240A6ADE410020EC71 /* ImageBackgroundView.m in Sources */ = {isa = PBXBuildFile; fileRef = A27ABC220A6ADE410020EC71 /* ImageBackgroundView.m */; };
    122122                A289EB0C0A33C56D00B082A3 /* ButtonBorder.png in Resources */ = {isa = PBXBuildFile; fileRef = A289EB0B0A33C56D00B082A3 /* ButtonBorder.png */; };
    123123                A28C43F40A4A5D700091A302 /* Transmission Help in Resources */ = {isa = PBXBuildFile; fileRef = A28C43EB0A4A5D700091A302 /* Transmission Help */; };
     
    159159                                A261F1E40A69A1B10002815A /* Growl.framework in CopyFiles */,
    160160                                A24F19210A3A796800C9C145 /* Sparkle.framework in CopyFiles */,
     161                                A27ABC230A6ADE410020EC71 /* ImageBackgroundView.h in CopyFiles */,
    161162                        );
    162163                        runOnlyForDeploymentPostprocessing = 0;
     
    281282                A200B9630A227FD0007BBB1E /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = macosx/English.lproj/InfoWindow.nib; sourceTree = "<group>"; };
    282283                A20AB97A0A5C622A004F81FA /* SmallTurtle.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = SmallTurtle.png; path = macosx/Images/SmallTurtle.png; sourceTree = "<group>"; };
    283                 A20B26140A6961780096C9DA /* FilterBarView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = FilterBarView.h; path = macosx/FilterBarView.h; sourceTree = "<group>"; };
    284                 A20B26150A6961780096C9DA /* FilterBarView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = FilterBarView.m; path = macosx/FilterBarView.m; sourceTree = "<group>"; };
    285284                A21610FA0A050B1700E8E4C1 /* MenuButton.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = MenuButton.h; path = macosx/MenuButton.h; sourceTree = "<group>"; };
    286285                A21610FB0A050B1700E8E4C1 /* MenuButton.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = MenuButton.m; path = macosx/MenuButton.m; sourceTree = "<group>"; };
     
    298297                A2305AA80A3DCCEF00AB2D77 /* ProgressBarEndGray.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ProgressBarEndGray.png; path = macosx/Images/ProgressBarEndGray.png; sourceTree = "<group>"; };
    299298                A24F19070A3A790800C9C145 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = macosx/Sparkle.framework; sourceTree = "<group>"; };
    300                 A2519D470A2FADFC00479D0C /* SmoothAquaView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = SmoothAquaView.m; path = macosx/SmoothAquaView.m; sourceTree = "<group>"; };
    301                 A2519D480A2FADFC00479D0C /* SmoothAquaView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SmoothAquaView.h; path = macosx/SmoothAquaView.h; sourceTree = "<group>"; };
    302299                A253F6F20A698970008EE24F /* FilterBarBackground.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = FilterBarBackground.png; path = macosx/Images/FilterBarBackground.png; sourceTree = "<group>"; };
    303300                A253F7080A6990EB008EE24F /* FilterButtonOverMain.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = FilterButtonOverMain.png; path = macosx/Images/FilterButtonOverMain.png; sourceTree = "<group>"; };
     
    323320                A27A53640A06AED200E1F16F /* StatusBorder.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = StatusBorder.png; path = macosx/Images/StatusBorder.png; sourceTree = "<group>"; };
    324321                A27A53650A06AEDB00E1F16F /* StatusBorder.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = StatusBorder.png; path = macosx/Images/StatusBorder.png; sourceTree = "<group>"; };
     322                A27ABC210A6ADE410020EC71 /* ImageBackgroundView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ImageBackgroundView.h; path = macosx/ImageBackgroundView.h; sourceTree = "<group>"; };
     323                A27ABC220A6ADE410020EC71 /* ImageBackgroundView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = ImageBackgroundView.m; path = macosx/ImageBackgroundView.m; sourceTree = "<group>"; };
    325324                A289EB0B0A33C56D00B082A3 /* ButtonBorder.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ButtonBorder.png; path = macosx/Images/ButtonBorder.png; sourceTree = "<group>"; };
    326325                A28C43EB0A4A5D700091A302 /* Transmission Help */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "Transmission Help"; path = "macosx/Transmission Help"; sourceTree = "<group>"; };
     
    392391                                A21610FA0A050B1700E8E4C1 /* MenuButton.h */,
    393392                                A21610FB0A050B1700E8E4C1 /* MenuButton.m */,
    394                                 A2519D470A2FADFC00479D0C /* SmoothAquaView.m */,
    395                                 A2519D480A2FADFC00479D0C /* SmoothAquaView.h */,
    396393                                A2AF1C360A3D0F6200F1575D /* FileTableView.h */,
    397394                                A2AF1C370A3D0F6200F1575D /* FileTableView.m */,
    398395                                A27431D80A68538400FA780A /* BarButton.h */,
    399396                                A27431D90A68538400FA780A /* BarButton.m */,
    400                                 A20B26140A6961780096C9DA /* FilterBarView.h */,
    401                                 A20B26150A6961780096C9DA /* FilterBarView.m */,
     397                                A27ABC210A6ADE410020EC71 /* ImageBackgroundView.h */,
     398                                A27ABC220A6ADE410020EC71 /* ImageBackgroundView.m */,
    402399                        );
    403400                        name = Sources;
     
    811808                                A21610FC0A050B1700E8E4C1 /* MenuButton.m in Sources */,
    812809                                A200B9200A22798F007BBB1E /* InfoWindowController.m in Sources */,
    813                                 A2519D490A2FADFC00479D0C /* SmoothAquaView.m in Sources */,
    814810                                A2AF1C390A3D0F6200F1575D /* FileTableView.m in Sources */,
    815811                                A27431DB0A68538400FA780A /* BarButton.m in Sources */,
    816                                 A20B26170A6961780096C9DA /* FilterBarView.m in Sources */,
     812                                A27ABC240A6ADE410020EC71 /* ImageBackgroundView.m in Sources */,
    817813                        );
    818814                        runOnlyForDeploymentPostprocessing = 0;
  • trunk/macosx/Controller.h

    r614 r624  
    3131#import "InfoWindowController.h"
    3232#import "Badger.h"
    33 #import "SmoothAquaView.h"
    34 #import "FilterBarView.h"
     33#import "ImageBackgroundView.h"
    3534#import "BarButton.h"
    3635
     
    3938@interface Controller : NSObject
    4039{
    41     tr_handle_t                 * fLib;
    42     int                         fCompleted;
     40    tr_handle_t                     * fLib;
     41    int                             fCompleted;
    4342   
    44     NSMutableArray              * fTorrents, * fFilteredTorrents;
     43    NSMutableArray                  * fTorrents, * fFilteredTorrents;
    4544   
    46     PrefsController             * fPrefsController;
    47     NSUserDefaults              * fDefaults;
    48     InfoWindowController        * fInfoController;
     45    PrefsController                 * fPrefsController;
     46    NSUserDefaults                  * fDefaults;
     47    InfoWindowController            * fInfoController;
    4948
    50     IBOutlet NSWindow           * fWindow;
    51     IBOutlet NSScrollView       * fScrollView;
    52     IBOutlet TorrentTableView   * fTableView;
    53     NSToolbar                   * fToolbar;
     49    IBOutlet NSWindow               * fWindow;
     50    IBOutlet NSScrollView           * fScrollView;
     51    IBOutlet TorrentTableView       * fTableView;
     52    NSToolbar                       * fToolbar;
    5453   
    55     IBOutlet NSMenuItem         * fAdvancedBarItem, * fSmallViewItem,
    56                                 * fSpeedLimitItem, * fSpeedLimitDockItem;
    57     IBOutlet NSButton           * fActionButton, * fSpeedLimitButton;
     54    IBOutlet NSMenuItem             * fAdvancedBarItem, * fSmallViewItem,
     55                                    * fSpeedLimitItem, * fSpeedLimitDockItem;
     56    IBOutlet NSButton               * fActionButton, * fSpeedLimitButton;
    5857   
    59     IBOutlet SmoothAquaView     * fStatusBar;
    60     BOOL                        fStatusBarVisible;
    61     IBOutlet NSTextField        * fTotalDLField, * fTotalULField, * fTotalTorrentsField;
     58    IBOutlet ImageBackgroundView    * fStatusBar;
     59    BOOL                            fStatusBarVisible;
     60    IBOutlet NSTextField            * fTotalDLField, * fTotalULField, * fTotalTorrentsField;
    6261   
    63     NSString                    * fSortType;
    64     IBOutlet NSMenuItem         * fNameSortItem, * fStateSortItem, * fProgressSortItem,
    65                                 * fDateSortItem, * fOrderSortItem;
     62    NSString                        * fSortType;
     63    IBOutlet NSMenuItem             * fNameSortItem, * fStateSortItem, * fProgressSortItem,
     64                                    * fDateSortItem, * fOrderSortItem;
    6665   
    67     IBOutlet FilterBarView      * fFilterBar;
    68     BOOL                        fFilterBarVisible;
    69     NSString                    * fFilterType;
    70     IBOutlet BarButton          * fNoFilterButton, * fPauseFilterButton,
    71                                 * fSeedFilterButton, * fDownloadFilterButton;
    72     IBOutlet NSSearchField      * fSearchFilterField;
     66    IBOutlet ImageBackgroundView    * fFilterBar;
     67    BOOL                            fFilterBarVisible;
     68    NSString                        * fFilterType;
     69    IBOutlet BarButton              * fNoFilterButton, * fPauseFilterButton,
     70                                    * fSeedFilterButton, * fDownloadFilterButton;
     71    IBOutlet NSSearchField          * fSearchFilterField;
    7372                               
    74     IBOutlet NSMenuItem         * fNextInfoTabItem, * fPrevInfoTabItem;
     73    IBOutlet NSMenuItem             * fNextInfoTabItem, * fPrevInfoTabItem;
    7574   
    76     IBOutlet NSMenu             * fUploadMenu, * fDownloadMenu;
    77     IBOutlet NSMenuItem         * fUploadLimitItem, * fUploadNoLimitItem,
    78                                 * fDownloadLimitItem, * fDownloadNoLimitItem,
    79                                 * fRatioSetItem, * fRatioNotSetItem;
     75    IBOutlet NSMenu                 * fUploadMenu, * fDownloadMenu;
     76    IBOutlet NSMenuItem             * fUploadLimitItem, * fUploadNoLimitItem,
     77                                    * fDownloadLimitItem, * fDownloadNoLimitItem,
     78                                    * fRatioSetItem, * fRatioNotSetItem;
    8079
    81     io_connect_t                fRootPort;
    82     NSTimer                     * fTimer;
     80    io_connect_t                    fRootPort;
     81    NSTimer                         * fTimer;
    8382   
    84     NSTimer                     * fAutoImportTimer;
    85     NSMutableArray              * fAutoImportedNames;
     83    NSTimer                         * fAutoImportTimer;
     84    NSMutableArray                  * fAutoImportedNames;
    8685   
    87     BOOL                        fUpdateInProgress;
    88     Badger                      * fBadger;
     86    BOOL                            fUpdateInProgress;
     87    Badger                          * fBadger;
    8988}
    9089
  • trunk/macosx/Controller.m

    r618 r624  
    102102{
    103103    [fPrefsController setPrefs: fLib];
     104   
     105    [fStatusBar setBackgroundImage: [NSImage imageNamed: @"StatusBorder.png"]];
     106    [fFilterBar setBackgroundImage: [NSImage imageNamed: @"FilterBarBackground.png"]];
    104107   
    105108    [fWindow setAcceptsMouseMovedEvents: YES]; //ensure filter buttons display correctly
     
    914917}
    915918
     919//doesn't remember selected rows
    916920- (void) sortTorrentsIgnoreSelected
    917921{
  • trunk/macosx/English.lproj/MainMenu.nib/classes.nib

    r614 r624  
    4545                fDownloadMenu = NSMenu;
    4646                fDownloadNoLimitItem = NSMenuItem;
    47                 fFilterBar = FilterBarView;
     47                fFilterBar = ImageBackgroundView;
    4848                fNameSortItem = NSMenuItem;
    4949                fNextInfoTabItem = NSMenuItem;
     
    7575            SUPERCLASS = NSObject;
    7676        },
    77         {CLASS = FilterBarView; LANGUAGE = ObjC; SUPERCLASS = NSView; },
    7877        {
    7978            ACTIONS = {revealFile = id; setNextTab = id; setPreviousTab = id; };
     
    8281            SUPERCLASS = NSObject;
    8382        },
     83        {CLASS = ImageBackgroundView; LANGUAGE = ObjC; SUPERCLASS = NSView; },
    8484        {CLASS = MenuButton; LANGUAGE = ObjC; SUPERCLASS = NSButton; },
    8585        {CLASS = NSSegmentedControl; LANGUAGE = ObjC; SUPERCLASS = NSControl; },
     
    145145            SUPERCLASS = NSObject;
    146146        },
    147         {CLASS = SmoothAquaView; LANGUAGE = ObjC; SUPERCLASS = NSView; },
    148147        {
    149148            CLASS = TorrentTableView;
  • trunk/macosx/English.lproj/MainMenu.nib/info.nib

    r614 r624  
    1212                <string>364 490 420 60 0 0 1152 842 </string>
    1313                <key>1603</key>
    14                 <string>241 540 477 65 0 0 1152 842 </string>
     14                <string>257 544 477 65 0 0 1152 842 </string>
    1515                <key>29</key>
    1616                <string>9 780 451 44 0 0 1152 842 </string>
Note: See TracChangeset for help on using the changeset viewer.