Skip to content

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

macosx: fixed delete menu item for the playlist table 

(cherry picked from commit b54ea14fb14faa924b7353a4112ecab8c719b604)
parent 59947987
Show whitespace changes
Inline Side-by-side
Showing with 66 additions and 251 deletions
extras/package/macosx/Resources/English.lproj/MainMenu.xib
View file @ 8c411815
...@@ -21,15 +21,15 @@ ...@@ -21,15 +21,15 @@
</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="4850"/>
<integer value="4722"/> <integer value="4722"/>
<integer value="4596"/>
<integer value="2"/>
<integer value="29"/>
<integer value="2730"/>
<integer value="915"/> <integer value="915"/>
<integer value="4948"/> <integer value="2730"/>
<integer value="1617"/> <integer value="1617"/>
<integer value="4850"/> <integer value="205"/>
<integer value="21"/>
<integer value="4948"/>
<integer value="4596"/>
<integer value="2770"/> <integer value="2770"/>
</object> </object>
<object class="NSArray" key="IBDocument.PluginDependencies"> <object class="NSArray" key="IBDocument.PluginDependencies">
...@@ -1570,11 +1570,10 @@ ...@@ -1570,11 +1570,10 @@
<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="131946062"> <object class="NSMenuItem" id="454498061">
<reference key="NSMenu" ref="701329419"/> <reference key="NSMenu" ref="701329419"/>
<string key="NSTitle">Clear</string> <string key="NSTitle">Delete</string>
<string key="NSKeyEquiv"/> <string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int> <int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="447396056"/> <reference key="NSOnImage" ref="447396056"/>
<reference key="NSMixedImage" ref="100133332"/> <reference key="NSMixedImage" ref="100133332"/>
...@@ -4996,14 +4995,6 @@ LCAuLi4</string> ...@@ -4996,14 +4995,6 @@ LCAuLi4</string>
</object> </object>
<int key="connectionID">228</int> <int key="connectionID">228</int>
</object> </object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">clear:</string>
<reference key="source" ref="936559509"/>
<reference key="destination" ref="131946062"/>
</object>
<int key="connectionID">229</int>
</object>
<object class="IBConnectionRecord"> <object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection"> <object class="IBActionConnection" key="connection">
<string key="label">selectAll:</string> <string key="label">selectAll:</string>
...@@ -6012,14 +6003,6 @@ LCAuLi4</string> ...@@ -6012,14 +6003,6 @@ LCAuLi4</string>
</object> </object>
<int key="connectionID">4457</int> <int key="connectionID">4457</int>
</object> </object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_mi_clear</string>
<reference key="source" ref="651263286"/>
<reference key="destination" ref="131946062"/>
</object>
<int key="connectionID">4458</int>
</object>
<object class="IBConnectionRecord"> <object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection"> <object class="IBOutletConnection" key="connection">
<string key="label">o_mi_close_window</string> <string key="label">o_mi_close_window</string>
...@@ -7972,6 +7955,22 @@ LCAuLi4</string> ...@@ -7972,6 +7955,22 @@ LCAuLi4</string>
</object> </object>
<int key="connectionID">5007</int> <int key="connectionID">5007</int>
</object> </object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">delete:</string>
<reference key="source" ref="936559509"/>
<reference key="destination" ref="454498061"/>
</object>
<int key="connectionID">5085</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_mi_clear</string>
<reference key="source" ref="651263286"/>
<reference key="destination" ref="454498061"/>
</object>
<int key="connectionID">5086</int>
</object>
</object> </object>
<object class="IBMutableOrderedSet" key="objectRecords"> <object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects"> <object class="NSArray" key="orderedObjects">
...@@ -8385,8 +8384,8 @@ LCAuLi4</string> ...@@ -8385,8 +8384,8 @@ LCAuLi4</string>
<reference ref="27954363"/> <reference ref="27954363"/>
<reference ref="10631197"/> <reference ref="10631197"/>
<reference ref="138659286"/> <reference ref="138659286"/>
<reference ref="131946062"/>
<reference ref="73532346"/> <reference ref="73532346"/>
<reference ref="454498061"/>
</object> </object>
<reference key="parent" ref="987792194"/> <reference key="parent" ref="987792194"/>
</object> </object>
...@@ -8405,11 +8404,6 @@ LCAuLi4</string> ...@@ -8405,11 +8404,6 @@ LCAuLi4</string>
<reference key="object" ref="138659286"/> <reference key="object" ref="138659286"/>
<reference key="parent" ref="701329419"/> <reference key="parent" ref="701329419"/>
</object> </object>
<object class="IBObjectRecord">
<int key="objectID">202</int>
<reference key="object" ref="131946062"/>
<reference key="parent" ref="701329419"/>
</object>
<object class="IBObjectRecord"> <object class="IBObjectRecord">
<int key="objectID">203</int> <int key="objectID">203</int>
<reference key="object" ref="73532346"/> <reference key="object" ref="73532346"/>
...@@ -11025,6 +11019,11 @@ LCAuLi4</string> ...@@ -11025,6 +11019,11 @@ LCAuLi4</string>
<reference key="object" ref="966879065"/> <reference key="object" ref="966879065"/>
<reference key="parent" ref="101195702"/> <reference key="parent" ref="101195702"/>
</object> </object>
<object class="IBObjectRecord">
<int key="objectID">5084</int>
<reference key="object" ref="454498061"/>
<reference key="parent" ref="701329419"/>
</object>
</object> </object>
</object> </object>
<object class="NSMutableDictionary" key="flattenedProperties"> <object class="NSMutableDictionary" key="flattenedProperties">
...@@ -11209,8 +11208,6 @@ LCAuLi4</string> ...@@ -11209,8 +11208,6 @@ LCAuLi4</string>
<string>1997.ImportedFromIB2</string> <string>1997.ImportedFromIB2</string>
<string>2.IBPluginDependency</string> <string>2.IBPluginDependency</string>
<string>2.ImportedFromIB2</string> <string>2.ImportedFromIB2</string>
<string>202.IBPluginDependency</string>
<string>202.ImportedFromIB2</string>
<string>203.IBPluginDependency</string> <string>203.IBPluginDependency</string>
<string>203.ImportedFromIB2</string> <string>203.ImportedFromIB2</string>
<string>205.IBEditorWindowLastContentRect</string> <string>205.IBEditorWindowLastContentRect</string>
...@@ -11836,6 +11833,7 @@ LCAuLi4</string> ...@@ -11836,6 +11833,7 @@ LCAuLi4</string>
<string>5004.CustomClassName</string> <string>5004.CustomClassName</string>
<string>5004.IBPluginDependency</string> <string>5004.IBPluginDependency</string>
<string>5005.IBPluginDependency</string> <string>5005.IBPluginDependency</string>
<string>5084.IBPluginDependency</string>
<string>56.IBPluginDependency</string> <string>56.IBPluginDependency</string>
<string>56.ImportedFromIB2</string> <string>56.ImportedFromIB2</string>
<string>57.IBEditorWindowLastContentRect</string> <string>57.IBEditorWindowLastContentRect</string>
...@@ -12058,9 +12056,7 @@ LCAuLi4</string> ...@@ -12058,9 +12056,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>{{619, 772}, {137, 103}}</string>
<boolean value="YES"/>
<string>{{430, 565}, {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>
...@@ -12117,7 +12113,7 @@ LCAuLi4</string> ...@@ -12117,7 +12113,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>{{515, 299}, {222, 363}}</string> <string>{{461, 86}, {222, 363}}</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>
...@@ -12286,7 +12282,7 @@ LCAuLi4</string> ...@@ -12286,7 +12282,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>{{317, 449}, {468, 20}}</string> <string>{{519, 875}, {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>
...@@ -12796,6 +12792,7 @@ LCAuLi4</string> ...@@ -12796,6 +12792,7 @@ LCAuLi4</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/> <boolean value="YES"/>
<string>{{329, 186}, {267, 263}}</string> <string>{{329, 186}, {267, 263}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
...@@ -12852,7 +12849,7 @@ LCAuLi4</string> ...@@ -12852,7 +12849,7 @@ LCAuLi4</string>
</object> </object>
</object> </object>
<nil key="sourceID"/> <nil key="sourceID"/>
<int key="maxID">5007</int> <int key="maxID">5086</int>
</object> </object>
<object class="IBClassDescriber" key="IBDocument.Classes"> <object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions"> <object class="NSMutableArray" key="referencedPartialClassDescriptions">
...@@ -12941,218 +12938,6 @@ LCAuLi4</string> ...@@ -12941,218 +12938,6 @@ LCAuLi4</string>
<string key="minorKey">../../../modules/gui/macosx/intf.h</string> <string key="minorKey">../../../modules/gui/macosx/intf.h</string>
</object> </object>
</object> </object>
<object class="IBPartialClassDescription">
<string key="className">VLCBookmarks</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>add:</string>
<string>clear:</string>
<string>edit:</string>
<string>edit_cancel:</string>
<string>edit_ok:</string>
<string>extract:</string>
<string>goToBookmark:</string>
<string>remove:</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>
</object>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>add:</string>
<string>clear:</string>
<string>edit:</string>
<string>edit_cancel:</string>
<string>edit_ok:</string>
<string>extract:</string>
<string>goToBookmark:</string>
<string>remove:</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBActionInfo">
<string key="name">add:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">clear:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">edit:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">edit_cancel:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">edit_ok:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">extract:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">goToBookmark:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">remove:</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_window</string>
<string>o_btn_add</string>
<string>o_btn_clear</string>
<string>o_btn_edit</string>
<string>o_btn_extract</string>
<string>o_btn_rm</string>
<string>o_edit_btn_cancel</string>
<string>o_edit_btn_ok</string>
<string>o_edit_fld_bytes</string>
<string>o_edit_fld_name</string>
<string>o_edit_fld_time</string>
<string>o_edit_lbl_bytes</string>
<string>o_edit_lbl_name</string>
<string>o_edit_lbl_time</string>
<string>o_edit_window</string>
<string>o_tbl_dataTable</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>
</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_window</string>
<string>o_btn_add</string>
<string>o_btn_clear</string>
<string>o_btn_edit</string>
<string>o_btn_extract</string>
<string>o_btn_rm</string>
<string>o_edit_btn_cancel</string>
<string>o_edit_btn_ok</string>
<string>o_edit_fld_bytes</string>
<string>o_edit_fld_name</string>
<string>o_edit_fld_time</string>
<string>o_edit_lbl_bytes</string>
<string>o_edit_lbl_name</string>
<string>o_edit_lbl_time</string>
<string>o_edit_window</string>
<string>o_tbl_dataTable</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBToOneOutletInfo">
<string key="name">o_bookmarks_window</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_btn_add</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_btn_clear</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_btn_edit</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_btn_extract</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_btn_rm</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_edit_btn_cancel</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_edit_btn_ok</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_edit_fld_bytes</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_edit_fld_name</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_edit_fld_time</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_edit_lbl_bytes</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_edit_lbl_name</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_edit_lbl_time</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_edit_window</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_tbl_dataTable</string>
<string key="candidateClassName">id</string>
</object>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">../../../modules/gui/macosx/bookmarks.h</string>
</object>
</object>
<object class="IBPartialClassDescription"> <object class="IBPartialClassDescription">
<string key="className">VLCControls</string> <string key="className">VLCControls</string>
<string key="superclassName">NSObject</string> <string key="superclassName">NSObject</string>
......
modules/gui/macosx/playlist.m
View file @ 8c411815
...@@ -97,6 +97,36 @@ ...@@ -97,6 +97,36 @@
} }
} }
- (BOOL)validateMenuItem:(NSMenuItem *)item
{
if (([self numberOfSelectedRows] >= 1 && [item action] == @selector(delete:)) || [item action] == @selector(selectAll:))
return YES;
return NO;
}
- (BOOL) acceptsFirstResponder
{
return YES;
}
- (BOOL) becomeFirstResponder
{
[self setNeedsDisplay:YES];
return YES;
}
- (BOOL) resignFirstResponder
{
[self setNeedsDisplay:YES];
return YES;
}
- (IBAction)delete:(id)sender
{
[[[VLCMain sharedInstance] playlist] deleteItem: sender];
}
@end @end
/***************************************************************************** /*****************************************************************************
......
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