diff --git a/macosx/Controller.m b/macosx/Controller.m index d4eba8dae..7d561b00c 100644 --- a/macosx/Controller.m +++ b/macosx/Controller.m @@ -611,9 +611,11 @@ static void sleepCallBack( void * controller, io_service_t y, //badge dock NSUserDefaults * defaults = [NSUserDefaults standardUserDefaults]; - [fBadger updateBadgeWithCompleted: [defaults boolForKey: @"BadgeCompleted"] ? fCompleted : 0 - uploadRate: ul >= 0.1 && [defaults boolForKey: @"BadgeUploadRate"] ? [NSString stringForSpeedAbbrev: ul] : nil - downloadRate: dl >= 0.1 && [defaults boolForKey: @"BadgeDownloadRate"] ? [NSString stringForSpeedAbbrev: dl] : nil]; + [fBadger updateBadgeWithCompleted: fCompleted + uploadRate: ul >= 0.1 && [defaults boolForKey: @"BadgeUploadRate"] + ? [NSString stringForSpeedAbbrev: ul] : nil + downloadRate: dl >= 0.1 && [defaults boolForKey: @"BadgeDownloadRate"] + ? [NSString stringForSpeedAbbrev: dl] : nil]; } - (int) numberOfRowsInTableView: (NSTableView *) t diff --git a/macosx/Defaults.plist b/macosx/Defaults.plist index 655a4d665..a3ee03f04 100644 --- a/macosx/Defaults.plist +++ b/macosx/Defaults.plist @@ -2,8 +2,6 @@ - BadgeCompleted - BadgeDownloadRate BadgeUploadRate diff --git a/macosx/English.lproj/MainMenu.nib/classes.nib b/macosx/English.lproj/MainMenu.nib/classes.nib index 4ffabfb34..e0cacde7e 100644 --- a/macosx/English.lproj/MainMenu.nib/classes.nib +++ b/macosx/English.lproj/MainMenu.nib/classes.nib @@ -73,7 +73,6 @@ CLASS = PrefsController; LANGUAGE = ObjC; OUTLETS = { - fBadgeCompletedCheck = NSButton; fBadgeDownloadRateCheck = NSButton; fBadgeUploadRateCheck = NSButton; fBlankView = NSView; diff --git a/macosx/English.lproj/MainMenu.nib/info.nib b/macosx/English.lproj/MainMenu.nib/info.nib index e585eb1bf..fba6fbc88 100644 --- a/macosx/English.lproj/MainMenu.nib/info.nib +++ b/macosx/English.lproj/MainMenu.nib/info.nib @@ -15,9 +15,9 @@ 589 54 521 112 118 0 0 1152 842 783 - 456 452 470 265 0 0 1440 878 + 483 459 420 250 0 0 1440 878 796 - 412 490 470 129 0 0 1280 832 + 484 520 420 129 0 0 1440 878 825 544 501 155 107 0 0 1280 832 diff --git a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib index 773f41cf8..64250fce7 100644 Binary files a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib and b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib differ diff --git a/macosx/PrefsController.h b/macosx/PrefsController.h index 58c47ae1b..3b52757d3 100644 --- a/macosx/PrefsController.h +++ b/macosx/PrefsController.h @@ -37,7 +37,6 @@ IBOutlet NSPopUpButton * fFolderPopUp; IBOutlet NSButton * fQuitCheck; IBOutlet NSButton * fRemoveCheck; - IBOutlet NSButton * fBadgeCompletedCheck; IBOutlet NSButton * fBadgeDownloadRateCheck; IBOutlet NSButton * fBadgeUploadRateCheck; IBOutlet NSPopUpButton * fUpdatePopUp; diff --git a/macosx/PrefsController.m b/macosx/PrefsController.m index 9b4b3e697..24903f1a7 100644 --- a/macosx/PrefsController.m +++ b/macosx/PrefsController.m @@ -131,7 +131,6 @@ NSOnState : NSOffState]; //set dock badging - [fBadgeCompletedCheck setState: [fDefaults boolForKey: @"BadgeCompleted"]]; [fBadgeDownloadRateCheck setState: [fDefaults boolForKey: @"BadgeDownloadRate"]]; [fBadgeUploadRateCheck setState: [fDefaults boolForKey: @"BadgeUploadRate"]]; @@ -267,9 +266,7 @@ { BOOL state = [sender state]; - if (sender == fBadgeCompletedCheck) - [fDefaults setBool: state forKey: @"BadgeCompleted"]; - else if (sender == fBadgeDownloadRateCheck) + if (sender == fBadgeDownloadRateCheck) [fDefaults setBool: state forKey: @"BadgeDownloadRate"]; else if (sender == fBadgeUploadRateCheck) [fDefaults setBool: state forKey: @"BadgeUploadRate"];