Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
d6d75822
Commit
d6d75822
authored
Mar 13, 2012
by
David Fuhrmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: implement double click for hotkey prefs
parent
07616a8e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
6 deletions
+16
-6
extras/package/macosx/Resources/English.lproj/Preferences.xib
...as/package/macosx/Resources/English.lproj/Preferences.xib
+6
-6
modules/gui/macosx/simple_prefs.m
modules/gui/macosx/simple_prefs.m
+10
-0
No files found.
extras/package/macosx/Resources/English.lproj/Preferences.xib
View file @
d6d75822
...
...
@@ -12,10 +12,11 @@
</object>
<object
class=
"NSMutableArray"
key=
"IBDocument.EditedObjectIDs"
>
<bool
key=
"EncodedWithXMLCoder"
>
YES
</bool>
<integer
value=
"2311"
/>
<integer
value=
"2265"
/>
<integer
value=
"2668"
/>
<integer
value=
"2440"
/>
<integer
value=
"2311"
/>
<integer
value=
"2562"
/>
<integer
value=
"2265"
/>
</object>
<object
class=
"NSArray"
key=
"IBDocument.PluginDependencies"
>
<bool
key=
"EncodedWithXMLCoder"
>
YES
</bool>
...
...
@@ -3707,7 +3708,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string
key=
"NSExtension"
>
NSResponder
</string>
</object>
<object
class=
"NSCustomView"
id=
"48286561"
>
<
nil
key=
"NSNextResponder"
/>
<
reference
key=
"NSNextResponder"
/>
<int
key=
"NSvFlags"
>
256
</int>
<object
class=
"NSMutableArray"
key=
"NSSubviews"
>
<bool
key=
"EncodedWithXMLCoder"
>
YES
</bool>
...
...
@@ -3827,7 +3828,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
<int
key=
"NSResizingMask"
>
3
</int>
<bool
key=
"NSIsResizeable"
>
YES
</bool>
<bool
key=
"NSIsEditable"
>
YES
</bool>
<reference
key=
"NSTableView"
ref=
"807091610"
/>
</object>
<object
class=
"NSTableColumn"
id=
"804468624"
>
...
...
@@ -3853,7 +3853,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
<int
key=
"NSResizingMask"
>
3
</int>
<bool
key=
"NSIsResizeable"
>
YES
</bool>
<bool
key=
"NSIsEditable"
>
YES
</bool>
<reference
key=
"NSTableView"
ref=
"807091610"
/>
</object>
</object>
...
...
@@ -3935,6 +3934,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
</object>
<string
key=
"NSFrameSize"
>
{570, 415}
</string>
<reference
key=
"NSSuperview"
/>
<object
class=
"NSMutableString"
key=
"NSClassName"
>
<characters
key=
"NS.bytes"
>
NSView
</characters>
</object>
...
...
@@ -9181,7 +9181,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<boolean
value=
"YES"
/>
<string>
com.apple.InterfaceBuilder.CocoaPlugin
</string>
<boolean
value=
"YES"
/>
<string>
{{340,
947
}, {570, 415}}
</string>
<string>
{{340,
591
}, {570, 415}}
</string>
<string>
com.apple.InterfaceBuilder.CocoaPlugin
</string>
<boolean
value=
"YES"
/>
<string>
com.apple.InterfaceBuilder.CocoaPlugin
</string>
...
...
modules/gui/macosx/simple_prefs.m
View file @
d6d75822
...
...
@@ -141,6 +141,9 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
[
o_intf_nativefullscreen_ckb
setEnabled
:
NO
];
#endif
[
o_hotkeys_listbox
setTarget
:
self
];
[
o_hotkeys_listbox
setDoubleAction
:
@selector
(
hotkeyTableDoubleClick
:)];
/* setup useful stuff */
o_hotkeysNonUseableKeys
=
[[
NSArray
arrayWithObjects
:
@"Command-c"
,
@"Command-x"
,
@"Command-v"
,
@"Command-a"
,
@"Command-,"
,
@"Command-h"
,
@"Command-Alt-h"
,
@"Command-Shift-o"
,
@"Command-o"
,
@"Command-d"
,
@"Command-n"
,
@"Command-s"
,
@"Command-z"
,
@"Command-l"
,
@"Command-r"
,
@"Command-3"
,
@"Command-m"
,
@"Command-w"
,
@"Command-Shift-w"
,
@"Command-Shift-c"
,
@"Command-Shift-p"
,
@"Command-i"
,
@"Command-e"
,
@"Command-Shift-e"
,
@"Command-b"
,
@"Command-Shift-m"
,
@"Command-Ctrl-m"
,
@"Command-?"
,
@"Command-Alt-?"
,
nil
]
retain
];
}
...
...
@@ -1229,6 +1232,13 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch
[
self
showSettingsForCategory
:
o_input_view
];
}
-
(
void
)
hotkeyTableDoubleClick
:(
id
)
object
{
// -1 is header
if
(
[
o_hotkeys_listbox
clickedRow
]
>=
0
)
[
self
hotkeySettingChanged
:
o_hotkeys_listbox
];
}
-
(
IBAction
)
hotkeySettingChanged
:(
id
)
sender
{
if
(
sender
==
o_hotkeys_change_btn
||
sender
==
o_hotkeys_listbox
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment