macosx: remove open BDMV folder button

Two different buttons signify to the user that there is an
actual difference in using either of these. But in fact,
both call the same code and if the folder is misnamed, even
the BDMV button would classify the folder as a DVD type.

stringcount--

diff --git a/extras/package/macosx/Resources/English.lproj/Open.xib b/extras/package/macosx/Resources/English.lproj/Open.xib
index 89ebfada360aaceb513ae52a530bef79471a22a7..f05fa3eb72ca382ca3785917fc4496b5db4805a1 100644 (file)
--- a/extras/package/macosx/Resources/English.lproj/Open.xib
+++ b/extras/package/macosx/Resources/English.lproj/Open.xib
@@ -12,10 +12,16 @@
     </object>
     <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
       <bool key="EncodedWithXMLCoder">YES</bool>
-      <integer value="637"/>
+      <integer value="3080"/>
       <integer value="1264"/>
+      <integer value="3233"/>
       <integer value="1411"/>
       <integer value="2346"/>
+      <integer value="3289"/>
+      <integer value="3119"/>
+      <integer value="3106"/>
+      <integer value="637"/>
+      <integer value="3093"/>
     </object>
     <object class="NSArray" key="IBDocument.PluginDependencies">
       <bool key="EncodedWithXMLCoder">YES</bool>
@@ -4996,7 +5002,7 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA</bytes>
         <string key="NSExtension">NSResponder</string>
       </object>
       <object class="NSCustomView" id="620780944">
-        <nil key="NSNextResponder"/>
+        <reference key="NSNextResponder"/>
         <int key="NSvFlags">256</int>
         <object class="NSMutableArray" key="NSSubviews">
           <bool key="EncodedWithXMLCoder">YES</bool>
@@ -5039,40 +5045,16 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA</bytes>
             </object>
             <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
           </object>
-          <object class="NSButton" id="276751840">
-            <reference key="NSNextResponder" ref="620780944"/>
-            <int key="NSvFlags">256</int>
-            <string key="NSFrame">{{49, 53}, {198, 32}}</string>
-            <reference key="NSSuperview" ref="620780944"/>
-            <bool key="NSEnabled">YES</bool>
-            <object class="NSButtonCell" key="NSCell" id="349360788">
-              <int key="NSCellFlags">67108864</int>
-              <int key="NSCellFlags2">134217728</int>
-              <string key="NSContents">Open BDMV folder</string>
-              <reference key="NSSupport" ref="725567486"/>
-              <reference key="NSControlView" ref="276751840"/>
-              <int key="NSButtonFlags">-2038284288</int>
-              <int key="NSButtonFlags2">1</int>
-              <reference key="NSAlternateImage" ref="725567486"/>
-              <string key="NSAlternateContents"/>
-              <object class="NSMutableString" key="NSKeyEquivalent">
-                <characters key="NS.bytes"/>
-              </object>
-              <int key="NSPeriodicDelay">200</int>
-              <int key="NSPeriodicInterval">25</int>
-            </object>
-            <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-          </object>
           <object class="NSButton" id="936649520">
             <reference key="NSNextResponder" ref="620780944"/>
             <int key="NSvFlags">256</int>
-            <string key="NSFrame">{{49, 85}, {198, 32}}</string>
+            <string key="NSFrame">{{32, 85}, {246, 32}}</string>
             <reference key="NSSuperview" ref="620780944"/>
             <bool key="NSEnabled">YES</bool>
             <object class="NSButtonCell" key="NSCell" id="911299270">
               <int key="NSCellFlags">67108864</int>
               <int key="NSCellFlags2">134217728</int>
-              <string key="NSContents">Open VIDEO_TS folder</string>
+              <string key="NSContents">Open VIDEO_TS or BDMV folder</string>
               <reference key="NSSupport" ref="725567486"/>
               <reference key="NSControlView" ref="936649520"/>
               <int key="NSButtonFlags">-2038284288</int>
@@ -5089,11 +5071,12 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA</bytes>
           </object>
         </object>
         <string key="NSFrameSize">{295, 205}</string>
+        <reference key="NSSuperview"/>
         <string key="NSClassName">NSView</string>
         <string key="NSExtension">NSResponder</string>
       </object>
       <object class="NSCustomView" id="568753667">
-        <nil key="NSNextResponder"/>
+        <reference key="NSNextResponder"/>
         <int key="NSvFlags">256</int>
         <object class="NSMutableArray" key="NSSubviews">
           <bool key="EncodedWithXMLCoder">YES</bool>
@@ -5114,40 +5097,16 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA</bytes>
             </object>
             <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
           </object>
-          <object class="NSButton" id="1020424421">
-            <reference key="NSNextResponder" ref="568753667"/>
-            <int key="NSvFlags">256</int>
-            <string key="NSFrame">{{49, 53}, {198, 32}}</string>
-            <reference key="NSSuperview" ref="568753667"/>
-            <bool key="NSEnabled">YES</bool>
-            <object class="NSButtonCell" key="NSCell" id="918113456">
-              <int key="NSCellFlags">67108864</int>
-              <int key="NSCellFlags2">134217728</int>
-              <string key="NSContents">Open BDMV folder</string>
-              <reference key="NSSupport" ref="725567486"/>
-              <reference key="NSControlView" ref="1020424421"/>
-              <int key="NSButtonFlags">-2038284288</int>
-              <int key="NSButtonFlags2">1</int>
-              <reference key="NSAlternateImage" ref="725567486"/>
-              <string key="NSAlternateContents"/>
-              <object class="NSMutableString" key="NSKeyEquivalent">
-                <characters key="NS.bytes"/>
-              </object>
-              <int key="NSPeriodicDelay">200</int>
-              <int key="NSPeriodicInterval">25</int>
-            </object>
-            <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-          </object>
           <object class="NSButton" id="632509242">
             <reference key="NSNextResponder" ref="568753667"/>
             <int key="NSvFlags">256</int>
