Merge branch 'hotfix-1.5.1'

lanayotech · May 16, 2014 · baebebe · baebebe
2 parents 5468690 + 0f16f97
commit baebebe
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 13 deletions.
diff --git a/Vagrant Manager.xcodeproj/project.pbxproj b/Vagrant Manager.xcodeproj/project.pbxproj
@@ -470,7 +470,7 @@
 				B1357A89187CEB3B00811CBC /* Images.xcassets in Resources */,
 				B15001361924A02C000A76E7 /* [email protected] in Resources */,
 				B1357A87187CEB3B00811CBC /* MainMenu.xib in Resources */,
-83EAC43B18D067C900FF26A1 /* vagrant_logo_off-clean.png in Resources */,
+				83EAC43B18D067C900FF26A1 /* vagrant_logo_off-clean@2x.png in Resources */,
 				83EAC43B18D067C900FF26A1 /* [email protected] in Resources */,
 				83BCB0491921B6BF00206967 /* dsa_pub.pem in Resources */,
 				838B393E18CC85BC00A04C15 /* vagrant_logo_highlighted-flat.png in Resources */,

diff --git a/Vagrant Manager/AppDelegate.m b/Vagrant Manager/AppDelegate.m
@@ -802,11 +802,17 @@ - (void)removeInfoWindow:(VirtualMachineInfoWindow*)infoWindow {
 
 - (NSString*)getCurrentTheme {
     NSString *theme = [[NSUserDefaults standardUserDefaults] objectForKey:@"statusBarIconTheme"];
+
+    NSArray *validThemes = @[@"default",
+                           @"clean",
+                           @"flat"];
 
     if(!theme) {
         theme = @"clean";
         [[NSUserDefaults standardUserDefaults] setValue:theme forKey:@"statusBarIconTheme"];
         [[NSUserDefaults standardUserDefaults] synchronize];
+    } else if(![validThemes containsObject:theme]) {
+        theme = @"clean";
     }
 
     return theme;

diff --git a/Vagrant Manager/PreferencesWindow.m b/Vagrant Manager/PreferencesWindow.m
@@ -28,14 +28,12 @@ - (void)windowDidLoad {
     NSString *statusBarIconTheme = [[NSUserDefaults standardUserDefaults] stringForKey:@"statusBarIconTheme"];
     NSString *updateStability = [Util getUpdateStability];
 
-    if([statusBarIconTheme isEqualToString:@"black"]) {
-        [self.statusBarIconThemePopUpButton selectItemWithTag:101];
-    } else if([statusBarIconTheme isEqualToString:@"flat"]) {
+    if([statusBarIconTheme isEqualToString:@"flat"]) {
         [self.statusBarIconThemePopUpButton selectItemWithTag:102];
-    } else if([statusBarIconTheme isEqualToString:@"clean"]) {
-        [self.statusBarIconThemePopUpButton selectItemWithTag:103];
-    } else {
+    } else if([statusBarIconTheme isEqualToString:@"default"]) {
         [self.statusBarIconThemePopUpButton selectItemWithTag:100];
+    } else {
+        [self.statusBarIconThemePopUpButton selectItemWithTag:103];
     }
 
     if ([terminalPreference isEqualToString:@"iTerm"]) {

diff --git a/Vagrant Manager/Vagrant Manager-Info.plist b/Vagrant Manager/Vagrant Manager-Info.plist
@@ -17,15 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5.0</string>
+	<string>1.5.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.5.0</string>
-	<key>SUPublicDSAKeyFile</key>
-	<string>dsa_pub.pem</string>
-	<key>SUFeedURL</key>
-	<string>http://api.lanayo.com/appcast/vagrant_manager.xml</string>
+	<string>1.5.1</string>
 	<key>Configuration</key>
 	<string>${CONFIGURATION}</string>
 	<key>LSApplicationCategoryType</key>
@@ -40,5 +36,9 @@
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
+	<key>SUFeedURL</key>
+	<string>http://api.lanayo.com/appcast/vagrant_manager.xml</string>
+	<key>SUPublicDSAKeyFile</key>
+	<string>dsa_pub.pem</string>
 </dict>
 </plist>