macosx: move VLCFSPanel from VLCControls to VLCMainWindow since its the only class...

diff --git a/extras/package/macosx/Resources/English.lproj/MainMenu.nib/designable.nib b/extras/package/macosx/Resources/English.lproj/MainMenu.nib/designable.nib
index e530effea5a4ba7d45bf61ea28f260f31b08e1b1..9dced1c70e1f3c925733c160e8d7a53163f578a6 100644 (file)
--- a/extras/package/macosx/Resources/English.lproj/MainMenu.nib/designable.nib
+++ b/extras/package/macosx/Resources/English.lproj/MainMenu.nib/designable.nib
@@ -21,14 +21,14 @@
     </object>
     <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
       <bool key="EncodedWithXMLCoder">YES</bool>
-      <integer value="283"/>
+      <integer value="1617"/>
       <integer value="2730"/>
+      <integer value="4682"/>
       <integer value="4596"/>
-      <integer value="1617"/>
-      <integer value="4722"/>
       <integer value="915"/>
       <integer value="334"/>
-      <integer value="4682"/>
+      <integer value="283"/>
+      <integer value="4722"/>
     </object>
     <object class="NSArray" key="IBDocument.PluginDependencies">
       <bool key="EncodedWithXMLCoder">YES</bool>
@@ -4410,7 +4410,7 @@ LCAuLi4</string>
                 <string key="NSReuseIdentifierKey">_NS:21</string>
               </object>
             </object>
-            <string key="NSFrame">{{123, 12}, {234, 229}}</string>
+            <string key="NSFrame">{{124, 11}, {234, 229}}</string>
             <reference key="NSSuperview" ref="256817023"/>
             <int key="NSViewLayerContentsRedrawPolicy">2</int>
             <string key="NSReuseIdentifierKey">_NS:18</string>
@@ -6626,14 +6626,6 @@ LCAuLi4</string>
           </object>
           <int key="connectionID">4592</int>
         </object>
-        <object class="IBConnectionRecord">
-          <object class="IBOutletConnection" key="connection">
-            <string key="label">o_fs_panel</string>
-            <reference key="source" ref="113811151"/>
-            <reference key="destination" ref="662599125"/>
-          </object>
-          <int key="connectionID">4595</int>
-        </object>
         <object class="IBConnectionRecord">
           <object class="IBOutletConnection" key="connection">
             <string key="label">o_mi_rate_view</string>
@@ -7186,6 +7178,14 @@ LCAuLi4</string>
           </object>
           <int key="connectionID">4749</int>
         </object>
+        <object class="IBConnectionRecord">
+          <object class="IBOutletConnection" key="connection">
+            <string key="label">o_fspanel</string>
+            <reference key="source" ref="498338108"/>
+            <reference key="destination" ref="662599125"/>
+          </object>
+          <int key="connectionID">4751</int>
+        </object>
       </object>
       <object class="IBMutableOrderedSet" key="objectRecords">
         <object class="NSArray" key="orderedObjects">
@@ -11028,14 +11028,14 @@ LCAuLi4</string>
           <boolean value="YES"/>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <boolean value="YES"/>
-          <string>{{85, 668}, {468, 20}}</string>
+          <string>{{330, 668}, {468, 20}}</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <boolean value="YES"/>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <boolean value="YES"/>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <boolean value="YES"/>
-          <string>{{364, 305}, {208, 363}}</string>
+          <string>{{609, 305}, {208, 363}}</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <boolean value="YES"/>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -11448,7 +11448,7 @@ LCAuLi4</string>
         </object>
       </object>
       <nil key="sourceID"/>
-      <int key="maxID">4749</int>
+      <int key="maxID">4751</int>
     </object>
     <object class="IBClassDescriber" key="IBDocument.Classes">
       <object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -14169,40 +14169,40 @@ LCAuLi4</string>
       <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.1+">
         <bool key="EncodedWithXMLCoder">YES</bool>
         <object class="IBPartialClassDescription">
-          <string key="className">VLCMainMenu</string>
+          <string key="className">VLCApplication</string>
+          <string key="superclassName">NSApplication</string>
+          <object class="IBClassDescriptionSource" key="sourceIdentifier" id="14210209">
+            <string key="majorKey">IBDocumentRelativeSource</string>
+            <string key="minorKey">../../../../../modules/gui/macosx/intf.h</string>
+          </object>
+        </object>
+        <object class="IBPartialClassDescription">
+          <string key="className">VLCControls</string>
           <string key="superclassName">NSObject</string>
           <object class="NSMutableDictionary" key="actions">
             <bool key="EncodedWithXMLCoder">YES</bool>
             <object class="NSArray" key="dict.sortedKeys">
               <bool key="EncodedWithXMLCoder">YES</bool>
-              <string>clearRecentItems:</string>
-              <string>createVideoSnapshot:</string>
-              <string>floatOnTop:</string>
-              <string>intfOpenCapture:</string>
-              <string>intfOpenDisc:</string>
-              <string>intfOpenFile:</string>
-              <string>intfOpenFileGeneric:</string>
-              <string>intfOpenNet:</string>
-              <string>openDocumentation:</string>
-              <string>openDonate:</string>
-              <string>openForum:</string>
-              <string>openReadMe:</string>
-              <string>openWebsite:</string>
-              <string>resizeVideoWindow:</string>
-              <string>setPlaybackRate:</string>
-              <string>showAudioEffects:</string>
-              <string>showBookmarks:</string>
-              <string>showInformationPanel:</string>
-              <string>showLicense:</string>
-              <string>showTrackSynchronization:</string>
-              <string>showVideoEffects:</string>
-              <string>showWizard:</string>
-              <string>toggleFullscreen:</string>
-              <string>toggleVar:</string>
-              <string>viewAbout:</string>
-              <string>viewErrorsAndWarnings:</string>
-              <string>viewHelp:</string>
-              <string>viewPreferences:</string>
+              <string>addSubtitleFile:</string>
+              <string>backward:</string>
+              <string>forward:</string>
+              <string>goToSpecificTime:</string>
+              <string>lockVideosAspectRatio:</string>
+              <string>loop:</string>
+              <string>mute:</string>
+              <string>next:</string>
+              <string>play:</string>
+              <string>prev:</string>
+              <string>quitAfterPlayback:</string>
+              <string>random:</string>
+              <string>repeat:</string>
+              <string>showPosition:</string>
+              <string>stop:</string>
+              <string>telxNavLink:</string>
+              <string>telxTransparent:</string>
+              <string>volumeDown:</string>
+              <string>volumeSliderUpdated:</string>
+              <string>volumeUp:</string>
             </object>
             <object class="NSMutableArray" key="dict.values">
               <bool key="EncodedWithXMLCoder">YES</bool>