-            <string key="NSFrame">{{49, 85}, {198, 32}}</string>
+            <string key="NSFrame">{{32, 85}, {246, 32}}</string>
             <reference key="NSSuperview" ref="568753667"/>
             <bool key="NSEnabled">YES</bool>
             <object class="NSButtonCell" key="NSCell" id="204055706">
               <int key="NSCellFlags">67108864</int>
               <int key="NSCellFlags2">134217728</int>
-              <string key="NSContents">Open VIDEO_TS folder</string>
+              <string key="NSContents">Open VIDEO_TS or BDMV folder</string>
               <reference key="NSSupport" ref="725567486"/>
               <reference key="NSControlView" ref="632509242"/>
               <int key="NSButtonFlags">-2038284288</int>
@@ -5164,11 +5123,12 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA</bytes>
           </object>
         </object>
         <string key="NSFrameSize">{295, 205}</string>
+        <reference key="NSSuperview"/>
         <string key="NSClassName">NSView</string>
         <string key="NSExtension">NSResponder</string>
       </object>
       <object class="NSCustomView" id="318731548">
-        <nil key="NSNextResponder"/>
+        <reference key="NSNextResponder"/>
         <int key="NSvFlags">256</int>
         <object class="NSMutableArray" key="NSSubviews">
           <bool key="EncodedWithXMLCoder">YES</bool>
@@ -5189,30 +5149,6 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA</bytes>
             </object>
             <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
           </object>
-          <object class="NSButton" id="847000499">
-            <reference key="NSNextResponder" ref="318731548"/>
-            <int key="NSvFlags">256</int>
-            <string key="NSFrame">{{49, 53}, {198, 32}}</string>
-            <reference key="NSSuperview" ref="318731548"/>
-            <bool key="NSEnabled">YES</bool>
-            <object class="NSButtonCell" key="NSCell" id="456119470">
-              <int key="NSCellFlags">67108864</int>
-              <int key="NSCellFlags2">134217728</int>
-              <string key="NSContents">Open BDMV folder</string>
-              <reference key="NSSupport" ref="725567486"/>
-              <reference key="NSControlView" ref="847000499"/>
-              <int key="NSButtonFlags">-2038284288</int>
-              <int key="NSButtonFlags2">1</int>
-              <reference key="NSAlternateImage" ref="725567486"/>
-              <string key="NSAlternateContents"/>
-              <object class="NSMutableString" key="NSKeyEquivalent">
-                <characters key="NS.bytes"/>
-              </object>
-              <int key="NSPeriodicDelay">200</int>
-              <int key="NSPeriodicInterval">25</int>
-            </object>
-            <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-          </object>
           <object class="NSButton" id="46748615">
             <reference key="NSNextResponder" ref="318731548"/>
             <int key="NSvFlags">256</int>
@@ -5240,13 +5176,13 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA</bytes>
           <object class="NSButton" id="117409615">
             <reference key="NSNextResponder" ref="318731548"/>
             <int key="NSvFlags">256</int>
-            <string key="NSFrame">{{49, 85}, {198, 32}}</string>
+            <string key="NSFrame">{{32, 85}, {246, 32}}</string>
             <reference key="NSSuperview" ref="318731548"/>
             <bool key="NSEnabled">YES</bool>
             <object class="NSButtonCell" key="NSCell" id="476878875">
-              <int key="NSCellFlags">67108864</int>
+              <int key="NSCellFlags">-2080374784</int>
               <int key="NSCellFlags2">134217728</int>
-              <string key="NSContents">Open VIDEO_TS folder</string>
+              <string key="NSContents">Open VIDEO_TS or BDMV folder</string>
               <reference key="NSSupport" ref="725567486"/>
               <reference key="NSControlView" ref="117409615"/>
               <int key="NSButtonFlags">-2038284288</int>
@@ -5263,11 +5199,12 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA</bytes>
           </object>
         </object>
         <string key="NSFrameSize">{295, 205}</string>
+        <reference key="NSSuperview"/>
         <string key="NSClassName">NSView</string>
         <string key="NSExtension">NSResponder</string>
       </object>
       <object class="NSCustomView" id="251474543">
-        <nil key="NSNextResponder"/>
+        <reference key="NSNextResponder"/>
         <int key="NSvFlags">256</int>
         <object class="NSMutableArray" key="NSSubviews">
           <bool key="EncodedWithXMLCoder">YES</bool>
@@ -5312,40 +5249,16 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA</bytes>
             </object>
             <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
           </object>
-          <object class="NSButton" id="418209998">
-            <reference key="NSNextResponder" ref="251474543"/>
-            <int key="NSvFlags">256</int>
-            <string key="NSFrame">{{49, 12}, {198, 32}}</string>
-            <reference key="NSSuperview" ref="251474543"/>
-            <bool key="NSEnabled">YES</bool>
-            <object class="NSButtonCell" key="NSCell" id="51562609">
-              <int key="NSCellFlags">67108864</int>
-              <int key="NSCellFlags2">134217728</int>
-              <string key="NSContents">Open BDMV folder</string>
-              <reference key="NSSupport" ref="725567486"/>
-              <reference key="NSControlView" ref="418209998"/>
-              <int key="NSButtonFlags">-2038284288</int>
-              <int key="NSButtonFlags2">1</int>
-              <reference key="NSAlternateImage" ref="725567486"/>
-              <string key="NSAlternateContents"/>
-              <object class="NSMutableString" key="NSKeyEquivalent">
-                <characters key="NS.bytes"/>
-              </object>
-              <int key="NSPeriodicDelay">200</int>
-              <int key="NSPeriodicInterval">25</int>
-            </object>
-            <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-          </object>
           <object class="NSButton" id="750730039">
             <reference key="NSNextResponder" ref="251474543"/>
             <int key="NSvFlags">256</int>
