Changeset 6215

Timestamp:

Jun 17, 2008, 5:17:15 PM (15 years ago)

Author:

livings124

Message:

some cleaning

Location:

trunk/macosx

Files:

• English.lproj/PrefsWindow.xib (modified) (4 diffs)
• PiecesView.m (modified) (1 diff)
• PrefsController.m (modified) (1 diff)
• Torrent.m (modified) (1 diff)
• TorrentTableView.m (modified) (1 diff)

trunk/macosx/English.lproj/PrefsWindow.xib

@@ -9 +9 @@
                 <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
                         <bool key="EncodedWithXMLCoder">YES</bool>
+                        <integer value="1481"/>
                         <integer value="66"/>
-                        <integer value="1481"/>
                 </object>
                 <object class="NSArray" key="IBDocument.PluginDependencies">
@@ -3545 +3545 @@
                         </object>
                         <object class="NSUserDefaultsController" id="356871564">
+                                <object class="NSMutableArray" key="NSDeclaredKeys">
+                                        <bool key="EncodedWithXMLCoder">YES</bool>
+                                        <string>Proxy</string>
+                                </object>
                                 <bool key="NSSharedInstance">YES</bool>
                         </object>
@@ -5921 +5925 @@
                                         </object>
                                         <int key="connectionID">1674</int>
+                                </object>
+                                <object class="IBConnectionRecord">
+                                        <object class="IBBindingConnection" key="connection">
+                                                <string key="label">textColor: values</string>
+                                                <reference key="source" ref="257109686"/>
+                                                <reference key="destination" ref="356871564"/>
+                                                <object class="NSNibBindingConnector" key="connector">
+                                                        <reference key="NSSource" ref="257109686"/>
+                                                        <reference key="NSDestination" ref="356871564"/>
+                                                        <string key="NSLabel">textColor: values</string>
+                                                        <string key="NSBinding">textColor</string>
+                                                        <string key="NSKeyPath">values</string>
+                                                        <object class="NSDictionary" key="NSOptions">
+                                                                <string key="NS.key.0">NSValueTransformerName</string>
+                                                                <string key="NS.object.0">ControlTextTransformer</string>
+                                                        </object>
+                                                        <int key="NSNibBindingConnectorVersion">2</int>
+                                                </object>
+                                        </object>
+                                        <int key="connectionID">1680</int>
                                 </object>
                         </object>
@@ -8975 +8999 @@
                         </object>
                         <nil key="sourceID"/>
-                        <int key="maxID">1674</int>
+                        <int key="maxID">1685</int>
                 </object>
                 <object class="IBClassDescriber" key="IBDocument.Classes">

trunk/macosx/PiecesView.m

@@ -42 +42 @@
 - (void) awakeFromNib
 {
-        //back image
-        fBack = [[NSImage alloc] initWithSize: [self bounds].size];
-        
-        [fBack lockFocus];
-        CTGradient * gradient = [CTGradient gradientWithBeginningColor: [NSColor colorWithCalibratedWhite: 0.0 alpha: 0.4]
-                                    endingColor: [NSColor colorWithCalibratedWhite: 0.2 alpha: 0.4]];
-        [gradient fillRect: [self bounds] angle: 90.0];
-        [fBack unlockFocus];
-        
-        //store box colors
-        fGreenAvailabilityColor = [[NSColor colorWithCalibratedRed: 0.0 green: 1.0 blue: 0.4 alpha: 1.0] retain];
-        fBluePieceColor = [[NSColor colorWithCalibratedRed: 0.0 green: 0.4 blue: 0.8 alpha: 1.0] retain];
-                
-        //actually draw the box
-        [self setTorrent: nil];
+    //back image
+    fBack = [[NSImage alloc] initWithSize: [self bounds].size];
+    
+    [fBack lockFocus];
+    CTGradient * gradient = [CTGradient gradientWithBeginningColor: [NSColor colorWithCalibratedWhite: 0.0 alpha: 0.4]
+                                endingColor: [NSColor colorWithCalibratedWhite: 0.2 alpha: 0.4]];
+    [gradient fillRect: [self bounds] angle: 90.0];
+    [fBack unlockFocus];
+    
+    //store box colors
+    fGreenAvailabilityColor = [[NSColor colorWithCalibratedRed: 0.0 green: 1.0 blue: 0.4 alpha: 1.0] retain];
+    fBluePieceColor = [[NSColor colorWithCalibratedRed: 0.0 green: 0.4 blue: 0.8 alpha: 1.0] retain];
+            
+    //actually draw the box
+    [self setTorrent: nil];
 }
 

trunk/macosx/PrefsController.m

@@ -689 +689 @@
 - (void) setProxyEnabled: (id) sender
 {
-    BOOL enable = [fDefaults boolForKey: @"Proxy"];
     tr_sessionSetProxyEnabled(fHandle, [fDefaults boolForKey: @"Proxy"]);
 }

trunk/macosx/Torrent.m

@@ -416 +416 @@
 - (void) setMaxPeerConnect: (uint16_t) count
 {
-    if (count > 0)
-        tr_torrentSetPeerLimit(fHandle, count);
+    NSAssert(count > 0, @"max peer count must be greater than 0");
+    
+    tr_torrentSetPeerLimit(fHandle, count);
 }
 

trunk/macosx/TorrentTableView.m

@@ -530 +530 @@
     unichar firstChar = [[event charactersIgnoringModifiers] characterAtIndex: 0];
     
-    if (firstChar == 'f' && [event modifierFlags] & NSAlternateKeyMask
-        && [event modifierFlags] & NSCommandKeyMask)
+    if (firstChar == 'f' && [event modifierFlags] & NSAlternateKeyMask && [event modifierFlags] & NSCommandKeyMask)
         [fController focusFilterField];
     else