@@ -14226,168 +14226,682 @@ LCAuLi4</string>
               <string>id</string>
               <string>id</string>
               <string>id</string>
-              <string>id</string>
-              <string>id</string>
-              <string>id</string>
-              <string>id</string>
-              <string>id</string>
-              <string>id</string>
-              <string>id</string>
-              <string>id</string>
             </object>
           </object>
           <object class="NSMutableDictionary" key="actionInfosByName">
             <bool key="EncodedWithXMLCoder">YES</bool>
             <object class="NSArray" key="dict.sortedKeys">
               <bool key="EncodedWithXMLCoder">YES</bool>
-              <string>clearRecentItems:</string>
-              <string>createVideoSnapshot:</string>
-              <string>floatOnTop:</string>
-              <string>intfOpenCapture:</string>
-              <string>intfOpenDisc:</string>
-              <string>intfOpenFile:</string>
-              <string>intfOpenFileGeneric:</string>
-              <string>intfOpenNet:</string>
-              <string>openDocumentation:</string>
-              <string>openDonate:</string>
-              <string>openForum:</string>
-              <string>openReadMe:</string>
-              <string>openWebsite:</string>
-              <string>resizeVideoWindow:</string>
-              <string>setPlaybackRate:</string>
-              <string>showAudioEffects:</string>
-              <string>showBookmarks:</string>
-              <string>showInformationPanel:</string>
-              <string>showLicense:</string>
-              <string>showTrackSynchronization:</string>
-              <string>showVideoEffects:</string>
-              <string>showWizard:</string>
-              <string>toggleFullscreen:</string>
-              <string>toggleVar:</string>
-              <string>viewAbout:</string>
-              <string>viewErrorsAndWarnings:</string>
-              <string>viewHelp:</string>
-              <string>viewPreferences:</string>
+              <string>addSubtitleFile:</string>
+              <string>backward:</string>
+              <string>forward:</string>
+              <string>goToSpecificTime:</string>
+              <string>lockVideosAspectRatio:</string>
+              <string>loop:</string>
+              <string>mute:</string>
+              <string>next:</string>
+              <string>play:</string>
+              <string>prev:</string>
+              <string>quitAfterPlayback:</string>
+              <string>random:</string>
+              <string>repeat:</string>
+              <string>showPosition:</string>
+              <string>stop:</string>
+              <string>telxNavLink:</string>
+              <string>telxTransparent:</string>
+              <string>volumeDown:</string>
+              <string>volumeSliderUpdated:</string>
+              <string>volumeUp:</string>
             </object>
             <object class="NSMutableArray" key="dict.values">
               <bool key="EncodedWithXMLCoder">YES</bool>
               <object class="IBActionInfo">
-                <string key="name">clearRecentItems:</string>
+                <string key="name">addSubtitleFile:</string>
                 <string key="candidateClassName">id</string>
               </object>
               <object class="IBActionInfo">
-                <string key="name">createVideoSnapshot:</string>
+                <string key="name">backward:</string>
                 <string key="candidateClassName">id</string>
               </object>
               <object class="IBActionInfo">
-                <string key="name">floatOnTop:</string>
+                <string key="name">forward:</string>
                 <string key="candidateClassName">id</string>
               </object>
               <object class="IBActionInfo">
-                <string key="name">intfOpenCapture:</string>
+                <string key="name">goToSpecificTime:</string>
                 <string key="candidateClassName">id</string>
               </object>
               <object class="IBActionInfo">
-                <string key="name">intfOpenDisc:</string>
+                <string key="name">lockVideosAspectRatio:</string>
                 <string key="candidateClassName">id</string>
               </object>
               <object class="IBActionInfo">
-                <string key="name">intfOpenFile:</string>
+                <string key="name">loop:</string>
                 <string key="candidateClassName">id</string>
               </object>
               <object class="IBActionInfo">
-                <string key="name">intfOpenFileGeneric:</string>
+                <string key="name">mute:</string>
                 <string key="candidateClassName">id</string>
               </object>
               <object class="IBActionInfo">
-                <string key="name">intfOpenNet:</string>
+                <string key="name">next:</string>
                 <string key="candidateClassName">id</string>
               </object>
               <object class="IBActionInfo">
-                <string key="name">openDocumentation:</string>
+                <string key="name">play:</string>
                 <string key="candidateClassName">id</string>
               </object>
               <object class="IBActionInfo">
-                <string key="name">openDonate:</string>
+                <string key="name">prev:</string>
                 <string key="candidateClassName">id</string>
               </object>
               <object class="IBActionInfo">
-                <string key="name">openForum:</string>
+                <string key="name">quitAfterPlayback:</string>
                 <string key="candidateClassName">id</string>
               </object>
               <object class="IBActionInfo">
-                <string key="name">openReadMe:</string>
+                <string key="name">random:</string>
                 <string key="candidateClassName">id</string>
               </object>
               <object class="IBActionInfo">
-                <string key="name">openWebsite:</string>
+                <string key="name">repeat:</string>
                 <string key="candidateClassName">id</string>
               </object>
               <object class="IBActionInfo">
-                <string key="name">resizeVideoWindow:</string>
+                <string key="name">showPosition:</string>
                 <string key="candidateClassName">id</string>
               </object>
               <object class="IBActionInfo">
-                <string key="name">setPlaybackRate:</string>
+                <string key="name">stop:</string>
                 <string key="candidateClassName">id</string>
               </object>
               <object class="IBActionInfo">