-            <string key="NSFrame">{{49, 44}, {198, 32}}</string>
+            <string key="NSFrame">{{32, 44}, {246, 32}}</string>
             <reference key="NSSuperview" ref="251474543"/>
             <bool key="NSEnabled">YES</bool>
             <object class="NSButtonCell" key="NSCell" id="332845413">
               <int key="NSCellFlags">67108864</int>
               <int key="NSCellFlags2">134217728</int>
-              <string key="NSContents">Open VIDEO_TS folder</string>
+              <string key="NSContents">Open VIDEO_TS or BDMV folder</string>
               <reference key="NSSupport" ref="725567486"/>
               <reference key="NSControlView" ref="750730039"/>
               <int key="NSButtonFlags">-2038284288</int>
@@ -5474,11 +5387,12 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA</bytes>
           </object>
         </object>
         <string key="NSFrameSize">{295, 205}</string>
+        <reference key="NSSuperview"/>
         <string key="NSClassName">NSView</string>
         <string key="NSExtension">NSResponder</string>
       </object>
       <object class="NSCustomView" id="415217891">
-        <nil key="NSNextResponder"/>
+        <reference key="NSNextResponder"/>
         <int key="NSvFlags">256</int>
         <object class="NSMutableArray" key="NSSubviews">
           <bool key="EncodedWithXMLCoder">YES</bool>
@@ -5499,40 +5413,16 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA</bytes>
             </object>
             <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
           </object>
-          <object class="NSButton" id="214101891">
-            <reference key="NSNextResponder" ref="415217891"/>
-            <int key="NSvFlags">256</int>
-            <string key="NSFrame">{{49, 12}, {198, 32}}</string>
-            <reference key="NSSuperview" ref="415217891"/>
-            <bool key="NSEnabled">YES</bool>
-            <object class="NSButtonCell" key="NSCell" id="891606234">
-              <int key="NSCellFlags">67108864</int>
-              <int key="NSCellFlags2">134217728</int>
-              <string key="NSContents">Open BDMV folder</string>
-              <reference key="NSSupport" ref="725567486"/>
-              <reference key="NSControlView" ref="214101891"/>
-              <int key="NSButtonFlags">-2038284288</int>
-              <int key="NSButtonFlags2">1</int>
-              <reference key="NSAlternateImage" ref="725567486"/>
-              <string key="NSAlternateContents"/>
-              <object class="NSMutableString" key="NSKeyEquivalent">
-                <characters key="NS.bytes"/>
-              </object>
-              <int key="NSPeriodicDelay">200</int>
-              <int key="NSPeriodicInterval">25</int>
-            </object>
-            <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-          </object>
           <object class="NSButton" id="402424987">
             <reference key="NSNextResponder" ref="415217891"/>
             <int key="NSvFlags">256</int>
-            <string key="NSFrame">{{49, 44}, {198, 32}}</string>
+            <string key="NSFrame">{{32, 44}, {246, 32}}</string>
             <reference key="NSSuperview" ref="415217891"/>
             <bool key="NSEnabled">YES</bool>
             <object class="NSButtonCell" key="NSCell" id="1030608156">
               <int key="NSCellFlags">67108864</int>
               <int key="NSCellFlags2">134217728</int>
-              <string key="NSContents">Open VIDEO_TS folder</string>
+              <string key="NSContents">Open VIDEO_TS or BDMV folder</string>
               <reference key="NSSupport" ref="725567486"/>
               <reference key="NSControlView" ref="402424987"/>
               <int key="NSButtonFlags">-2038284288</int>
@@ -5661,11 +5551,12 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA</bytes>
           </object>
         </object>
         <string key="NSFrameSize">{295, 205}</string>
+        <reference key="NSSuperview"/>
         <string key="NSClassName">NSView</string>
         <string key="NSExtension">NSResponder</string>
       </object>
       <object class="NSCustomView" id="41973276">
-        <nil key="NSNextResponder"/>
+        <reference key="NSNextResponder"/>
         <int key="NSvFlags">256</int>
         <object class="NSMutableArray" key="NSSubviews">
           <bool key="EncodedWithXMLCoder">YES</bool>
@@ -5686,40 +5577,16 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA</bytes>
             </object>
             <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
           </object>
-          <object class="NSButton" id="222399010">
-            <reference key="NSNextResponder" ref="41973276"/>
-            <int key="NSvFlags">256</int>
-            <string key="NSFrame">{{49, 53}, {198, 32}}</string>
-            <reference key="NSSuperview" ref="41973276"/>
-            <bool key="NSEnabled">YES</bool>
-            <object class="NSButtonCell" key="NSCell" id="606952127">
-              <int key="NSCellFlags">67108864</int>
-              <int key="NSCellFlags2">134217728</int>
-              <string key="NSContents">Open BDMV folder</string>
-              <reference key="NSSupport" ref="725567486"/>
-              <reference key="NSControlView" ref="222399010"/>
-              <int key="NSButtonFlags">-2038284288</int>
-              <int key="NSButtonFlags2">1</int>
-              <reference key="NSAlternateImage" ref="725567486"/>
-              <string key="NSAlternateContents"/>
-              <object class="NSMutableString" key="NSKeyEquivalent">
-                <characters key="NS.bytes"/>
-              </object>
-              <int key="NSPeriodicDelay">200</int>
-              <int key="NSPeriodicInterval">25</int>
-            </object>
-            <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-          </object>
           <object class="NSButton" id="814750527">
             <reference key="NSNextResponder" ref="41973276"/>
             <int key="NSvFlags">256</int>
