Changeset 6989


Ignore:
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:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/macosx/InfoWindowController.m

    r6917 r6989  
    442442            NSString * location = [torrent publicTorrentLocation];
    443443            [fTorrentLocationField setStringValue: [location stringByAbbreviatingWithTildeInPath]];
    444             [fTorrentLocationField setToolTip: [location stringByAppendingFormat: @"\n\n%@", [torrent torrentLocation]]];
     444            [fTorrentLocationField setToolTip: location];
    445445        }
    446446        else
    447447        {
    448             [fTorrentLocationField setStringValue: NSLocalizedString(@"Transmission Support Folder", "Inspector -> torrent location")];
    449             [fTorrentLocationField setToolTip: [torrent torrentLocation]];
     448            [fTorrentLocationField setStringValue: @""];
     449            [fTorrentLocationField setToolTip: nil];
    450450        }
    451451       
  • trunk/macosx/PiecesView.h

    r6125 r6989  
    3434   
    3535    Torrent * fTorrent;
    36     int fNumPieces, fAcross, fWidth, fExtraBorder;
     36    NSInteger fNumPieces, fAcross, fWidth, fExtraBorder;
    3737}
    3838
  • trunk/macosx/PiecesView.m

    r6974 r6989  
    8383        fAcross = ceil(sqrt(fNumPieces));
    8484       
    85         float width = [self bounds].size.width;
     85        CGFloat width = [self bounds].size.width;
    8686        fWidth = (width - (fAcross + 1) * BETWEEN) / fAcross;
    8787        fExtraBorder = (width - ((fWidth + BETWEEN) * fAcross + BETWEEN)) / 2;
     
    116116
    117117    int8_t * pieces = NULL;
    118     float * piecesPercent = NULL;
     118    CGFloat * piecesPercent = NULL;
    119119   
    120120    BOOL showAvailablity = [[NSUserDefaults standardUserDefaults] boolForKey: @"PiecesViewShowAvailability"];
     
    126126    else
    127127    {   
    128         piecesPercent = (float *)tr_malloc(fNumPieces * sizeof(float));
     128        piecesPercent = (CGFloat *)tr_malloc(fNumPieces * sizeof(CGFloat));
    129129        [fTorrent getAmountFinished: piecesPercent size: fNumPieces];
    130130    }
     
    132132    NSImage * image = [self image];
    133133   
    134     int index = -1;
     134    NSInteger index = -1;
    135135    NSRect rect = NSMakeRect(0, 0, fWidth, fWidth);
    136136    BOOL change = NO;
     
    183183            {
    184184                //always redraw "mixed"
    185                 float percent = showAvailablity ? (float)pieces[index]/HIGH_PEERS : piecesPercent[index];
     185                CGFloat percent = showAvailablity ? (CGFloat)pieces[index]/HIGH_PEERS : piecesPercent[index];
    186186                NSColor * fullColor = showAvailablity ? fGreenAvailabilityColor : fBluePieceColor;
    187187                pieceColor = [[NSColor whiteColor] blendedColorWithFraction: percent ofColor: fullColor];
  • trunk/macosx/en.lproj/Localizable.strings

    r6952 r6989  
    264264"Create a Torrent File" = "Create a Torrent File";
    265265
     266/* Create toolbar item -> tooltip */
     267"Create torrent file" = "Create torrent file";
     268
    266269/* Create torrent -> select file
    267270   Create toolbar item -> palette label */
    268271"Create Torrent File" = "Create Torrent File";
    269 
    270 /* Create toolbar item -> tooltip */
    271 "Create torrent file" = "Create torrent file";
    272272
    273273/* Create torrent -> failed -> title */
     
    690690"Seeding" = "Seeding";
    691691
     692/* Torrent -> status string */
     693"Seeding complete" = "Seeding complete";
     694
    692695/* Growl notification title */
    693696"Seeding Complete" = "Seeding Complete";
    694 
    695 /* Torrent -> status string */
    696 "Seeding complete" = "Seeding complete";
    697697
    698698/* Torrent -> status string */
     
    893893"Transmission is already running." = "Transmission is already running.";
    894894
    895 /* Inspector -> torrent location */
    896 "Transmission Support Folder" = "Transmission Support Folder";
    897 
    898895/* Torrent -> status string
    899896   status bar -> status label */
Note: See TracChangeset for help on using the changeset viewer.