-                <string key="name">showAudioEffects:</string>
+                <string key="name">telxNavLink:</string>
                 <string key="candidateClassName">id</string>
               </object>
               <object class="IBActionInfo">
-                <string key="name">showBookmarks:</string>
+                <string key="name">telxTransparent:</string>
                 <string key="candidateClassName">id</string>
               </object>
               <object class="IBActionInfo">
-                <string key="name">showInformationPanel:</string>
+                <string key="name">volumeDown:</string>
                 <string key="candidateClassName">id</string>
               </object>
               <object class="IBActionInfo">
-                <string key="name">showLicense:</string>
+                <string key="name">volumeSliderUpdated:</string>
                 <string key="candidateClassName">id</string>
               </object>
               <object class="IBActionInfo">
-                <string key="name">showTrackSynchronization:</string>
+                <string key="name">volumeUp:</string>
                 <string key="candidateClassName">id</string>
               </object>
-              <object class="IBActionInfo">
-                <string key="name">showVideoEffects:</string>
+            </object>
+          </object>
+          <object class="NSMutableDictionary" key="outlets">
+            <bool key="EncodedWithXMLCoder">YES</bool>
+            <object class="NSArray" key="dict.sortedKeys">
+              <bool key="EncodedWithXMLCoder">YES</bool>
+              <string>o_main</string>
+              <string>o_specificTime_cancel_btn</string>
+              <string>o_specificTime_enter_fld</string>
+              <string>o_specificTime_goTo_lbl</string>
+              <string>o_specificTime_mi</string>
+              <string>o_specificTime_ok_btn</string>
+              <string>o_specificTime_sec_lbl</string>
+              <string>o_specificTime_stepper</string>
+              <string>o_specificTime_win</string>
+            </object>
+            <object class="NSMutableArray" key="dict.values">
+              <bool key="EncodedWithXMLCoder">YES</bool>
+              <string>id</string>
+              <string>id</string>
+              <string>id</string>
+              <string>id</string>
+              <string>id</string>
+              <string>id</string>
+              <string>id</string>
+              <string>id</string>
+              <string>id</string>
+            </object>
+          </object>
+          <object class="NSMutableDictionary" key="toOneOutletInfosByName">
+            <bool key="EncodedWithXMLCoder">YES</bool>
+            <object class="NSArray" key="dict.sortedKeys">
+              <bool key="EncodedWithXMLCoder">YES</bool>
+              <string>o_main</string>
+              <string>o_specificTime_cancel_btn</string>
+              <string>o_specificTime_enter_fld</string>
+              <string>o_specificTime_goTo_lbl</string>
+              <string>o_specificTime_mi</string>
+              <string>o_specificTime_ok_btn</string>
+              <string>o_specificTime_sec_lbl</string>
+              <string>o_specificTime_stepper</string>
+              <string>o_specificTime_win</string>
+            </object>
+            <object class="NSMutableArray" key="dict.values">
+              <bool key="EncodedWithXMLCoder">YES</bool>
+              <object class="IBToOneOutletInfo">
+                <string key="name">o_main</string>
                 <string key="candidateClassName">id</string>
               </object>
-              <object class="IBActionInfo">
-                <string key="name">showWizard:</string>
+              <object class="IBToOneOutletInfo">
+                <string key="name">o_specificTime_cancel_btn</string>
                 <string key="candidateClassName">id</string>
               </object>
-              <object class="IBActionInfo">
-                <string key="name">toggleFullscreen:</string>
+              <object class="IBToOneOutletInfo">
+                <string key="name">o_specificTime_enter_fld</string>
                 <string key="candidateClassName">id</string>
               </object>
-              <object class="IBActionInfo">
-                <string key="name">toggleVar:</string>
+              <object class="IBToOneOutletInfo">
+                <string key="name">o_specificTime_goTo_lbl</string>
                 <string key="candidateClassName">id</string>
               </object>
-              <object class="IBActionInfo">
-                <string key="name">viewAbout:</string>
+              <object class="IBToOneOutletInfo">
+                <string key="name">o_specificTime_mi</string>
                 <string key="candidateClassName">id</string>
               </object>
-              <object class="IBActionInfo">
-                <string key="name">viewErrorsAndWarnings:</string>
+              <object class="IBToOneOutletInfo">
+                <string key="name">o_specificTime_ok_btn</string>
                 <string key="candidateClassName">id</string>
               </object>
-              <object class="IBActionInfo">
-                <string key="name">viewHelp:</string>
+              <object class="IBToOneOutletInfo">
+                <string key="name">o_specificTime_sec_lbl</string>
                 <string key="candidateClassName">id</string>
               </object>
-              <object class="IBActionInfo">
-                <string key="name">viewPreferences:</string>
+              <object class="IBToOneOutletInfo">
+                <string key="name">o_specificTime_stepper</string>
+                <string key="candidateClassName">id</string>
+              </object>
+              <object class="IBToOneOutletInfo">
+                <string key="name">o_specificTime_win</string>
                 <string key="candidateClassName">id</string>
               </object>
             </object>
           </object>