-            <string key="NSFrame">{{49, 85}, {198, 32}}</string>
+            <string key="NSFrame">{{32, 85}, {246, 32}}</string>
             <reference key="NSSuperview" ref="41973276"/>
             <bool key="NSEnabled">YES</bool>
             <object class="NSButtonCell" key="NSCell" id="45541712">
               <int key="NSCellFlags">67108864</int>
               <int key="NSCellFlags2">134217728</int>
-              <string key="NSContents">Open VIDEO_TS folder</string>
+              <string key="NSContents">Open VIDEO_TS or BDMV folder</string>
               <reference key="NSSupport" ref="725567486"/>
               <reference key="NSControlView" ref="814750527"/>
               <int key="NSButtonFlags">-2038284288</int>
@@ -5736,6 +5603,7 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA</bytes>
           </object>
         </object>
         <string key="NSFrameSize">{295, 205}</string>
+        <reference key="NSSuperview"/>
         <string key="NSClassName">NSView</string>
         <string key="NSExtension">NSResponder</string>
       </object>
@@ -7466,14 +7334,6 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA</bytes>
           </object>
           <int key="connectionID">3200</int>
         </object>
-        <object class="IBConnectionRecord">
-          <object class="IBOutletConnection" key="connection">
-            <string key="label">o_disc_nodisc_bdmv_btn</string>
-            <reference key="source" ref="609169471"/>
-            <reference key="destination" ref="1020424421"/>
-          </object>
-          <int key="connectionID">3201</int>
-        </object>
         <object class="IBConnectionRecord">
           <object class="IBOutletConnection" key="connection">
             <string key="label">o_disc_nodisc_videots_btn</string>
@@ -7498,14 +7358,6 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA</bytes>
           </object>
           <int key="connectionID">3204</int>
         </object>
-        <object class="IBConnectionRecord">
-          <object class="IBOutletConnection" key="connection">
-            <string key="label">o_disc_dvdwomenus_bdmv_btn</string>
-            <reference key="source" ref="609169471"/>
-            <reference key="destination" ref="418209998"/>
-          </object>
-          <int key="connectionID">3205</int>
-        </object>
         <object class="IBConnectionRecord">
           <object class="IBOutletConnection" key="connection">
             <string key="label">o_disc_dvdwomenus_chapter</string>
@@ -7602,22 +7454,6 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA</bytes>
           </object>
           <int key="connectionID">3217</int>
         </object>
-        <object class="IBConnectionRecord">
-          <object class="IBOutletConnection" key="connection">
-            <string key="label">o_disc_audiocd_bdmv_btn</string>
-            <reference key="source" ref="609169471"/>
-            <reference key="destination" ref="276751840"/>
-          </object>
-          <int key="connectionID">3218</int>
-        </object>
-        <object class="IBConnectionRecord">
-          <object class="IBOutletConnection" key="connection">
-            <string key="label">o_disc_dvd_bdmv_btn</string>
-            <reference key="source" ref="609169471"/>
-            <reference key="destination" ref="847000499"/>
-          </object>
-          <int key="connectionID">3219</int>
-        </object>
         <object class="IBConnectionRecord">
           <object class="IBOutletConnection" key="connection">
             <string key="label">o_disc_dvd_disablemenus_btn</string>
@@ -7658,14 +7494,6 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA</bytes>
           </object>
           <int key="connectionID">3224</int>
         </object>
-        <object class="IBConnectionRecord">
-          <object class="IBActionConnection" key="connection">
-            <string key="label">openSpecialMediaFolder:</string>
-            <reference key="source" ref="609169471"/>
-            <reference key="destination" ref="1020424421"/>
-          </object>
-          <int key="connectionID">3225</int>
-        </object>
         <object class="IBConnectionRecord">
           <object class="IBActionConnection" key="connection">
             <string key="label">openSpecialMediaFolder:</string>
@@ -7674,22 +7502,6 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA</bytes>
           </object>
           <int key="connectionID">3226</int>
         </object>
-        <object class="IBConnectionRecord">
-          <object class="IBActionConnection" key="connection">
-            <string key="label">openSpecialMediaFolder:</string>
-            <reference key="source" ref="609169471"/>
-            <reference key="destination" ref="276751840"/>
-          </object>
-          <int key="connectionID">3227</int>
-        </object>
-        <object class="IBConnectionRecord">
-          <object class="IBActionConnection" key="connection">
-            <string key="label">openSpecialMediaFolder:</string>
-            <reference key="source" ref="609169471"/>
-            <reference key="destination" ref="847000499"/>
-          </object>
-          <int key="connectionID">3229</int>
-        </object>
         <object class="IBConnectionRecord">
           <object class="IBActionConnection" key="connection">
             <string key="label">openSpecialMediaFolder:</string>
@@ -7706,14 +7518,6 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA</bytes>
           </object>
           <int key="connectionID">3231</int>
         </object>
-        <object class="IBConnectionRecord">
-          <object class="IBActionConnection" key="connection">
-            <string key="label">openSpecialMediaFolder:</string>
-            <reference key="source" ref="609169471"/>
-            <reference key="destination" ref="418209998"/>
-          </object>
-          <int key="connectionID">3232</int>
-        </object>
         <object class="IBConnectionRecord">
           <object class="IBActionConnection" key="connection">
             <string key="label">openSpecialMediaFolder:</string>
