Commit 27be3b6e authored by Felix Paul Kühne's avatar Felix Paul Kühne

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

macosx: move VLCFSPanel from VLCControls to VLCMainWindow since its the only class which should know about it
parent 8c2eb7b4
......@@ -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">