-          <object class="NSMutableDictionary" key="outlets">
-            <bool key="EncodedWithXMLCoder">YES</bool>
-            <object class="NSArray" key="dict.sortedKeys">
+          <object class="IBClassDescriptionSource" key="sourceIdentifier">
+            <string key="majorKey">IBDocumentRelativeSource</string>
+            <string key="minorKey">../../../../../modules/gui/macosx/controls.h</string>
+          </object>
+        </object>
+        <object class="IBPartialClassDescription">
+          <string key="className">VLCFSPanel</string>
+          <string key="superclassName">NSWindow</string>
+          <object class="IBClassDescriptionSource" key="sourceIdentifier">
+            <string key="majorKey">IBDocumentRelativeSource</string>
+            <string key="minorKey">../../../../../modules/gui/macosx/fspanel.h</string>
+          </object>
+        </object>
+        <object class="IBPartialClassDescription">
+          <string key="className">VLCMain</string>
+          <string key="superclassName">NSObject</string>
+          <object class="NSMutableDictionary" key="actions">
+            <bool key="EncodedWithXMLCoder">YES</bool>
+            <object class="NSArray" key="dict.sortedKeys">
+              <bool key="EncodedWithXMLCoder">YES</bool>
+              <string>crashReporterAction:</string>
+              <string>openCrashLog:</string>
+              <string>saveDebugLog:</string>
+              <string>showMessagesPanel:</string>
+            </object>
+            <object class="NSMutableArray" key="dict.values">
+              <bool key="EncodedWithXMLCoder">YES</bool>
+              <string>id</string>
+              <string>id</string>
+              <string>id</string>
+              <string>id</string>
+            </object>
+          </object>
+          <object class="NSMutableDictionary" key="actionInfosByName">
+            <bool key="EncodedWithXMLCoder">YES</bool>
+            <object class="NSArray" key="dict.sortedKeys">
+              <bool key="EncodedWithXMLCoder">YES</bool>
+              <string>crashReporterAction:</string>
+              <string>openCrashLog:</string>
+              <string>saveDebugLog:</string>
+              <string>showMessagesPanel:</string>
+            </object>
+            <object class="NSMutableArray" key="dict.values">
+              <bool key="EncodedWithXMLCoder">YES</bool>
+              <object class="IBActionInfo">
+                <string key="name">crashReporterAction:</string>
+                <string key="candidateClassName">id</string>
+              </object>
+              <object class="IBActionInfo">
+                <string key="name">openCrashLog:</string>
+                <string key="candidateClassName">id</string>
+              </object>
+              <object class="IBActionInfo">
+                <string key="name">saveDebugLog:</string>
+                <string key="candidateClassName">id</string>
+              </object>
+              <object class="IBActionInfo">
+                <string key="name">showMessagesPanel:</string>
+                <string key="candidateClassName">id</string>
+              </object>
+            </object>
+          </object>
+          <object class="NSMutableDictionary" key="outlets">
+            <bool key="EncodedWithXMLCoder">YES</bool>
+            <object class="NSArray" key="dict.sortedKeys">
+              <bool key="EncodedWithXMLCoder">YES</bool>
+              <string>o_bookmarks</string>
+              <string>o_controls</string>
+              <string>o_coredialogs</string>
+              <string>o_coreinteraction</string>
+              <string>o_crashrep_desc_txt</string>
+              <string>o_crashrep_dontSend_btn</string>
+              <string>o_crashrep_fld</string>
+              <string>o_crashrep_includeEmail_ckb</string>
+              <string>o_crashrep_includeEmail_txt</string>
+              <string>o_crashrep_send_btn</string>
+              <string>o_crashrep_title_txt</string>
+              <string>o_crashrep_win</string>
+              <string>o_embedded_list</string>
+              <string>o_eyetv</string>
+              <string>o_info</string>
+              <string>o_mainmenu</string>
+              <string>o_mainwindow</string>
+              <string>o_messages</string>
+              <string>o_msgs_crashlog_btn</string>
+              <string>o_msgs_panel</string>
+              <string>o_msgs_save_btn</string>
+              <string>o_open</string>
+              <string>o_playlist</string>
+              <string>o_prefs</string>
+              <string>o_sprefs</string>
+              <string>o_wizard</string>
+            </object>
+            <object class="NSMutableArray" key="dict.values">
+              <bool key="EncodedWithXMLCoder">YES</bool>
+              <string>id</string>
+              <string>VLCControls</string>
+              <string>id</string>
+              <string>id</string>
+              <string>NSTextField</string>
+              <string>NSButton</string>
+              <string>NSTextView</string>
+              <string>NSButton</string>
+              <string>NSTextField</string>
+              <string>NSButton</string>
+              <string>NSTextField</string>
+              <string>NSWindow</string>
+              <string>id</string>
+              <string>id</string>
+              <string>id</string>
+              <string>id</string>
+              <string>id</string>
+              <string>NSTextView</string>
+              <string>NSButton</string>
+              <string>NSWindow</string>
+              <string>NSButton</string>
+              <string>id</string>
+              <string>VLCPlaylist</string>
+              <string>id</string>
+              <string>id</string>
+              <string>id</string>
+            </object>
+          </object>
+          <object class="NSMutableDictionary" key="toOneOutletInfosByName">
+            <bool key="EncodedWithXMLCoder">YES</bool>
+            <object class="NSArray" key="dict.sortedKeys">
+              <bool key="EncodedWithXMLCoder">YES</bool>
+              <string>o_bookmarks</string>
+              <string>o_controls</string>
+              <string>o_coredialogs</string>
+              <string>o_coreinteraction</string>
+              <string>o_crashrep_desc_txt</string>
+              <string>o_crashrep_dontSend_btn</string>
+              <string>o_crashrep_fld</string>
+              <string>o_crashrep_includeEmail_ckb</string>
+              <string>o_crashrep_includeEmail_txt</string>
+              <string>o_crashrep_send_btn</string>
+              <string>o_crashrep_title_txt</string>
+              <string>o_crashrep_win</string>
+              <string>o_embedded_list</string>
+              <string>o_eyetv</string>
+              <string>o_info</string>
+              <string>o_mainmenu</string>
+              <string>o_mainwindow</string>
+              <string>o_messages</string>
+              <string>o_msgs_crashlog_btn</string>
+              <string>o_msgs_panel</string>
+              <string>o_msgs_save_btn</string>
+              <string>o_open</string>
+              <string>o_playlist</string>
+              <string>o_prefs</string>
+              <string>o_sprefs</string>
+              <string>o_wizard</string>
+            </object>
+            <object class="NSMutableArray" key="dict.values">
+              <bool key="EncodedWithXMLCoder">YES</bool>
+              <object class="IBToOneOutletInfo">
+                <string key="name">o_bookmarks</string>
+                <string key="candidateClassName">id</string>
+              </object>
+              <object class="IBToOneOutletInfo">
+                <string key="name">o_controls</string>
+                <string key="candidateClassName">VLCControls</string>
+              </object>
+              <object class="IBToOneOutletInfo">
+                <string key="name">o_coredialogs</string>
+                <string key="candidateClassName">id</string>
+              </object>
+              <object class="IBToOneOutletInfo">
+                <string key="name">o_coreinteraction</string>
+                <string key="candidateClassName">id</string>
+              </object>
+              <object class="IBToOneOutletInfo">
+                <string key="name">o_crashrep_desc_txt</string>
+                <string key="candidateClassName">NSTextField</string>
+              </object>
+              <object class="IBToOneOutletInfo">
+                <string key="name">o_crashrep_dontSend_btn</string>
+                <string key="candidateClassName">NSButton</string>
+              </object>
+              <object class="IBToOneOutletInfo">
+                <string key="name">o_crashrep_fld</string>
+                <string key="candidateClassName">NSTextView</string>
+              </object>
+              <object class="IBToOneOutletInfo">
+                <string key="name">o_crashrep_includeEmail_ckb</string>
+                <string key="candidateClassName">NSButton</string>
+              </object>
+              <object class="IBToOneOutletInfo">
+                <string key="name">o_crashrep_includeEmail_txt</string>
+                <string key="candidateClassName">NSTextField</string>
+              </object>
+              <object class="IBToOneOutletInfo">
+                <string key="name">o_crashrep_send_btn</string>
+                <string key="candidateClassName">NSButton</string>
+              </object>
+              <object class="IBToOneOutletInfo">
+                <string key="name">o_crashrep_title_txt</string>
+                <string key="candidateClassName">NSTextField</string>
+              </object>
+              <object class="IBToOneOutletInfo">
+                <string key="name">o_crashrep_win</string>
+                <string key="candidateClassName">NSWindow</string>
+              </object>
+              <object class="IBToOneOutletInfo">
+                <string key="name">o_embedded_list</string>
+                <string key="candidateClassName">id</string>
+              </object>
+              <object class="IBToOneOutletInfo">
+                <string key="name">o_eyetv</string>
+                <string key="candidateClassName">id</string>
+              </object>
+              <object class="IBToOneOutletInfo">
+                <string key="name">o_info</string>
+                <string key="candidateClassName">id</string>
+              </object>
+              <object class="IBToOneOutletInfo">
+                <string key="name">o_mainmenu</string>
+                <string key="candidateClassName">id</string>
+              </object>
+              <object class="IBToOneOutletInfo">
+                <string key="name">o_mainwindow</string>
+                <string key="candidateClassName">id</string>
+              </object>
+              <object class="IBToOneOutletInfo">
+                <string key="name">o_messages</string>
+                <string key="candidateClassName">NSTextView</string>
+              </object>
+              <object class="IBToOneOutletInfo">
+                <string key="name">o_msgs_crashlog_btn</string>
+                <string key="candidateClassName">NSButton</string>
+              </object>
+              <object class="IBToOneOutletInfo">
+                <string key="name">o_msgs_panel</string>
+                <string key="candidateClassName">NSWindow</string>
+              </object>
+              <object class="IBToOneOutletInfo">
+                <string key="name">o_msgs_save_btn</string>
+                <string key="candidateClassName">NSButton</string>
+              </object>
+              <object class="IBToOneOutletInfo">
+                <string key="name">o_open</string>
+                <string key="candidateClassName">id</string>
+              </object>
+              <object class="IBToOneOutletInfo">
+                <string key="name">o_playlist</string>
+                <string key="candidateClassName">VLCPlaylist</string>
+              </object>
+              <object class="IBToOneOutletInfo">
+                <string key="name">o_prefs</string>
+                <string key="candidateClassName">id</string>
+              </object>
+              <object class="IBToOneOutletInfo">
+                <string key="name">o_sprefs</string>
+                <string key="candidateClassName">id</string>
+              </object>
+              <object class="IBToOneOutletInfo">
+                <string key="name">o_wizard</string>
+                <string key="candidateClassName">id</string>
+              </object>
+            </object>
+          </object>
+          <reference key="sourceIdentifier" ref="14210209"/>
+        </object>
+        <object class="IBPartialClassDescription">
+          <string key="className">VLCMainMenu</string>
+          <string key="superclassName">NSObject</string>
+          <object class="NSMutableDictionary" key="actions">
+            <bool key="EncodedWithXMLCoder">YES</bool>
+            <object class="NSArray" key="dict.sortedKeys">
+              <bool key="EncodedWithXMLCoder">YES</bool>
+              <string>clearRecentItems:</string>
+              <string>createVideoSnapshot:</string>
+              <string>floatOnTop:</string>
+              <string>intfOpenCapture:</string>
+              <string>intfOpenDisc:</string>
+              <string>intfOpenFile:</string>
+              <string>intfOpenFileGeneric:</string>
+              <string>intfOpenNet:</string>
+              <string>openDocumentation:</string>
+              <string>openDonate:</string>
+              <string>openForum:</string>
+              <string>openReadMe:</string>
+              <string>openWebsite:</string>
+              <string>resizeVideoWindow:</string>
+              <string>setPlaybackRate:</string>
+              <string>showAudioEffects:</string>
+              <string>showBookmarks:</string>
+              <string>showInformationPanel:</string>
+              <string>showLicense:</string>
+              <string>showTrackSynchronization:</string>
+              <string>showVideoEffects:</string>
+              <string>showWizard:</string>
+              <string>toggleFullscreen:</string>
+              <string>toggleVar:</string>
+              <string>viewAbout:</string>
+              <string>viewErrorsAndWarnings:</string>
+              <string>viewHelp:</string>
+              <string>viewPreferences:</string>
+            </object>
+            <object class="NSMutableArray" key="dict.values">
+              <bool key="EncodedWithXMLCoder">YES</bool>
+              <string>id</string>
+              <string>id</string>
+              <string>id</string>
+              <string>id</string>
+              <string>id</string>
+              <string>id</string>
+              <string>id</string>
+              <string>id</string>
+              <string>id</string>
+              <string>id</string>
+              <string>id</string>
+              <string>id</string>
+              <string>id</string>
+              <string>id</string>
+              <string>id</string>
+              <string>id</string>
+              <string>id</string>
+              <string>id</string>
+              <string>id</string>
+              <string>id</string>
+              <string>id</string>
+              <string>id</string>
+              <string>id</string>
+              <string>id</string>
+              <string>id</string>
+              <string>id</string>
+              <string>id</string>
+              <string>id</string>
+            </object>
+          </object>
+          <object class="NSMutableDictionary" key="actionInfosByName">
+            <bool key="EncodedWithXMLCoder">YES</bool>
+            <object class="NSArray" key="dict.sortedKeys">
+              <bool key="EncodedWithXMLCoder">YES</bool>
+              <string>clearRecentItems:</string>
+              <string>createVideoSnapshot:</string>
+              <string>floatOnTop:</string>
+              <string>intfOpenCapture:</string>
+              <string>intfOpenDisc:</string>
+              <string>intfOpenFile:</string>
+              <string>intfOpenFileGeneric:</string>
+              <string>intfOpenNet:</string>
+              <string>openDocumentation:</string>
+              <string>openDonate:</string>
+              <string>openForum:</string>
+              <string>openReadMe:</string>
+              <string>openWebsite:</string>
+              <string>resizeVideoWindow:</string>
+              <string>setPlaybackRate:</string>
+              <string>showAudioEffects:</string>
+              <string>showBookmarks:</string>
+              <string>showInformationPanel:</string>
+              <string>showLicense:</string>
+              <string>showTrackSynchronization:</string>
+              <string>showVideoEffects:</string>
+              <string>showWizard:</string>
+              <string>toggleFullscreen:</string>
+              <string>toggleVar:</string>
+              <string>viewAbout:</string>
+              <string>viewErrorsAndWarnings:</string>
+              <string>viewHelp:</string>
+              <string>viewPreferences:</string>
+            </object>
+            <object class="NSMutableArray" key="dict.values">
+              <bool key="EncodedWithXMLCoder">YES</bool>
+              <object class="IBActionInfo">
+                <string key="name">clearRecentItems:</string>
+                <string key="candidateClassName">id</string>
+              </object>
+              <object class="IBActionInfo">
+                <string key="name">createVideoSnapshot:</string>
+                <string key="candidateClassName">id</string>
+              </object>
+              <object class="IBActionInfo">
+                <string key="name">floatOnTop:</string>
+                <string key="candidateClassName">id</string>
+              </object>
+              <object class="IBActionInfo">
+                <string key="name">intfOpenCapture:</string>
+                <string key="candidateClassName">id</string>
+              </object>
+              <object class="IBActionInfo">
+                <string key="name">intfOpenDisc:</string>
+                <string key="candidateClassName">id</string>
+              </object>
+              <object class="IBActionInfo">
+                <string key="name">intfOpenFile:</string>
+                <string key="candidateClassName">id</string>
+              </object>
+              <object class="IBActionInfo">
+                <string key="name">intfOpenFileGeneric:</string>
+                <string key="candidateClassName">id</string>
+              </object>
+              <object class="IBActionInfo">
+                <string key="name">intfOpenNet:</string>
+                <string key="candidateClassName">id</string>
+              </object>
+              <object class="IBActionInfo">
+                <string key="name">openDocumentation:</string>
+                <string key="candidateClassName">id</string>
+              </object>
+              <object class="IBActionInfo">
+                <string key="name">openDonate:</string>
+                <string key="candidateClassName">id</string>
+              </object>
+              <object class="IBActionInfo">
+                <string key="name">openForum:</string>
+                <string key="candidateClassName">id</string>
+              </object>
+              <object class="IBActionInfo">
+                <string key="name">openReadMe:</string>
+                <string key="candidateClassName">id</string>
+              </object>
+              <object class="IBActionInfo">
+                <string key="name">openWebsite:</string>
+                <string key="candidateClassName">id</string>
+              </object>
+              <object class="IBActionInfo">
+                <string key="name">resizeVideoWindow:</string>
+                <string key="candidateClassName">id</string>
+              </object>
+              <object class="IBActionInfo">
+                <string key="name">setPlaybackRate:</string>
+                <string key="candidateClassName">id</string>
+              </object>
+              <object class="IBActionInfo">
+                <string key="name">showAudioEffects:</string>
+                <string key="candidateClassName">id</string>
+              </object>
+              <object class="IBActionInfo">
+                <string key="name">showBookmarks:</string>
+                <string key="candidateClassName">id</string>
+              </object>
+              <object class="IBActionInfo">
+                <string key="name">showInformationPanel:</string>
+                <string key="candidateClassName">id</string>
+              </object>
+              <object class="IBActionInfo">
+                <string key="name">showLicense:</string>
+                <string key="candidateClassName">id</string>
+              </object>
+              <object class="IBActionInfo">
+                <string key="name">showTrackSynchronization:</string>
+                <string key="candidateClassName">id</string>
+              </object>
+              <object class="IBActionInfo">
+                <string key="name">showVideoEffects:</string>
+                <string key="candidateClassName">id</string>
+              </object>
+              <object class="IBActionInfo">
+                <string key="name">showWizard:</string>
+                <string key="candidateClassName">id</string>
+              </object>
+              <object class="IBActionInfo">
+                <string key="name">toggleFullscreen:</string>
+                <string key="candidateClassName">id</string>
+              </object>
+              <object class="IBActionInfo">
+                <string key="name">toggleVar:</string>
+                <string key="candidateClassName">id</string>
+              </object>
+              <object class="IBActionInfo">
+                <string key="name">viewAbout:</string>
+                <string key="candidateClassName">id</string>
+              </object>
+              <object class="IBActionInfo">
+                <string key="name">viewErrorsAndWarnings:</string>
+                <string key="candidateClassName">id</string>
+              </object>
+              <object class="IBActionInfo">
+                <string key="name">viewHelp:</string>
+                <string key="candidateClassName">id</string>
+              </object>
+              <object class="IBActionInfo">
+                <string key="name">viewPreferences:</string>
+                <string key="candidateClassName">id</string>
+              </object>
+            </object>
+          </object>
+          <object class="NSMutableDictionary" key="outlets">
+            <bool key="EncodedWithXMLCoder">YES</bool>
+            <object class="NSArray" key="dict.sortedKeys">
               <bool key="EncodedWithXMLCoder">YES</bool>
               <string>o_about</string>
               <string>o_audioeffects</string>
