Minor UI changes, + allow physical DVDs in HBE

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

diff --git a/macosx/English.lproj/Express.nib/info.nib b/macosx/English.lproj/Express.nib/info.nib
index 6dbd31c865f889f4d30c2aeb2d34057e7c0ec5ba..f6be5c802fbd4e00af1cd89c79c7c67c13a975a8 100644 (file)
--- a/macosx/English.lproj/Express.nib/info.nib
+++ b/macosx/English.lproj/Express.nib/info.nib
@@ -9,7 +9,7 @@
                <key>248</key>
                <string>483 424 408 321 0 0 1440 878 </string>
                <key>259</key>
-               <string>417 300 408 508 0 0 1280 832 </string>
+               <string>487 331 408 508 0 0 1440 878 </string>
                <key>29</key>
                <string>33 298 338 44 0 0 1280 832 </string>
                <key>303</key>
@@ -18,6 +18,6 @@
        <key>IBFramework Version</key>
        <string>443.0</string>
        <key>IBSystem Version</key>
-       <string>8H14</string>
+       <string>8G1454</string>
 </dict>
 </plist>

diff --git a/macosx/English.lproj/Express.nib/keyedobjects.nib b/macosx/English.lproj/Express.nib/keyedobjects.nib
index 0e4089422833cd3a603fca595a92f2491914aa21..b51325f1fb527ac013540d98b004c55e5d11adca 100644 (file)
Binary files a/macosx/English.lproj/Express.nib/keyedobjects.nib and b/macosx/English.lproj/Express.nib/keyedobjects.nib differ

diff --git a/macosx/ExpressController.m b/macosx/ExpressController.m
index fb881fa524772261e246b17935cda4861dbd8f5f..f9b6f95efd02767175c846d21187fb613e5b8e25 100644 (file)
--- a/macosx/ExpressController.m
+++ b/macosx/ExpressController.m
@@ -158,7 +158,15 @@
     [fOpenIndicator setIndeterminate: YES];
     [fOpenIndicator startAnimation: nil];
 
-    hb_scan( fHandle, [fOpenFolderString UTF8String], 0 );
+    if( [fOpenMatrix selectedRow] )
+    {
+        hb_scan( fHandle, [fOpenFolderString UTF8String], 0 );
+    }
+    else
+    {
+        hb_scan( fHandle, [[fOpenPopUp titleOfSelectedItem]
+                    UTF8String], 0 );
+    }
 
     NSTimer * timer = [NSTimer scheduledTimerWithTimeInterval: 0.5
         target: self selector: @selector( openTimer: ) userInfo: nil
@@ -230,6 +238,10 @@
     {
         [fOpenPopUp selectItemAtIndex: 0];
     }
+    if( [fOpenMatrix isEnabled] )
+    {
+        [self openEnable: YES];
+    }
 }
 
 - (void) openBrowseDidEnd: (NSOpenPanel *) sheet returnCode: (int)
@@ -262,6 +274,10 @@
         {
             [fOpenFolderField  setEnabled: NO];
             [fOpenBrowseButton setEnabled: NO];
+            if( ![fOpenPopUp numberOfItems] )
+            {
+                [fOpenGoButton setEnabled: NO];
+            }
         }
     }
 }