Changeset 706

Timestamp:

Jul 29, 2006, 6:09:35 PM (16 years ago)

Author:

livings124

Message:

Remove redundant variables

Location:

trunk/macosx

Files:

• Controller.h (modified) (2 diffs)
• Controller.m (modified) (12 diffs)

trunk/macosx/Controller.h

@@ -61 +61 @@
     
     IBOutlet ImageBackgroundView    * fStatusBar;
-    BOOL                            fStatusBarVisible;
     IBOutlet NSTextField            * fTotalDLField, * fTotalULField, * fTotalTorrentsField;
     
@@ -71 +70 @@
     
     IBOutlet ImageBackgroundView    * fFilterBar;
-    BOOL                            fFilterBarVisible;
     NSString                        * fFilterType;
     IBOutlet BarButton              * fNoFilterButton, * fPauseFilterButton,

trunk/macosx/Controller.m

@@ -61 +61 @@
 }
 
-
 @implementation Controller
 
@@ -148 +147 @@
     [fFilterBar setHidden: YES];
     
-    fFilterBarVisible = NO;
     NSRect filterBarFrame = [fFilterBar frame];
     filterBarFrame.size.width = [fWindow frame].size.width;
@@ -159 +157 @@
     
     //set up status bar
-    fStatusBarVisible = NO;
     [fStatusBar setHidden: YES];
     
@@ -871 +868 @@
     float downloadRate, uploadRate;
     tr_torrentRates(fLib, & downloadRate, & uploadRate);
-    if (fStatusBarVisible)
+    if (![fStatusBar isHidden])
     {
         [fTotalDLField setStringValue: [@"Total DL: " stringByAppendingString: [NSString stringForSpeed: downloadRate]]];
@@ -1602 +1599 @@
 - (void) toggleStatusBar: (id) sender
 {
-    [self showStatusBar: !fStatusBarVisible animate: YES];
-    [fDefaults setBool: fStatusBarVisible forKey: @"StatusBar"];
+    [self showStatusBar: [fStatusBar isHidden] animate: YES];
+    [fDefaults setBool: ![fStatusBar isHidden] forKey: @"StatusBar"];
 }
 
 - (void) showStatusBar: (BOOL) show animate: (BOOL) animate
 {
-    if (show == fStatusBarVisible)
+    if (show == ![fStatusBar isHidden])
         return;
 
@@ -1621 +1618 @@
     frame.size.height += heightChange;
     frame.origin.y -= heightChange;
-        
-    fStatusBarVisible = show;
     
     [self updateUI: nil];
@@ -1659 +1654 @@
 {
     //disable filtering when hiding
-    if (fFilterBarVisible)
+    if (![fFilterBar isHidden])
     {
         [fSearchFilterField setStringValue: @""];
@@ -1665 +1660 @@
     }
 
-    [self showFilterBar: !fFilterBarVisible animate: YES];
-    [fDefaults setBool: fFilterBarVisible forKey: @"FilterBar"];
+    [self showFilterBar: [fFilterBar isHidden] animate: YES];
+    [fDefaults setBool: ![fFilterBar isHidden] forKey: @"FilterBar"];
 }
 
 - (void) showFilterBar: (BOOL) show animate: (BOOL) animate
 {
-    if (show == fFilterBarVisible)
+    if (show == ![fFilterBar isHidden])
         return;
 
@@ -1684 +1679 @@
     frame.size.height += heightChange;
     frame.origin.y -= heightChange;
-        
-    fFilterBarVisible = show;
     
     //set views to not autoresize
@@ -1916 +1909 @@
     if (action == @selector(toggleStatusBar:))
     {
-        NSString * title = fStatusBarVisible ? @"Hide Status Bar" : @"Show Status Bar";
+        NSString * title = [fStatusBar isHidden] ? @"Show Status Bar" : @"Hide Status Bar";
         if (![[menuItem title] isEqualToString: title])
                 [menuItem setTitle: title];
@@ -1926 +1919 @@
     if (action == @selector(toggleFilterBar:))
     {
-        NSString * title = fFilterBarVisible ? @"Hide Filter Bar" : @"Show Filter Bar";
+        NSString * title = [fFilterBar isHidden] ? @"Show Filter Bar" : @"Hide Filter Bar";
         if (![[menuItem title] isEqualToString: title])
                 [menuItem setTitle: title];
@@ -2134 +2127 @@
     {
         float maxHeight = [[fWindow screen] visibleFrame].size.height;
-        if (!fStatusBarVisible)
+        if ([fStatusBar isHidden])
             maxHeight -= [fStatusBar frame].size.height;
-        if (!fFilterBarVisible) 
+        if ([fFilterBar isHidden]) 
             maxHeight -= [fFilterBar frame].size.height;