Skip to content

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

Implement the full/basic switch correctly and completely. Additionally, fixed... 

Implement the full/basic switch correctly and completely. Additionally, fixed a rare sprefs init failure.
parent ca0d8dc7
Hide whitespace changes
Inline Side-by-side
Showing with 245 additions and 359 deletions
extras/package/macosx/Resources/English.lproj/Preferences.nib/classes.nib
View file @ 61751385
<?xml version="1.0" encoding="UTF-8"?> {
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> IBClasses = (
<plist version="1.0"> {
<dict> CLASS = FirstResponder;
<key>IBClasses</key> LANGUAGE = ObjC;
<array> SUPERCLASS = NSObject;
<dict> },
<key>CLASS</key> {
<string>NSApplication</string> CLASS = NSApplication;
<key>LANGUAGE</key> LANGUAGE = ObjC;
<string>ObjC</string> SUPERCLASS = NSResponder;
<key>SUPERCLASS</key> },
<string>NSResponder</string> {
</dict> CLASS = NSObject;
<dict> LANGUAGE = ObjC;
<key>CLASS</key> },
<string>VLCHotkeyChangeWindow</string> {
<key>LANGUAGE</key> CLASS = VLCHotkeyChangeWindow;
<string>ObjC</string> LANGUAGE = ObjC;
<key>SUPERCLASS</key> SUPERCLASS = NSWindow;
<string>NSWindow</string> },
</dict> {
<dict> ACTIONS = {
<key>ACTIONS</key> advancedToggle = id;
<dict> buttonAction = id;
<key>audioSettingChanged</key> closePrefs = id;
<string>id</string> resetAll = id;
<key>buttonAction</key> savePrefs = id;
<string>id</string> };
<key>hotkeySettingChanged</key> CLASS = VLCPrefs;
<string>id</string> LANGUAGE = ObjC;
<key>inputSettingChanged</key> OUTLETS = {
<string>id</string> "o_advanced_ckb" = id;
<key>interfaceSettingChanged</key> "o_basicFull_matrix" = id;
<string>id</string> "o_cancel_btn" = id;
<key>osdSettingChanged</key> "o_prefs_view" = id;
<string>id</string> "o_prefs_window" = id;
<key>videoSettingChanged</key> "o_reset_btn" = id;
<string>id</string> "o_save_btn" = id;
</dict> "o_title" = id;
<key>CLASS</key> "o_tree" = id;
<string>VLCSimplePrefs</string> };
<key>LANGUAGE</key> SUPERCLASS = NSObject;
<string>ObjC</string> },
<key>OUTLETS</key> {
<dict> ACTIONS = {
<key>o_audio_dolby_pop</key> audioSettingChanged = id;
<string>id</string> buttonAction = id;
<key>o_audio_dolby_txt</key> hotkeySettingChanged = id;
<string>id</string> inputSettingChanged = id;
<key>o_audio_effects_box</key> interfaceSettingChanged = id;
<string>id</string> osdSettingChanged = id;
<key>o_audio_enable_ckb</key> videoSettingChanged = id;
<string>id</string> };
<key>o_audio_general_box</key> CLASS = VLCSimplePrefs;
<string>id</string> LANGUAGE = ObjC;
<key>o_audio_headphone_ckb</key> OUTLETS = {
<string>id</string> "o_audio_dolby_pop" = id;
<key>o_audio_lang_fld</key> "o_audio_dolby_txt" = id;
<string>id</string> "o_audio_effects_box" = id;
<key>o_audio_lang_txt</key> "o_audio_enable_ckb" = id;
<string>id</string> "o_audio_general_box" = id;
<key>o_audio_last_box</key> "o_audio_headphone_ckb" = id;
<string>id</string> "o_audio_lang_fld" = id;
<key>o_audio_last_ckb</key> "o_audio_lang_txt" = id;
<string>id</string> "o_audio_last_box" = id;
<key>o_audio_lastpwd_sfld</key> "o_audio_last_ckb" = id;
<string>id</string> "o_audio_lastpwd_sfld" = id;
<key>o_audio_lastpwd_txt</key> "o_audio_lastpwd_txt" = id;
<string>id</string> "o_audio_lastuser_fld" = id;
<key>o_audio_lastuser_fld</key> "o_audio_lastuser_txt" = id;
<string>id</string> "o_audio_norm_ckb" = id;
<key>o_audio_lastuser_txt</key> "o_audio_norm_fld" = id;
<string>id</string> "o_audio_spdif_ckb" = id;
<key>o_audio_norm_ckb</key> "o_audio_view" = id;
<string>id</string> "o_audio_visual_pop" = id;
<key>o_audio_norm_fld</key> "o_audio_visual_txt" = id;
<string>id</string> "o_audio_vol_fld" = id;
<key>o_audio_spdif_ckb</key> "o_audio_vol_sld" = id;
<string>id</string> "o_audio_vol_txt" = id;
<key>o_audio_view</key> "o_hotkeys_change_btn" = id;
<string>id</string> "o_hotkeys_change_cancel_btn" = id;
<key>o_audio_visual_pop</key> "o_hotkeys_change_keys_lbl" = id;
<string>id</string> "o_hotkeys_change_lbl" = id;
<key>o_audio_visual_txt</key> "o_hotkeys_change_ok_btn" = id;
<string>id</string> "o_hotkeys_change_taken_lbl" = id;
<key>o_audio_vol_fld</key> "o_hotkeys_change_win" = id;
<string>id</string> "o_hotkeys_clear_btn" = id;
<key>o_audio_vol_sld</key> "o_hotkeys_lbl" = id;
<string>id</string> "o_hotkeys_listbox" = id;
<key>o_audio_vol_txt</key> "o_hotkeys_view" = id;
<string>id</string> "o_input_access_box" = id;
<key>o_currentlyShownCategoryView</key> "o_input_avi_pop" = id;
<string>id</string> "o_input_avi_txt" = id;
<key>o_hotkeys_change_btn</key> "o_input_bandwidth_ckb" = id;
<string>id</string> "o_input_cachelevel_custom_txt" = id;
<key>o_hotkeys_change_cancel_btn</key> "o_input_cachelevel_pop" = id;
<string>id</string> "o_input_cachelevel_txt" = id;
<key>o_hotkeys_change_keys_lbl</key> "o_input_caching_box" = id;
<string>id</string> "o_input_dump_ckb" = id;
<key>o_hotkeys_change_lbl</key> "o_input_httpproxy_fld" = id;
<string>id</string> "o_input_httpproxy_txt" = id;
<key>o_hotkeys_change_ok_btn</key> "o_input_httpproxypwd_sfld" = id;
<string>id</string> "o_input_httpproxypwd_txt" = id;
<key>o_hotkeys_change_taken_lbl</key> "o_input_mux_box" = id;
<string>id</string> "o_input_net_box" = id;
<key>o_hotkeys_change_win</key> "o_input_postproc_fld" = id;
<string>id</string> "o_input_postproc_txt" = id;
<key>o_hotkeys_clear_btn</key> "o_input_record_ckb" = id;
<string>id</string> "o_input_rtsp_ckb" = id;
<key>o_hotkeys_lbl</key> "o_input_serverport_fld" = id;
<string>id</string> "o_input_serverport_txt" = id;
<key>o_hotkeys_listbox</key> "o_input_timeshift_ckb" = id;
<string>id</string> "o_input_view" = id;
<key>o_hotkeys_view</key> "o_intf_art_pop" = id;
<string>id</string> "o_intf_art_txt" = id;
<key>o_input_access_box</key> "o_intf_embedded_ckb" = id;
<string>id</string> "o_intf_fspanel_ckb" = id;
<key>o_input_avi_pop</key> "o_intf_lang_pop" = id;
<string>id</string> "o_intf_lang_txt" = id;
<key>o_input_avi_txt</key> "o_intf_meta_ckb" = id;
<string>id</string> "o_intf_network_box" = id;
<key>o_input_bandwidth_ckb</key> "o_intf_view" = id;
<string>id</string> "o_osd_encoding_pop" = id;
<key>o_input_cachelevel_custom_txt</key> "o_osd_encoding_txt" = id;
<string>id</string> "o_osd_font_box" = id;
<key>o_input_cachelevel_pop</key> "o_osd_font_btn" = id;
<string>id</string> "o_osd_font_color_pop" = id;
<key>o_input_cachelevel_txt</key> "o_osd_font_color_txt" = id;
<string>id</string> "o_osd_font_effect_pop" = id;
<key>o_input_caching_box</key> "o_osd_font_effect_txt" = id;
<string>id</string> "o_osd_font_fld" = id;
<key>o_input_dump_ckb</key> "o_osd_font_size_pop" = id;
<string>id</string> "o_osd_font_size_txt" = id;
<key>o_input_httpproxy_fld</key> "o_osd_font_txt" = id;
<string>id</string> "o_osd_lang_box" = id;
<key>o_input_httpproxy_txt</key> "o_osd_lang_fld" = id;
<string>id</string> "o_osd_lang_txt" = id;
<key>o_input_httpproxypwd_sfld</key> "o_osd_osd_box" = id;
<string>id</string> "o_osd_osd_ckb" = id;
<key>o_input_httpproxypwd_txt</key> "o_osd_view" = id;
<string>id</string> "o_sprefs_basicFull_matrix" = id;
<key>o_input_mux_box</key> "o_sprefs_basic_box" = id;
<string>id</string> "o_sprefs_cancel_btn" = id;
<key>o_input_net_box</key> "o_sprefs_controls_box" = id;
<string>id</string> "o_sprefs_reset_btn" = id;
<key>o_input_postproc_fld</key> "o_sprefs_save_btn" = id;
<string>id</string> "o_sprefs_win" = id;
<key>o_input_postproc_txt</key> "o_video_black_ckb" = id;
<string>id</string> "o_video_device_pop" = id;
<key>o_input_record_ckb</key> "o_video_device_txt" = id;
<string>id</string> "o_video_display_box" = id;
<key>o_input_rtsp_ckb</key> "o_video_enable_ckb" = id;
<string>id</string> "o_video_fullscreen_ckb" = id;
<key>o_input_serverport_fld</key> "o_video_onTop_ckb" = id;
<string>id</string> "o_video_output_pop" = id;
<key>o_input_serverport_txt</key> "o_video_output_txt" = id;
<string>id</string> "o_video_skipFrames_ckb" = id;
<key>o_input_timeshift_ckb</key> "o_video_snap_box" = id;
<string>id</string> "o_video_snap_folder_btn" = id;
<key>o_input_view</key> "o_video_snap_folder_fld" = id;
<string>id</string> "o_video_snap_folder_txt" = id;
<key>o_intf_art_pop</key> "o_video_snap_format_pop" = id;
<string>id</string> "o_video_snap_format_txt" = id;
<key>o_intf_art_txt</key> "o_video_snap_prefix_fld" = id;
<string>id</string> "o_video_snap_prefix_txt" = id;
<key>o_intf_embedded_ckb</key> "o_video_snap_seqnum_ckb" = id;
<string>id</string> "o_video_view" = id;
<key>o_intf_fspanel_ckb</key> };
<string>id</string> SUPERCLASS = NSObject;
<key>o_intf_lang_pop</key> }
<string>id</string> );
<key>o_intf_lang_txt</key> IBVersion = 1;
<string>id</string> }
<key>o_intf_meta_ckb</key> \ No newline at end of file
<string>id</string>
<key>o_intf_network_box</key>
<string>id</string>
<key>o_intf_view</key>
<string>id</string>
<key>o_osd_encoding_pop</key>
<string>id</string>
<key>o_osd_encoding_txt</key>
<string>id</string>
<key>o_osd_font_box</key>
<string>id</string>
<key>o_osd_font_btn</key>
<string>id</string>
<key>o_osd_font_color_pop</key>
<string>id</string>
<key>o_osd_font_color_txt</key>
<string>id</string>
<key>o_osd_font_effect_pop</key>
<string>id</string>
<key>o_osd_font_effect_txt</key>
<string>id</string>
<key>o_osd_font_fld</key>
<string>id</string>
<key>o_osd_font_size_pop</key>
<string>id</string>
<key>o_osd_font_size_txt</key>
<string>id</string>
<key>o_osd_font_txt</key>
<string>id</string>
<key>o_osd_lang_box</key>
<string>id</string>
<key>o_osd_lang_fld</key>
<string>id</string>
<key>o_osd_lang_txt</key>
<string>id</string>
<key>o_osd_osd_box</key>
<string>id</string>
<key>o_osd_osd_ckb</key>
<string>id</string>
<key>o_osd_view</key>
<string>id</string>
<key>o_sprefs_basicFull_matrix</key>
<string>id</string>
<key>o_sprefs_basic_box</key>
<string>id</string>
<key>o_sprefs_cancel_btn</key>
<string>id</string>
<key>o_sprefs_controls_box</key>
<string>id</string>
<key>o_sprefs_reset_btn</key>
<string>id</string>
<key>o_sprefs_save_btn</key>
<string>id</string>
<key>o_sprefs_win</key>
<string>id</string>
<key>o_video_black_ckb</key>
<string>id</string>
<key>o_video_device_pop</key>
<string>id</string>
<key>o_video_device_txt</key>
<string>id</string>
<key>o_video_display_box</key>
<string>id</string>
<key>o_video_enable_ckb</key>
<string>id</string>
<key>o_video_fullscreen_ckb</key>
<string>id</string>
<key>o_video_onTop_ckb</key>
<string>id</string>
<key>o_video_output_pop</key>
<string>id</string>
<key>o_video_output_txt</key>
<string>id</string>
<key>o_video_skipFrames_ckb</key>
<string>id</string>
<key>o_video_snap_box</key>
<string>id</string>
<key>o_video_snap_folder_btn</key>
<string>id</string>
<key>o_video_snap_folder_fld</key>
<string>id</string>
<key>o_video_snap_folder_txt</key>
<string>id</string>
<key>o_video_snap_format_pop</key>
<string>id</string>
<key>o_video_snap_format_txt</key>
<string>id</string>
<key>o_video_snap_prefix_fld</key>
<string>id</string>
<key>o_video_snap_prefix_txt</key>
<string>id</string>
<key>o_video_snap_seqnum_ckb</key>
<string>id</string>
<key>o_video_view</key>
<string>id</string>
</dict>
<key>SUPERCLASS</key>
<string>NSObject</string>
</dict>
<dict>
<key>CLASS</key>
<string>NSObject</string>
<key>LANGUAGE</key>
<string>ObjC</string>
</dict>
<dict>
<key>CLASS</key>
<string>FirstResponder</string>
<key>LANGUAGE</key>
<string>ObjC</string>
<key>SUPERCLASS</key>
<string>NSObject</string>
</dict>
<dict>
<key>ACTIONS</key>
<dict>
<key>advancedToggle</key>
<string>id</string>
<key>closePrefs</key>
<string>id</string>
<key>resetAll</key>
<string>id</string>
<key>savePrefs</key>
<string>id</string>
</dict>
<key>CLASS</key>
<string>VLCPrefs</string>
<key>LANGUAGE</key>
<string>ObjC</string>
<key>OUTLETS</key>
<dict>
<key>o_advanced_ckb</key>
<string>id</string>
<key>o_cancel_btn</key>
<string>id</string>
<key>o_prefs_view</key>
<string>id</string>
<key>o_prefs_window</key>
<string>id</string>
<key>o_reset_btn</key>
<string>id</string>
<key>o_save_btn</key>
<string>id</string>
<key>o_title</key>
<string>id</string>
<key>o_tree</key>
<string>id</string>
</dict>
<key>SUPERCLASS</key>
<string>NSObject</string>
</dict>
</array>
<key>IBVersion</key>
<string>1</string>
</dict>
</plist>
extras/package/macosx/Resources/English.lproj/Preferences.nib/info.nib
View file @ 61751385
...@@ -2,22 +2,39 @@ ...@@ -2,22 +2,39 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0"> <plist version="1.0">
<dict> <dict>
<key>IBDocumentLocation</key>
<string>48 424 356 240 0 0 1280 778 </string>
<key>IBEditorPositions</key>
<dict>
<key>2311</key>
<string>345 402 590 264 0 0 1280 778 </string>
<key>2330</key>
<string>345 223 590 502 0 0 1280 778 </string>
<key>2440</key>
<string>345 308 590 389 0 0 1280 778 </string>
<key>2523</key>
<string>345 320 590 373 0 0 1280 778 </string>
<key>2562</key>
<string>345 221 590 505 0 0 1280 778 </string>
<key>2668</key>
<string>345 257 590 457 0 0 1280 778 </string>
</dict>
<key>IBFramework Version</key> <key>IBFramework Version</key>
<string>667</string> <string>489.0</string>
<key>IBLastKnownRelativeProjectPath</key> <key>IBLastKnownRelativeProjectPath</key>
<string>../../vlc.xcodeproj</string> <string>../../vlc.xcodeproj</string>
<key>IBOldestOS</key> <key>IBOldestOS</key>
<integer>5</integer> <integer>5</integer>
<key>IBOpenObjects</key> <key>IBOpenObjects</key>
<array> <array>
<integer>2265</integer>
<integer>2311</integer> <integer>2311</integer>
<integer>2410</integer>
<integer>2678</integer>
<integer>2523</integer>
<integer>2668</integer> <integer>2668</integer>
<integer>2330</integer>
<integer>2563</integer>
<integer>2440</integer> <integer>2440</integer>
<integer>2562</integer>
<integer>2330</integer>
<integer>2523</integer>
<integer>1530</integer>
</array> </array>
<key>IBSystem Version</key> <key>IBSystem Version</key>
<string>9D34</string> <string>9D34</string>
......
modules/gui/macosx/intf.m
View file @ 61751385
...@@ -423,7 +423,7 @@ static VLCMain *_o_sharedMainInstance = nil; ...@@ -423,7 +423,7 @@ static VLCMain *_o_sharedMainInstance = nil;
_o_sharedMainInstance = [super init]; _o_sharedMainInstance = [super init];
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];
o_wizard = [[VLCWizard alloc] init]; o_wizard = [[VLCWizard alloc] init];
o_extended = nil; o_extended = nil;
...@@ -1801,22 +1801,25 @@ static VLCMain *_o_sharedMainInstance = nil; ...@@ -1801,22 +1801,25 @@ static VLCMain *_o_sharedMainInstance = nil;
/* release some other objects here, because it isn't sure whether dealloc /* release some other objects here, because it isn't sure whether dealloc
* will be called later on */ * will be called later on */
if( nib_about_loaded ) if( nib_about_loaded )
[o_about release]; [o_about release];
if( nib_prefs_loaded ) if( nib_prefs_loaded )
{
[o_sprefs release];
[o_prefs release]; [o_prefs release];
}
if( nib_open_loaded ) if( nib_open_loaded )
[o_open release]; [o_open release];
if( nib_extended_loaded ) if( nib_extended_loaded )
{ {
[o_extended collapsAll]; [o_extended collapsAll];
[o_extended release]; [o_extended release];
} }
if( nib_bookmarks_loaded ) if( nib_bookmarks_loaded )
[o_bookmarks release]; [o_bookmarks release];
...@@ -2003,11 +2006,14 @@ static VLCMain *_o_sharedMainInstance = nil; ...@@ -2003,11 +2006,14 @@ static VLCMain *_o_sharedMainInstance = nil;
- (IBAction)viewPreferences:(id)sender - (IBAction)viewPreferences:(id)sender
{ {
if( !nib_prefs_loaded ) if( !nib_prefs_loaded )
{
nib_prefs_loaded = [NSBundle loadNibNamed:@"Preferences" owner: self]; nib_prefs_loaded = [NSBundle loadNibNamed:@"Preferences" owner: self];
o_sprefs = [[VLCSimplePrefs alloc] init];
o_prefs= [[VLCPrefs alloc] init];
}
if( sender == o_mi_sprefs ) if( sender == o_mi_sprefs )
{ {
o_sprefs = [[VLCSimplePrefs alloc] init];
[o_sprefs showSimplePrefs]; [o_sprefs showSimplePrefs];
} }
else else
......
modules/gui/macosx/prefs.h
View file @ 61751385
...@@ -66,6 +66,7 @@ ...@@ -66,6 +66,7 @@
IBOutlet id o_cancel_btn; IBOutlet id o_cancel_btn;
IBOutlet id o_reset_btn; IBOutlet id o_reset_btn;
IBOutlet id o_advanced_ckb; IBOutlet id o_advanced_ckb;
IBOutlet id o_basicFull_matrix;
} }
+ (VLCPrefs *)sharedInstance; + (VLCPrefs *)sharedInstance;
...@@ -77,6 +78,7 @@ ...@@ -77,6 +78,7 @@
- (IBAction)closePrefs: (id)sender; - (IBAction)closePrefs: (id)sender;
- (IBAction)resetAll: (id)sender; - (IBAction)resetAll: (id)sender;
- (IBAction)advancedToggle: (id)sender; - (IBAction)advancedToggle: (id)sender;
- (IBAction)buttonAction: (id)sender;
@end @end
......
modules/gui/macosx/prefs.m
View file @ 61751385
...@@ -53,10 +53,11 @@ ...@@ -53,10 +53,11 @@
#include <vlc_common.h> #include <vlc_common.h>
#include <vlc_config_cat.h> #include <vlc_config_cat.h>
#include "intf.h" #import "intf.h"
#include "prefs.h" #import "prefs.h"
#include "prefs_widgets.h" #import "simple_prefs.h"
#include "vlc_keys.h" #import "prefs_widgets.h"
#import "vlc_keys.h"
/***************************************************************************** /*****************************************************************************
* VLCPrefs implementation * VLCPrefs implementation
...@@ -112,6 +113,9 @@ static VLCPrefs *_o_sharedMainInstance = nil; ...@@ -112,6 +113,9 @@ static VLCPrefs *_o_sharedMainInstance = nil;
- (void)showPrefs - (void)showPrefs
{ {
[[o_basicFull_matrix cellAtRow:0 column:0] setState: NSOffState];
[[o_basicFull_matrix cellAtRow:0 column:1] setState: NSOnState];
[o_prefs_window center]; [o_prefs_window center];
[o_prefs_window makeKeyAndOrderFront:self]; [o_prefs_window makeKeyAndOrderFront:self];
} }
...@@ -123,6 +127,8 @@ static VLCPrefs *_o_sharedMainInstance = nil; ...@@ -123,6 +127,8 @@ static VLCPrefs *_o_sharedMainInstance = nil;
[o_cancel_btn setTitle: _NS("Cancel")]; [o_cancel_btn setTitle: _NS("Cancel")];
[o_reset_btn setTitle: _NS("Reset All")]; [o_reset_btn setTitle: _NS("Reset All")];
[o_advanced_ckb setTitle: _NS("Advanced")]; [o_advanced_ckb setTitle: _NS("Advanced")];
[[o_basicFull_matrix cellAtRow: 0 column: 0] setStringValue: _NS("Basic")];
[[o_basicFull_matrix cellAtRow: 0 column: 1] setStringValue: _NS("All")];
} }
- (IBAction)savePrefs: (id)sender - (IBAction)savePrefs: (id)sender
...@@ -170,6 +176,14 @@ static VLCPrefs *_o_sharedMainInstance = nil; ...@@ -170,6 +176,14 @@ static VLCPrefs *_o_sharedMainInstance = nil;
( [o_advanced_ckb state] == NSOnState ) ? true : false]; ( [o_advanced_ckb state] == NSOnState ) ? true : false];
} }
- (IBAction)buttonAction: (id)sender
{
[o_prefs_window orderOut: self];
[[o_basicFull_matrix cellAtRow:0 column:0] setState: NSOnState];
[[o_basicFull_matrix cellAtRow:0 column:1] setState: NSOffState];
[[[VLCMain sharedInstance] getSimplePreferences] showSimplePrefs];
}
- (void)loadConfigTree - (void)loadConfigTree
{ {
} }
......
modules/gui/macosx/simple_prefs.m
View file @ 61751385
...@@ -48,10 +48,10 @@ static VLCSimplePrefs *_o_sharedInstance = nil; ...@@ -48,10 +48,10 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
if (_o_sharedInstance) { if (_o_sharedInstance) {
[self dealloc]; [self dealloc];
} else { } else {
p_intf = VLCIntf;
_o_sharedInstance = [super init]; _o_sharedInstance = [super init];
p_intf = VLCIntf;
} }
return _o_sharedInstance; return _o_sharedInstance;
} }
...@@ -274,14 +274,6 @@ static VLCSimplePrefs *_o_sharedInstance = nil; ...@@ -274,14 +274,6 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
[o_osd_osd_box setTitle: _NS("On Screen Display")]; [o_osd_osd_box setTitle: _NS("On Screen Display")];
[o_osd_osd_ckb setTitle: _NS("Enable OSD")]; [o_osd_osd_ckb setTitle: _NS("Enable OSD")];
/* generic stuff */
[[o_sprefs_basicFull_matrix cellAtRow: 0 column: 0] setStringValue: _NS("Basic")];
[[o_sprefs_basicFull_matrix cellAtRow: 0 column: 1] setStringValue: _NS("All")];
[o_sprefs_cancel_btn setTitle: _NS("Cancel")];
[o_sprefs_reset_btn setTitle: _NS("Reset Preferences")];
[o_sprefs_save_btn setTitle: _NS("Save")];
[o_sprefs_win setTitle: _NS("Preferences")];
/* video */ /* video */
[o_video_black_ckb setTitle: _NS("Black screens in Fullscreen mode")]; [o_video_black_ckb setTitle: _NS("Black screens in Fullscreen mode")];
[o_video_device_txt setStringValue: _NS("Display device")]; [o_video_device_txt setStringValue: _NS("Display device")];
...@@ -297,6 +289,14 @@ static VLCSimplePrefs *_o_sharedInstance = nil; ...@@ -297,6 +289,14 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
[o_video_snap_format_txt setStringValue: _NS("Format")]; [o_video_snap_format_txt setStringValue: _NS("Format")];
[o_video_snap_prefix_txt setStringValue: _NS("Prefix")]; [o_video_snap_prefix_txt setStringValue: _NS("Prefix")];
[o_video_snap_seqnum_ckb setTitle: _NS("Sequential numbering")]; [o_video_snap_seqnum_ckb setTitle: _NS("Sequential numbering")];
/* generic stuff */
[[o_sprefs_basicFull_matrix cellAtRow: 0 column: 0] setStringValue: _NS("Basic")];
[[o_sprefs_basicFull_matrix cellAtRow: 0 column: 1] setStringValue: _NS("All")];
[o_sprefs_cancel_btn setTitle: _NS("Cancel")];
[o_sprefs_reset_btn setTitle: _NS("Reset Preferences")];
[o_sprefs_save_btn setTitle: _NS("Save")];
[o_sprefs_win setTitle: _NS("Preferences")];
} }
- (void)resetControls - (void)resetControls
...@@ -356,6 +356,9 @@ static VLCSimplePrefs *_o_sharedInstance = nil; ...@@ -356,6 +356,9 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
vlc_list_release( p_list ); \ vlc_list_release( p_list ); \
[object setToolTip: _NS(p_item->psz_longtext)] [object setToolTip: _NS(p_item->psz_longtext)]
[[o_sprefs_basicFull_matrix cellAtRow:0 column:0] setState: NSOnState];
[[o_sprefs_basicFull_matrix cellAtRow:0 column:1] setState: NSOffState];
/********************** /**********************
* interface settings * * interface settings *
**********************/ **********************/
...@@ -610,8 +613,9 @@ static VLCSimplePrefs *_o_sharedInstance = nil; ...@@ -610,8 +613,9 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
else if( sender == o_sprefs_basicFull_matrix ) else if( sender == o_sprefs_basicFull_matrix )
{ {
[o_sprefs_win orderOut: self]; [o_sprefs_win orderOut: self];
[[o_sprefs_basicFull_matrix cellAtRow:0 column:0] setState: NSOffState];
[[o_sprefs_basicFull_matrix cellAtRow:0 column:1] setState: NSOnState];
[[[VLCMain sharedInstance] getPreferences] showPrefs]; [[[VLCMain sharedInstance] getPreferences] showPrefs];
[self resetControls];
} }
else else
msg_Err( p_intf, "unknown buttonAction sender" ); msg_Err( p_intf, "unknown buttonAction sender" );
......
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