Skip to content

V
vlc-gpu
Commit e6d7a9db authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

macosx: removed the outdated and dysfunctional service discovery menu items... 

macosx: removed the outdated and dysfunctional service discovery menu items from both the playlist and the main menu

(manually cherry-picked from 5e8666c883f3653b6c9a1e1a94515947df17a20a)
parent b74a6a68
Show whitespace changes
Inline Side-by-side
Showing with 387 additions and 220 deletions
extras/package/macosx/Resources/English.lproj/MainMenu.xib
View file @ e6d7a9db
...@@ -2,10 +2,10 @@ ...@@ -2,10 +2,10 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10"> <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data> <data>
<int key="IBDocument.SystemTarget">1050</int> <int key="IBDocument.SystemTarget">1050</int>
<string key="IBDocument.SystemVersion">11D50</string> <string key="IBDocument.SystemVersion">11E53</string>
<string key="IBDocument.InterfaceBuilderVersion">851</string> <string key="IBDocument.InterfaceBuilderVersion">851</string>
<string key="IBDocument.AppKitVersion">1138.32</string> <string key="IBDocument.AppKitVersion">1138.47</string>
<string key="IBDocument.HIToolboxVersion">568.00</string> <string key="IBDocument.HIToolboxVersion">569.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys"> <object class="NSArray" key="dict.sortedKeys">
...@@ -21,20 +21,16 @@ ...@@ -21,20 +21,16 @@
</object> </object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<integer value="2770"/>
<integer value="235"/>
<integer value="2730"/>
<integer value="4756"/>
<integer value="4722"/>
<integer value="4850"/> <integer value="4850"/>
<integer value="4596"/>
<integer value="4722"/>
<integer value="21"/>
<integer value="4948"/> <integer value="4948"/>
<integer value="915"/>
<integer value="2730"/> <integer value="2730"/>
<integer value="2770"/>
<integer value="915"/>
<integer value="1617"/> <integer value="1617"/>
<integer value="205"/> <integer value="81"/>
<integer value="21"/>
<integer value="4948"/>
<integer value="4596"/>
</object> </object>
<object class="NSArray" key="IBDocument.PluginDependencies"> <object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
...@@ -1453,22 +1449,6 @@ ...@@ -1453,22 +1449,6 @@
<string key="NSName">_NSRecentDocumentsMenu</string> <string key="NSName">_NSRecentDocumentsMenu</string>
</object> </object>
</object> </object>
<object class="NSMenuItem" id="998443130">
<reference key="NSMenu" ref="1050252183"/>
<string key="NSTitle">Services Discovery</string>
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="447396056"/>
<reference key="NSMixedImage" ref="100133332"/>
<string key="NSAction">submenuAction:</string>
<object class="NSMenu" key="NSSubmenu" id="1017825917">
<string key="NSTitle">Services Discovery</string>
<object class="NSMutableArray" key="NSMenuItems">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
</object>
</object>
<object class="NSMenuItem" id="764543718"> <object class="NSMenuItem" id="764543718">
<reference key="NSMenu" ref="1050252183"/> <reference key="NSMenu" ref="1050252183"/>
<bool key="NSIsDisabled">YES</bool> <bool key="NSIsDisabled">YES</bool>
...@@ -2926,33 +2906,6 @@ ...@@ -2926,33 +2906,6 @@
<reference key="NSOnImage" ref="447396056"/> <reference key="NSOnImage" ref="447396056"/>
<reference key="NSMixedImage" ref="100133332"/> <reference key="NSMixedImage" ref="100133332"/>
</object> </object>
<object class="NSMenuItem" id="308359387">
<reference key="NSMenu" ref="966937735"/>
<bool key="NSIsDisabled">YES</bool>
<bool key="NSIsSeparator">YES</bool>
<string key="NSTitle"/>
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="447396056"/>
<reference key="NSMixedImage" ref="100133332"/>
</object>
<object class="NSMenuItem" id="202444850">
<reference key="NSMenu" ref="966937735"/>
<string key="NSTitle">Services discovery</string>
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="447396056"/>
<reference key="NSMixedImage" ref="100133332"/>
<string key="NSAction">submenuAction:</string>
<object class="NSMenu" key="NSSubmenu" id="132244936">
<string key="NSTitle">Services discovery</string>
<object class="NSMutableArray" key="NSMenuItems">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
</object>
</object>
</object> </object>
<string key="NSName"/> <string key="NSName"/>
<bool key="NSNoAutoenable">YES</bool> <bool key="NSNoAutoenable">YES</bool>
...@@ -5325,38 +5278,6 @@ LCAuLi4</string> ...@@ -5325,38 +5278,6 @@ LCAuLi4</string>
</object> </object>
<int key="connectionID">2246</int> <int key="connectionID">2246</int>
</object> </object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_mi_services</string>
<reference key="source" ref="998338913"/>
<reference key="destination" ref="202444850"/>
</object>
<int key="connectionID">2281</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_mu_services</string>
<reference key="source" ref="998338913"/>
<reference key="destination" ref="132244936"/>
</object>
<int key="connectionID">2283</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_mm_mi_services</string>
<reference key="source" ref="998338913"/>
<reference key="destination" ref="998443130"/>
</object>
<int key="connectionID">2295</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_mm_mu_services</string>
<reference key="source" ref="998338913"/>
<reference key="destination" ref="1017825917"/>
</object>
<int key="connectionID">2296</int>
</object>
<object class="IBConnectionRecord"> <object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection"> <object class="IBActionConnection" key="connection">
<string key="label">savePlaylist:</string> <string key="label">savePlaylist:</string>
...@@ -8285,7 +8206,6 @@ LCAuLi4</string> ...@@ -8285,7 +8206,6 @@ LCAuLi4</string>
<reference ref="935741430"/> <reference ref="935741430"/>
<reference ref="47280649"/> <reference ref="47280649"/>
<reference ref="754650504"/> <reference ref="754650504"/>
<reference ref="998443130"/>
<reference ref="630566305"/> <reference ref="630566305"/>
<reference ref="502289002"/> <reference ref="502289002"/>
<reference ref="571184165"/> <reference ref="571184165"/>
...@@ -8330,20 +8250,6 @@ LCAuLi4</string> ...@@ -8330,20 +8250,6 @@ LCAuLi4</string>
<reference key="object" ref="754650504"/> <reference key="object" ref="754650504"/>
<reference key="parent" ref="1050252183"/> <reference key="parent" ref="1050252183"/>
</object> </object>
<object class="IBObjectRecord">
<int key="objectID">2294</int>
<reference key="object" ref="998443130"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="1017825917"/>
</object>
<reference key="parent" ref="1050252183"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">2293</int>
<reference key="object" ref="1017825917"/>
<reference key="parent" ref="998443130"/>
</object>
<object class="IBObjectRecord"> <object class="IBObjectRecord">
<int key="objectID">2306</int> <int key="objectID">2306</int>
<reference key="object" ref="630566305"/> <reference key="object" ref="630566305"/>
...@@ -9069,8 +8975,6 @@ LCAuLi4</string> ...@@ -9069,8 +8975,6 @@ LCAuLi4</string>
<reference ref="385115394"/> <reference ref="385115394"/>
<reference ref="132197193"/> <reference ref="132197193"/>
<reference ref="856840234"/> <reference ref="856840234"/>
<reference ref="308359387"/>
<reference ref="202444850"/>
<reference ref="567652292"/> <reference ref="567652292"/>
<reference ref="725223680"/> <reference ref="725223680"/>
<reference ref="494756783"/> <reference ref="494756783"/>
...@@ -9124,25 +9028,6 @@ LCAuLi4</string> ...@@ -9124,25 +9028,6 @@ LCAuLi4</string>
<reference key="object" ref="856840234"/> <reference key="object" ref="856840234"/>
<reference key="parent" ref="966937735"/> <reference key="parent" ref="966937735"/>
</object> </object>
<object class="IBObjectRecord">
<int key="objectID">2261</int>
<reference key="object" ref="308359387"/>
<reference key="parent" ref="966937735"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">2263</int>
<reference key="object" ref="202444850"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="132244936"/>
</object>
<reference key="parent" ref="966937735"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">2271</int>
<reference key="object" ref="132244936"/>
<reference key="parent" ref="202444850"/>
</object>
<object class="IBObjectRecord"> <object class="IBObjectRecord">
<int key="objectID">2312</int> <int key="objectID">2312</int>
<reference key="object" ref="567652292"/> <reference key="object" ref="567652292"/>
...@@ -11242,17 +11127,6 @@ LCAuLi4</string> ...@@ -11242,17 +11127,6 @@ LCAuLi4</string>
<string>2241.ImportedFromIB2</string> <string>2241.ImportedFromIB2</string>
<string>2249.IBPluginDependency</string> <string>2249.IBPluginDependency</string>
<string>2249.ImportedFromIB2</string> <string>2249.ImportedFromIB2</string>
<string>2261.IBPluginDependency</string>
<string>2261.ImportedFromIB2</string>
<string>2263.IBPluginDependency</string>
<string>2263.ImportedFromIB2</string>
<string>2271.IBPluginDependency</string>
<string>2271.ImportedFromIB2</string>
<string>2293.IBEditorWindowLastContentRect</string>
<string>2293.IBPluginDependency</string>
<string>2293.ImportedFromIB2</string>
<string>2294.IBPluginDependency</string>
<string>2294.ImportedFromIB2</string>
<string>2298.IBPluginDependency</string> <string>2298.IBPluginDependency</string>
<string>2298.ImportedFromIB2</string> <string>2298.ImportedFromIB2</string>
<string>23.IBPluginDependency</string> <string>23.IBPluginDependency</string>
...@@ -12058,7 +11932,7 @@ LCAuLi4</string> ...@@ -12058,7 +11932,7 @@ LCAuLi4</string>
<boolean value="YES"/> <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/> <boolean value="YES"/>
<string>{{619, 772}, {137, 103}}</string> <string>{{600, 633}, {137, 103}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/> <boolean value="YES"/>
<string>{{363, 446}, {604, 310}}</string> <string>{{363, 446}, {604, 310}}</string>
...@@ -12096,9 +11970,6 @@ LCAuLi4</string> ...@@ -12096,9 +11970,6 @@ LCAuLi4</string>
<boolean value="YES"/> <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/> <boolean value="YES"/>
<string>{{1004, 600}, {64, 6}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/> <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
...@@ -12107,15 +11978,7 @@ LCAuLi4</string> ...@@ -12107,15 +11978,7 @@ LCAuLi4</string>
<boolean value="YES"/> <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/> <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>{{644, 373}, {222, 363}}</string>
<boolean value="YES"/>
<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>{{956, 323}, {302, 413}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/> <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
...@@ -12284,7 +12147,7 @@ LCAuLi4</string> ...@@ -12284,7 +12147,7 @@ LCAuLi4</string>
<boolean value="YES"/> <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/> <boolean value="YES"/>
<string>{{812, 736}, {468, 20}}</string> <string>{{500, 736}, {468, 20}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/> <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
...@@ -12807,7 +12670,7 @@ LCAuLi4</string> ...@@ -12807,7 +12670,7 @@ LCAuLi4</string>
<boolean value="YES"/> <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/> <boolean value="YES"/>
<string>{{387, 419}, {297, 243}}</string> <string>{{558, 513}, {297, 223}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/> <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
...@@ -12816,7 +12679,7 @@ LCAuLi4</string> ...@@ -12816,7 +12679,7 @@ LCAuLi4</string>
<boolean value="YES"/> <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/> <boolean value="YES"/>
<string>{{347, 114}, {205, 263}}</string> <string>{{347, 144}, {205, 233}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/> <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
...@@ -17403,6 +17266,379 @@ LCAuLi4</string> ...@@ -17403,6 +17266,379 @@ LCAuLi4</string>
</object> </object>
<reference key="sourceIdentifier" ref="672431580"/> <reference key="sourceIdentifier" ref="672431580"/>
</object> </object>
<object class="IBPartialClassDescription">
<string key="className">VLCPlaylist</string>
<string key="superclassName">VLCPlaylistCommon</string>
<object class="NSMutableDictionary" key="actions">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>deleteItem:</string>
<string>downloadCoverArt:</string>
<string>playItem:</string>
<string>preparseItem:</string>
<string>recursiveExpandNode:</string>
<string>revealItemInFinder:</string>
<string>savePlaylist:</string>
<string>searchItem:</string>
<string>selectAll:</string>
<string>servicesChange:</string>
<string>sortNodeByAuthor:</string>
<string>sortNodeByName:</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>
</object>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>deleteItem:</string>
<string>downloadCoverArt:</string>
<string>playItem:</string>
<string>preparseItem:</string>
<string>recursiveExpandNode:</string>
<string>revealItemInFinder:</string>
<string>savePlaylist:</string>
<string>searchItem:</string>
<string>selectAll:</string>
<string>servicesChange:</string>
<string>sortNodeByAuthor:</string>
<string>sortNodeByName:</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBActionInfo">
<string key="name">deleteItem:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">downloadCoverArt:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">playItem:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">preparseItem:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">recursiveExpandNode:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">revealItemInFinder:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">savePlaylist:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">searchItem:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">selectAll:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">servicesChange:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">sortNodeByAuthor:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">sortNodeByName:</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_btn_playlist</string>
<string>o_controller</string>
<string>o_ctx_menu</string>
<string>o_mi_delete</string>
<string>o_mi_dl_cover_art</string>
<string>o_mi_info</string>
<string>o_mi_play</string>
<string>o_mi_preparse</string>
<string>o_mi_recursive_expand</string>
<string>o_mi_revealInFinder</string>
<string>o_mi_save_playlist</string>
<string>o_mi_selectall</string>
<string>o_mi_sort_author</string>
<string>o_mi_sort_name</string>
<string>o_mm_mi_revealInFinder</string>
<string>o_playlist_view</string>
<string>o_playlist_wizard</string>
<string>o_save_accessory_popup</string>
<string>o_save_accessory_text</string>
<string>o_save_accessory_view</string>
<string>o_search_field</string>
<string>o_search_field_other</string>
<string>o_tc_sortColumn</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>
</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_btn_playlist</string>
<string>o_controller</string>
<string>o_ctx_menu</string>
<string>o_mi_delete</string>
<string>o_mi_dl_cover_art</string>
<string>o_mi_info</string>
<string>o_mi_play</string>
<string>o_mi_preparse</string>
<string>o_mi_recursive_expand</string>
<string>o_mi_revealInFinder</string>
<string>o_mi_save_playlist</string>
<string>o_mi_selectall</string>
<string>o_mi_sort_author</string>
<string>o_mi_sort_name</string>
<string>o_mm_mi_revealInFinder</string>
<string>o_playlist_view</string>
<string>o_playlist_wizard</string>
<string>o_save_accessory_popup</string>
<string>o_save_accessory_text</string>
<string>o_save_accessory_view</string>
<string>o_search_field</string>
<string>o_search_field_other</string>
<string>o_tc_sortColumn</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBToOneOutletInfo">
<string key="name">o_btn_playlist</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_controller</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_ctx_menu</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_mi_delete</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_mi_dl_cover_art</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_mi_info</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_mi_play</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_mi_preparse</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_mi_recursive_expand</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_mi_revealInFinder</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_mi_save_playlist</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_mi_selectall</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_mi_sort_author</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_mi_sort_name</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_mm_mi_revealInFinder</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_playlist_view</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_playlist_wizard</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_save_accessory_popup</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_save_accessory_text</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_save_accessory_view</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_search_field</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_search_field_other</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_tc_sortColumn</string>
<string key="candidateClassName">id</string>
</object>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="98033026">
<string key="majorKey">IBDocumentRelativeSource</string>
<string key="minorKey">../../../../../modules/gui/macosx/playlist.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">VLCPlaylistCommon</string>
<string key="superclassName">NSObject</string>
<object class="NSMutableDictionary" key="outlets">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>o_outline_view</string>
<string>o_outline_view_other</string>
<string>o_tc_author</string>
<string>o_tc_author_other</string>
<string>o_tc_duration</string>
<string>o_tc_duration_other</string>
<string>o_tc_name</string>
<string>o_tc_name_other</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>VLCPlaylistView</string>
<string>VLCPlaylistView</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_outline_view</string>
<string>o_outline_view_other</string>
<string>o_tc_author</string>
<string>o_tc_author_other</string>
<string>o_tc_duration</string>
<string>o_tc_duration_other</string>
<string>o_tc_name</string>
<string>o_tc_name_other</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBToOneOutletInfo">
<string key="name">o_outline_view</string>
<string key="candidateClassName">VLCPlaylistView</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_outline_view_other</string>
<string key="candidateClassName">VLCPlaylistView</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_tc_author</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_tc_author_other</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_tc_duration</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_tc_duration_other</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_tc_name</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_tc_name_other</string>
<string key="candidateClassName">id</string>
</object>
</object>
</object>
<reference key="sourceIdentifier" ref="98033026"/>
</object>
<object class="IBPartialClassDescription">
<string key="className">VLCPlaylistView</string>
<string key="superclassName">NSOutlineView</string>
<reference key="sourceIdentifier" ref="98033026"/>
</object>
<object class="IBPartialClassDescription"> <object class="IBPartialClassDescription">
<string key="className">VLCResizeControl</string> <string key="className">VLCResizeControl</string>
<string key="superclassName">NSImageView</string> <string key="superclassName">NSImageView</string>
......
modules/gui/macosx/playlist.h
View file @ e6d7a9db
...@@ -99,14 +99,6 @@ ...@@ -99,14 +99,6 @@
IBOutlet id o_mi_sort_author; IBOutlet id o_mi_sort_author;
IBOutlet id o_mi_recursive_expand; IBOutlet id o_mi_recursive_expand;
/* "services discovery" menu in the playlist menu */
IBOutlet id o_mi_services;
IBOutlet id o_mu_services;
/* "services discovery" menu in the main menu */
IBOutlet id o_mm_mi_services;
IBOutlet id o_mm_mu_services;
IBOutlet id o_save_accessory_view; IBOutlet id o_save_accessory_view;
IBOutlet id o_save_accessory_popup; IBOutlet id o_save_accessory_popup;
IBOutlet id o_save_accessory_text; IBOutlet id o_save_accessory_text;
......
modules/gui/macosx/playlist.m
View file @ e6d7a9db
...@@ -27,8 +27,6 @@ ...@@ -27,8 +27,6 @@
/* TODO /* TODO
* add 'icons' for different types of nodes? (http://www.cocoadev.com/index.pl?IconAndTextInTableCell) * add 'icons' for different types of nodes? (http://www.cocoadev.com/index.pl?IconAndTextInTableCell)
* reimplement enable/disable item * reimplement enable/disable item
* create a new 'tool' button (see the gear button in the Finder window) for 'actions'
(adding service discovery, other views, new node/playlist, save node/playlist) stuff like that
*/ */
...@@ -51,7 +49,6 @@ ...@@ -51,7 +49,6 @@
#import "open.h" #import "open.h"
#include <vlc_keys.h> #include <vlc_keys.h>
#import <vlc_services_discovery.h>
#import <vlc_osd.h> #import <vlc_osd.h>
#import <vlc_interface.h> #import <vlc_interface.h>
...@@ -464,45 +461,6 @@ ...@@ -464,45 +461,6 @@
o_descendingSortingImage = [[NSOutlineView class] _defaultTableHeaderReverseSortImage]; o_descendingSortingImage = [[NSOutlineView class] _defaultTableHeaderReverseSortImage];
o_tc_sortColumn = nil; o_tc_sortColumn = nil;
#if 0
char ** ppsz_name;
char ** ppsz_services = vlc_sd_GetNames( VLCIntf, &ppsz_name, NULL );
if( !ppsz_services )
return;
for( i = 0; ppsz_services[i]; i++ )
{
bool b_enabled;
NSMenuItem *o_lmi;
char * name = ppsz_name[i] ? ppsz_name[i] : ppsz_services[i];
/* Check whether to enable these menuitems */
b_enabled = playlist_IsServicesDiscoveryLoaded( p_playlist, ppsz_services[i] );
/* Create the menu entries used in the playlist menu */
o_lmi = [[o_mi_services submenu] addItemWithTitle:
[NSString stringWithUTF8String: name]
action: @selector(servicesChange:)
keyEquivalent: @""];
[o_lmi setTarget: self];
[o_lmi setRepresentedObject: [NSString stringWithUTF8String: ppsz_services[i]]];
if( b_enabled ) [o_lmi setState: NSOnState];
/* Create the menu entries for the main menu */
o_lmi = [[o_mm_mi_services submenu] addItemWithTitle:
[NSString stringWithUTF8String: name]
action: @selector(servicesChange:)
keyEquivalent: @""];
[o_lmi setTarget: self];
[o_lmi setRepresentedObject: [NSString stringWithUTF8String: ppsz_services[i]]];
if( b_enabled ) [o_lmi setState: NSOnState];
free( ppsz_services[i] );
free( ppsz_name[i] );
}
free( ppsz_services );
free( ppsz_name );
#endif
} }
- (void)searchfieldChanged:(NSNotification *)o_notification - (void)searchfieldChanged:(NSNotification *)o_notification
...@@ -527,8 +485,6 @@ ...@@ -527,8 +485,6 @@
[[o_mm_mi_revealInFinder menu] setAutoenablesItems: NO]; [[o_mm_mi_revealInFinder menu] setAutoenablesItems: NO];
[o_mi_sort_name setTitle: _NS("Sort Node by Name")]; [o_mi_sort_name setTitle: _NS("Sort Node by Name")];
[o_mi_sort_author setTitle: _NS("Sort Node by Author")]; [o_mi_sort_author setTitle: _NS("Sort Node by Author")];
[o_mi_services setTitle: _NS("Services discovery")];
[o_mm_mi_services setTitle: _NS("Services discovery")];
[o_search_field setToolTip: _NS("Search in Playlist")]; [o_search_field setToolTip: _NS("Search in Playlist")];
[o_search_field_other setToolTip: _NS("Search in Playlist")]; [o_search_field_other setToolTip: _NS("Search in Playlist")];
...@@ -933,23 +889,6 @@ ...@@ -933,23 +889,6 @@
[self playlistUpdated]; [self playlistUpdated];
} }
- (IBAction)servicesChange:(id)sender
{
NSMenuItem *o_mi = (NSMenuItem *)sender;
NSString *o_string = [o_mi representedObject];
playlist_t * p_playlist = pl_Get( VLCIntf );
if( !playlist_IsServicesDiscoveryLoaded( p_playlist, [o_string UTF8String] ) )
playlist_ServicesDiscoveryAdd( p_playlist, [o_string UTF8String] );
else
playlist_ServicesDiscoveryRemove( p_playlist, [o_string UTF8String] );
[o_mi setState: playlist_IsServicesDiscoveryLoaded( p_playlist,
[o_string UTF8String] ) ? YES : NO];
[self playlistUpdated];
return;
}
- (IBAction)selectAll:(id)sender - (IBAction)selectAll:(id)sender
{ {
[o_outline_view selectAll: nil]; [o_outline_view selectAll: nil];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment