MacGui: Fix main menu enabling if user cancels the source browse window

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@834 b64f7644-9d1e-0410-96f1-a4d463321fa5

5 files changed, 33 insertions, 2 deletions

diff --git a/macosx/English.lproj/MainMenu.nib/classes.nib b/macosx/English.lproj/MainMenu.nib/classes.nib
index 2d93f6edd..a949990ee 100644
--- a/macosx/English.lproj/MainMenu.nib/classes.nib
+++ b/macosx/English.lproj/MainMenu.nib/classes.nib
@@ -311,7 +311,14 @@
                 fFolderCell = NSButtonCell; 
                 fFolderField = NSTextField; 
                 fIndicator = NSProgressIndicator; 
+                fMainMenuAddToQueue = NSMenuItem; 
+                fMainMenuOpenSource = NSMenuItem; 
+                fMainMenuPauseEncode = NSMenuItem; 
+                fMainMenuStartEncode = NSMenuItem; 
+                fMainWindowSrcName = NSTextField; 
                 fMatrix = NSMatrix; 
+                fMenuPicturePanelShow = NSMenuItem; 
+                fMenuQueuePanelShow = NSMenuItem; 
                 fOpenButton = NSButton; 
                 fPanel = NSPanel; 
                 fSelectString = NSTextField; 
diff --git a/macosx/English.lproj/MainMenu.nib/info.nib b/macosx/English.lproj/MainMenu.nib/info.nib
index 1a4031744..7c2bddc03 100644
--- a/macosx/English.lproj/MainMenu.nib/info.nib
+++ b/macosx/English.lproj/MainMenu.nib/info.nib
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>IBDocumentLocation</key>
-	<string>106 75 451 803 0 0 1440 878 </string>
+	<string>5 70 451 803 0 0 1440 878 </string>
 	<key>IBEditorPositions</key>
 	<dict>
 		<key>1843</key>
@@ -27,8 +27,8 @@
 	<integer>4</integer>
 	<key>IBOpenObjects</key>
 	<array>
-		<integer>2436</integer>
 		<integer>29</integer>
+		<integer>21</integer>
 	</array>
 	<key>IBSystem Version</key>
 	<string>8R2218</string>
diff --git a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib
index 6d1c0a613..16076eacd 100644
--- a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib
+++ b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib
diff --git a/macosx/ScanController.h b/macosx/ScanController.h
index 5bd72cd38..8c21b4909 100644
--- a/macosx/ScanController.h
+++ b/macosx/ScanController.h
@@ -18,6 +18,18 @@
     
     IBOutlet NSTextField         * fStatusField;
     IBOutlet NSProgressIndicator * fIndicator;
+	IBOutlet NSTextField         * fMainWindowSrcName;
+	
+	/* Menu Items */
+	/* File Menu */
+	IBOutlet NSMenuItem * fMainMenuOpenSource;
+	IBOutlet NSMenuItem * fMainMenuAddToQueue;
+	IBOutlet NSMenuItem * fMainMenuStartEncode;
+	IBOutlet NSMenuItem * fMainMenuPauseEncode;
+	/* Window Menu */
+	IBOutlet NSMenuItem * fMenuQueuePanelShow;
+	IBOutlet NSMenuItem * fMenuPicturePanelShow;
+	
 	
 }
 
diff --git a/macosx/ScanController.mm b/macosx/ScanController.mm
index 81b27236c..01aa0026e 100644
--- a/macosx/ScanController.mm
+++ b/macosx/ScanController.mm
@@ -95,6 +95,18 @@
     }
 	else // User clicked Cancel in browse window
 	{
+		/* use the outlets to the main menu bar to determine what to
+		   enable and disable */
+		[fMainMenuOpenSource setEnabled: YES];
+		/* if we have a title loaded up */
+		if ([[fMainWindowSrcName stringValue] length] > 0)
+		{
+		[fMainMenuAddToQueue setEnabled: YES];
+		[fMainMenuStartEncode setEnabled: YES];
+		//[fMainMenuPauseEncode setEnabled: YES];
+		[fMenuQueuePanelShow setEnabled: YES];
+		[fMenuPicturePanelShow setEnabled: YES];
+		}
 		[self Cancel: nil];
 	}