Changeset 3240

Timestamp:

Sep 30, 2007, 1:33:50 PM (15 years ago)

Author:

livings124

Message:

rearrange some status string code

File:

• trunk/macosx/Torrent.m (modified) (7 diffs)

trunk/macosx/Torrent.m

@@ -907 +907 @@
                     string = NSLocalizedString(@"Paused", "Torrent -> status string");
                 break;
+            
+            case TR_STATUS_STOPPING:
+                string = [NSLocalizedString(@"Stopping", "Torrent -> status string") stringByAppendingEllipsis];
+                break;
 
             case TR_STATUS_CHECK_WAIT:
@@ -935 +939 @@
                                                     [self peersGettingFromUs]];
                 break;
-
-            case TR_STATUS_STOPPING:
-                string = [NSLocalizedString(@"Stopping", "Torrent -> status string") stringByAppendingEllipsis];
-                break;
             
             default:
@@ -947 +947 @@
             string = [NSLocalizedString(@"Stalled, ", "Torrent -> status string") stringByAppendingString: string];
         
+        //append even if error
         if ([self isActive] && ![self isChecking])
         {
@@ -978 +979 @@
                 string = NSLocalizedString(@"Paused", "Torrent -> status string");
             break;
+        
+        case TR_STATUS_STOPPING:
+            string = [NSLocalizedString(@"Stopping", "Torrent -> status string") stringByAppendingEllipsis];
+            break;
 
         case TR_STATUS_CHECK_WAIT:
@@ -987 +992 @@
                                     "Torrent -> status string"), 100.0 * fStat->recheckProgress];
             break;
-
-        case TR_STATUS_STOPPING:
-            string = [NSLocalizedString(@"Stopping", "Torrent -> status string") stringByAppendingEllipsis];
+        
+        case TR_STATUS_DOWNLOAD:
+            string = [NSString stringWithFormat: NSLocalizedString(@"DL: %@, UL: %@", "Torrent -> status string"),
+                            [NSString stringForSpeed: [self downloadRate]], [NSString stringForSpeed: [self uploadRate]]];
+            break;
+        
+        case TR_STATUS_SEED:
+        case TR_STATUS_DONE:
+            string = [NSString stringWithFormat: NSLocalizedString(@"Ratio: %@, UL: %@", "Torrent -> status string"),
+                            [NSString stringForRatio: [self ratio]], [NSString stringForSpeed: [self uploadRate]]];
             break;
         
         default:
-            if ([self isActive])
-            {
-                if (![self allDownloaded])
-                    string = [NSString stringWithFormat: NSLocalizedString(@"DL: %@, ", "Torrent -> status string"),
-                                        [NSString stringForSpeed: [self downloadRate]]];
-                else
-                    string = [NSString stringWithFormat: NSLocalizedString(@"Ratio: %@, ", "Torrent -> status string"),
-                                [NSString stringForRatio: [self ratio]]];
-                
-                string = [string stringByAppendingFormat: NSLocalizedString(@"UL: %@", "Torrent -> status string"),
-                                [NSString stringForSpeed: [self uploadRate]]];
-            }
-            else
-                string = @"";
+            string = @"";
     }
     
@@ -1047 +1046 @@
             return NSLocalizedString(@"Paused", "Torrent -> status string");
             break;
+        
+        case TR_STATUS_STOPPING:
+            return [NSLocalizedString(@"Stopping", "Torrent -> status string") stringByAppendingEllipsis];
+            break;
 
         case TR_STATUS_CHECK:
@@ -1064 +1067 @@
         case TR_STATUS_DONE:
             return NSLocalizedString(@"Seeding", "Torrent -> status string");
-            break;
-
-        case TR_STATUS_STOPPING:
-            return [NSLocalizedString(@"Stopping", "Torrent -> status string") stringByAppendingEllipsis];
             break;