@@ -15483,6 +15997,7 @@ LCAuLi4</string>
               <string>o_dropzone_lbl</string>
               <string>o_dropzone_view</string>
               <string>o_effects_btn</string>
+              <string>o_fspanel</string>
               <string>o_fullscreen_btn</string>
               <string>o_fwd_btn</string>
               <string>o_play_btn</string>
@@ -15517,6 +16032,7 @@ LCAuLi4</string>
               <string>id</string>
               <string>id</string>
               <string>id</string>
+              <string>VLCFSPanel</string>
               <string>id</string>
               <string>id</string>
               <string>id</string>
@@ -15554,6 +16070,7 @@ LCAuLi4</string>
               <string>o_dropzone_lbl</string>
               <string>o_dropzone_view</string>
               <string>o_effects_btn</string>
+              <string>o_fspanel</string>
               <string>o_fullscreen_btn</string>
               <string>o_fwd_btn</string>
               <string>o_play_btn</string>
@@ -15609,6 +16126,10 @@ LCAuLi4</string>
                 <string key="name">o_effects_btn</string>
                 <string key="candidateClassName">id</string>
               </object>
+              <object class="IBToOneOutletInfo">
+                <string key="name">o_fspanel</string>
+                <string key="candidateClassName">VLCFSPanel</string>
+              </object>
               <object class="IBToOneOutletInfo">
                 <string key="name">o_fullscreen_btn</string>
                 <string key="candidateClassName">id</string>