@@ -7722,22 +7526,6 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA</bytes>
           </object>
           <int key="connectionID">3256</int>
         </object>
-        <object class="IBConnectionRecord">
-          <object class="IBActionConnection" key="connection">
-            <string key="label">openSpecialMediaFolder:</string>
-            <reference key="source" ref="609169471"/>
-            <reference key="destination" ref="214101891"/>
-          </object>
-          <int key="connectionID">3257</int>
-        </object>
-        <object class="IBConnectionRecord">
-          <object class="IBActionConnection" key="connection">
-            <string key="label">openSpecialMediaFolder:</string>
-            <reference key="source" ref="609169471"/>
-            <reference key="destination" ref="222399010"/>
-          </object>
-          <int key="connectionID">3298</int>
-        </object>
         <object class="IBConnectionRecord">
           <object class="IBActionConnection" key="connection">
             <string key="label">openSpecialMediaFolder:</string>
@@ -7834,14 +7622,6 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA</bytes>
           </object>
           <int key="connectionID">3311</int>
         </object>
-        <object class="IBConnectionRecord">
-          <object class="IBOutletConnection" key="connection">
-            <string key="label">o_disc_bd_bdmv_btn</string>
-            <reference key="source" ref="609169471"/>
-            <reference key="destination" ref="222399010"/>
-          </object>
-          <int key="connectionID">3312</int>
-        </object>
         <object class="IBConnectionRecord">
           <object class="IBOutletConnection" key="connection">
             <string key="label">o_disc_bd_lbl</string>
@@ -7866,14 +7646,6 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA</bytes>
           </object>
           <int key="connectionID">3315</int>
         </object>
-        <object class="IBConnectionRecord">
-          <object class="IBOutletConnection" key="connection">
-            <string key="label">o_disc_vcd_bdmv_btn</string>
-            <reference key="source" ref="609169471"/>
-            <reference key="destination" ref="214101891"/>
-          </object>
-          <int key="connectionID">3316</int>
-        </object>
         <object class="IBConnectionRecord">
           <object class="IBOutletConnection" key="connection">
             <string key="label">o_disc_vcd_chapter</string>
@@ -10572,7 +10344,6 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA</bytes>
             <object class="NSMutableArray" key="children">
               <bool key="EncodedWithXMLCoder">YES</bool>
               <reference ref="936649520"/>
-              <reference ref="276751840"/>
               <reference ref="337608548"/>
               <reference ref="937752082"/>
             </object>
@@ -10588,15 +10359,6 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA</bytes>
             </object>
             <reference key="parent" ref="620780944"/>
           </object>
-          <object class="IBObjectRecord">
-            <int key="objectID">3082</int>
-            <reference key="object" ref="276751840"/>
-            <object class="NSMutableArray" key="children">
-              <bool key="EncodedWithXMLCoder">YES</bool>
-              <reference ref="349360788"/>
-            </object>
-            <reference key="parent" ref="620780944"/>
-          </object>
           <object class="IBObjectRecord">
             <int key="objectID">3084</int>
             <reference key="object" ref="337608548"/>
@@ -10611,11 +10373,6 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA</bytes>
             <reference key="object" ref="576719946"/>
             <reference key="parent" ref="337608548"/>
           </object>
-          <object class="IBObjectRecord">
-            <int key="objectID">3087</int>
-            <reference key="object" ref="349360788"/>
-            <reference key="parent" ref="276751840"/>
-          </object>
           <object class="IBObjectRecord">
             <int key="objectID">3088</int>
             <reference key="object" ref="911299270"/>
@@ -10627,7 +10384,6 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA</bytes>
             <object class="NSMutableArray" key="children">
               <bool key="EncodedWithXMLCoder">YES</bool>
               <reference ref="701079583"/>
-              <reference ref="1020424421"/>
               <reference ref="632509242"/>
             </object>
             <reference key="parent" ref="0"/>
@@ -10642,15 +10398,6 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA</bytes>
             </object>
             <reference key="parent" ref="568753667"/>
           </object>
-          <object class="IBObjectRecord">
-            <int key="objectID">3095</int>
-            <reference key="object" ref="1020424421"/>
-            <object class="NSMutableArray" key="children">
-              <bool key="EncodedWithXMLCoder">YES</bool>
-              <reference ref="918113456"/>
-            </object>
-            <reference key="parent" ref="568753667"/>
-          </object>
           <object class="IBObjectRecord">
             <int key="objectID">3096</int>
             <reference key="object" ref="632509242"/>
@@ -10665,11 +10412,6 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA</bytes>
             <reference key="object" ref="204055706"/>
             <reference key="parent" ref="632509242"/>
           </object>
-          <object class="IBObjectRecord">
-            <int key="objectID">3100</int>
-            <reference key="object" ref="918113456"/>
-            <reference key="parent" ref="1020424421"/>
-          </object>
           <object class="IBObjectRecord">
             <int key="objectID">3101</int>
             <reference key="object" ref="730125979"/>
@@ -10695,7 +10437,6 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA</bytes>
             <object class="NSMutableArray" key="children">
               <bool key="EncodedWithXMLCoder">YES</bool>
               <reference ref="117409615"/>
-              <reference ref="847000499"/>
               <reference ref="163378610"/>
               <reference ref="46748615"/>
             </object>
@@ -10711,15 +10452,6 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA</bytes>
             </object>
             <reference key="parent" ref="318731548"/>
           </object>
-          <object class="IBObjectRecord">
-            <int key="objectID">3109</int>
-            <reference key="object" ref="847000499"/>
-            <object class="NSMutableArray" key="children">
-              <bool key="EncodedWithXMLCoder">YES</bool>
-              <reference ref="456119470"/>
-            </object>
-            <reference key="parent" ref="318731548"/>
-          </object>
           <object class="IBObjectRecord">
             <int key="objectID">3110</int>
             <reference key="object" ref="163378610"/>
