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

diff --git a/macosx/English.lproj/MainMenu.nib/classes.nib b/macosx/English.lproj/MainMenu.nib/classes.nib
index 2d93f6edd32822407923c8fc609e595c6beddd73..a949990eebdbba7bf08c1a7e9828e50a32871898 100644 (file)
--- 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 1a40317443e84d5f578203f2cab83d71b6d09d34..7c2bddc030e7d0c56433f8ba0fe6a4e321c327b8 100644 (file)
--- 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 6d1c0a613c87f218dc926f6ad2f0b1f3f7fb8e5a..16076eacdc4254874230f6a2eaaad8c9f1e19231 100644 (file)
Binary files a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib and b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib differ

diff --git a/macosx/ScanController.h b/macosx/ScanController.h
index 5bd72cd38ce1a23d1b1d85a0a24098dbc8cfcc60..8c21b49097b61c2aa71970a909b819e7dac60fb1 100644 (file)
--- 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 81b27236c75c003fd0f2021aa3fa1eae3e51b92d..01aa0026e86fd1aca852bd3091a6b6ab62958adc 100644 (file)
--- 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];
        }