Skip to content

Commit

Permalink
Merge branch 'release/2.4.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
@amitailanciano
amitailanciano committed Jun 6, 2015
2 parents fa6c983 + 9017a1d commit 26fd24d
Show file tree
Hide file tree
Showing 10 changed files with 51 additions and 27 deletions.
24 changes: 24 additions & 0 deletions Vagrant Manager.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@
objects = {

/* Begin PBXBuildFile section */
26130E9A1B1D565200872C4F /* bm_status_icon_off.png in Resources */ = {isa = PBXBuildFile; fileRef = 26130E981B1D565200872C4F /* bm_status_icon_off.png */; };
26130E9B1B1D565200872C4F /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 26130E991B1D565200872C4F /* [email protected] */; };
26130E9E1B1D596400872C4F /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 26130E9C1B1D596400872C4F /* [email protected] */; };
26130E9F1B1D596400872C4F /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 26130E9D1B1D596400872C4F /* [email protected] */; };
26130EA51B1D68CA00872C4F /* bm_status_icon_on.png in Resources */ = {isa = PBXBuildFile; fileRef = 26130EA31B1D68CA00872C4F /* bm_status_icon_on.png */; };
26130EA61B1D68CA00872C4F /* bm_status_icon_suspended.png in Resources */ = {isa = PBXBuildFile; fileRef = 26130EA41B1D68CA00872C4F /* bm_status_icon_suspended.png */; };
8308E132188662BD001E0B45 /* AboutWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 8308E130188662BD001E0B45 /* AboutWindow.m */; };
8308E133188662BD001E0B45 /* AboutWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 8308E131188662BD001E0B45 /* AboutWindow.xib */; };
8308E135188668A1001E0B45 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8308E134188668A1001E0B45 /* WebKit.framework */; };
Expand Down Expand Up @@ -142,6 +148,12 @@
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
26130E981B1D565200872C4F /* bm_status_icon_off.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = bm_status_icon_off.png; sourceTree = "<group>"; };
26130E991B1D565200872C4F /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
26130E9C1B1D596400872C4F /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
26130E9D1B1D596400872C4F /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
26130EA31B1D68CA00872C4F /* bm_status_icon_on.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = bm_status_icon_on.png; sourceTree = "<group>"; };
26130EA41B1D68CA00872C4F /* bm_status_icon_suspended.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = bm_status_icon_suspended.png; sourceTree = "<group>"; };
8308E12F188662BD001E0B45 /* AboutWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AboutWindow.h; sourceTree = "<group>"; };
8308E130188662BD001E0B45 /* AboutWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AboutWindow.m; sourceTree = "<group>"; };
8308E131188662BD001E0B45 /* AboutWindow.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = AboutWindow.xib; sourceTree = "<group>"; };
Expand Down Expand Up @@ -494,6 +506,12 @@
83F5BBB71983B99600ACE853 /* Status Icons */ = {
isa = PBXGroup;
children = (
26130EA31B1D68CA00872C4F /* bm_status_icon_on.png */,
26130EA41B1D68CA00872C4F /* bm_status_icon_suspended.png */,
26130E9C1B1D596400872C4F /* [email protected] */,
26130E9D1B1D596400872C4F /* [email protected] */,
26130E981B1D565200872C4F /* bm_status_icon_off.png */,
26130E991B1D565200872C4F /* [email protected] */,
B150013119249FFD000A76E7 /* [email protected] */,
B17AA1971887DB8C00B4C274 /* status_icon_off.png */,
B15001351924A02C000A76E7 /* [email protected] */,
Expand Down Expand Up @@ -690,24 +708,30 @@
83C4CDE01A060B3600611DCC /* suspend.png in Resources */,
83C4CDFB1A06259A00611DCC /* [email protected] in Resources */,
B17AA19A1887DB8C00B4C274 /* status_icon_on.png in Resources */,
26130EA51B1D68CA00872C4F /* bm_status_icon_on.png in Resources */,
83C4CDDD1A060B3600611DCC /* [email protected] in Resources */,
B150013419249FFD000A76E7 /* [email protected] in Resources */,
8339DCA2187E756B0036E162 /* TaskOutputWindow.xib in Resources */,
83C4CDE41A060B3600611DCC /* reload.png in Resources */,
B17AA1901887CA4600B4C274 /* PreferencesWindow.xib in Resources */,
B150012E19249CA2000A76E7 /* [email protected] in Resources */,
83C4CDDE1A060B3600611DCC /* up.png in Resources */,
26130E9E1B1D596400872C4F /* [email protected] in Resources */,
83F5BBC01983D85C00ACE853 /* MainMenu.xib in Resources */,
83C4CE0A1A0628AC00611DCC /* [email protected] in Resources */,
83C4CDA61A05FA0400611DCC /* vagrant_logo_off-clean.png in Resources */,
26130E9B1B1D565200872C4F /* [email protected] in Resources */,
83C4CE1E1A062BCF00611DCC /* vagrant_logo_refresh_5-flat.png in Resources */,
B1357A89187CEB3B00811CBC /* Images.xcassets in Resources */,
83C4CDA91A05FA0400611DCC /* [email protected] in Resources */,
83C4CE1D1A062BCF00611DCC /* vagrant_logo_refresh_4-flat.png in Resources */,
83C4CDDF1A060B3600611DCC /* [email protected] in Resources */,
83C4CE191A062BCF00611DCC /* vagrant_logo_refresh_2-flat.png in Resources */,
26130EA61B1D68CA00872C4F /* bm_status_icon_suspended.png in Resources */,
B15001361924A02C000A76E7 /* [email protected] in Resources */,
83C4CDFC1A06259A00611DCC /* [email protected] in Resources */,
26130E9A1B1D565200872C4F /* bm_status_icon_off.png in Resources */,
26130E9F1B1D596400872C4F /* [email protected] in Resources */,
83C4CE1C1A062BCF00611DCC /* vagrant_logo_refresh_3-flat.png in Resources */,
83BCB0491921B6BF00206967 /* dsa_pub.pem in Resources */,
B150012A19249B19000A76E7 /* [email protected] in Resources */,
Expand Down
6 changes: 2 additions & 4 deletions Vagrant Manager/NativeMenu.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,6 @@ @implementation NativeMenu {
NSMenuItem *_checkForVagrantUpdatesMenuItem;
}

- (BOOL)validateMenuItem:(NSMenuItem *)menuItem {
return [menuItem isEnabled];
}

- (id)init {
self = [super init];

Expand All @@ -44,6 +40,7 @@ - (id)init {

_statusItem = [[NSStatusBar systemStatusBar] statusItemWithLength:NSVariableStatusItemLength];
_menu = [[NSMenu alloc] init];
[_menu setAutoenablesItems:NO];

_menuItems = [[NSMutableArray alloc] init];

Expand All @@ -63,6 +60,7 @@ - (id)init {
[_menu addItem:_bottomMachineSeparator];

NSMenu *allMachinesMenu = [[NSMenu alloc] init];
[allMachinesMenu setAutoenablesItems:NO];

NSMenuItem *menuItem = [[NSMenuItem alloc] initWithTitle:@"Up" action:@selector(allUpMenuItemClicked:) keyEquivalent:@""];
menuItem.target = self;
Expand Down
44 changes: 23 additions & 21 deletions Vagrant Manager/NativeMenuItem.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ - (void)refresh {

if(!self.menuItem.hasSubmenu) {
[self.menuItem setSubmenu:[[NSMenu alloc] init]];
[self.menuItem.submenu setAutoenablesItems:NO];
self.menuItem.submenu.delegate = self;
}

Expand Down Expand Up @@ -117,6 +118,7 @@ - (void)refresh {

[self.menuItem.submenu addItem:_instanceCustomCommandMenuItem];
_instanceCustomCommandMenuItem.submenu = [[NSMenu alloc] init];
[_instanceCustomCommandMenuItem.submenu setAutoenablesItems:NO];
}

[_instanceCustomCommandMenuItem.submenu removeAllItems];
Expand Down Expand Up @@ -155,6 +157,7 @@ - (void)refresh {
if (!_chooseProviderMenuItem) {
_chooseProviderMenuItem = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@"Provider: %@", self.instance.providerIdentifier ?: @"Unknown"] action:nil keyEquivalent:@""];
NSMenu *submenu = [[NSMenu alloc] init];
[submenu setAutoenablesItems:NO];
NSArray *providerIdentifiers = [[VagrantManager sharedManager] getProviderIdentifiers];
for(NSString *providerIdentifier in providerIdentifiers) {
NSMenuItem *submenuItem = [[NSMenuItem alloc] initWithTitle:providerIdentifier action:@selector(updateProviderIdentifier:) keyEquivalent:@""];
Expand All @@ -180,15 +183,17 @@ - (void)refresh {
[self.menuItem.submenu addItem:_addBookmarkMenuItem];
}

Bookmark *bookmark = [[BookmarkManager sharedManager] getBookmarkWithPath:self.instance.path];

if([self.instance hasVagrantfile]) {
int runningCount = [self.instance getRunningMachineCount];
int suspendedCount = [self.instance getMachineCountWithState:SavedState];
if(runningCount == 0 && suspendedCount == 0) {
self.menuItem.image = [NSImage imageNamed:@"status_icon_off"];
self.menuItem.image = [NSImage imageNamed:bookmark ? @"bm_status_icon_off" : @"status_icon_off"];
} else if(runningCount == self.instance.machines.count) {
self.menuItem.image = [NSImage imageNamed:@"status_icon_on"];
self.menuItem.image = [NSImage imageNamed:bookmark ? @"bm_status_icon_on" : @"status_icon_on"];
} else {
self.menuItem.image = [NSImage imageNamed:@"status_icon_suspended"];
self.menuItem.image = [NSImage imageNamed:bookmark ? @"bm_status_icon_suspended" : @"status_icon_suspended"];
}

if([self.instance getRunningMachineCount] < self.instance.machines.count) {
Expand Down Expand Up @@ -233,28 +238,23 @@ - (void)refresh {
self.menuItem.submenu = nil;
}

Bookmark *bookmark = [[BookmarkManager sharedManager] getBookmarkWithPath:self.instance.path];
if(bookmark) {
self.menuItem.title = [NSString stringWithFormat:@"[B] %@", bookmark.displayName];
NSString *title;
if([[NSUserDefaults standardUserDefaults] boolForKey:@"usePathAsInstanceDisplayName"]) {
title = self.instance.path;
} else {
NSString *title;
if([[NSUserDefaults standardUserDefaults] boolForKey:@"usePathAsInstanceDisplayName"]) {
title = self.instance.path;
} else {
title = self.instance.displayName;
}

if(self.instance.machines.count > 0 && [[NSUserDefaults standardUserDefaults] boolForKey:@"includeMachineNamesInMenu"]) {
NSMutableArray *machineNames = [[NSMutableArray alloc] init];
for(VagrantMachine *machine in self.instance.machines) {
[machineNames addObject:machine.name];
}
title = [title stringByAppendingString:[NSString stringWithFormat:@" (%@)", [machineNames componentsJoinedByString:@", "]]];
title = self.instance.displayName;
}

if(self.instance.machines.count > 0 && [[NSUserDefaults standardUserDefaults] boolForKey:@"includeMachineNamesInMenu"]) {
NSMutableArray *machineNames = [[NSMutableArray alloc] init];
for(VagrantMachine *machine in self.instance.machines) {
[machineNames addObject:machine.name];
}

self.menuItem.title = title;
title = [title stringByAppendingString:[NSString stringWithFormat:@" (%@)", [machineNames componentsJoinedByString:@", "]]];
}

self.menuItem.title = title;

if(!_machineSeparator) {
_machineSeparator = [NSMenuItem separatorItem];
[self.menuItem.submenu addItem:_machineSeparator];
Expand All @@ -274,6 +274,7 @@ - (void)refresh {
for(VagrantMachine *machine in self.instance.machines) {
NSMenuItem *machineItem = [[NSMenuItem alloc] initWithTitle:machine.name action:nil keyEquivalent:@""];
NSMenu *machineSubmenu = [[NSMenu alloc] init];
[machineSubmenu setAutoenablesItems:NO];
machineSubmenu.delegate = self;

NSMenuItem *machineUpMenuItem = [[NSMenuItem alloc] initWithTitle:@"Up" action:@selector(upMachine:) keyEquivalent:@""];
Expand Down Expand Up @@ -330,6 +331,7 @@ - (void)refresh {
[machineCustomCommandMenuItem.image setTemplate:YES];
[machineSubmenu addItem:machineCustomCommandMenuItem];
machineCustomCommandMenuItem.submenu = [[NSMenu alloc] init];
[machineCustomCommandMenuItem.submenu setAutoenablesItems:NO];

[machineCustomCommandMenuItem.submenu removeAllItems];
if(customCommands.count > 0) {
Expand Down
4 changes: 2 additions & 2 deletions Vagrant Manager/Vagrant Manager-Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>2.4.0</string>
<string>2.4.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>2.4.0</string>
<string>2.4.1</string>
<key>Configuration</key>
<string>${CONFIGURATION}</string>
<key>LSApplicationCategoryType</key>
Expand Down
Binary file added Vagrant Manager/bm_status_icon_off.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Vagrant Manager/[email protected]
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Vagrant Manager/bm_status_icon_on.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Vagrant Manager/[email protected]
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Vagrant Manager/bm_status_icon_suspended.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Vagrant Manager/[email protected]
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 26fd24d

Please sign in to comment.