Changeset 1124 for trunk/macosx


Ignore:
Timestamp:
Nov 23, 2006, 4:10:16 AM (15 years ago)
Author:
livings124
Message:

merge tracker address and announce address into one field in the inspector

Location:
trunk/macosx
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/macosx/English.lproj/InfoWindow.nib/classes.nib

    r1123 r1124  
    1919            LANGUAGE = ObjC;
    2020            OUTLETS = {
    21                 fAnnounceField = NSTextField;
    2221                fCommentView = NSTextView;
    2322                fConnectedPeersField = NSTextField;
  • trunk/macosx/InfoWindowController.h

    r1123 r1124  
    3838    IBOutlet NSImageView * fImageView;
    3939    IBOutlet NSTextField * fNameField, * fSizeField, * fTrackerField,
    40                         * fAnnounceField, * fPiecesField,
    41                         * fHashField,
     40                        * fPiecesField, * fHashField,
    4241                        * fTorrentLocationField, * fDataLocationField,
    4342                        * fDateStartedField,
  • trunk/macosx/InfoWindowController.m

    r1123 r1124  
    4040
    4141//15 spacing at the bottom of each tab
    42 #define TAB_INFO_HEIGHT 284.0
     42#define TAB_INFO_HEIGHT 268.0
    4343#define TAB_ACTIVITY_HEIGHT 109.0
    44 #define TAB_PEERS_HEIGHT 284.0
    45 #define TAB_FILES_HEIGHT 284.0
     44#define TAB_PEERS_HEIGHT 268.0
     45#define TAB_FILES_HEIGHT 268.0
    4646#define TAB_OPTIONS_HEIGHT 83.0
    4747
     
    152152        [fTrackerField setStringValue: @""];
    153153        [fTrackerField setToolTip: nil];
    154         [fAnnounceField setStringValue: @""];
    155         [fAnnounceField setToolTip: nil];
    156154        [fPiecesField setStringValue: @""];
    157155        [fHashField setStringValue: @""];
     
    173171        //don't allow empty fields to be selected
    174172        [fTrackerField setSelectable: NO];
    175         [fAnnounceField setSelectable: NO];
    176173        [fHashField setSelectable: NO];
    177174        [fCreatorField setSelectable: NO];
     
    205202        [fSizeField setStringValue: [NSString stringForFileSize: [torrent size]]];
    206203       
    207         NSString * tracker = [torrent tracker],
    208                 * announce = [torrent announce],
     204        NSString * tracker = [[torrent tracker] stringByAppendingString: [torrent announce]],
    209205                * hashString = [torrent hashString],
    210206                * commentString = [torrent comment];
    211207        [fTrackerField setStringValue: tracker];
    212208        [fTrackerField setToolTip: tracker];
    213         [fAnnounceField setStringValue: announce];
    214         [fAnnounceField setToolTip: announce];
    215209        [fPiecesField setStringValue: [NSString stringWithFormat: @"%d, %@", [torrent pieceCount],
    216210                                        [NSString stringForFileSize: [torrent pieceSize]]]];
     
    239233        //allow these fields to be selected
    240234        [fTrackerField setSelectable: YES];
    241         [fAnnounceField setSelectable: YES];
    242235        [fHashField setSelectable: YES];
    243236        [fCommentView setSelectable: YES];
Note: See TracChangeset for help on using the changeset viewer.