diff --git a/Imagr/MainController.py b/Imagr/MainController.py
index b452508..8e39f2d 100644
--- a/Imagr/MainController.py
+++ b/Imagr/MainController.py
@@ -22,6 +22,12 @@
import PyObjCTools
class MainController(NSObject):
+
+ theTabView = objc.IBOutlet()
+ introTab = objc.IBOutlet()
+ loginTab = objc.IBOutlet()
+ mainTab = objc.IBOutlet()
+
password = objc.IBOutlet()
passwordLabel = objc.IBOutlet()
loginLabel = objc.IBOutlet()
@@ -29,9 +35,6 @@ class MainController(NSObject):
errorField = objc.IBOutlet()
mainWindow = objc.IBOutlet()
- mainView = objc.IBOutlet()
- loginView = objc.IBOutlet()
-
progressPanel = objc.IBOutlet()
progressIndicator = objc.IBOutlet()
progressText = objc.IBOutlet()
@@ -72,15 +75,15 @@ class MainController(NSObject):
blessTarget = None
def runStartupTasks(self):
- self.loginView.setHidden_(self)
+ #self.loginView.setHidden_(self)
self.mainWindow.center()
#self.progressPanel.center()
#self.password.becomeFirstResponder()
# Run app startup - get the images, password, volumes - anything that takes a while
self.progressText.setStringValue_("Application Starting...")
- NSApp.beginSheet_modalForWindow_modalDelegate_didEndSelector_contextInfo_(
- self.progressPanel, self.mainWindow, self, None, None)
+ #NSApp.beginSheet_modalForWindow_modalDelegate_didEndSelector_contextInfo_(
+ # self.progressPanel, self.mainWindow, self, None, None)
self.progressIndicator.setIndeterminate_(True)
self.progressIndicator.setUsesThreadedAnimation_(True)
self.progressIndicator.startAnimation_(self)
@@ -106,8 +109,8 @@ def loadData(self):
def loadDataComplete(self):
# end modal sheet and close the panel
- NSApp.endSheet_(self.progressPanel)
- self.progressPanel.orderOut_(self)
+ #NSApp.endSheet_(self.progressPanel)
+ #self.progressPanel.orderOut_(self)
if not self.passwordHash:
self.password.setEnabled_(False)
self.loginButton.setEnabled_(False)
@@ -115,8 +118,9 @@ def loadDataComplete(self):
self.startUpDiskText.setStringValue_(
"No Server URL has been set. Please contact your administrator.")
self.setStartupDisk_(self)
- self.loginView.setHidden_(False)
- self.mainView.setHidden_(True)
+ #self.loginView.setHidden_(False)
+ #self.mainView.setHidden_(True)
+ self.theTabView.selectTabViewItem_(self.loginTab)
self.mainWindow.makeFirstResponder_(self.password)
@objc.IBAction
@@ -127,8 +131,7 @@ def login_(self, sender):
self.errorField.setEnabled_(sender)
self.errorField.setStringValue_("Incorrect password")
else:
- self.loginView.setHidden_(sender)
- self.mainView.setHidden_(False)
+ self.theTabView.selectTabViewItem_(self.mainTab)
self.chooseImagingTarget_(sender)
self.enableAllButtons_(self)
diff --git a/Imagr/en.lproj/MainMenu.xib b/Imagr/en.lproj/MainMenu.xib
index 233bb24..e673ef1 100644
--- a/Imagr/en.lproj/MainMenu.xib
+++ b/Imagr/en.lproj/MainMenu.xib
@@ -14,7 +14,6 @@
NSButton
NSButtonCell
NSCustomObject
- NSCustomView
NSImageCell
NSImageView
NSMenu
@@ -26,6 +25,8 @@
NSScroller
NSSecureTextField
NSSecureTextFieldCell
+ NSTabView
+ NSTabViewItem
NSTextField
NSTextFieldCell
NSTextView
@@ -1175,491 +1176,498 @@
NO
YES
-
-
-
- 268
- {{374, 271}, {288, 37}}
-
-
-
- 1
- YES
-
- 342884417
- 272663616
-
-
- YES
- 25
- 1044
-
-
- YES
-
- 6
- System
- textBackgroundColor
-
- 3
- MQA
+
+ 1
+
+
+ 274
+
+
+
+ 268
+ {{327, 324}, {354, 17}}
+
+
+ YES
+
+ 68157504
+ 272630784
+ Enter Deployment Password
+
+
+
+
+ 6
+ System
+ controlTextColor
+
+
+
+ NO
+ 1
-
-
- 6
- System
- textColor
-
- 3
- MAA
+
+
+ 268
+ {{329, 279}, {288, 37}}
+
+
+ 1
+ YES
+
+ 342884417
+ 272630848
+
+
+ YES
+ 25
+ 1044
+
+
+ YES
+
+ 6
+ System
+ textBackgroundColor
+
+ 3
+ MQA
+
+
+
+ 6
+ System
+ textColor
+
+
+
+ NSAllRomanInputSourcesLocaleIdentifier
+
+
+ NO
+ 1
+
+
+
+ 268
+
+ {{536, 243}, {87, 32}}
+
+
+ {250, 750}
+ YES
+
+ 67108864
+ 134217728
+ Login
+
+
+ -2038284288
+ 129
+
+ .HelveticaNeueDeskInterface-Regular
+ 13
+ 16
+
+
+
+ 400
+ 75
+
+ NO
+
+
+
+ 268
+ {{332, 225}, {283, 17}}
+
+ YES
+
+ 68157504
+ 138413056
+
+
+
+
+
+ 1
+ MC42OTYyNjc4MzI5IDAgMC4wMDgyMDgwNjIwNjUAA
+
+
+ NO
+ 1
-
-
- NSAllRomanInputSourcesLocaleIdentifier
+ {680, 487}
+
+ _NS:11
- NO
- 1
-
-
-
- 268
- {{372, 316}, {354, 17}}
-
-
-
- YES
-
- 68157504
- 272630784
- Enter Deployment Password
-
-
-
-
- 6
- System
- controlTextColor
-
-
-
- NO
- 1
-
-
- {{20, 10}, {673, 473}}
-
-
-
- NSView
-
-
-
- -2147479278
-
-
-
- -2147483380
- {{94, 230}, {470, 20}}
-
-
-
- _NS:9
- {250, 250}
- 16397
- 100
-
-
-
- -2147483380
- {{92, 257}, {474, 17}}
-
-
-
- _NS:526
- {251, 750}
- YES
-
- 68157504
- 272630784
- ImagingLabel
-
- _NS:526
-
-
-
- 6
- System
- labelColor
-
-
-
- NO
- 1
+ Login
+
+
-
- {{91, 86}, {493, 262}}
-
-
-
- _NS:9
- 133138
-
-
-
- 0.25
- 4
- 1
-
-
-
- 268
-
- {{464, 347}, {126, 32}}
-
-
-
- _NS:9
- YES
-
- 67108864
- 134217728
- Run Workflow
-
- _NS:9
-
- -2038284288
- 129
-
-
- 200
- 25
+
+ {680, 487}
+
+ _NS:28
- NO
+ Main
+
+
- {{20, 10}, {673, 481}}
-
-
-
+
+
+ 6
+ YES
+
+
+
+
{697, 503}
@@ -2636,195 +2644,187 @@
- errorField
+ startupDiskDropdown
-
+
- 665
+ 692
- loginButton
+ startUpDiskPanel
-
+
- 666
+ 693
- loginLabel
+ startupDiskRestartButton
-
+
- 667
+ 694
- loginView
+ startUpDiskText
-
+
- 668
+ 695
- mainView
+ mainWindow
-
+
- 669
+ 697
- password
+ progressPanel
-
+
- 671
+ 699
- progressText
+ chooseTargetCancelButton
-
+
- 675
+ 718
- progressIndicator
-
-
-
- 676
-
-
-
- login:
+ chooseTargetDropDown
-
+
- 678
+ 719
-
- login:
+
+ chooseTargetPanel
-
+
- 679
+ 720
- startupDiskDropdown
+ chooseTargetPanelSelectTarget
-
+
- 692
+ 721
-
- startUpDiskPanel
+
+ closeImagingTarget:
-
+
- 693
+ 722
-
- startupDiskRestartButton
+
+ selectImagingTarget:
-
+
- 694
+ 741
- startUpDiskText
+ imagingProgressPanel
-
+
- 695
+ 798
-
- setStartupDisk:
+
+ imagingLabel
-
+
- 696
+ 799
- mainWindow
+ imagingProgress
-
+
- 697
+ 800
- progressPanel
+ imagingProgressDetail
-
+
- 699
+ 803
- chooseTargetCancelButton
+ loginLabel
-
+
- 718
+ 667
- chooseTargetDropDown
+ password
-
+
- 719
+ 671
-
- chooseTargetPanel
+
+ login:
-
+
- 720
+ 679
- chooseTargetPanelSelectTarget
+ loginButton
-
+
- 721
+ 666
- closeImagingTarget:
+ login:
-
+
- 722
+ 678
- cancelAndRestartButton
+ errorField
-
+
- 724
+ 665
- selectImagingTarget:
+ chooseWorkflowDropDownDidChange:
-
+
- 741
+ 771
@@ -2835,28 +2835,28 @@
756
-
- chooseWorkflowLabel
+
+ setStartupDisk:
- 757
+ 696
-
- chooseWorkflowDropDownDidChange:
+
+ cancelAndRestartButton
-
+
- 771
+ 724
- workflowDescriptionView
+ chooseWorkflowLabel
-
+
- 772
+ 757
@@ -2866,6 +2866,14 @@
773
+
+
+ workflowDescriptionView
+
+
+
+ 772
+
runWorkflow:
@@ -2884,35 +2892,43 @@
- imagingProgressPanel
+ progressIndicator
-
+
- 798
+ 839
- imagingLabel
+ progressText
-
+
- 799
+ 840
- imagingProgress
+ theTabView
-
+
- 800
+ 841
- imagingProgressDetail
+ loginTab
-
+
- 803
+ 842
+
+
+
+ mainTab
+
+
+
+ 843
@@ -3897,9 +3913,8 @@
470
-
-
+
Container
@@ -4011,72 +4026,6 @@
-
- 472
-
-
-
-
-
-
-
-
- LoginView
-
-
- 479
-
-
-
-
-
-
-
- 480
-
-
-
-
- 478
-
-
-
-
-
- Password
-
-
- 481
-
-
-
-
- 477
-
-
-
-
-
-
-
- 482
-
-
-
-
- 476
-
-
-
-
-
- Error
-
-
- 483
-
-
-
791
@@ -4130,90 +4079,121 @@
- 473
-
+ 471
+
-
-
-
-
-
-
-
+
- MainView
- 774
-
+ 484
+
+
+
+
+ 829
+
-
+
+
+
-
+
- 775
-
-
+ 830
+
+
+
+
+
+ Main
- 761
-
+ 831
+
-
-
-
+
-
- Workflow Description
+
+ Login
- 764
-
-
+ 832
+
+
+
+
+
+
+
+
- 763
-
-
+ 833
+
+
+
+
+
+
+
+
- 762
-
-
+ 479
+
+
+
+
+
+
+
+ 480
+
+
- 759
-
+ 478
+
-
+
-
+
+ Password
+
+
+ 481
+
+
- 760
-
-
+ 477
+
+
+
+
+
- 758
-
-
+ 482
+
+
- 754
-
+ 476
+
-
+
-
- WorkflowLabel
+
+ Error
- 755
-
-
+ 483
+
+
748
@@ -4221,7 +4201,7 @@
-
+
WorkflowPulldown
@@ -4243,8 +4223,8 @@
- 751
-
+ 753
+
@@ -4253,8 +4233,8 @@
- 753
-
+ 751
+
@@ -4263,7 +4243,7 @@
-
+
475
@@ -4271,17 +4251,78 @@
- 471
-
+ 761
+
-
+
+
+
-
+
+ Workflow Description
- 484
-
-
+ 762
+
+
+
+
+ 763
+
+
+
+
+ 764
+
+
+
+
+ 774
+
+
+
+
+
+
+
+ 775
+
+
+
+
+ 834
+
+
+
+
+
+
+
+ 835
+
+
+
+
+
+
+
+
+ 836
+
+
+
+
+ 837
+
+
+
+
+
+
+
+ 838
+
+
@@ -4458,14 +4499,6 @@
com.apple.InterfaceBuilder.CocoaPlugin
-
-
- com.apple.InterfaceBuilder.CocoaPlugin
-
-
-
- com.apple.InterfaceBuilder.CocoaPlugin
-
@@ -4549,14 +4582,6 @@
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
- {234, 178.5}
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- {1053, 359}
- com.apple.InterfaceBuilder.CocoaPlugin
- {1053, 307.5}
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
@@ -4593,14 +4618,36 @@
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
+
+ InitialTabViewItem
+
+ InitialTabViewItem
+
+
+
+
+
+ com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+
+ com.apple.InterfaceBuilder.CocoaPlugin
+
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
- 816
+ 843
@@ -4693,10 +4740,11 @@
id
id
id
+ id
id
id
- id
- id
+ id
+ id
id
id
id
@@ -4709,6 +4757,7 @@
id
id
id
+ id
id
id
@@ -4761,6 +4810,10 @@
imagingProgressPanel
id
+
+ introTab
+ id
+
loginButton
id
@@ -4769,12 +4822,12 @@
loginLabel
id
-
- loginView
+
+ loginTab
id
-
- mainView
+
+ mainTab
id
@@ -4825,6 +4878,10 @@
startupDiskRestartButton
id
+
+ theTabView
+ id
+
workflowDescription
id
@@ -5120,6 +5177,22 @@
NSTextFieldCell
+
+ NSTabView
+ NSView
+
+ IBFrameworkSource
+ AppKit.framework/Headers/NSTabView.h
+
+
+
+ NSTabViewItem
+ NSObject
+
+ IBFrameworkSource
+ AppKit.framework/Headers/NSTabViewItem.h
+
+
NSTableView
NSControl