Changeset 1588

Timestamp:

Mar 24, 2007, 5:31:10 PM (15 years ago)

Author:

livings124

Message:

preference to not give warning about remaining space

Location:

trunk/macosx

Files:

• Defaults.plist (modified) (2 diffs)
• English.lproj/PrefsWindow.nib/info.nib (modified) (1 diff)
• English.lproj/PrefsWindow.nib/keyedobjects.nib (modified) (previous)
• PrefsController.h (modified) (1 diff)
• Torrent.m (modified) (2 diffs)
• TorrentCell.m (modified) (1 diff)

trunk/macosx/Defaults.plist

@@ -69 +69 @@
         <key>QueueDownloadNumber</key>
         <integer>3</integer>
-    <key>QueueSeed</key>
+        <key>QueueSeed</key>
         <false/>
-    <key>QueueSeedNumber</key>
+        <key>QueueSeedNumber</key>
         <integer>3</integer>
         <key>RatioCheck</key>
@@ -77 +77 @@
         <key>RatioLimit</key>
         <integer>2</integer>
+        <key>RemainingSpaceWarning</key>
+        <true/>
         <key>SUScheduledCheckInterval</key>
         <integer>86400</integer>

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

@@ -10 +10 @@
                 <string>294 445 563 268 0 0 1152 842 </string>
                 <key>28</key>
-                <string>294 433 563 290 0 0 1152 842 </string>
+                <string>92 421 563 320 0 0 1152 842 </string>
                 <key>41</key>
                 <string>189 445 563 305 0 0 1152 842 </string>

trunk/macosx/PrefsController.h

@@ -61 +61 @@
 - (void) setUpdater: (SUUpdater *) updater;
 
-- (void) setBadge:          (id) sender;
-- (void) setSound:          (id) sender;
-- (void) setUpdate:         (id) sender;
+- (void) setBadge: (id) sender;
+- (void) setSound: (id) sender;
+- (void) setUpdate: (id) sender;
 
-- (void) setQueue:          (id) sender;
-- (void) setQueueNumber:    (id) sender;
+- (void) setQueue: (id) sender;
+- (void) setQueueNumber: (id) sender;
 
-- (void) setDownloadLocation:       (id) sender;
-- (void) folderSheetShow:           (id) sender;
+- (void) setDownloadLocation: (id) sender;
+- (void) folderSheetShow: (id) sender;
 - (void) incompleteFolderSheetShow: (id) sender;
 
-- (void) setPort:   (id) sender;
+- (void) setPort: (id) sender;
 - (void) updatePortStatus;
 - (void) portCheckerDidFinishProbing: (PortChecker *) portChecker;
-- (void) setNat:    (id) sender;
+- (void) setNat: (id) sender;
 - (void) updateNatStatus;
 

trunk/macosx/Torrent.m

@@ -648 +648 @@
 - (BOOL) alertForRemainingDiskSpace
 {
-    if ([self allDownloaded])
+    if ([self allDownloaded] || ![fDefaults boolForKey: @"RemainingSpaceWarning"])
         return YES;
     
@@ -656 +656 @@
     uint64_t remainingSpace = [[fsAttributes objectForKey: NSFileSystemFreeSize] unsignedLongLongValue],
             torrentRemaining = [self size] - (uint64_t)[self downloadedValid];
-    
-    /*NSLog(@"Volume: %@", volumeName);
-    NSLog(@"Remaining disk space: %qu (%@)", remainingSpace, [NSString stringForFileSize: remainingSpace]);
-    NSLog(@"Torrent remaining size: %qu (%@)", torrentRemaining, [NSString stringForFileSize: torrentRemaining]);*/
     
     if (volumeName && remainingSpace <= torrentRemaining)

trunk/macosx/TorrentCell.m

@@ -84 +84 @@
 - (void) placeBar: (NSImage *) barImage width: (float) width point: (NSPoint) point
 {
+    if (width <= 0.0)
+        return;
+    
     if ([barImage size].width < width)
         [barImage setSize: NSMakeSize(width * 2.0, BAR_HEIGHT)];