Changeset 6989

Timestamp:

Oct 30, 2008, 1:37:46 AM (12 years ago)

Author:

livings124

Message:

for the "torrent file" in the inspector, don't give information about the internal torrent file

Location:

trunk/macosx

Files:

• InfoWindowController.m (modified) (1 diff)
• PiecesView.h (modified) (1 diff)
• PiecesView.m (modified) (5 diffs)
• en.lproj/Localizable.strings (modified) (3 diffs)

trunk/macosx/InfoWindowController.m

@@ -442 +442 @@
             NSString * location = [torrent publicTorrentLocation];
             [fTorrentLocationField setStringValue: [location stringByAbbreviatingWithTildeInPath]];
-            [fTorrentLocationField setToolTip: [location stringByAppendingFormat: @"\n\n%@", [torrent torrentLocation]]];
+            [fTorrentLocationField setToolTip: location];
         }
         else
         {
-            [fTorrentLocationField setStringValue: NSLocalizedString(@"Transmission Support Folder", "Inspector -> torrent location")];
-            [fTorrentLocationField setToolTip: [torrent torrentLocation]];
+            [fTorrentLocationField setStringValue: @""];
+            [fTorrentLocationField setToolTip: nil];
         }
         

trunk/macosx/PiecesView.h

@@ -34 +34 @@
     
     Torrent * fTorrent;
-    int fNumPieces, fAcross, fWidth, fExtraBorder;
+    NSInteger fNumPieces, fAcross, fWidth, fExtraBorder;
 }
 

trunk/macosx/PiecesView.m

@@ -83 +83 @@
         fAcross = ceil(sqrt(fNumPieces));
         
-        float width = [self bounds].size.width;
+        CGFloat width = [self bounds].size.width;
         fWidth = (width - (fAcross + 1) * BETWEEN) / fAcross;
         fExtraBorder = (width - ((fWidth + BETWEEN) * fAcross + BETWEEN)) / 2;
@@ -116 +116 @@
 
     int8_t * pieces = NULL;
-    float * piecesPercent = NULL;
+    CGFloat * piecesPercent = NULL;
     
     BOOL showAvailablity = [[NSUserDefaults standardUserDefaults] boolForKey: @"PiecesViewShowAvailability"];
@@ -126 +126 @@
     else
     {   
-        piecesPercent = (float *)tr_malloc(fNumPieces * sizeof(float));
+        piecesPercent = (CGFloat *)tr_malloc(fNumPieces * sizeof(CGFloat));
         [fTorrent getAmountFinished: piecesPercent size: fNumPieces];
     }
@@ -132 +132 @@
     NSImage * image = [self image];
     
-    int index = -1;
+    NSInteger index = -1;
     NSRect rect = NSMakeRect(0, 0, fWidth, fWidth);
     BOOL change = NO;
@@ -183 +183 @@
             {
                 //always redraw "mixed"
-                float percent = showAvailablity ? (float)pieces[index]/HIGH_PEERS : piecesPercent[index];
+                CGFloat percent = showAvailablity ? (CGFloat)pieces[index]/HIGH_PEERS : piecesPercent[index];
                 NSColor * fullColor = showAvailablity ? fGreenAvailabilityColor : fBluePieceColor;
                 pieceColor = [[NSColor whiteColor] blendedColorWithFraction: percent ofColor: fullColor];

trunk/macosx/en.lproj/Localizable.strings

@@ -264 +264 @@
 "Create a Torrent File" = "Create a Torrent File";
 
+/* Create toolbar item -> tooltip */
+"Create torrent file" = "Create torrent file";
+
 /* Create torrent -> select file
    Create toolbar item -> palette label */
 "Create Torrent File" = "Create Torrent File";
-
-/* Create toolbar item -> tooltip */
-"Create torrent file" = "Create torrent file";
 
 /* Create torrent -> failed -> title */
@@ -690 +690 @@
 "Seeding" = "Seeding";
 
+/* Torrent -> status string */
+"Seeding complete" = "Seeding complete";
+
 /* Growl notification title */
 "Seeding Complete" = "Seeding Complete";
-
-/* Torrent -> status string */
-"Seeding complete" = "Seeding complete";
 
 /* Torrent -> status string */
@@ -893 +893 @@
 "Transmission is already running." = "Transmission is already running.";
 
-/* Inspector -> torrent location */
-"Transmission Support Folder" = "Transmission Support Folder";
-
 /* Torrent -> status string
    status bar -> status label */