Changeset 535


Ignore:
Timestamp:
Jul 6, 2006, 12:03:27 AM (16 years ago)
Author:
livings124
Message:

Re-added state to inspector because state isn't visible from minimal view and state can still differ from what's displayed (for example, it might display "waiting to start" when status is "paused").

Location:
trunk/macosx
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/macosx/Controller.m

    r534 r535  
    487487   
    488488    [self updateUI: nil];
    489     [fInfoController updateInfoSettings];
     489    [fInfoController updateInfoStatsAndSettings];
    490490    [self updateTorrentHistory];
    491491}
     
    516516   
    517517    [self updateUI: nil];
    518     [fInfoController updateInfoSettings];
     518    [fInfoController updateInfoStatsAndSettings];
    519519    [self updateTorrentHistory];
    520520}
     
    10341034       
    10351035        [self updateUI: nil];
    1036         [fInfoController updateInfoSettings];
     1036        [fInfoController updateInfoStatsAndSettings];
    10371037        [self updateTorrentHistory];
    10381038    }
     
    10441044   
    10451045    [self updateUI: nil];
    1046     [fInfoController updateInfoSettings];
     1046    [fInfoController updateInfoStatsAndSettings];
    10471047    [self updateTorrentHistory];
    10481048}
     
    10531053
    10541054    [self updateUI: nil];
    1055     [fInfoController updateInfoSettings];
     1055    [fInfoController updateInfoStatsAndSettings];
    10561056    [self updateTorrentHistory];
    10571057}
     
    11271127- (void) reloadInspectorSettings: (NSNotification *) notification
    11281128{
    1129     [fInfoController updateInfoSettings];
     1129    [fInfoController updateInfoStatsAndSettings];
    11301130}
    11311131
  • trunk/macosx/English.lproj/InfoWindow.nib/classes.nib

    r451 r535  
    3737                fSeedersField = NSTextField;
    3838                fSizeField = NSTextField;
     39                fStateField = NSTextField;
    3940                fTabView = NSTabView;
    4041                fTorrentLocationField = NSTextField;
  • trunk/macosx/InfoWindowController.h

    r515 r535  
    4141                        * fDateStartedField,
    4242/*
    43                         * fStateField, * fPercentField,
     43                        * fPercentField,
    4444                        * fDownloadRateField, * fUploadRateField,
    4545*/
     46                        * fStateField,
    4647                        * fDownloadedValidField, * fDownloadedTotalField, * fUploadedTotalField,
    4748                        * fRatioField, * fSeedersField, * fLeechersField,
     
    5758- (void) updateInfoForTorrents: (NSArray *) torrents;
    5859- (void) updateInfoStats;
    59 - (void) updateInfoSettings;
     60- (void) updateInfoStatsAndSettings;
    6061
    6162- (void) setNextTab;
  • trunk/macosx/InfoWindowController.m

    r515 r535  
    4040//15 spacing at the bottom of each tab
    4141#define TAB_INFO_HEIGHT 182.0
    42 #define TAB_ACTIVITY_HEIGHT 198.0
     42#define TAB_ACTIVITY_HEIGHT 214.0
    4343#define TAB_OPTIONS_HEIGHT 116.0
    4444#define TAB_FILES_HEIGHT 250.0
     
    137137        [fDateStartedField setStringValue: @""];
    138138       
     139        [fStateField setStringValue: @""];
    139140/*
    140         [fStateField setStringValue: @""];
    141141        [fPercentField setStringValue: @""];
    142142*/
     
    178178        [fDateStartedField setObjectValue: [torrent date]];
    179179    }
    180     [self updateInfoStats];
    181     [self updateInfoSettings];
     180   
     181    //update stats and settings
     182    [self updateInfoStatsAndSettings];
    182183
    183184    //set file table
     
    223224        {
    224225            torrent = [fTorrents objectAtIndex: 0];
     226
     227            [fStateField setStringValue: [torrent stateString]];
    225228/*
    226             [fStateField setStringValue: [torrent state]];
    227229            [fPercentField setStringValue: [NSString stringWithFormat:
    228230                                            @"%.2f%%", 100.0 * [torrent progress]]];
     
    249251}
    250252
    251 - (void) updateInfoSettings
     253- (void) updateInfoStatsAndSettings
    252254{
    253255    int numberSelected = [fTorrents count];
     
    325327        [fRatioLimitField setStringValue: @""];
    326328    }
     329   
     330    [self updateInfoStats];
    327331}
    328332
  • trunk/macosx/Torrent.h

    r530 r535  
    105105- (BOOL) privateTorrent;
    106106
    107 //- (NSString *) state;
     107- (NSString *) stateString;
    108108
    109109- (float)   progress;
  • trunk/macosx/Torrent.m

    r533 r535  
    429429}
    430430
    431 /*- (NSString *) state
     431- (NSString *) stateString
    432432{
    433433    switch( fStat->status )
     
    456456            return @"N/A";
    457457    }
    458 }*/
     458}
    459459
    460460- (float) progress
Note: See TracChangeset for help on using the changeset viewer.