@@ -10734,11 +10466,6 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA</bytes>
             <reference key="object" ref="178473332"/>
             <reference key="parent" ref="163378610"/>
           </object>
-          <object class="IBObjectRecord">
-            <int key="objectID">3112</int>
-            <reference key="object" ref="456119470"/>
-            <reference key="parent" ref="847000499"/>
-          </object>
           <object class="IBObjectRecord">
             <int key="objectID">3113</int>
             <reference key="object" ref="476878875"/>
@@ -10756,7 +10483,6 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA</bytes>
               <reference ref="814364142"/>
               <reference ref="466921596"/>
               <reference ref="750730039"/>
-              <reference ref="418209998"/>
               <reference ref="163862958"/>
               <reference ref="543265513"/>
             </object>
@@ -10914,20 +10640,6 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA</bytes>
             </object>
             <reference key="parent" ref="251474543"/>
           </object>
-          <object class="IBObjectRecord">
-            <int key="objectID">3187</int>
-            <reference key="object" ref="418209998"/>
-            <object class="NSMutableArray" key="children">
-              <bool key="EncodedWithXMLCoder">YES</bool>
-              <reference ref="51562609"/>
-            </object>
-            <reference key="parent" ref="251474543"/>
-          </object>
-          <object class="IBObjectRecord">
-            <int key="objectID">3188</int>
-            <reference key="object" ref="51562609"/>
-            <reference key="parent" ref="418209998"/>
-          </object>
           <object class="IBObjectRecord">
             <int key="objectID">3189</int>
             <reference key="object" ref="332845413"/>
@@ -10967,7 +10679,6 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA</bytes>
             <object class="NSMutableArray" key="children">
               <bool key="EncodedWithXMLCoder">YES</bool>
               <reference ref="247665811"/>
-              <reference ref="214101891"/>
               <reference ref="402424987"/>
               <reference ref="717451284"/>
               <reference ref="576152701"/>
@@ -10988,15 +10699,6 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA</bytes>
             </object>
             <reference key="parent" ref="415217891"/>
           </object>
-          <object class="IBObjectRecord">
-            <int key="objectID">3236</int>
-            <reference key="object" ref="214101891"/>
-            <object class="NSMutableArray" key="children">
-              <bool key="EncodedWithXMLCoder">YES</bool>
-              <reference ref="891606234"/>
-            </object>
-            <reference key="parent" ref="415217891"/>
-          </object>
           <object class="IBObjectRecord">
             <int key="objectID">3237</int>
             <reference key="object" ref="402424987"/>
@@ -11095,11 +10797,6 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA</bytes>
             <reference key="object" ref="1030608156"/>
             <reference key="parent" ref="402424987"/>
           </object>
-          <object class="IBObjectRecord">
-            <int key="objectID">3251</int>
-            <reference key="object" ref="891606234"/>
-            <reference key="parent" ref="214101891"/>
-          </object>
           <object class="IBObjectRecord">
             <int key="objectID">3253</int>
             <reference key="object" ref="478920248"/>
@@ -11111,7 +10808,6 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA</bytes>
             <object class="NSMutableArray" key="children">
               <bool key="EncodedWithXMLCoder">YES</bool>
               <reference ref="189992576"/>
-              <reference ref="222399010"/>
               <reference ref="814750527"/>
             </object>
             <reference key="parent" ref="0"/>
@@ -11126,15 +10822,6 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA</bytes>
             </object>
             <reference key="parent" ref="41973276"/>
           </object>
-          <object class="IBObjectRecord">
-            <int key="objectID">3292</int>
-            <reference key="object" ref="222399010"/>
-            <object class="NSMutableArray" key="children">
-              <bool key="EncodedWithXMLCoder">YES</bool>
-              <reference ref="606952127"/>
-            </object>
-            <reference key="parent" ref="41973276"/>
-          </object>
           <object class="IBObjectRecord">
             <int key="objectID">3293</int>
             <reference key="object" ref="814750527"/>
@@ -11149,11 +10836,6 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA</bytes>
             <reference key="object" ref="45541712"/>
             <reference key="parent" ref="814750527"/>
           </object>
-          <object class="IBObjectRecord">
-            <int key="objectID">3295</int>
-            <reference key="object" ref="606952127"/>
-            <reference key="parent" ref="222399010"/>
-          </object>
           <object class="IBObjectRecord">
             <int key="objectID">3296</int>
             <reference key="object" ref="21152877"/>
@@ -12242,29 +11924,27 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA</bytes>
           <string>3074.IBPluginDependency</string>
           <string>3075.IBPluginDependency</string>
           <string>3076.IBPluginDependency</string>
+          <string>3080.IBEditorWindowLastContentRect</string>
           <string>3080.IBPluginDependency</string>
           <string>3081.IBPluginDependency</string>
-          <string>3082.IBPluginDependency</string>
           <string>3084.IBPluginDependency</string>
           <string>3085.IBPluginDependency</string>
-          <string>3087.IBPluginDependency</string>
           <string>3088.IBPluginDependency</string>
+          <string>3093.IBEditorWindowLastContentRect</string>
           <string>3093.IBPluginDependency</string>
           <string>3094.IBPluginDependency</string>
-          <string>3095.IBPluginDependency</string>
           <string>3096.IBPluginDependency</string>
           <string>3099.IBPluginDependency</string>
-          <string>3100.IBPluginDependency</string>
           <string>3101.IBPluginDependency</string>
           <string>3104.IBPluginDependency</string>
           <string>3105.IBPluginDependency</string>