diff --git a/extras/package/macosx/Resources/English.lproj/MainMenu.nib/keyedobjects.nib b/extras/package/macosx/Resources/English.lproj/MainMenu.nib/keyedobjects.nib
index ec451599123e9e8b3af20d168bc31b01c13e2aec..6b1a1732bcf01a51229f9b556d8e88f67c80172e 100644 (file)
Binary files a/extras/package/macosx/Resources/English.lproj/MainMenu.nib/keyedobjects.nib and b/extras/package/macosx/Resources/English.lproj/MainMenu.nib/keyedobjects.nib differ

diff --git a/modules/gui/macosx/MainWindow.h b/modules/gui/macosx/MainWindow.h
index 22bb753affa59f5c32941c1fe1700a18d30aedd6..ed6331da42339fa3a2e38d03627aefe534f6d19d 100644 (file)
--- a/modules/gui/macosx/MainWindow.h
+++ b/modules/gui/macosx/MainWindow.h
@@ -28,6 +28,7 @@
 #import "PXSourceList.h"
 #import <vlc_input.h>
 #import "misc.h"
+#import "fspanel.h"
 
 #ifndef MAC_OS_X_VERSION_10_6
 @protocol NSAnimationDelegate <NSObject> @end
@@ -68,6 +69,8 @@
     IBOutlet id o_dropzone_btn;
     IBOutlet id o_dropzone_lbl;
 
