diff --git a/macosx/Controller.h b/macosx/Controller.h index c94486f89..e244dde79 100644 --- a/macosx/Controller.h +++ b/macosx/Controller.h @@ -58,9 +58,11 @@ IBOutlet NSButton * fActionButton, * fSpeedLimitButton; NSTimer * fSpeedLimitTimer; + IBOutlet NSTextField * fTotalTorrentsField; IBOutlet StatusBarView * fStatusBar; - IBOutlet NSTextField * fTotalDLField, * fTotalULField, * fTotalTorrentsField; + IBOutlet NSButton * fStatusButton; + IBOutlet NSTextField * fTotalDLField, * fTotalULField; IBOutlet StatusBarView * fFilterBar; IBOutlet FilterButton * fNoFilterButton, * fDownloadFilterButton, * fSeedFilterButton, * fPauseFilterButton; diff --git a/macosx/Controller.m b/macosx/Controller.m index d9437ff4d..45475349b 100644 --- a/macosx/Controller.m +++ b/macosx/Controller.m @@ -1400,14 +1400,25 @@ void sleepCallBack(void * controller, io_service_t y, natural_t messageType, voi else [self sortTorrents]; - //update the global DL/UL rates + //update status bar if (![fStatusBar isHidden]) { + //set rates float downloadRate, uploadRate; tr_torrentRates(fLib, & downloadRate, & uploadRate); [fTotalDLField setStringValue: [NSString stringForSpeed: downloadRate]]; [fTotalULField setStringValue: [NSString stringForSpeed: uploadRate]]; + + //set status button text + tr_session_stats stats; + tr_getCumulativeSessionStats(fLib, &stats); + + NSString * statusString = [NSLocalizedString(@"Total Ratio: ", "status bar -> status button text") + stringByAppendingString: [NSString stringForRatio: stats.ratio]]; + + [fStatusButton setTitle: statusString]; + [fStatusButton sizeToFit]; } } diff --git a/macosx/English.lproj/MainMenu.nib/classes.nib b/macosx/English.lproj/MainMenu.nib/classes.nib index 8501256a6..93fb59fa0 100644 --- a/macosx/English.lproj/MainMenu.nib/classes.nib +++ b/macosx/English.lproj/MainMenu.nib/classes.nib @@ -193,6 +193,8 @@ NSButton fStatusBar StatusBarView + fStatusButton + NSButton fTableView TorrentTableView fTotalDLField @@ -232,6 +234,14 @@ SUPERCLASS NSObject + + CLASS + FilterButton + LANGUAGE + ObjC + SUPERCLASS + NSButton + ACTIONS @@ -270,14 +280,6 @@ SUPERCLASS NSTableView - - CLASS - FilterButton - LANGUAGE - ObjC - SUPERCLASS - NSButton - CLASS ActionPopUpButton diff --git a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib index ed7fecfbe..1561df3e0 100644 Binary files a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib and b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib differ