Changeset 1785

Timestamp:

Apr 23, 2007, 7:58:21 PM (15 years ago)

Author:

joshe

Message:

Merge r1754, r1755, and r1756 from trunk.

Location:

branches/0.7x/macosx

Files:

• InfoWindowController.m (modified) (1 diff)
• Torrent.m (modified) (2 diffs)
• TorrentTableView.m (modified) (3 diffs)

branches/0.7x/macosx/InfoWindowController.m

@@ -549 +549 @@
                 
                 [fPexCheck setEnabled: NO];
+        [fPexCheck setState: NSOffState];
     }
     

branches/0.7x/macosx/Torrent.m

@@ -81 +81 @@
     {
         fUseIncompleteFolder = [fDefaults boolForKey: @"UseIncompleteDownloadFolder"];
-        fIncompleteFolder = [[fDefaults stringForKey: @"IncompleteDownloadFolder"] copy];
+        fIncompleteFolder = [[[fDefaults stringForKey: @"IncompleteDownloadFolder"] stringByExpandingTildeInPath] retain];
         
         if (!fPublicTorrent)
@@ -959 +959 @@
         return @"";
     
-    #warning localize string after release
     NSString * error;
     if (!(error = [NSString stringWithUTF8String: fStat->errorString])
         && !(error = [NSString stringWithCString: fStat->errorString encoding: NSISOLatin1StringEncoding]))
-        error = @"";
-        //error = NSLocalizedString(@"(unreadable error)", "Torrent -> error string unreadable");
+        error = NSLocalizedString(@"(unreadable error)", "Torrent -> error string unreadable");
     
     return error;

branches/0.7x/macosx/TorrentTableView.m

@@ -217 +217 @@
     
     //select torrent closest to text that isn't before text alphabetically
+    int row;
     NSEnumerator * enumerator = [tempTorrents objectEnumerator];
     Torrent * torrent;
@@ -222 +223 @@
         if ([[torrent name] caseInsensitiveCompare: text] != NSOrderedAscending)
         {
-            [self selectRow: [fTorrents indexOfObject: torrent] byExtendingSelection: NO];
+            row = [fTorrents indexOfObject: torrent];
             break;
         }
@@ -228 +229 @@
     //select last torrent alphabetically if no match found
     if (!torrent)
-        [self selectRow: [fTorrents indexOfObject: [tempTorrents lastObject]] byExtendingSelection: NO];
+        row = [fTorrents indexOfObject: [tempTorrents lastObject]];
+    
+    [self selectRow: row byExtendingSelection: NO];
+    [self scrollRowToVisible: row];
 }