+          <string>3106.IBEditorWindowLastContentRect</string>
           <string>3106.IBPluginDependency</string>
           <string>3108.IBPluginDependency</string>
-          <string>3109.IBPluginDependency</string>
           <string>3110.IBPluginDependency</string>
           <string>3111.IBPluginDependency</string>
-          <string>3112.IBPluginDependency</string>
           <string>3113.IBPluginDependency</string>
+          <string>3119.IBEditorWindowLastContentRect</string>
           <string>3119.IBPluginDependency</string>
           <string>3148.IBPluginDependency</string>
           <string>3149.IBPluginDependency</string>
@@ -12287,16 +11967,14 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA</bytes>
           <string>3183.IBPluginDependency</string>
           <string>3184.IBPluginDependency</string>
           <string>3186.IBPluginDependency</string>
-          <string>3187.IBPluginDependency</string>
-          <string>3188.IBPluginDependency</string>
           <string>3189.IBPluginDependency</string>
           <string>3192.IBPluginDependency</string>
           <string>3193.IBPluginDependency</string>
           <string>3194.IBPluginDependency</string>
           <string>3195.IBPluginDependency</string>
+          <string>3233.IBEditorWindowLastContentRect</string>
           <string>3233.IBPluginDependency</string>
           <string>3234.IBPluginDependency</string>
-          <string>3236.IBPluginDependency</string>
           <string>3237.IBPluginDependency</string>
           <string>3238.IBPluginDependency</string>
           <string>3239.IBPluginDependency</string>
@@ -12311,14 +11989,12 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA</bytes>
           <string>3248.IBPluginDependency</string>
           <string>3249.IBPluginDependency</string>
           <string>3250.IBPluginDependency</string>
-          <string>3251.IBPluginDependency</string>
           <string>3253.IBPluginDependency</string>
+          <string>3289.IBEditorWindowLastContentRect</string>
           <string>3289.IBPluginDependency</string>
           <string>3291.IBPluginDependency</string>
-          <string>3292.IBPluginDependency</string>
           <string>3293.IBPluginDependency</string>
           <string>3294.IBPluginDependency</string>
-          <string>3295.IBPluginDependency</string>
           <string>3296.IBPluginDependency</string>
           <string>3326.IBPluginDependency</string>
           <string>3327.IBPluginDependency</string>
@@ -12504,9 +12180,9 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA</bytes>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-          <string>{{0, 455}, {524, 540}}</string>
+          <string>{{0, 216}, {524, 540}}</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-          <string>{{0, 455}, {524, 540}}</string>
+          <string>{{0, 216}, {524, 540}}</string>
           <boolean value="YES"/>
           <string>{213, 107}</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -12846,11 +12522,13 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA</bytes>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+          <string>{{303, 541}, {295, 205}}</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+          <string>{{473, 164}, {295, 205}}</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -12858,11 +12536,13 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA</bytes>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+          <string>{{0, 529}, {295, 205}}</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+          <string>{{333, 528}, {295, 205}}</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -12890,6 +12570,7 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA</bytes>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+          <string>{{84, 437}, {295, 205}}</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -12907,18 +12588,7 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA</bytes>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-          <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-          <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-          <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-          <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-          <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-          <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-          <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-          <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-          <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-          <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-          <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-          <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+          <string>{{428, 442}, {295, 205}}</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -13385,12 +13055,10 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA</bytes>
               <string>o_disc_bd_lbl</string>
               <string>o_disc_bd_videots_btn</string>
               <string>o_disc_bd_view</string>
-              <string>o_disc_dvd_bdmv_btn</string>
               <string>o_disc_dvd_disablemenus_btn</string>
               <string>o_disc_dvd_lbl</string>
               <string>o_disc_dvd_videots_btn</string>
               <string>o_disc_dvd_view</string>
-              <string>o_disc_dvdwomenus_bdmv_btn</string>
               <string>o_disc_dvdwomenus_chapter</string>
               <string>o_disc_dvdwomenus_chapter_lbl</string>
               <string>o_disc_dvdwomenus_chapter_stp</string>
@@ -13686,8 +13354,6 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA</bytes>
               <string>id</string>
               <string>id</string>
               <string>id</string>
-              <string>id</string>
-              <string>id</string>
             </object>
           </object>
           <object class="NSMutableDictionary" key="toOneOutletInfosByName">
@@ -13718,12 +13384,10 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA</bytes>
               <string>o_disc_bd_lbl</string>
               <string>o_disc_bd_videots_btn</string>
               <string>o_disc_bd_view</string>
-              <string>o_disc_dvd_bdmv_btn</string>
               <string>o_disc_dvd_disablemenus_btn</string>
               <string>o_disc_dvd_lbl</string>
               <string>o_disc_dvd_videots_btn</string>
               <string>o_disc_dvd_view</string>
-              <string>o_disc_dvdwomenus_bdmv_btn</string>
               <string>o_disc_dvdwomenus_chapter</string>
               <string>o_disc_dvdwomenus_chapter_lbl</string>
               <string>o_disc_dvdwomenus_chapter_stp</string>
@@ -13955,10 +13619,6 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA</bytes>
                 <string key="name">o_disc_bd_view</string>
                 <string key="candidateClassName">id</string>
               </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">o_disc_dvd_bdmv_btn</string>
-                <string key="candidateClassName">id</string>
-              </object>
               <object class="IBToOneOutletInfo">
                 <string key="name">o_disc_dvd_disablemenus_btn</string>
                 <string key="candidateClassName">id</string>
@@ -13975,10 +13635,6 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA</bytes>
                 <string key="name">o_disc_dvd_view</string>
                 <string key="candidateClassName">id</string>
               </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">o_disc_dvdwomenus_bdmv_btn</string>
