add preference to include machine names in top-level menu labels

Vagrant Manager/AppDelegate.m

@@ -31,6 +31,7 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(taskCompleted:) name:@"vagrant-manager.task-completed" object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(themeChanged:) name:@"vagrant-manager.theme-changed" object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(showRunningVmCountPreferenceChanged:) name:@"vagrant-manager.show-running-vm-count-preference-changed" object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(includeMachineNamesInMenuPreferenceChanged:) name:@"vagrant-manager.include-machine-names-in-menu-preference-changed" object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(showUpdateNotificationPreferenceChanged:) name:@"vagrant-manager.show-update-notification-preference-changed" object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(bookmarksUpdated:) name:@"vagrant-manager.bookmarks-updated" object:nil];
 
@@ -76,8 +77,12 @@ - (void)showRunningVmCountPreferenceChanged:(NSNotification*)notification {
     [self updateRunningVmCount];
 }
 
+- (void)includeMachineNamesInMenuPreferenceChanged:(NSNotification*)notification {
+    [_nativeMenu rebuildMenu];
+}
+
 - (void)showUpdateNotificationPreferenceChanged:(NSNotification*)notification {
-     [[NSNotificationCenter defaultCenter] postNotificationName:@"vagrant-manager.notification-preference-changed" object:nil];
+    [[NSNotificationCenter defaultCenter] postNotificationName:@"vagrant-manager.notification-preference-changed" object:nil];
 }
 
 #pragma mark - Vagrant manager control

Vagrant Manager/NativeMenu.h

@@ -20,4 +20,6 @@
 
 @property (weak) id<MenuDelegate> delegate;
 
+- (void)rebuildMenu;
+
 @end

Vagrant Manager/NativeMenuItem.m

@@ -194,7 +194,17 @@ - (void)refresh {
         if(bookmark) {
             self.menuItem.title = [NSString stringWithFormat:@"[B] %@", bookmark.displayName];
         } else {
-            self.menuItem.title = self.instance.displayName;
+            NSString *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:@", "]]];
+            }
+
+            self.menuItem.title = title;
         }
 
         if(!_machineSeparator) {

Vagrant Manager/PreferencesWindow.h

@@ -13,6 +13,7 @@
 
 @property (weak) IBOutlet NSButton *autoCloseCheckBox;
 @property (weak) IBOutlet NSButton *dontShowUpdateCheckBox;
+@property (weak) IBOutlet NSButton *includeMachineNamesCheckBox;
 @property (weak) IBOutlet NSButton *dontShowRunningVmCountCheckBox;
 @property (weak) IBOutlet NSPopUpButton *terminalPreferencePopUpButton;
 @property (weak) IBOutlet NSPopUpButton *statusBarIconThemePopUpButton;
@@ -24,6 +25,7 @@
 
 - (IBAction)autoCloseCheckBoxClicked:(id)sender;
 - (IBAction)dontShowUpdateCheckBoxClicked:(id)sender;
+- (IBAction)includeMachineNamesCheckBoxClicked:(id)sender;
 - (IBAction)dontShowRunningVmCountCheckBoxClicked:(id)sender;
 - (IBAction)terminalPreferencePopUpButtonClicked:(id)sender;
 - (IBAction)statusBarIconThemePopUpButtonClicked:(id)sender;

Vagrant Manager/PreferencesWindow.m

@@ -25,6 +25,7 @@ - (void)windowDidLoad {
     NSString *terminalPreference = [[NSUserDefaults standardUserDefaults] stringForKey:@"terminalPreference"];
     BOOL autoCloseTaskWindows = [[NSUserDefaults standardUserDefaults] boolForKey:@"autoCloseTaskWindows"];
     BOOL dontShowUpdateNotification = [[NSUserDefaults standardUserDefaults] boolForKey:@"dontShowUpdateNotification"];
+    BOOL includeMachineNames = [[NSUserDefaults standardUserDefaults] boolForKey:@"includeMachineNamesInMenu"];
     BOOL dontShowRunningVmCount = [[NSUserDefaults standardUserDefaults] boolForKey:@"dontShowRunningVmCount"];
     BOOL refreshEvery = [[NSUserDefaults standardUserDefaults] boolForKey:@"refreshEvery"];
     NSInteger refreshEveryInterval = [[NSUserDefaults standardUserDefaults] integerForKey:@"refreshEveryInterval"];
@@ -57,6 +58,7 @@ - (void)windowDidLoad {
 
     [self.autoCloseCheckBox setState:autoCloseTaskWindows ? NSOnState : NSOffState];
     [self.dontShowUpdateCheckBox setState:dontShowUpdateNotification ? NSOnState : NSOffState];
+    [self.includeMachineNamesCheckBox setState:includeMachineNames ? NSOnState : NSOffState];
     [self.dontShowRunningVmCountCheckBox setState:dontShowRunningVmCount ? NSOnState : NSOffState];
     [self.refreshEveryCheckBox setState:refreshEvery ? NSOnState : NSOffState];
     [self.intervalMenu selectItemWithTag:refreshEveryInterval];
@@ -77,6 +79,13 @@ - (IBAction)dontShowUpdateCheckBoxClicked:(id)sender {
     [[NSNotificationCenter defaultCenter] postNotificationName:@"vagrant-manager.show-update-notification-preference-changed" object:nil];
 }
 
+- (IBAction)includeMachineNamesCheckBoxClicked:(id)sender {
+    [[NSUserDefaults standardUserDefaults] setBool:(self.includeMachineNamesCheckBox.state == NSOnState) forKey:@"includeMachineNamesInMenu"];
+    [[NSUserDefaults standardUserDefaults] synchronize];
+
+    [[NSNotificationCenter defaultCenter] postNotificationName:@"vagrant-manager.include-machine-names-in-menu-preference-changed" object:nil];
+}
+
 - (IBAction)dontShowRunningVmCountCheckBoxClicked:(id)sender {
     [[NSUserDefaults standardUserDefaults] setBool:(self.dontShowRunningVmCountCheckBox.state == NSOnState) forKey:@"dontShowRunningVmCount"];
     [[NSUserDefaults standardUserDefaults] synchronize];