* Only enable "Jump To Time" when the stream is seekable

* Fix enabling of the step forward/backward functions

diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
index 6af17b46c571db61b3128c2204a15eacf15d0ccb..48f1feb9255b0d6e0272d185622fc7b37604beff 100644 (file)
--- a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
+++ b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
@@ -11,17 +11,18 @@
                <key>2197</key>
                <string>422 532 596 143 0 0 1440 878 </string>
                <key>29</key>
-               <string>356 400 438 44 0 0 1440 878 </string>
+               <string>71 662 438 44 0 0 1024 746 </string>
                <key>915</key>
                <string>777 479 187 249 0 0 1440 878 </string>
        </dict>
        <key>IBFramework Version</key>
-       <string>443.0</string>
+       <string>439.0</string>
        <key>IBLockedObjects</key>
        <array/>
        <key>IBOpenObjects</key>
        <array>
                <integer>1789</integer>
+               <integer>29</integer>
        </array>
        <key>IBSystem Version</key>
        <string>8H14</string>

diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/keyedobjects.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/keyedobjects.nib
index 0bf4eb1d572810e2fb55fa1ecfb27cdfb9c01290..2cfbd665c3b033ff5edc32936d48d345a454ddb3 100644 (file)
Binary files a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/keyedobjects.nib and b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/keyedobjects.nib differ

diff --git a/modules/gui/macosx/controls.m b/modules/gui/macosx/controls.m
index 5fb81cb3e50a2d827afec73535347918703cff3c..f603eaf64fbec80f7b89453778bb98c428b35519 100644 (file)
--- a/modules/gui/macosx/controls.m
+++ b/modules/gui/macosx/controls.m
@@ -605,7 +605,7 @@
 @end
 
 @implementation VLCControls (NSMenuValidation)
- 
+
 - (BOOL)validateMenuItem:(NSMenuItem *)o_mi
 {
     BOOL bEnabled = TRUE;
@@ -640,7 +640,7 @@
         {
             bEnabled = FALSE;
         }
-               [o_main setupMenus]; /* Make sure input menu is up to date */
+        [o_main setupMenus]; /* Make sure input menu is up to date */
     }
     else if( [[o_mi title] isEqualToString: _NS("Previous")] ||
              [[o_mi title] isEqualToString: _NS("Next")] )
@@ -669,18 +669,20 @@
         [o_mi setState: i_state];
     }
     else if( [[o_mi title] isEqualToString: _NS("Step Forward")] ||
-             [[o_mi title] isEqualToString: _NS("Step Backward")] )
+             [[o_mi title] isEqualToString: _NS("Step Backward")] ||
+             [[o_mi title] isEqualToString: _NS("Jump To Time")])
     {
         if( p_input != NULL )
         {
             var_Get( p_input, "seekable", &val);
             bEnabled = val.b_bool;
         }
+        else bEnabled = FALSE;
     }
-    else if( [[o_mi title] isEqualToString: _NS("Mute")] ) 
+    else if( [[o_mi title] isEqualToString: _NS("Mute")] )
     {
         [o_mi setState: p_intf->p_sys->b_mute ? NSOnState : NSOffState];
-               [o_main setupMenus]; /* Make sure audio menu is up to date */
+        [o_main setupMenus]; /* Make sure audio menu is up to date */
     }
     else if( [[o_mi title] isEqualToString: _NS("Half Size")] ||
                 [[o_mi title] isEqualToString: _NS("Normal Size")] ||