Merge conflict #64

codler · Jun 22, 2013 · 03bda33 · 03bda33
2 parents ef14d97 + 723ba5b
commit 03bda33
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 6 deletions.
diff --git a/Battery Time Remaining/AppDelegate.h b/Battery Time Remaining/AppDelegate.h
@@ -23,6 +23,7 @@
 #define kBTRMenuEnergySaverSetting  10
 #define kBTRMenuUpdater             11
 #define kBTRMenuQuitKey             12
+#define kBTRMenuWhiteText           13
 
 #endif
 

diff --git a/Battery Time Remaining/AppDelegate.m b/Battery Time Remaining/AppDelegate.m
@@ -43,6 +43,7 @@ @interface AppDelegate ()
     BOOL isCapacityWarning;
     BOOL showParenthesis;
     BOOL showFahrenheit;
+    BOOL whiteText;
 }
 
 - (void)cacheBatteryIcon;
@@ -136,11 +137,19 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification
     showFahrenheit = [[NSUserDefaults standardUserDefaults] boolForKey:@"fahrenheit"];
     fahrenheitSubmenuItem.state = (showFahrenheit) ? NSOnState : NSOffState;
 
+    // Toggle Black & White Text
+    NSMenuItem *colorTextSubmenuItem = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"White Text Color", @"White Text Color") action:@selector(toggleTextColor:) keyEquivalent:@""];
+    [colorTextSubmenuItem setTag:kBTRMenuWhiteText];
+    colorTextSubmenuItem.target = self;
+    whiteText = [[NSUserDefaults standardUserDefaults] boolForKey:@"whiteText"];
+    colorTextSubmenuItem.state = (whiteText) ? NSOnState : NSOffState;
+
     // Build the setting submenu
     NSMenu *settingSubmenu = [[NSMenu alloc] initWithTitle:@"Setting Menu"];
     [settingSubmenu addItem:advancedSubmenuItem];
     [settingSubmenu addItem:parenthesisSubmenuItem];
     [settingSubmenu addItem:fahrenheitSubmenuItem];
+    [settingSubmenu addItem:colorTextSubmenuItem];
 
     // Settings menu item
     NSMenuItem *settingMenu = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"Settings", @"Settings menuitem") action:nil keyEquivalent:@""];
@@ -433,11 +442,18 @@ - (void)setStatusBarImage:(NSImage *)image title:(NSString *)title
     [self.statusItem setAlternateImage:[ImageFilter invertColor:image]];
 
     // Title
-    NSDictionary *attributedStyle = [NSDictionary dictionaryWithObjectsAndKeys:
-                                     // Font
-                                     [NSFont menuFontOfSize:12.0f],
-                                     NSFontAttributeName,
-                                     nil];
+    NSMutableDictionary *attributedStyle = [NSMutableDictionary dictionaryWithObjectsAndKeys:
+                                             // Font
+                                             [NSFont menuFontOfSize:12.0f],
+                                             NSFontAttributeName,
+                                             nil];
+
+    if(whiteText) {
+        [attributedStyle setObject:[NSColor whiteColor] forKey:NSForegroundColorAttributeName];
+    } else {
+        [attributedStyle setObject:[NSColor blackColor] forKey:NSForegroundColorAttributeName];
+    }
+
 
     NSAttributedString *attributedTitle = [[NSAttributedString alloc] initWithString:title attributes:attributedStyle];
     self.statusItem.attributedTitle = attributedTitle;
@@ -664,6 +680,27 @@ - (void)toggleFahrenheit:(id)sender
     [self updateStatusItem];
 }
 
+- (void)toggleTextColor:(id)sender {
+    NSMenuItem     *item = sender;
+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+
+    if ([defaults boolForKey:@"whiteText"])
+    {
+        item.state = NSOffState;
+        whiteText = NO;
+        [defaults setBool:NO forKey:@"whiteText"];
+    }
+    else
+    {
+        item.state = NSOnState;
+        whiteText = YES;
+        [defaults setBool:YES forKey:@"whiteText"];
+    }
+    [defaults synchronize];
+
+    [self updateStatusItem];
+}
+
 - (void)notify:(NSString *)message
 {
     [self notify:@"Battery Time Remaining" message:message];
@@ -839,4 +876,4 @@ - (void)menuDidClose:(NSMenu *)menu
     optionKeyPressedTimer = nil;
 }
 
-@end
+@end