Changeset 3740

Timestamp:

Nov 7, 2007, 12:14:33 AM (15 years ago)

Author:

livings124

Message:

remove the separate filter bar view and instead reuse the status bar view

Location:

trunk/macosx

Files:

• Controller.h (modified) (3 diffs)
• Controller.m (modified) (1 diff)
• English.lproj/MainMenu.nib/classes.nib (modified) (3 diffs)
• English.lproj/MainMenu.nib/keyedobjects.nib (modified) (previous)
• FilterBarView.h (deleted)
• FilterBarView.m (deleted)
• StatusBarView.m (modified) (1 diff)

trunk/macosx/Controller.h

@@ -31 +31 @@
 #import "Badger.h"
 #import "ImageBackgroundView.h"
-#import "FilterBarView.h"
+#import "StatusBarView.h"
 #import "IPCController.h"
 
@@ -61 +61 @@
     NSTimer                         * fSpeedLimitTimer;
     
-    IBOutlet ImageBackgroundView    * fStatusBar;
+    IBOutlet StatusBarView          * fStatusBar;
     IBOutlet NSTextField            * fTotalDLField, * fTotalULField, * fTotalTorrentsField;
     
@@ -69 +69 @@
                                     * fTrackerSortActionItem, * fDateSortActionItem, * fOrderSortActionItem;
     
-    IBOutlet FilterBarView          * fFilterBar;
+    IBOutlet StatusBarView          * fFilterBar;
     IBOutlet NSButton               * fNoFilterButton, * fDownloadFilterButton, * fSeedFilterButton, * fPauseFilterButton;
     IBOutlet NSSearchField          * fSearchFilterField;

trunk/macosx/Controller.m

@@ -337 +337 @@
     
     //set filter
-    #warning clean up
     NSString * filterType = [fDefaults stringForKey: @"Filter"];
     

trunk/macosx/English.lproj/MainMenu.nib/classes.nib

@@ -7 +7 @@
                 <dict>
                         <key>CLASS</key>
-                        <string>FilterBarView</string>
-                        <key>LANGUAGE</key>
-                        <string>ObjC</string>
-                        <key>SUPERCLASS</key>
-                        <string>ImageBackgroundView</string>
-                </dict>
-                <dict>
-                        <key>CLASS</key>
                         <string>NSApplication</string>
                         <key>LANGUAGE</key>
@@ -171 +163 @@
                                 <string>NSMenuItem</string>
                                 <key>fFilterBar</key>
-                                <string>FilterBarView</string>
+                                <string>StatusBarView</string>
                                 <key>fNameSortActionItem</key>
                                 <string>NSMenuItem</string>
@@ -211 +203 @@
                                 <string>NSMenuItem</string>
                                 <key>fStatusBar</key>
-                                <string>ImageBackgroundView</string>
+                                <string>StatusBarView</string>
                                 <key>fTableView</key>
                                 <string>TorrentTableView</string>

trunk/macosx/StatusBarView.m

@@ -26 +26 @@
 #import "CTGradient.h"
 
-#warning combine
-
 @implementation StatusBarView