diff --git a/osx/installerplugins/managevmplugin/Base.lproj/managevmplugin.xib b/osx/installerplugins/managevmplugin/Base.lproj/managevmplugin.xib index 518e778823..9135dd3bf6 100644 --- a/osx/installerplugins/managevmplugin/Base.lproj/managevmplugin.xib +++ b/osx/installerplugins/managevmplugin/Base.lproj/managevmplugin.xib @@ -1,5 +1,5 @@ - + @@ -17,6 +17,7 @@ + @@ -69,7 +70,7 @@ + diff --git a/osx/installerplugins/managevmplugin/managevmpluginPane.h b/osx/installerplugins/managevmplugin/managevmpluginPane.h index cab3ef3f3e..31a6b5e3f0 100644 --- a/osx/installerplugins/managevmplugin/managevmpluginPane.h +++ b/osx/installerplugins/managevmplugin/managevmpluginPane.h @@ -20,5 +20,8 @@ @property (weak) IBOutlet NSTextField *migrationStatusLabel; @property (unsafe_unretained) IBOutlet NSTextView *migrationLogsTextView; @property (weak) IBOutlet NSScrollView *migrationLogsScrollView; +@property (weak) IBOutlet NSButton *issueButton; + +- (IBAction)issueButtonClicked:(id)sender; @end diff --git a/osx/installerplugins/managevmplugin/managevmpluginPane.m b/osx/installerplugins/managevmplugin/managevmpluginPane.m index a2b22b55b8..0372a57e49 100644 --- a/osx/installerplugins/managevmplugin/managevmpluginPane.m +++ b/osx/installerplugins/managevmplugin/managevmpluginPane.m @@ -111,6 +111,8 @@ NSString *dockerMachinePath = @"/usr/local/bin/docker-machine"; self.nextEnabled = YES; [self gotoNextPane]; } else { + self.migrationLogsScrollView.hidden = NO; + self.issueButton.hidden = NO; [Mixpanel trackEvent:@"Boot2Docker Migration Failed" forPane:self]; self.migrationStatusLabel.hidden = NO; self.migrationStatusLabel.stringValue = @"VM Migration failed. Please see the logs below."; @@ -179,7 +181,6 @@ NSString *dockerMachinePath = @"/usr/local/bin/docker-machine"; self.arrowImage.hidden = YES; self.migrateCheckbox.enabled = NO; self.migrationStatusLabel.stringValue = @"Migrating..."; - self.migrationLogsScrollView.hidden = NO; [self migrateBoot2DockerVM]; return NO; @@ -190,4 +191,8 @@ NSString *dockerMachinePath = @"/usr/local/bin/docker-machine"; } +- (IBAction)issueButtonClicked:(id)sender { + NSURL *url = [[NSURL alloc] initWithString: @"https://github.com/docker/toolbox/issues"]; + [[NSWorkspace sharedWorkspace] openURL:url]; +} @end diff --git a/osx/mpkg/Plugins/managevmplugin.bundle/Contents/MacOS/managevmplugin b/osx/mpkg/Plugins/managevmplugin.bundle/Contents/MacOS/managevmplugin index 8d6f30bfbf..f375beb90b 100755 Binary files a/osx/mpkg/Plugins/managevmplugin.bundle/Contents/MacOS/managevmplugin and b/osx/mpkg/Plugins/managevmplugin.bundle/Contents/MacOS/managevmplugin differ diff --git a/osx/mpkg/Plugins/managevmplugin.bundle/Contents/Resources/Base.lproj/managevmplugin.nib b/osx/mpkg/Plugins/managevmplugin.bundle/Contents/Resources/Base.lproj/managevmplugin.nib index f5669988fc..327c0cbde0 100644 Binary files a/osx/mpkg/Plugins/managevmplugin.bundle/Contents/Resources/Base.lproj/managevmplugin.nib and b/osx/mpkg/Plugins/managevmplugin.bundle/Contents/Resources/Base.lproj/managevmplugin.nib differ