Changeset 2179

Timestamp:

Jun 21, 2007, 11:21:19 PM (15 years ago)

Author:

livings124

Message:

cleaned up the pieces view segment control code a bit, and clicking the view will toggle it

Location:

trunk/macosx

Files:

• English.lproj/InfoWindow.nib/info.nib (modified) (2 diffs)
• English.lproj/InfoWindow.nib/keyedobjects.nib (modified) (previous)
• InfoWindowController.h (modified) (1 diff)
• InfoWindowController.m (modified) (4 diffs)
• PiecesView.m (modified) (2 diffs)

trunk/macosx/English.lproj/InfoWindow.nib/info.nib

@@ -8 +8 @@
         <dict>
                 <key>549</key>
-                <string>565 283 144 118 0 0 1152 842 </string>
+                <string>565 283 174 149 0 0 1152 842 </string>
         </dict>
         <key>IBFramework Version</key>
@@ -22 +22 @@
         <key>IBOpenObjects</key>
         <array>
-                <integer>549</integer>
                 <integer>5</integer>
         </array>

trunk/macosx/InfoWindowController.h

@@ -74 +74 @@
 
 - (void) setPiecesView: (id) sender;
+- (void) setPiecesViewForAvailable: (BOOL) available;
 
 - (void) revealTorrentFile: (id) sender;

trunk/macosx/InfoWindowController.m

@@ -101 +101 @@
     [self setWindowForTab: identifier animate: NO];
     
-    //set pieces control
-    [fPiecesControl setSelectedSegment: [[NSUserDefaults standardUserDefaults] boolForKey: @"PiecesViewShowAvailability"]
-                                            ? PIECES_CONTROL_AVAILABLE : PIECES_CONTROL_PROGRESS];
-    
     //initially sort peer table by IP
     if ([[fPeerTable sortDescriptors] count] == 0)
@@ -221 +217 @@
         [fDateActivityField setStringValue: @""];
         
+        [fPiecesControl setEnabled: NO];
+        [fPiecesView setTorrent: nil];
+        
+        [fPiecesControl setSelected: NO forSegment: PIECES_CONTROL_AVAILABLE];
+        [fPiecesControl setSelected: NO forSegment: PIECES_CONTROL_PROGRESS];
         [fPiecesControl setEnabled: NO];
         [fPiecesView setTorrent: nil];
@@ -286 +287 @@
         [fDataLocationField setSelectable: YES];
         
+        //set pieces view
+        BOOL piecesAvailableSegment = [[NSUserDefaults standardUserDefaults] boolForKey: @"PiecesViewShowAvailability"];
+        [fPiecesControl setSelected: piecesAvailableSegment forSegment: PIECES_CONTROL_AVAILABLE];
+        [fPiecesControl setSelected: !piecesAvailableSegment forSegment: PIECES_CONTROL_PROGRESS];
         [fPiecesControl setEnabled: YES];
+        
         [fPiecesView setTorrent: torrent];
         
@@ -994 +1000 @@
 - (void) setPiecesView: (id) sender
 {
-    [[NSUserDefaults standardUserDefaults] setBool: [sender selectedSegment] == PIECES_CONTROL_AVAILABLE
-                            forKey: @"PiecesViewShowAvailability"];
+    [self setPiecesViewForAvailable: [sender selectedSegment] == PIECES_CONTROL_AVAILABLE];
+}
+
+- (void) setPiecesViewForAvailable: (BOOL) available
+{
+    [fPiecesControl setSelected: available forSegment: PIECES_CONTROL_AVAILABLE];
+    [fPiecesControl setSelected: !available forSegment: PIECES_CONTROL_PROGRESS];
+    
+    [[NSUserDefaults standardUserDefaults] setBool: available forKey: @"PiecesViewShowAvailability"];
     [fPiecesView updateView: YES];
 }

trunk/macosx/PiecesView.m

@@ -24 +24 @@
 
 #import "PiecesView.h"
+#import "InfoWindowController.h"
 
 #define MAX_ACROSS 18
@@ -376 +377 @@
 }
 
+- (BOOL) acceptsFirstMouse: (NSEvent *) event
+{
+    return YES;
+}
+
+- (void) mouseDown: (NSEvent *) event
+{
+    if (fTorrent)
+        [[[self window] windowController] setPiecesViewForAvailable:
+            ![[NSUserDefaults standardUserDefaults] boolForKey: @"PiecesViewShowAvailability"]];
+    [super mouseDown: event];
+}
+
 @end