* finish the vout menu (cloeses #302)

diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib
index f056b0bfddbf4d22dba9aa95f63d18829af0f3aa..454a39e7f47935053c8a75b2347db70c6bc8fb7a 100644 (file)
--- a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib
+++ b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib
@@ -324,6 +324,15 @@
                 "o_scrollfield" = id; 
                 "o_timefield" = id; 
                 "o_timeslider" = id; 
+                "o_vmi_fullscreen" = id; 
+                "o_vmi_mute" = id; 
+                "o_vmi_next" = id; 
+                "o_vmi_play" = id; 
+                "o_vmi_prev" = id; 
+                "o_vmi_snapshot" = id; 
+                "o_vmi_stop" = id; 
+                "o_vmi_voldown" = id; 
+                "o_vmi_volup" = id; 
                 "o_volumeslider" = id; 
                 "o_vout_menu" = id; 
                 "o_window" = id; 

diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
index 2661752d026fb6ea7978b7362e3d6c4365bfd783..f8b53cfa9e301c6bebc638748441b563ca4fdfb1 100644 (file)
--- a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
+++ b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
        <key>IBDocumentLocation</key>
-       <string>185 59 478 430 0 0 1440 878 </string>
+       <string>361 41 478 430 0 0 1440 878 </string>
        <key>IBEditorPositions</key>
        <dict>
                <key>1617</key>
@@ -13,7 +13,7 @@
                <key>2709</key>
                <string>305 626 508 82 0 0 1024 746 </string>
                <key>2730</key>
-               <string>694 440 105 68 0 0 1440 878 </string>
+               <string>396 512 130 249 0 0 1440 878 </string>
                <key>29</key>
                <string>130 802 438 44 0 0 1440 878 </string>
                <key>915</key>
@@ -27,6 +27,7 @@
        <array>
                <integer>2416</integer>
                <integer>29</integer>
+               <integer>2730</integer>
                <integer>21</integer>
        </array>
        <key>IBSystem Version</key>

diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/keyedobjects.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/keyedobjects.nib
index d2f847fb2fd0bd24bd492733ccf6b5c51c8ad74e..5e7b4c0d4f968a7166dfae8a64eb4d4af07b02a6 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/intf.m b/modules/gui/macosx/intf.m
index 9d25ff1c1a504d0da0d919ef7657bcc2a780d236..81e7316571af74ce8bcb723764dc27b8ddd3a02f 100644 (file)
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -1379,6 +1379,7 @@ static VLCMain *_o_sharedMainInstance = nil;
         [o_btn_play setToolTip: _NS("Pause")];
         [o_mi_play setTitle: _NS("Pause")];
         [o_dmi_play setTitle: _NS("Pause")];
+        [o_vmi_play setTitle: _NS("Pause")];
     }
     else
     {
@@ -1387,6 +1388,7 @@ static VLCMain *_o_sharedMainInstance = nil;
         [o_btn_play setToolTip: _NS("Play")];
         [o_mi_play setTitle: _NS("Play")];
         [o_dmi_play setTitle: _NS("Play")];
+        [o_vmi_play setTitle: _NS("Play")];
     }
 }