Commit 83636730 authored by Jérome Decoodt's avatar Jérome Decoodt

Preferences panel can be viewed on X.2. Closes #104.

+ fix hotkeys widget with macos < 10.3
parent 6f663e2c
...@@ -294,7 +294,7 @@ static VLCMain *_o_sharedMainInstance = nil; ...@@ -294,7 +294,7 @@ static VLCMain *_o_sharedMainInstance = nil;
} }
o_about = [[VLAboutBox alloc] init]; o_about = [[VLAboutBox alloc] init];
o_prefs = [[VLCPrefs alloc] init]; o_prefs = nil;
o_open = [[VLCOpen alloc] init]; o_open = [[VLCOpen alloc] init];
i_lastShownVolume = -1; i_lastShownVolume = -1;
...@@ -1415,6 +1415,9 @@ static VLCMain *_o_sharedMainInstance = nil; ...@@ -1415,6 +1415,9 @@ static VLCMain *_o_sharedMainInstance = nil;
- (IBAction)viewPreferences:(id)sender - (IBAction)viewPreferences:(id)sender
{ {
/* GRUIIIIIIIK */
if( o_prefs == nil )
o_prefs = [[VLCPrefs alloc] init];
[o_prefs showPrefs]; [o_prefs showPrefs];
} }
......
...@@ -55,6 +55,7 @@ ...@@ -55,6 +55,7 @@
action:nil keyEquivalent:@""]; \ action:nil keyEquivalent:@""]; \
[o_mi setKeyEquivalentModifierMask: \ [o_mi setKeyEquivalentModifierMask: \
0]; \ 0]; \
if( MACOS_VERSION >= 10.3 ) \
[o_mi setAlternate: NO]; \ [o_mi setAlternate: NO]; \
[o_mi setTag: \ [o_mi setTag: \
( value )]; \ ( value )]; \
......
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