Changeset 5309

Timestamp:

Mar 19, 2008, 6:03:02 PM (14 years ago)

Author:

livings124

Message:

#799 treat "waiting to check..." as paused

Location:

trunk/macosx

Files:

• Controller.m (modified) (1 diff)
• InfoWindowController.m (modified) (4 diffs)
• Torrent.h (modified) (1 diff)
• Torrent.m (modified) (1 diff)

trunk/macosx/Controller.m

@@ -1845 +1845 @@
         
         //check status
-        if ([torrent isActive])
+        if ([torrent isActive] && ![torrent isCheckingWaiting])
         {
             if ([torrent isSeeding])

trunk/macosx/InfoWindowController.m

@@ -211 +211 @@
             
             [fNameField setStringValue: [NSString stringWithFormat: NSLocalizedString(@"%d Torrents Selected",
-                                            "Inspector -> above tabs -> selected torrents"), numberSelected]];
+                                            "Inspector -> selected torrents"), numberSelected]];
         
             uint64_t size = 0;
@@ -227 +227 @@
                 [NSString stringWithFormat: NSLocalizedString(@"%@ Total", "Inspector -> selected torrents"),
                 [NSString stringForFileSize: size]]]];
-            [fBasicInfoField setToolTip: [NSString stringWithFormat: NSLocalizedString(@"%u bytes",
-                                            "Inspector -> above tabs -> selected torrents"), size]];
+            [fBasicInfoField setToolTip: [NSString stringWithFormat: NSLocalizedString(@"%u bytes", "Inspector -> selected torrents"),
+                                            size]];
         }
         else
@@ -234 +234 @@
             [fImageView setImage: [NSImage imageNamed: @"NSApplicationIcon"]];
             
-            [fNameField setStringValue: NSLocalizedString(@"No Torrents Selected", "Inspector -> above tabs -> selected torrents")];
+            [fNameField setStringValue: NSLocalizedString(@"No Torrents Selected", "Inspector -> selected torrents")];
             [fBasicInfoField setStringValue: @""];
             [fBasicInfoField setToolTip: @""];
@@ -365 +365 @@
             int fileCount = [torrent fileCount];
             if (fileCount == 1)
-                fileString = NSLocalizedString(@"1 File", "Inspector -> above tabs -> selected torrents");
+                fileString = NSLocalizedString(@"1 File", "Inspector -> selected torrents");
             else
-                fileString= [NSString stringWithFormat: NSLocalizedString(@"%d Files",
-                                "Inspector -> above tabs -> selected torrents"), fileCount];
+                fileString= [NSString stringWithFormat: NSLocalizedString(@"%d Files", "Inspector -> selected torrents"), fileCount];
             basicString = [NSString stringWithFormat: @"%@, %@", fileString, basicString];
         }
         [fBasicInfoField setStringValue: basicString];
-        [fBasicInfoField setToolTip: [NSString stringWithFormat: NSLocalizedString(@"%u bytes",
-                                        "Inspector -> above tabs -> selected torrents"), [torrent size]]];
+        [fBasicInfoField setToolTip: [NSString stringWithFormat: NSLocalizedString(@"%u bytes", "Inspector -> selected torrents"),
+                                        [torrent size]]];
         
         NSString * hashString = [torrent hashString];

trunk/macosx/Torrent.h

@@ -182 +182 @@
 - (BOOL) isSeeding;
 - (BOOL) isChecking;
+- (BOOL) isCheckingWaiting;
 - (BOOL) allDownloaded;
 - (BOOL) isComplete;

trunk/macosx/Torrent.m

@@ -896 +896 @@
 }
 
+- (BOOL) isCheckingWaiting
+{
+    return fStat->status == TR_STATUS_CHECK_WAIT;
+}
+
 - (BOOL) allDownloaded
 {