Changeset 9433

Timestamp:

Oct 29, 2009, 2:45:58 AM (13 years ago)

Author:

livings124

Message:

trivial cleanup and update strings file

Location:

trunk/macosx

Files:

• Controller.m (modified) (6 diffs)
• en.lproj/Localizable.strings (modified) (6 diffs)

trunk/macosx/Controller.m

@@ -847 +847 @@
     }
     
-    tr_info info;
     for (NSString * torrentPath in filenames)
     {
@@ -853 +852 @@
         tr_ctor * ctor = tr_ctorNew(fLib);
         tr_ctorSetMetainfoFromFile(ctor, [torrentPath UTF8String]);
-        tr_parse_result result = tr_torrentParse(ctor, &info);
+        
+        tr_info info;
+        const tr_parse_result result = tr_torrentParse(ctor, &info);
+        tr_ctorFree(ctor);
+        
         if (result != TR_PARSE_OK)
         {
@@ -866 +869 @@
                 NSAssert2(NO, @"Unknown error code (%d) when attempting to open \"%@\"", result, torrentPath);
             
-            tr_ctorFree(ctor);
             tr_metainfoFree(&info);
             continue;
         }
-        
-        tr_ctorFree(ctor);
         
         //determine download location
@@ -889 +889 @@
         
         //determine to show the options window
-        BOOL showWindow = type == ADD_SHOW_OPTIONS || ([fDefaults boolForKey: @"DownloadAsk"]
-                            && (info.isMultifile || ![fDefaults boolForKey: @"DownloadAskMulti"])
-                            && (type != ADD_AUTO || ![fDefaults boolForKey: @"DownloadAskManual"]));
+        const BOOL showWindow = type == ADD_SHOW_OPTIONS || ([fDefaults boolForKey: @"DownloadAsk"]
+                                    && (info.isMultifile || ![fDefaults boolForKey: @"DownloadAskMulti"])
+                                    && (type != ADD_AUTO || ![fDefaults boolForKey: @"DownloadAskManual"]));
         tr_metainfoFree(&info);
         
@@ -2001 +2001 @@
         if ([torrent isActive] && ![torrent isCheckingWaiting])
         {
+            const BOOL isActive = ![torrent isStalled];
+            if (isActive)
+                active++;
+            
             if ([torrent isSeeding])
             {
                 seeding++;
-                BOOL isActive = ![torrent isStalled];
-                if (isActive)
-                    active++;
-                
                 if (filterStatus && !((filterActive && isActive) || filterSeed))
                     continue;
@@ -2014 +2014 @@
             {
                 downloading++;
-                BOOL isActive = ![torrent isStalled];
-                if (isActive)
-                    active++;
-                
                 if (filterStatus && !((filterActive && isActive) || filterDownload))
                     continue;

trunk/macosx/en.lproj/Localizable.strings

@@ -51 +51 @@
    Status Bar -> speed tooltip */
 "%d KB/s" = "%d KB/s";
+
+/* Inspector -> Peers tab -> peers */
+"%d known" = "%d known";
 
 /* Status bar transfer count */
@@ -286 +289 @@
 "DL" = "DL";
 
+/* Inspector -> Peers tab -> peers */
+"DL from %d" = "DL from %d";
+
 /* Torrent disk space alert -> button */
 "Do not check disk space again" = "Do not check disk space again";
@@ -509 +515 @@
 /* files tab -> tooltip */
 "Normal Priority" = "Normal Priority";
+
+/* Inspector -> Peers tab -> peers */
+"Not Connected" = "Not Connected";
 
 /* Torrent disk space alert -> title */
@@ -738 +747 @@
 /* Create torrent -> location sheet -> button
    Create torrent -> select file
-   Default folder cannot be used alert -> prompt
-   Default incomplete folder cannot be used alert -> prompt
    Move torrent -> prompt
    Open torrent -> prompt
@@ -821 +828 @@
 "The directory \"%@\" does not currently exist. Create this directory or choose a different one to create the torrent file." = "The directory \"%@\" does not currently exist. Create this directory or choose a different one to create the torrent file.";
 
-/* Default folder cannot be used alert -> message */
-"The download folder cannot be used. Choose a new location." = "The download folder cannot be used. Choose a new location.";
-
-/* Default incomplete folder cannot be used alert -> message */
-"The incomplete folder cannot be used. Choose a new location or cancel for none." = "The incomplete folder cannot be used. Choose a new location or cancel for none.";
-
 /* Move error alert -> message
    Move inside itself alert -> message */
@@ -950 +951 @@
 "UL" = "UL";
 
+/* Inspector -> Peers tab -> peers */
+"UL to %d" = "UL to %d";
+
 /* File Outline -> Menu */
 "Uncheck Selected" = "Uncheck Selected";