-                <string key="candidateClassName">id</string>
-              </object>
               <object class="IBToOneOutletInfo">
                 <string key="name">o_disc_dvdwomenus_chapter</string>
                 <string key="candidateClassName">id</string>

diff --git a/modules/gui/macosx/open.h b/modules/gui/macosx/open.h
index a932c878a702219c7e7fee8b1896c136154847da..ee7c68a0d27e2971155f482c2f48e545ddd44cef 100644 (file)
--- a/modules/gui/macosx/open.h
+++ b/modules/gui/macosx/open.h
@@ -77,25 +77,21 @@
     IBOutlet id o_disc_nodisc_view;
     IBOutlet id o_disc_nodisc_lbl;
     IBOutlet id o_disc_nodisc_videots_btn;
-    IBOutlet id o_disc_nodisc_bdmv_btn;
 
     IBOutlet id o_disc_audiocd_view;
     IBOutlet id o_disc_audiocd_lbl;
     IBOutlet id o_disc_audiocd_trackcount_lbl;
     IBOutlet id o_disc_audiocd_videots_btn;
-    IBOutlet id o_disc_audiocd_bdmv_btn;
 
     IBOutlet id o_disc_dvd_view;
     IBOutlet id o_disc_dvd_lbl;
     IBOutlet id o_disc_dvd_disablemenus_btn;
     IBOutlet id o_disc_dvd_videots_btn;
-    IBOutlet id o_disc_dvd_bdmv_btn;
 
     IBOutlet id o_disc_dvdwomenus_view;
     IBOutlet id o_disc_dvdwomenus_lbl;
     IBOutlet id o_disc_dvdwomenus_enablemenus_btn;
     IBOutlet id o_disc_dvdwomenus_videots_btn;
-    IBOutlet id o_disc_dvdwomenus_bdmv_btn;
     IBOutlet id o_disc_dvdwomenus_title;
     IBOutlet id o_disc_dvdwomenus_title_lbl;
     IBOutlet id o_disc_dvdwomenus_title_stp;
@@ -106,7 +102,6 @@
     IBOutlet id o_disc_vcd_view;
     IBOutlet id o_disc_vcd_lbl;
     IBOutlet id o_disc_vcd_videots_btn;
-    IBOutlet id o_disc_vcd_bdmv_btn;
     IBOutlet id o_disc_vcd_title;
     IBOutlet id o_disc_vcd_title_lbl;
     IBOutlet id o_disc_vcd_title_stp;
@@ -117,7 +112,6 @@
     IBOutlet id o_disc_bd_view;
     IBOutlet id o_disc_bd_lbl;
     IBOutlet id o_disc_bd_videots_btn;
-    IBOutlet id o_disc_bd_bdmv_btn;
 
     /* open network */
     IBOutlet id o_net_http_url;

diff --git a/modules/gui/macosx/open.m b/modules/gui/macosx/open.m
index a392ad4e980b185d6dc36949d2b80b409a5b83e2..9f3cfcda3b8d5fc618893ec8b87f20f0637fb324 100644 (file)
--- a/modules/gui/macosx/open.m
+++ b/modules/gui/macosx/open.m
@@ -154,31 +154,24 @@ static VLCOpen *_o_sharedMainInstance = nil;
 
     [o_disc_selector_pop removeAllItems];
     [o_disc_selector_pop setHidden: NO];
-    NSString *o_videots = _NS("Open VIDEO_TS folder");
-    NSString *o_bdmv = _NS("Open BDMV folder");
+    NSString *o_videots = _NS("Open VIDEO_TS / BDMV folder");
     [o_disc_nodisc_lbl setStringValue: _NS("Insert Disc")];
     [o_disc_nodisc_videots_btn setTitle: o_videots];
-    [o_disc_nodisc_bdmv_btn setTitle: o_bdmv];
     [o_disc_audiocd_lbl setStringValue: _NS("Audio CD")];
     [o_disc_audiocd_trackcount_lbl setStringValue: @""];
     [o_disc_audiocd_videots_btn setTitle: o_videots];
-    [o_disc_audiocd_bdmv_btn setTitle: o_bdmv];
     [o_disc_dvd_lbl setStringValue: @""];
     [o_disc_dvd_disablemenus_btn setTitle: _NS("Disable DVD menus")];
     [o_disc_dvd_videots_btn setTitle: o_videots];
-    [o_disc_dvd_bdmv_btn setTitle: o_bdmv];
     [o_disc_dvdwomenus_lbl setStringValue: @""];
     [o_disc_dvdwomenus_enablemenus_btn setTitle: _NS("Enable DVD menus")];
     [o_disc_dvdwomenus_videots_btn setTitle: o_videots];
-    [o_disc_dvdwomenus_bdmv_btn setTitle: o_bdmv];
     [o_disc_dvdwomenus_title_lbl setStringValue: _NS("Title")];
     [o_disc_dvdwomenus_chapter_lbl setStringValue: _NS("Chapter")];
     [o_disc_vcd_title_lbl setStringValue: _NS("Title")];
     [o_disc_vcd_chapter_lbl setStringValue: _NS("Chapter")];
     [o_disc_vcd_videots_btn setTitle: o_videots];
-    [o_disc_vcd_bdmv_btn setTitle: o_bdmv];
     [o_disc_bd_videots_btn setTitle: o_videots];
-    [o_disc_bd_bdmv_btn setTitle: o_bdmv];
 
     [o_net_udp_port_lbl setStringValue: _NS("Port")];
     [o_net_udpm_addr_lbl setStringValue: _NS("IP Address")];