+    IBOutlet VLCFSPanel *o_fspanel;
+
     BOOL b_dark_interface;
     BOOL b_video_playback_enabled;
     int i_lastShownVolume;

diff --git a/modules/gui/macosx/MainWindow.m b/modules/gui/macosx/MainWindow.m
index 9591170394fa2eda8a57d50f5b3bd69da2355b30..75214e380c3c9e47c8a6ff60c7b64c3d862013ab 100644 (file)
--- a/modules/gui/macosx/MainWindow.m
+++ b/modules/gui/macosx/MainWindow.m
@@ -57,7 +57,10 @@ static VLCMainWindow *_o_sharedInstance = nil;
         return _o_sharedInstance;
     }
     else
+    {
+        o_fspanel = [[VLCFSPanel alloc] init];
         _o_sharedInstance = [super init];
+    }
 
     return _o_sharedInstance;
 }
@@ -534,7 +537,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
             o_time = [NSString stringWithUTF8String: secstotimestr( psz_time, (time.i_time / 1000000) )];
 
         [o_time_fld setStringValue: o_time];
-        [[[[VLCMain sharedInstance] controls] fspanel] setStreamPos: f_updated andTime: o_time];
+        [o_fspanel setStreamPos: f_updated andTime: o_time];
         vlc_object_release( p_input );
     }
     [self drawFancyGradientEffectForTimeSlider];
@@ -616,7 +619,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
 
         [o_time_fld setStringValue: o_time];
         [o_time_fld setNeedsDisplay:YES];
-//        [[[[VLCMain sharedInstance] controls] fspanel] setStreamPos: f_updated andTime: o_time];
+        [o_fspanel setStreamPos: f_updated andTime: o_time];
         vlc_object_release( p_input );
     }
     else
@@ -643,7 +646,8 @@ static VLCMainWindow *_o_sharedInstance = nil;
         int i_volume_step = 0;
         i_volume_step = config_GetInt( VLCIntf->p_libvlc, "volume-step" );
         [o_volume_sld setFloatValue: (float)i_lastShownVolume / i_volume_step];
-//        [[[[VLCMain sharedInstance] controls] fspanel] setVolumeLevel: (float)i_lastShownVolume / i_volume_step];
+        if ([o_fspanel respondsToSelector:@selector(setVolumeLevel:)])
+            [o_fspanel setVolumeLevel: (float)i_lastShownVolume / i_volume_step];
     }
 }
 
@@ -695,7 +699,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
         }
 
         [self setTitle: aString];
-        [[[[VLCMain sharedInstance] controls] fspanel] setStreamTitle: aString];
+        [o_fspanel setStreamTitle: aString];
     }
     else
     {
@@ -758,7 +762,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
 
     [o_time_sld setEnabled: b_seekable];
     [self updateTimeSlider];
-    [[[[VLCMain sharedInstance] controls] fspanel] setSeekable: b_seekable];
+    [o_fspanel setSeekable: b_seekable];
 
     PL_LOCK;
     if (playlist_CurrentSize( p_playlist ) >= 1)
@@ -773,6 +777,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
     [o_play_btn setImage: o_pause_img];
     [o_play_btn setAlternateImage: o_pause_pressed_img];
     [o_play_btn setToolTip: _NS("Pause")];
+    [o_fspanel setPause];
 }
 
 - (void)setPlay
@@ -780,6 +785,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
     [o_play_btn setImage: o_play_img];
     [o_play_btn setAlternateImage: o_play_pressed_img];
     [o_play_btn setToolTip: _NS("Play")];
+    [o_fspanel setPlay];
 }
 
 - (void)drawFancyGradientEffectForTimeSlider
@@ -1027,12 +1033,12 @@ static VLCMainWindow *_o_sharedInstance = nil;
     [o_fullscreen_window setAcceptsMouseMovedEvents: TRUE];
 
     /* tell the fspanel to move itself to front next time it's triggered */
-    [[[[VLCMain sharedInstance] controls] fspanel] setVoutWasUpdated: (int)[[o_fullscreen_window screen] displayID]];
+    [o_fspanel setVoutWasUpdated: (int)[[o_fullscreen_window screen] displayID]];
 
     if([self isVisible])
         [super orderOut: self];
 
-    [[[[VLCMain sharedInstance] controls] fspanel] setActive: nil];
+    [o_fspanel setActive: nil];
 
     b_fullscreen = YES;
     [self unlockFullscreenAnimation];
@@ -1076,7 +1082,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
             CGDisplayFade( token, 0.3, kCGDisplayBlendNormal, kCGDisplayBlendSolidColor, 0, 0, 0, YES );
         }
 
-        [[[[VLCMain sharedInstance] controls] fspanel] setNonActive: nil];
+        [o_fspanel setNonActive: nil];
         SetSystemUIMode( kUIModeNormal, kUIOptionAutoShowMenuBar);
 
         /* Will release the lock */
@@ -1098,7 +1104,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
     [self setAlphaValue: 0.0];
     [self orderFront: self];
 
-    [[[[VLCMain sharedInstance] controls] fspanel] setNonActive: nil];
+    [o_fspanel setNonActive: nil];
     SetSystemUIMode( kUIModeNormal, kUIOptionAutoShowMenuBar);
 
     if (o_fullscreen_anim1)

diff --git a/modules/gui/macosx/controls.h b/modules/gui/macosx/controls.h
index 7add587b559a6275766da9990482b276c0d09232..0d9aa367bf5b34dfcfc82733d29711d3645cd581 100644 (file)
--- a/modules/gui/macosx/controls.h
+++ b/modules/gui/macosx/controls.h
@@ -24,8 +24,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#import "fspanel.h"
-
 /*****************************************************************************
  * VLCControls interface
  *****************************************************************************/
@@ -41,8 +39,6 @@
     IBOutlet id o_specificTime_sec_lbl;
     IBOutlet id o_specificTime_stepper;
     IBOutlet id o_specificTime_mi;
-
-    IBOutlet VLCFSPanel *o_fs_panel;
 }
 - (IBAction)play:(id)sender;
 - (IBAction)stop:(id)sender;
@@ -73,7 +69,5 @@
 - (void)scrollWheel: (NSEvent *)theEvent;
 
 - (IBAction)goToSpecificTime:(id)sender;
-
-- (id)fspanel;
 @end
 

diff --git a/modules/gui/macosx/controls.m b/modules/gui/macosx/controls.m
index 226d667f353e1d2d07e963f5131cade89d5567bc..ee2ead6cea13474d341bed6f36fdbdc89fbc05d1 100644 (file)
--- a/modules/gui/macosx/controls.m
+++ b/modules/gui/macosx/controls.m
@@ -46,13 +46,6 @@
  *****************************************************************************/
 @implementation VLCControls
 
-- (id)init
-{
-    [super init];
-    o_fs_panel = [[VLCFSPanel alloc] init];
-    return self;
-}
-
 - (void)awakeFromNib
 {
     [o_specificTime_mi setTitle: _NS("Jump To Time")];
@@ -268,17 +261,6 @@
     }
 }
 
-- (id)fspanel
-{
-    if( o_fs_panel )
-        return o_fs_panel;
-    else
-    {
-        msg_Err( VLCIntf, "FSPanel is nil" );
-        return NULL;
-    }
-}
-
 - (void)scrollWheel:(NSEvent *)theEvent
 {
     intf_thread_t * p_intf = VLCIntf;

diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 47a93ff8717241339df32f1e328a8f929f74cf67..103e00ce4a5b0124a0b577b9facc3abe8c9a8d0c 100644 (file)
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -42,7 +42,6 @@
 #import "intf.h"
 #import "MainMenu.h"
 #import "MainWindow.h"
-#import "fspanel.h"
 #import "vout.h"
 #import "prefs.h"
 #import "playlist.h"
@@ -362,7 +361,7 @@ static int ShowController( vlc_object_t *p_this, const char *psz_variable,
     intf_thread_t * p_intf = VLCIntf;
     if( p_intf && p_intf->p_sys )
     {
-        NSLog( @"fixme! we should implement ShowController here" );
+//        [[[VLCMain sharedInstance] fspanel] makeKeyAndOrderFront: nil];
     }
     return VLC_SUCCESS;
 }
@@ -507,8 +506,6 @@ static VLCMain *_o_sharedMainInstance = nil;
 
     o_msg_lock = [[NSLock alloc] init];
     o_msg_arr = [[NSMutableArray arrayWithCapacity: 600] retain];
-    /* subscribe to LibVLC's debug messages as early as possible (for us) */
-    [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(libvlcMessageReceived:) name: @"VLCCoreMessageReceived" object: nil];
 
     o_open = [[VLCOpen alloc] init];
     //o_embedded_list = [[VLCEmbeddedList alloc] init];
@@ -1308,7 +1305,6 @@ unsigned int CocoaKeyToVLC( unichar i_key )
         int state = var_GetInteger( p_input, "state" );
         if( state == PLAYING_S )
         {
-            [[[self controls] fspanel] setPause];
             [[self mainMenu] setPause];
             [o_mainwindow setPause];
         }
@@ -1316,7 +1312,6 @@ unsigned int CocoaKeyToVLC( unichar i_key )
         {
             if (state == END_S)
                 [o_mainmenu setSubmenusEnabled: FALSE];
-            [[[self controls] fspanel] setPlay];
             [[self mainMenu] setPlay];
             [o_mainwindow setPlay];
         }