Skip to content

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

macosx: refactor simple preferences to work without object in xib

parent b6afe6b4
Show whitespace changes
Inline Side-by-side
Showing with 2958 additions and 703 deletions
extras/package/macosx/Resources/English.lproj/SimplePreferences.xib 0 → 100644
View file @ 34812220
This source diff could not be displayed because it is too large. You can view the blob instead.
extras/package/macosx/vlc.xcodeproj/project.pbxproj
View file @ 34812220
...@@ -463,6 +463,7 @@ ...@@ -463,6 +463,7 @@
7D8BB0BA1830367200FAE9B7 /* PlaylistMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7D8BB0B81830367200FAE9B7 /* PlaylistMenu.xib */; }; 7D8BB0BA1830367200FAE9B7 /* PlaylistMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7D8BB0B81830367200FAE9B7 /* PlaylistMenu.xib */; };
7D8BB0C01830393300FAE9B7 /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7D8BB0BE1830393300FAE9B7 /* MainWindow.xib */; }; 7D8BB0C01830393300FAE9B7 /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7D8BB0BE1830393300FAE9B7 /* MainWindow.xib */; };
7DB65D5618ABD6490053B874 /* AddonManager.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7DB65D5418ABD6490053B874 /* AddonManager.xib */; }; 7DB65D5618ABD6490053B874 /* AddonManager.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7DB65D5418ABD6490053B874 /* AddonManager.xib */; };
7DD6EC101B58136D0047CF5C /* SimplePreferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7DD6EC0E1B58136D0047CF5C /* SimplePreferences.xib */; };
7DE88F2A1831396A00CD9DA2 /* PlaylistAccessoryView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7DE88F281831396A00CD9DA2 /* PlaylistAccessoryView.xib */; }; 7DE88F2A1831396A00CD9DA2 /* PlaylistAccessoryView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7DE88F281831396A00CD9DA2 /* PlaylistAccessoryView.xib */; };
7DFFA16C16124F38001AF89F /* effects-one-button-pressed-dark.png in Resources */ = {isa = PBXBuildFile; fileRef = 7DFFA16A16124F38001AF89F /* effects-one-button-pressed-dark.png */; }; 7DFFA16C16124F38001AF89F /* effects-one-button-pressed-dark.png in Resources */ = {isa = PBXBuildFile; fileRef = 7DFFA16A16124F38001AF89F /* effects-one-button-pressed-dark.png */; };
7DFFA16D16124F38001AF89F /* effects-one-button-pressed-dark@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7DFFA16B16124F38001AF89F /* effects-one-button-pressed-dark@2x.png */; }; 7DFFA16D16124F38001AF89F /* effects-one-button-pressed-dark@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7DFFA16B16124F38001AF89F /* effects-one-button-pressed-dark@2x.png */; };
...@@ -1246,6 +1247,7 @@ ...@@ -1246,6 +1247,7 @@
7DB65D5218ABD6380053B874 /* AddonsWindowController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = AddonsWindowController.h; path = ../../../modules/gui/macosx/AddonsWindowController.h; sourceTree = SOURCE_ROOT; }; 7DB65D5218ABD6380053B874 /* AddonsWindowController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = AddonsWindowController.h; path = ../../../modules/gui/macosx/AddonsWindowController.h; sourceTree = SOURCE_ROOT; };
7DB65D5318ABD6380053B874 /* AddonsWindowController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = AddonsWindowController.m; path = ../../../modules/gui/macosx/AddonsWindowController.m; sourceTree = SOURCE_ROOT; }; 7DB65D5318ABD6380053B874 /* AddonsWindowController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = AddonsWindowController.m; path = ../../../modules/gui/macosx/AddonsWindowController.m; sourceTree = SOURCE_ROOT; };
7DB65D5518ABD6490053B874 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Resources/English.lproj/AddonManager.xib; sourceTree = "<group>"; }; 7DB65D5518ABD6490053B874 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Resources/English.lproj/AddonManager.xib; sourceTree = "<group>"; };
7DD6EC0F1B58136D0047CF5C /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Resources/English.lproj/SimplePreferences.xib; sourceTree = "<group>"; };
7DE88F291831396A00CD9DA2 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Resources/English.lproj/PlaylistAccessoryView.xib; sourceTree = "<group>"; }; 7DE88F291831396A00CD9DA2 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Resources/English.lproj/PlaylistAccessoryView.xib; sourceTree = "<group>"; };
7DF0435E1972E26A0022B534 /* AddonListDataSource.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = AddonListDataSource.h; path = ../../../modules/gui/macosx/AddonListDataSource.h; sourceTree = SOURCE_ROOT; }; 7DF0435E1972E26A0022B534 /* AddonListDataSource.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = AddonListDataSource.h; path = ../../../modules/gui/macosx/AddonListDataSource.h; sourceTree = SOURCE_ROOT; };
7DF0435F1972E26A0022B534 /* AddonListDataSource.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = AddonListDataSource.m; path = ../../../modules/gui/macosx/AddonListDataSource.m; sourceTree = SOURCE_ROOT; }; 7DF0435F1972E26A0022B534 /* AddonListDataSource.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = AddonListDataSource.m; path = ../../../modules/gui/macosx/AddonListDataSource.m; sourceTree = SOURCE_ROOT; };
...@@ -2883,6 +2885,7 @@ ...@@ -2883,6 +2885,7 @@
CCD83E3813FEA143004F1652 /* MediaInfo.xib */, CCD83E3813FEA143004F1652 /* MediaInfo.xib */,
CCD83E3A13FEA143004F1652 /* Open.xib */, CCD83E3A13FEA143004F1652 /* Open.xib */,
CCD83E3C13FEA143004F1652 /* Preferences.xib */, CCD83E3C13FEA143004F1652 /* Preferences.xib */,
7DD6EC0E1B58136D0047CF5C /* SimplePreferences.xib */,
CCD83E3E13FEA143004F1652 /* SyncTracks.xib */, CCD83E3E13FEA143004F1652 /* SyncTracks.xib */,
CCD83E4013FEA143004F1652 /* VideoEffects.xib */, CCD83E4013FEA143004F1652 /* VideoEffects.xib */,
CCD83E2B13FE9B90004F1652 /* MainMenu.xib */, CCD83E2B13FE9B90004F1652 /* MainMenu.xib */,
...@@ -3081,6 +3084,7 @@ ...@@ -3081,6 +3084,7 @@
CC04323F13B246DF00D7D52E /* effects-double-buttons-pressed_dark.png in Resources */, CC04323F13B246DF00D7D52E /* effects-double-buttons-pressed_dark.png in Resources */,
CC04324013B246DF00D7D52E /* effects-one-button_dark.png in Resources */, CC04324013B246DF00D7D52E /* effects-one-button_dark.png in Resources */,
CC04324413B246DF00D7D52E /* fullscreen-double-buttons_dark.png in Resources */, CC04324413B246DF00D7D52E /* fullscreen-double-buttons_dark.png in Resources */,
7DD6EC101B58136D0047CF5C /* SimplePreferences.xib in Resources */,
CC04324513B246DF00D7D52E /* fullscreen-double-buttons-pressed_dark.png in Resources */, CC04324513B246DF00D7D52E /* fullscreen-double-buttons-pressed_dark.png in Resources */,
CC04324613B246DF00D7D52E /* pause_dark.png in Resources */, CC04324613B246DF00D7D52E /* pause_dark.png in Resources */,
1C88BC9B19DC7CB300645190 /* ys-fs_pause_highlight@2x.png in Resources */, 1C88BC9B19DC7CB300645190 /* ys-fs_pause_highlight@2x.png in Resources */,
...@@ -3988,6 +3992,14 @@ ...@@ -3988,6 +3992,14 @@
name = AddonManager.xib; name = AddonManager.xib;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
7DD6EC0E1B58136D0047CF5C /* SimplePreferences.xib */ = {
isa = PBXVariantGroup;
children = (
7DD6EC0F1B58136D0047CF5C /* English */,
);
name = SimplePreferences.xib;
sourceTree = "<group>";
};
7DE88F281831396A00CD9DA2 /* PlaylistAccessoryView.xib */ = { 7DE88F281831396A00CD9DA2 /* PlaylistAccessoryView.xib */ = {
isa = PBXVariantGroup; isa = PBXVariantGroup;
children = ( children = (
......
modules/gui/macosx/intf.m
View file @ 34812220
...@@ -1285,7 +1285,7 @@ audio_output_t *getAout(void) ...@@ -1285,7 +1285,7 @@ audio_output_t *getAout(void)
o_sprefs = [[VLCSimplePrefs alloc] init]; o_sprefs = [[VLCSimplePrefs alloc] init];
if (!nib_prefs_loaded) if (!nib_prefs_loaded)
nib_prefs_loaded = [NSBundle loadNibNamed:@"Preferences" owner: NSApp]; nib_prefs_loaded = [NSBundle loadNibNamed:@"SimplePreferences" owner: o_sprefs];
return o_sprefs; return o_sprefs;
} }
...@@ -1296,7 +1296,7 @@ audio_output_t *getAout(void) ...@@ -1296,7 +1296,7 @@ audio_output_t *getAout(void)
o_prefs = [[VLCPrefs alloc] init]; o_prefs = [[VLCPrefs alloc] init];
if (!nib_prefs_loaded) if (!nib_prefs_loaded)
nib_prefs_loaded = [NSBundle loadNibNamed:@"Preferences" owner: NSApp]; nib_prefs_loaded = [NSBundle loadNibNamed:@"Preferences" owner: o_prefs];
return o_prefs; return o_prefs;
} }
......
modules/gui/macosx/simple_prefs.h
View file @ 34812220
...@@ -25,165 +25,165 @@ ...@@ -25,165 +25,165 @@
#import "intf.h" #import "intf.h"
#import <vlc_common.h> #import <vlc_common.h>
@interface VLCSimplePrefs : NSObject <NSToolbarDelegate, NSWindowDelegate> @interface VLCSimplePrefs : NSObject
{
IBOutlet NSPopUpButton *o_audio_dolby_pop;
IBOutlet id o_audio_dolby_txt;
IBOutlet id o_audio_effects_box;
IBOutlet id o_audio_enable_ckb;
IBOutlet id o_audio_general_box;
IBOutlet id o_audio_lang_fld;
IBOutlet id o_audio_lang_txt;
IBOutlet id o_audio_last_box;
IBOutlet id o_audio_last_ckb;
IBOutlet id o_audio_lastpwd_sfld;
IBOutlet id o_audio_lastpwd_txt;
IBOutlet id o_audio_lastuser_fld;
IBOutlet id o_audio_lastuser_txt;
IBOutlet id o_audio_spdif_ckb;
IBOutlet id o_audio_view;
IBOutlet NSPopUpButton *o_audio_visual_pop;
IBOutlet id o_audio_visual_txt;
IBOutlet id o_audio_vol_fld;
IBOutlet id o_audio_vol_sld;
IBOutlet id o_audio_autosavevol_matrix;
IBOutlet id o_audio_autosavevol_yes_bcell;
IBOutlet id o_audio_autosavevol_no_bcell;
IBOutlet id o_hotkeys_change_btn;
IBOutlet id o_hotkeys_change_lbl;
IBOutlet id o_hotkeys_change_keys_lbl;
IBOutlet id o_hotkeys_change_taken_lbl;
IBOutlet id o_hotkeys_change_win;
IBOutlet id o_hotkeys_change_cancel_btn;
IBOutlet id o_hotkeys_change_ok_btn;
IBOutlet id o_hotkeys_clear_btn;
IBOutlet id o_hotkeys_lbl;
IBOutlet id o_hotkeys_listbox;
IBOutlet id o_hotkeys_view;
IBOutlet id o_input_record_box;
IBOutlet id o_input_record_fld;
IBOutlet id o_input_record_btn;
IBOutlet NSPopUpButton *o_input_avi_pop;
IBOutlet id o_input_avi_txt;
IBOutlet NSPopUpButton *o_input_cachelevel_pop;
IBOutlet id o_input_cachelevel_txt;
IBOutlet id o_input_cachelevel_custom_txt;
IBOutlet id o_input_caching_box;
IBOutlet id o_input_mux_box;
IBOutlet id o_input_net_box;
IBOutlet id o_input_avcodec_hw_txt;
IBOutlet NSPopUpButton *o_input_avcodec_hw_pop;
IBOutlet id o_input_postproc_fld;
IBOutlet id o_input_postproc_txt;
IBOutlet id o_input_rtsp_ckb;
IBOutlet id o_input_skipLoop_txt;
IBOutlet NSPopUpButton *o_input_skipLoop_pop;
IBOutlet id o_input_mkv_preload_dir_ckb;
IBOutlet id o_input_urlhandler_btn;
IBOutlet id o_input_view;
IBOutlet NSPopUpButton *o_intf_language_pop;
IBOutlet id o_intf_language_txt;
IBOutlet id o_intf_style_txt;
IBOutlet id o_intf_style_dark_bcell;
IBOutlet id o_intf_style_bright_bcell;
IBOutlet id o_intf_art_ckb;
IBOutlet id o_intf_embedded_ckb;
IBOutlet id o_intf_fspanel_ckb;
IBOutlet id o_intf_appleremote_ckb;
IBOutlet id o_intf_appleremote_sysvol_ckb;
IBOutlet id o_intf_mediakeys_ckb;
IBOutlet id o_intf_network_box;
IBOutlet id o_intf_view;
IBOutlet id o_intf_update_ckb;
IBOutlet id o_intf_last_update_lbl;
IBOutlet id o_intf_enableGrowl_ckb;
IBOutlet id o_intf_nativefullscreen_ckb;
IBOutlet id o_intf_autoresize_ckb;
IBOutlet id o_intf_pauseminimized_ckb;
IBOutlet id o_intf_luahttp_box;
IBOutlet id o_intf_luahttppwd_lbl;
IBOutlet id o_intf_luahttppwd_fld;
IBOutlet id o_intf_pauseitunes_lbl;
IBOutlet NSPopUpButton *o_intf_pauseitunes_pop;
IBOutlet id o_intf_continueplayback_lbl;
IBOutlet NSPopUpButton *o_intf_continueplayback_pop;
IBOutlet NSPopUpButton *o_osd_encoding_pop;
IBOutlet id o_osd_encoding_txt;
IBOutlet id o_osd_font_box;
IBOutlet id o_osd_font_btn;
IBOutlet NSPopUpButton *o_osd_font_color_pop;
IBOutlet id o_osd_font_color_txt;
IBOutlet id o_osd_font_fld;
IBOutlet NSPopUpButton *o_osd_font_size_pop;
IBOutlet id o_osd_font_size_txt;
IBOutlet id o_osd_font_txt;
IBOutlet id o_osd_lang_box;
IBOutlet id o_osd_lang_fld;
IBOutlet id o_osd_lang_txt;
IBOutlet id o_osd_opacity_txt;
IBOutlet id o_osd_opacity_fld;
IBOutlet id o_osd_opacity_sld;
IBOutlet NSPopUpButton *o_osd_outline_color_pop;
IBOutlet id o_osd_outline_color_txt;
IBOutlet NSPopUpButton *o_osd_outline_thickness_pop;
IBOutlet id o_osd_outline_thickness_txt;
IBOutlet id o_osd_forcebold_ckb;
IBOutlet id o_osd_osd_box;
IBOutlet id o_osd_osd_ckb;
IBOutlet id o_osd_view;
IBOutlet id o_sprefs_showAll_btn;
IBOutlet id o_sprefs_cancel_btn;
IBOutlet id o_sprefs_controls_box;
IBOutlet id o_sprefs_reset_btn;
IBOutlet id o_sprefs_save_btn;
IBOutlet id o_sprefs_win;
IBOutlet id o_video_black_ckb;
IBOutlet NSPopUpButton *o_video_device_pop;
IBOutlet id o_video_device_txt;
IBOutlet id o_video_display_box;
IBOutlet id o_video_enable_ckb;
IBOutlet id o_video_fullscreen_ckb;
IBOutlet id o_video_videodeco_ckb;
IBOutlet id o_video_onTop_ckb;
IBOutlet id o_video_skipFrames_ckb;
IBOutlet id o_video_snap_box;
IBOutlet id o_video_snap_folder_btn;
IBOutlet id o_video_snap_folder_fld;
IBOutlet id o_video_snap_folder_txt;
IBOutlet NSPopUpButton *o_video_snap_format_pop;
IBOutlet id o_video_snap_format_txt;
IBOutlet id o_video_snap_prefix_fld;
IBOutlet id o_video_snap_prefix_txt;
IBOutlet id o_video_snap_seqnum_ckb;
IBOutlet id o_video_deinterlace_txt;
IBOutlet NSPopUpButton *o_video_deinterlace_pop;
IBOutlet id o_video_deinterlace_mode_txt;
IBOutlet NSPopUpButton *o_video_deinterlace_mode_pop;
IBOutlet id o_video_video_box;
IBOutlet id o_video_view;
IBOutlet id o_urlhandler_title_txt;
IBOutlet id o_urlhandler_subtitle_txt;
IBOutlet id o_urlhandler_save_btn;
IBOutlet id o_urlhandler_cancel_btn;
IBOutlet NSPopUpButton *o_urlhandler_ftp_pop;
IBOutlet NSPopUpButton *o_urlhandler_mms_pop;
IBOutlet NSPopUpButton *o_urlhandler_rtmp_pop;
IBOutlet NSPopUpButton *o_urlhandler_rtp_pop;
IBOutlet NSPopUpButton *o_urlhandler_rtsp_pop;
IBOutlet NSPopUpButton *o_urlhandler_sftp_pop;
IBOutlet NSPopUpButton *o_urlhandler_smb_pop;
IBOutlet NSPopUpButton *o_urlhandler_udp_pop;
IBOutlet id o_urlhandler_win;
}
+ (VLCSimplePrefs *)sharedInstance; + (VLCSimplePrefs *)sharedInstance;
@property (readwrite, weak) IBOutlet NSPopUpButton *audio_dolbyPopup;
@property (readwrite, weak) IBOutlet NSTextField *audio_dolbyLabel;
@property (readwrite, weak) IBOutlet NSBox *audio_effectsBox;
@property (readwrite, weak) IBOutlet NSButton *audio_enableCheckbox;
@property (readwrite, weak) IBOutlet NSBox *audio_generalBox;
@property (readwrite, weak) IBOutlet NSTextField *audio_langTextField;
@property (readwrite, weak) IBOutlet NSTextField *audio_langLabel;
@property (readwrite, weak) IBOutlet NSBox *audio_lastBox;
@property (readwrite, weak) IBOutlet NSButton *audio_lastCheckbox;
@property (readwrite, weak) IBOutlet NSSecureTextField *audio_lastpwdSecureTextField;
@property (readwrite, weak) IBOutlet NSTextField *audio_lastpwdLabel;
@property (readwrite, weak) IBOutlet NSTextField *audio_lastuserTextField;
@property (readwrite, weak) IBOutlet NSTextField *audio_lastuserLabel;
@property (readwrite, weak) IBOutlet NSButton *audio_spdifCheckbox;
@property (readwrite, weak) IBOutlet NSView *audioView;
@property (readwrite, weak) IBOutlet NSPopUpButton *audio_visualPopup;
@property (readwrite, weak) IBOutlet NSTextField *audio_visualLabel;
@property (readwrite, weak) IBOutlet NSTextField *audio_volTextField;
@property (readwrite, weak) IBOutlet NSSlider *audio_volSlider;
@property (readwrite, weak) IBOutlet NSMatrix *audio_autosavevolMatrix;
@property (readwrite, weak) IBOutlet NSButtonCell *audio_autosavevol_yesButtonCell;
@property (readwrite, weak) IBOutlet NSButtonCell *audio_autosavevol_noButtonCell;
@property (readwrite, weak) IBOutlet NSButton *hotkeys_changeButton;
@property (readwrite, weak) IBOutlet NSTextField *hotkeys_changeLabel;
@property (readwrite, weak) IBOutlet NSTextField *hotkeys_change_keysLabel;
@property (readwrite, weak) IBOutlet NSTextField *hotkeys_change_takenLabel;
@property (readwrite, weak) IBOutlet NSWindow *hotkeys_change_win;
@property (readwrite, weak) IBOutlet NSButton *hotkeys_change_cancelButton;
@property (readwrite, weak) IBOutlet NSButton *hotkeys_change_okButton;
@property (readwrite, weak) IBOutlet NSButton *hotkeys_clearButton;
@property (readwrite, weak) IBOutlet NSTextField *hotkeysLabel;
@property (readwrite, weak) IBOutlet NSTableView *hotkeys_listbox;
@property (readwrite, weak) IBOutlet NSView *hotkeysView;
@property (readwrite, weak) IBOutlet NSBox *input_recordBox;
@property (readwrite, weak) IBOutlet NSTextField *input_recordTextField;
@property (readwrite, weak) IBOutlet NSButton *input_recordButton;
@property (readwrite, weak) IBOutlet NSPopUpButton *input_aviPopup;
@property (readwrite, weak) IBOutlet NSTextField *input_aviLabel;
@property (readwrite, weak) IBOutlet NSPopUpButton *input_cachelevelPopup;
@property (readwrite, weak) IBOutlet NSTextField *input_cachelevelLabel;
@property (readwrite, weak) IBOutlet NSTextField *input_cachelevel_customLabel;
@property (readwrite, weak) IBOutlet NSBox *input_cachingBox;
@property (readwrite, weak) IBOutlet NSBox *input_muxBox;
@property (readwrite, weak) IBOutlet NSBox *input_netBox;
@property (readwrite, weak) IBOutlet NSTextField *input_avcodec_hwLabel;
@property (readwrite, weak) IBOutlet NSPopUpButton *input_avcodec_hwPopup;
@property (readwrite, weak) IBOutlet NSTextField *input_postprocTextField;
@property (readwrite, weak) IBOutlet NSTextField *input_postprocLabel;
@property (readwrite, weak) IBOutlet NSButton *input_rtspCheckbox;
@property (readwrite, weak) IBOutlet NSTextField *input_skipLoopLabel;
@property (readwrite, weak) IBOutlet NSPopUpButton *input_skipLoopPopup;
@property (readwrite, weak) IBOutlet NSButton *input_mkv_preload_dirCheckbox;
@property (readwrite, weak) IBOutlet NSButton *input_urlhandlerButton;
@property (readwrite, weak) IBOutlet NSView *inputView;
@property (readwrite, weak) IBOutlet NSPopUpButton *intf_languagePopup;
@property (readwrite, weak) IBOutlet NSTextField *intf_languageLabel;
@property (readwrite, weak) IBOutlet NSTextField *intf_styleLabel;
@property (readwrite, weak) IBOutlet NSButtonCell *intf_style_darkButtonCell;
@property (readwrite, weak) IBOutlet NSButtonCell *intf_style_brightButtonCell;
@property (readwrite, weak) IBOutlet NSButton *intf_artCheckbox;
@property (readwrite, weak) IBOutlet NSButton *intf_embeddedCheckbox;
@property (readwrite, weak) IBOutlet NSButton *intf_fspanelCheckbox;
@property (readwrite, weak) IBOutlet NSButton *intf_appleremoteCheckbox;
@property (readwrite, weak) IBOutlet NSButton *intf_appleremote_sysvolCheckbox;
@property (readwrite, weak) IBOutlet NSButton *intf_mediakeysCheckbox;
@property (readwrite, weak) IBOutlet NSBox *intf_networkBox;
@property (readwrite, weak) IBOutlet NSView *intfView;
@property (readwrite, weak) IBOutlet NSButton *intf_updateCheckbox;
@property (readwrite, weak) IBOutlet NSTextField *intf_last_updateLabel;
@property (readwrite, weak) IBOutlet NSButton *intf_enableGrowlCheckbox;
@property (readwrite, weak) IBOutlet NSButton *intf_nativefullscreenCheckbox;
@property (readwrite, weak) IBOutlet NSButton *intf_autoresizeCheckbox;
@property (readwrite, weak) IBOutlet NSButton *intf_pauseminimizedCheckbox;
@property (readwrite, weak) IBOutlet NSBox *intf_luahttpBox;
@property (readwrite, weak) IBOutlet NSTextField *intf_luahttppwdLabel;
@property (readwrite, weak) IBOutlet NSTextField *intf_luahttppwdTextField;
@property (readwrite, weak) IBOutlet NSTextField *intf_pauseitunesLabel;
@property (readwrite, weak) IBOutlet NSPopUpButton *intf_pauseitunesPopup;
@property (readwrite, weak) IBOutlet NSTextField *intf_continueplaybackLabel;
@property (readwrite, weak) IBOutlet NSPopUpButton *intf_continueplaybackPopup;
@property (readwrite, weak) IBOutlet NSPopUpButton *osd_encodingPopup;
@property (readwrite, weak) IBOutlet NSTextField *osd_encodingLabel;
@property (readwrite, weak) IBOutlet NSBox *osd_fontBox;
@property (readwrite, weak) IBOutlet NSButton *osd_fontButton;
@property (readwrite, weak) IBOutlet NSPopUpButton *osd_font_colorPopup;
@property (readwrite, weak) IBOutlet NSTextField *osd_font_colorLabel;
@property (readwrite, weak) IBOutlet NSTextField *osd_fontTextField;
@property (readwrite, weak) IBOutlet NSPopUpButton *osd_font_sizePopup;
@property (readwrite, weak) IBOutlet NSTextField *osd_font_sizeLabel;
@property (readwrite, weak) IBOutlet NSTextField *osd_fontLabel;
@property (readwrite, weak) IBOutlet NSBox *osd_langBox;
@property (readwrite, weak) IBOutlet NSTextField *osd_langTextField;
@property (readwrite, weak) IBOutlet NSTextField *osd_langLabel;
@property (readwrite, weak) IBOutlet NSTextField *osd_opacityLabel;
@property (readwrite, weak) IBOutlet NSTextField *osd_opacityTextField;
@property (readwrite, weak) IBOutlet NSSlider *osd_opacitySlider;
@property (readwrite, weak) IBOutlet NSPopUpButton *osd_outline_colorPopup;
@property (readwrite, weak) IBOutlet NSTextField *osd_outline_colorLabel;
@property (readwrite, weak) IBOutlet NSPopUpButton *osd_outline_thicknessPopup;
@property (readwrite, weak) IBOutlet NSTextField *osd_outline_thicknessLabel;
@property (readwrite, weak) IBOutlet NSButton *osd_forceboldCheckbox;
@property (readwrite, weak) IBOutlet NSBox *osd_osdBox;
@property (readwrite, weak) IBOutlet NSButton *osd_osdCheckbox;
@property (readwrite, weak) IBOutlet NSView *osdView;
@property (readwrite, weak) IBOutlet NSButton *showAllButton;
@property (readwrite, weak) IBOutlet NSButton *cancelButton;
@property (readwrite, weak) IBOutlet NSBox *controlsBox;
@property (readwrite, weak) IBOutlet NSButton *resetButton;
@property (readwrite, weak) IBOutlet NSButton *saveButton;
@property (readwrite, weak) IBOutlet NSWindow *window;
@property (readwrite, weak) IBOutlet NSButton *video_blackCheckbox;
@property (readwrite, weak) IBOutlet NSPopUpButton *video_devicePopup;
@property (readwrite, weak) IBOutlet NSTextField *video_deviceLabel;
@property (readwrite, weak) IBOutlet NSBox *video_displayBox;
@property (readwrite, weak) IBOutlet NSButton *video_enableCheckbox;
@property (readwrite, weak) IBOutlet NSButton *video_fullscreenCheckbox;
@property (readwrite, weak) IBOutlet NSButton *video_videodecoCheckbox;
@property (readwrite, weak) IBOutlet NSButton *video_onTopCheckbox;
@property (readwrite, weak) IBOutlet NSButton *video_skipFramesCheckbox;
@property (readwrite, weak) IBOutlet NSBox *video_snapBox;
@property (readwrite, weak) IBOutlet NSButton *video_snap_folderButton;
@property (readwrite, weak) IBOutlet NSTextField *video_snap_folderTextField;
@property (readwrite, weak) IBOutlet NSTextField *video_snap_folderLabel;
@property (readwrite, weak) IBOutlet NSPopUpButton *video_snap_formatPopup;
@property (readwrite, weak) IBOutlet NSTextField *video_snap_formatLabel;
@property (readwrite, weak) IBOutlet NSTextField *video_snap_prefixTextField;
@property (readwrite, weak) IBOutlet NSTextField *video_snap_prefixLabel;
@property (readwrite, weak) IBOutlet NSButton *video_snap_seqnumCheckbox;
@property (readwrite, weak) IBOutlet NSTextField *video_deinterlaceLabel;
@property (readwrite, weak) IBOutlet NSPopUpButton *video_deinterlacePopup;
@property (readwrite, weak) IBOutlet NSTextField *video_deinterlace_modeLabel;
@property (readwrite, weak) IBOutlet NSPopUpButton *video_deinterlace_modePopup;
@property (readwrite, weak) IBOutlet NSBox *video_videoBox;
@property (readwrite, weak) IBOutlet NSView *videoView;
@property (readwrite, weak) IBOutlet NSTextField *urlhandler_titleLabel;
@property (readwrite, weak) IBOutlet NSTextField *urlhandler_subtitleLabel;
@property (readwrite, weak) IBOutlet NSButton *urlhandler_saveButton;
@property (readwrite, weak) IBOutlet NSButton *urlhandler_cancelButton;
@property (readwrite, weak) IBOutlet NSPopUpButton *urlhandler_ftpPopup;
@property (readwrite, weak) IBOutlet NSPopUpButton *urlhandler_mmsPopup;
@property (readwrite, weak) IBOutlet NSPopUpButton *urlhandler_rtmpPopup;
@property (readwrite, weak) IBOutlet NSPopUpButton *urlhandler_rtpPopup;
@property (readwrite, weak) IBOutlet NSPopUpButton *urlhandler_rtspPopup;
@property (readwrite, weak) IBOutlet NSPopUpButton *urlhandler_sftpPopup;
@property (readwrite, weak) IBOutlet NSPopUpButton *urlhandler_smbPopup;
@property (readwrite, weak) IBOutlet NSPopUpButton *urlhandler_udpPopup;
@property (readwrite, weak) IBOutlet NSWindow *urlhandler_win;
/* toolbar */ /* toolbar */
- (NSToolbarItem *)toolbar:(NSToolbar *)o_toolbar - (NSToolbarItem *)toolbar:(NSToolbar *)o_toolbar
itemForItemIdentifier:(NSString *)o_itemIdent itemForItemIdentifier:(NSString *)o_itemIdent
......
modules/gui/macosx/simple_prefs.m
View file @ 34812220
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
#import "CoreInteraction.h" #import "CoreInteraction.h"
#ifdef HAVE_SPARKLE #ifdef HAVE_SPARKLE
#import <Sparkle/Sparkle.h> //for o_intf_last_update_lbl #import <Sparkle/Sparkle.h> //for o_intf_last_updateLabel
#endif #endif
static const char *const ppsz_language[] = static const char *const ppsz_language[] =
...@@ -179,22 +179,22 @@ static NSString* VLCOSDSettingToolbarIdentifier = @"Subtitles Settings Item Iden ...@@ -179,22 +179,22 @@ static NSString* VLCOSDSettingToolbarIdentifier = @"Subtitles Settings Item Iden
static NSString* VLCInputSettingToolbarIdentifier = @"Input Settings Item Identifier"; static NSString* VLCInputSettingToolbarIdentifier = @"Input Settings Item Identifier";
static NSString* VLCHotkeysSettingToolbarIdentifier = @"Hotkeys Settings Item Identifier"; static NSString* VLCHotkeysSettingToolbarIdentifier = @"Hotkeys Settings Item Identifier";
@interface VLCSimplePrefs() @interface VLCSimplePrefs() <NSToolbarDelegate, NSWindowDelegate>
{ {
BOOL b_audioSettingChanged; BOOL _audioSettingChanged;
BOOL b_intfSettingChanged; BOOL _intfSettingChanged;
BOOL b_videoSettingChanged; BOOL _videoSettingChanged;
BOOL b_osdSettingChanged; BOOL _osdSettingChanged;
BOOL b_inputSettingChanged; BOOL _inputSettingChanged;
BOOL b_hotkeyChanged; BOOL _hotkeyChanged;
id o_currentlyShownCategoryView; id _currentlyShownCategoryView;
NSOpenPanel *o_selectFolderPanel; NSOpenPanel *_selectFolderPanel;
NSArray *o_hotkeyDescriptions; NSArray *_hotkeyDescriptions;
NSArray *o_hotkeyNames; NSArray *_hotkeyNames;
NSArray *o_hotkeysNonUseableKeys; NSArray *_hotkeysNonUseableKeys;
NSMutableArray *o_hotkeySettings; NSMutableArray *_hotkeySettings;
NSString *o_keyInTransition; NSString *_keyInTransition;
intf_thread_t *p_intf; intf_thread_t *p_intf;
} }
...@@ -228,77 +228,77 @@ static NSString* VLCHotkeysSettingToolbarIdentifier = @"Hotkeys Settings Item Id ...@@ -228,77 +228,77 @@ static NSString* VLCHotkeysSettingToolbarIdentifier = @"Hotkeys Settings Item Id
[self initStrings]; [self initStrings];
#ifdef HAVE_SPARKLE #ifdef HAVE_SPARKLE
[o_intf_update_ckb bind:@"value" [_intf_updateCheckbox bind:@"value"
toObject:[SUUpdater sharedUpdater] toObject:[SUUpdater sharedUpdater]
withKeyPath:@"automaticallyChecksForUpdates" withKeyPath:@"automaticallyChecksForUpdates"
options:nil]; options:nil];
#else #else
[o_intf_update_ckb setState:NSOffState]; [_intf_updateCheckbox setState:NSOffState];
[o_intf_update_ckb setEnabled:NO]; [_intf_updateCheckbox setEnabled:NO];
#endif #endif
/* setup the toolbar */ /* setup the toolbar */
NSToolbar * o_sprefs_toolbar = [[NSToolbar alloc] initWithIdentifier: VLCSPrefsToolbarIdentifier]; NSToolbar * toolbar = [[NSToolbar alloc] initWithIdentifier: VLCSPrefsToolbarIdentifier];
[o_sprefs_toolbar setAllowsUserCustomization: NO]; [toolbar setAllowsUserCustomization: NO];
[o_sprefs_toolbar setAutosavesConfiguration: NO]; [toolbar setAutosavesConfiguration: NO];
[o_sprefs_toolbar setDisplayMode: NSToolbarDisplayModeIconAndLabel]; [toolbar setDisplayMode: NSToolbarDisplayModeIconAndLabel];
[o_sprefs_toolbar setSizeMode: NSToolbarSizeModeRegular]; [toolbar setSizeMode: NSToolbarSizeModeRegular];
[o_sprefs_toolbar setDelegate: self]; [toolbar setDelegate: self];
[o_sprefs_win setToolbar: o_sprefs_toolbar]; [_window setToolbar:toolbar];
[o_sprefs_win setCollectionBehavior: NSWindowCollectionBehaviorFullScreenAuxiliary]; [_window setCollectionBehavior: NSWindowCollectionBehaviorFullScreenAuxiliary];
[o_sprefs_win setHidesOnDeactivate:YES]; [_window setHidesOnDeactivate:YES];
[o_hotkeys_listbox setTarget:self]; [_hotkeys_listbox setTarget:self];
[o_hotkeys_listbox setDoubleAction:@selector(hotkeyTableDoubleClick:)]; [_hotkeys_listbox setDoubleAction:@selector(hotkeyTableDoubleClick:)];
/* setup useful stuff */ /* 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-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]; _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-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];
} }
#define CreateToolbarItem(o_name, o_desc, o_img, sel) \ #define CreateToolbarItem(name, desc, img, sel) \
o_toolbarItem = create_toolbar_item(o_itemIdent, o_name, o_desc, o_img, self, @selector(sel)); toolbarItem = create_toolbar_item(itemIdent, name, desc, img, self, @selector(sel));
static inline NSToolbarItem * static inline NSToolbarItem *
create_toolbar_item(NSString * o_itemIdent, NSString * o_name, NSString * o_desc, NSString * o_img, id target, SEL selector) create_toolbar_item(NSString *itemIdent, NSString *name, NSString *desc, NSString *img, id target, SEL selector)
{ {
NSToolbarItem *o_toolbarItem = [[NSToolbarItem alloc] initWithItemIdentifier: o_itemIdent]; NSToolbarItem *toolbarItem = [[NSToolbarItem alloc] initWithItemIdentifier: itemIdent];
[o_toolbarItem setLabel: o_name]; [toolbarItem setLabel:name];
[o_toolbarItem setPaletteLabel: o_desc]; [toolbarItem setPaletteLabel:desc];
[o_toolbarItem setToolTip: o_desc]; [toolbarItem setToolTip:desc];
[o_toolbarItem setImage: [NSImage imageNamed: o_img]]; [toolbarItem setImage:[NSImage imageNamed:img]];
[o_toolbarItem setTarget: target]; [toolbarItem setTarget:target];
[o_toolbarItem setAction: selector]; [toolbarItem setAction:selector];
[o_toolbarItem setEnabled: YES]; [toolbarItem setEnabled:YES];
[o_toolbarItem setAutovalidates: YES]; [toolbarItem setAutovalidates:YES];
return o_toolbarItem; return toolbarItem;
} }
- (NSToolbarItem *) toolbar: (NSToolbar *)o_sprefs_toolbar - (NSToolbarItem *) toolbar:(NSToolbar *)toolbar
itemForItemIdentifier: (NSString *)o_itemIdent itemForItemIdentifier:(NSString *)itemIdent
willBeInsertedIntoToolbar: (BOOL)b_willBeInserted willBeInsertedIntoToolbar:(BOOL)willBeInserted
{ {
NSToolbarItem *o_toolbarItem = nil; NSToolbarItem *toolbarItem = nil;
if ([o_itemIdent isEqual: VLCIntfSettingToolbarIdentifier]) { if ([itemIdent isEqual: VLCIntfSettingToolbarIdentifier]) {
CreateToolbarItem(_NS("Interface"), _NS("Interface Settings"), @"spref_cone_Interface_64", showInterfaceSettings); CreateToolbarItem(_NS("Interface"), _NS("Interface Settings"), @"spref_cone_Interface_64", showInterfaceSettings);
} else if ([o_itemIdent isEqual: VLCAudioSettingToolbarIdentifier]) { } else if ([itemIdent isEqual: VLCAudioSettingToolbarIdentifier]) {
CreateToolbarItem(_NS("Audio"), _NS("Audio Settings"), @"spref_cone_Audio_64", showAudioSettings); CreateToolbarItem(_NS("Audio"), _NS("Audio Settings"), @"spref_cone_Audio_64", showAudioSettings);
} else if ([o_itemIdent isEqual: VLCVideoSettingToolbarIdentifier]) { } else if ([itemIdent isEqual: VLCVideoSettingToolbarIdentifier]) {
CreateToolbarItem(_NS("Video"), _NS("Video Settings"), @"spref_cone_Video_64", showVideoSettings); CreateToolbarItem(_NS("Video"), _NS("Video Settings"), @"spref_cone_Video_64", showVideoSettings);
} else if ([o_itemIdent isEqual: VLCOSDSettingToolbarIdentifier]) { } else if ([itemIdent isEqual: VLCOSDSettingToolbarIdentifier]) {
CreateToolbarItem(_NS(SUBPIC_TITLE), _NS("Subtitle & On Screen Display Settings"), @"spref_cone_Subtitles_64", showOSDSettings); CreateToolbarItem(_NS(SUBPIC_TITLE), _NS("Subtitle & On Screen Display Settings"), @"spref_cone_Subtitles_64", showOSDSettings);
} else if ([o_itemIdent isEqual: VLCInputSettingToolbarIdentifier]) { } else if ([itemIdent isEqual: VLCInputSettingToolbarIdentifier]) {
CreateToolbarItem(_NS(INPUT_TITLE), _NS("Input & Codec Settings"), @"spref_cone_Input_64", showInputSettings); CreateToolbarItem(_NS(INPUT_TITLE), _NS("Input & Codec Settings"), @"spref_cone_Input_64", showInputSettings);
} else if ([o_itemIdent isEqual: VLCHotkeysSettingToolbarIdentifier]) { } else if ([itemIdent isEqual: VLCHotkeysSettingToolbarIdentifier]) {
CreateToolbarItem(_NS("Hotkeys"), _NS("Hotkeys settings"), @"spref_cone_Hotkeys_64", showHotkeySettings); CreateToolbarItem(_NS("Hotkeys"), _NS("Hotkeys settings"), @"spref_cone_Hotkeys_64", showHotkeySettings);
} }
return o_toolbarItem; return toolbarItem;
} }
- (NSArray *)toolbarDefaultItemIdentifiers: (NSToolbar *)toolbar - (NSArray *)toolbarDefaultItemIdentifiers: (NSToolbar *)toolbar
...@@ -324,116 +324,116 @@ create_toolbar_item(NSString * o_itemIdent, NSString * o_name, NSString * o_desc ...@@ -324,116 +324,116 @@ create_toolbar_item(NSString * o_itemIdent, NSString * o_name, NSString * o_desc
- (void)initStrings - (void)initStrings
{ {
/* audio */ /* audio */
[o_audio_dolby_txt setStringValue: _NS("Force detection of Dolby Surround")]; [_audio_dolbyLabel setStringValue: _NS("Force detection of Dolby Surround")];
[o_audio_effects_box setTitle: _NS("Audio Effects")]; [_audio_effectsBox setTitle: _NS("Audio Effects")];
[o_audio_enable_ckb setTitle: _NS("Enable audio")]; [_audio_enableCheckbox setTitle: _NS("Enable audio")];
[o_audio_general_box setTitle: _NS("General Audio")]; [_audio_generalBox setTitle: _NS("General Audio")];
[o_audio_lang_txt setStringValue: _NS("Preferred Audio language")]; [_audio_langLabel setStringValue: _NS("Preferred Audio language")];
[o_audio_last_ckb setTitle: _NS("Enable Last.fm submissions")]; [_audio_lastCheckbox setTitle: _NS("Enable Last.fm submissions")];
[o_audio_lastpwd_txt setStringValue: _NS("Password")]; [_audio_lastpwdLabel setStringValue: _NS("Password")];
[o_audio_lastuser_txt setStringValue: _NS("Username")]; [_audio_lastuserLabel setStringValue: _NS("Username")];
[o_audio_spdif_ckb setTitle: _NS("Use S/PDIF when available")]; [_audio_spdifCheckbox setTitle: _NS("Use S/PDIF when available")];
[o_audio_visual_txt setStringValue: _NS("Visualization")]; [_audio_visualLabel setStringValue: _NS("Visualization")];
[o_audio_autosavevol_yes_bcell setTitle: _NS("Keep audio level between sessions")]; [_audio_autosavevol_yesButtonCell setTitle: _NS("Keep audio level between sessions")];
[o_audio_autosavevol_no_bcell setTitle: _NS("Always reset audio start level to:")]; [_audio_autosavevol_noButtonCell setTitle: _NS("Always reset audio start level to:")];
/* hotkeys */ /* hotkeys */
[o_hotkeys_change_btn setTitle: _NS("Change")]; [_hotkeys_changeButton setTitle: _NS("Change")];
[o_hotkeys_change_win setTitle: _NS("Change Hotkey")]; [_hotkeys_change_win setTitle: _NS("Change Hotkey")];
[o_hotkeys_change_cancel_btn setTitle: _NS("Cancel")]; [_hotkeys_change_cancelButton setTitle: _NS("Cancel")];
[o_hotkeys_change_ok_btn setTitle: _NS("OK")]; [_hotkeys_change_okButton setTitle: _NS("OK")];
[o_hotkeys_clear_btn setTitle: _NS("Clear")]; [_hotkeys_clearButton setTitle: _NS("Clear")];
[o_hotkeys_lbl setStringValue: _NS("Select an action to change the associated hotkey:")]; [_hotkeysLabel setStringValue: _NS("Select an action to change the associated hotkey:")];
[[[o_hotkeys_listbox tableColumnWithIdentifier: @"action"] headerCell] setStringValue: _NS("Action")]; [[[_hotkeys_listbox tableColumnWithIdentifier: @"action"] headerCell] setStringValue: _NS("Action")];
[[[o_hotkeys_listbox tableColumnWithIdentifier: @"shortcut"] headerCell] setStringValue: _NS("Shortcut")]; [[[_hotkeys_listbox tableColumnWithIdentifier: @"shortcut"] headerCell] setStringValue: _NS("Shortcut")];
/* input */ /* input */
[o_input_record_box setTitle: _NS("Record directory or filename")]; [_input_recordBox setTitle: _NS("Record directory or filename")];
[o_input_record_btn setTitle: _NS("Browse...")]; [_input_recordButton setTitle: _NS("Browse...")];
[o_input_record_btn setToolTip: _NS("Directory or filename where the records will be stored")]; [_input_recordButton setToolTip: _NS("Directory or filename where the records will be stored")];
[o_input_avi_txt setStringValue: _NS("Repair AVI Files")]; [_input_aviLabel setStringValue: _NS("Repair AVI Files")];
[o_input_cachelevel_txt setStringValue: _NS("Default Caching Level")]; [_input_cachelevelLabel setStringValue: _NS("Default Caching Level")];
[o_input_caching_box setTitle: _NS("Caching")]; [_input_cachingBox setTitle: _NS("Caching")];
[o_input_cachelevel_custom_txt setStringValue: _NS("Use the complete preferences to configure custom caching values for each access module.")]; [_input_cachelevel_customLabel setStringValue: _NS("Use the complete preferences to configure custom caching values for each access module.")];
[o_input_mux_box setTitle: _NS("Codecs / Muxers")]; [_input_muxBox setTitle: _NS("Codecs / Muxers")];
[o_input_net_box setTitle: _NS("Network")]; [_input_netBox setTitle: _NS("Network")];
[o_input_avcodec_hw_txt setStringValue: _NS("Hardware Acceleration")]; [_input_avcodec_hwLabel setStringValue: _NS("Hardware Acceleration")];
[o_input_postproc_txt setStringValue: _NS("Post-Processing Quality")]; [_input_postprocLabel setStringValue: _NS("Post-Processing Quality")];
[o_input_rtsp_ckb setTitle: _NS("Use RTP over RTSP (TCP)")]; [_input_rtspCheckbox setTitle: _NS("Use RTP over RTSP (TCP)")];
[o_input_skipLoop_txt setStringValue: _NS("Skip the loop filter for H.264 decoding")]; [_input_skipLoopLabel setStringValue: _NS("Skip the loop filter for H.264 decoding")];
[o_input_mkv_preload_dir_ckb setTitle: _NS("Preload MKV files in the same directory")]; [_input_mkv_preload_dirCheckbox setTitle: _NS("Preload MKV files in the same directory")];
[o_input_urlhandler_btn setTitle: _NS("Edit default application settings for network protocols")]; [_input_urlhandlerButton setTitle: _NS("Edit default application settings for network protocols")];
/* url handler */ /* url handler */
[o_urlhandler_title_txt setStringValue: _NS("Open network streams using the following protocols")]; [_urlhandler_titleLabel setStringValue: _NS("Open network streams using the following protocols")];
[o_urlhandler_subtitle_txt setStringValue: _NS("Note that these are system-wide settings.")]; [_urlhandler_subtitleLabel setStringValue: _NS("Note that these are system-wide settings.")];
[o_urlhandler_save_btn setTitle: _NS("Save")]; [_urlhandler_saveButton setTitle: _NS("Save")];
[o_urlhandler_cancel_btn setTitle: _NS("Cancel")]; [_urlhandler_cancelButton setTitle: _NS("Cancel")];
/* interface */ /* interface */
[o_intf_language_txt setStringValue: _NS("Language")]; [_intf_languageLabel setStringValue: _NS("Language")];
[o_intf_style_txt setStringValue: _NS("Interface style")]; [_intf_styleLabel setStringValue: _NS("Interface style")];
[o_intf_style_dark_bcell setTitle: _NS("Dark")]; [_intf_style_darkButtonCell setTitle: _NS("Dark")];
[o_intf_style_bright_bcell setTitle: _NS("Bright")]; [_intf_style_brightButtonCell setTitle: _NS("Bright")];
[o_intf_embedded_ckb setTitle: _NS("Show video within the main window")]; [_intf_embeddedCheckbox setTitle: _NS("Show video within the main window")];
[o_intf_nativefullscreen_ckb setTitle: _NS("Use the native fullscreen mode")]; [_intf_nativefullscreenCheckbox setTitle: _NS("Use the native fullscreen mode")];
[o_intf_fspanel_ckb setTitle: _NS("Show Fullscreen Controller")]; [_intf_fspanelCheckbox setTitle: _NS("Show Fullscreen Controller")];
[o_intf_network_box setTitle: _NS("Privacy / Network Interaction")]; [_intf_networkBox setTitle: _NS("Privacy / Network Interaction")];
[o_intf_appleremote_ckb setTitle: _NS("Control playback with the Apple Remote")]; [_intf_appleremoteCheckbox setTitle: _NS("Control playback with the Apple Remote")];
[o_intf_appleremote_sysvol_ckb setTitle: _NS("Control system volume with the Apple Remote")]; [_intf_appleremote_sysvolCheckbox setTitle: _NS("Control system volume with the Apple Remote")];
[o_intf_mediakeys_ckb setTitle: _NS("Control playback with media keys")]; [_intf_mediakeysCheckbox setTitle: _NS("Control playback with media keys")];
[o_intf_art_ckb setTitle: _NS("Allow metadata network access")]; [_intf_artCheckbox setTitle: _NS("Allow metadata network access")];
[o_intf_update_ckb setTitle: _NS("Automatically check for updates")]; [_intf_updateCheckbox setTitle: _NS("Automatically check for updates")];
[o_intf_last_update_lbl setStringValue: @""]; [_intf_last_updateLabel setStringValue: @""];
[o_intf_enableGrowl_ckb setTitle: _NS("Enable Growl notifications (on playlist item change)")]; [_intf_enableGrowlCheckbox setTitle: _NS("Enable Growl notifications (on playlist item change)")];
[o_intf_autoresize_ckb setTitle: _NS("Resize interface to the native video size")]; [_intf_autoresizeCheckbox setTitle: _NS("Resize interface to the native video size")];
[o_intf_pauseminimized_ckb setTitle: _NS("Pause the video playback when minimized")]; [_intf_pauseminimizedCheckbox setTitle: _NS("Pause the video playback when minimized")];
[o_intf_luahttp_box setTitle:_NS("Lua HTTP")]; [_intf_luahttpBox setTitle:_NS("Lua HTTP")];
[o_intf_luahttppwd_lbl setStringValue:_NS("Password")]; [_intf_luahttppwdLabel setStringValue:_NS("Password")];
[o_intf_pauseitunes_lbl setStringValue:_NS("Control external music players")]; [_intf_pauseitunesLabel setStringValue:_NS("Control external music players")];
[o_intf_continueplayback_lbl setStringValue:_NS("Continue playback")]; [_intf_continueplaybackLabel setStringValue:_NS("Continue playback")];
/* Subtitles and OSD */ /* Subtitles and OSD */
[o_osd_encoding_txt setStringValue: _NS("Default Encoding")]; [_osd_encodingLabel setStringValue: _NS("Default Encoding")];
[o_osd_font_box setTitle: _NS("Display Settings")]; [_osd_fontBox setTitle: _NS("Display Settings")];
[o_osd_font_btn setTitle: _NS("Choose...")]; [_osd_fontButton setTitle: _NS("Choose...")];
[o_osd_font_color_txt setStringValue: _NS("Font color")]; [_osd_font_colorLabel setStringValue: _NS("Font color")];
[o_osd_font_size_txt setStringValue: _NS("Font size")]; [_osd_font_sizeLabel setStringValue: _NS("Font size")];
[o_osd_font_txt setStringValue: _NS("Font")]; [_osd_fontLabel setStringValue: _NS("Font")];
[o_osd_lang_box setTitle: _NS("Subtitle languages")]; [_osd_langBox setTitle: _NS("Subtitle languages")];
[o_osd_lang_txt setStringValue: _NS("Preferred subtitle language")]; [_osd_langLabel setStringValue: _NS("Preferred subtitle language")];
[o_osd_osd_box setTitle: _NS("On Screen Display")]; [_osd_osdBox setTitle: _NS("On Screen Display")];
[o_osd_osd_ckb setTitle: _NS("Enable OSD")]; [_osd_osdCheckbox setTitle: _NS("Enable OSD")];
[o_osd_opacity_txt setStringValue: _NS("Opacity")]; [_osd_opacityLabel setStringValue: _NS("Opacity")];
[o_osd_forcebold_ckb setTitle: _NS("Force bold")]; [_osd_forceboldCheckbox setTitle: _NS("Force bold")];
[o_osd_outline_color_txt setStringValue: _NS("Outline color")]; [_osd_outline_colorLabel setStringValue: _NS("Outline color")];
[o_osd_outline_thickness_txt setStringValue: _NS("Outline thickness")]; [_osd_outline_thicknessLabel setStringValue: _NS("Outline thickness")];
/* video */ /* video */
[o_video_black_ckb setTitle: _NS("Black screens in Fullscreen mode")]; [_video_blackCheckbox setTitle: _NS("Black screens in Fullscreen mode")];
[o_video_device_txt setStringValue: _NS("Fullscreen Video Device")]; [_video_deviceLabel setStringValue: _NS("Fullscreen Video Device")];
[o_video_display_box setTitle: _NS("Display")]; [_video_displayBox setTitle: _NS("Display")];
[o_video_enable_ckb setTitle: _NS("Enable video")]; [_video_enableCheckbox setTitle: _NS("Enable video")];
[o_video_fullscreen_ckb setTitle: _NS("Fullscreen")]; [_video_fullscreenCheckbox setTitle: _NS("Fullscreen")];
[o_video_videodeco_ckb setTitle: _NS("Window decorations")]; [_video_videodecoCheckbox setTitle: _NS("Window decorations")];
[o_video_onTop_ckb setTitle: _NS("Float on Top")]; [_video_onTopCheckbox setTitle: _NS("Float on Top")];
[o_video_skipFrames_ckb setTitle: _NS("Skip frames")]; [_video_skipFramesCheckbox setTitle: _NS("Skip frames")];
[o_video_snap_box setTitle: _NS("Video snapshots")]; [_video_snapBox setTitle: _NS("Video snapshots")];
[o_video_snap_folder_btn setTitle: _NS("Browse...")]; [_video_snap_folderButton setTitle: _NS("Browse...")];
[o_video_snap_folder_txt setStringValue: _NS("Folder")]; [_video_snap_folderLabel setStringValue: _NS("Folder")];
[o_video_snap_format_txt setStringValue: _NS("Format")]; [_video_snap_formatLabel setStringValue: _NS("Format")];
[o_video_snap_prefix_txt setStringValue: _NS("Prefix")]; [_video_snap_prefixLabel setStringValue: _NS("Prefix")];
[o_video_snap_seqnum_ckb setTitle: _NS("Sequential numbering")]; [_video_snap_seqnumCheckbox setTitle: _NS("Sequential numbering")];
[o_video_deinterlace_txt setStringValue: _NS("Deinterlace")]; [_video_deinterlaceLabel setStringValue: _NS("Deinterlace")];
[o_video_deinterlace_mode_txt setStringValue: _NS("Deinterlace mode")]; [_video_deinterlace_modeLabel setStringValue: _NS("Deinterlace mode")];
[o_video_video_box setTitle: _NS("Video")]; [_video_videoBox setTitle: _NS("Video")];
/* generic stuff */ /* generic stuff */
[o_sprefs_showAll_btn setTitle: _NS("Show All")]; [_showAllButton setTitle: _NS("Show All")];
[o_sprefs_cancel_btn setTitle: _NS("Cancel")]; [_cancelButton setTitle: _NS("Cancel")];
[o_sprefs_reset_btn setTitle: _NS("Reset All")]; [_resetButton setTitle: _NS("Reset All")];
[o_sprefs_save_btn setTitle: _NS("Save")]; [_saveButton setTitle: _NS("Save")];
[o_sprefs_win setTitle: _NS("Preferences")]; [_window setTitle: _NS("Preferences")];
} }
/* TODO: move this part to core */ /* TODO: move this part to core */
...@@ -547,11 +547,11 @@ static inline char * __config_GetLabel(vlc_object_t *p_this, const char *psz_nam ...@@ -547,11 +547,11 @@ static inline char * __config_GetLabel(vlc_object_t *p_this, const char *psz_nam
[object setToolTip: _NS(config_GetLabel(p_intf, name))]; [object setToolTip: _NS(config_GetLabel(p_intf, name))];
} }
- (void)setupField:(NSTextField *)o_object forOption:(const char *)psz_option - (void)setupField:(NSTextField *)object forOption:(const char *)psz_option
{ {
char *psz_tmp = config_GetPsz(p_intf, psz_option); char *psz_tmp = config_GetPsz(p_intf, psz_option);
[o_object setStringValue: [NSString stringWithUTF8String:psz_tmp ?: ""]]; [object setStringValue: [NSString stringWithUTF8String:psz_tmp ?: ""]];
[o_object setToolTip: _NS(config_GetLabel(p_intf, psz_option))]; [object setToolTip: _NS(config_GetLabel(p_intf, psz_option))];
free(psz_tmp); free(psz_tmp);
} }
...@@ -568,210 +568,210 @@ static inline char * __config_GetLabel(vlc_object_t *p_this, const char *psz_nam ...@@ -568,210 +568,210 @@ static inline char * __config_GetLabel(vlc_object_t *p_this, const char *psz_nam
const char *pref = NULL; const char *pref = NULL;
pref = [[[NSUserDefaults standardUserDefaults] objectForKey:@"language"] UTF8String]; pref = [[[NSUserDefaults standardUserDefaults] objectForKey:@"language"] UTF8String];
for (int x = 0; ppsz_language[x] != NULL; x++) { for (int x = 0; ppsz_language[x] != NULL; x++) {
[o_intf_language_pop addItemWithTitle:[NSString stringWithUTF8String:ppsz_language_text[x]]]; [_intf_languagePopup addItemWithTitle:[NSString stringWithUTF8String:ppsz_language_text[x]]];
if (pref) { if (pref) {
if (!strcmp(ppsz_language[x], pref)) if (!strcmp(ppsz_language[x], pref))
sel = x; sel = x;
} }
} }
[o_intf_language_pop selectItemAtIndex:sel]; [_intf_languagePopup selectItemAtIndex:sel];
[self setupButton: o_intf_art_ckb forBoolValue: "metadata-network-access"]; [self setupButton:_intf_artCheckbox forBoolValue: "metadata-network-access"];
[self setupButton: o_intf_fspanel_ckb forBoolValue: "macosx-fspanel"]; [self setupButton:_intf_fspanelCheckbox forBoolValue: "macosx-fspanel"];
[self setupButton: o_intf_nativefullscreen_ckb forBoolValue: "macosx-nativefullscreenmode"]; [self setupButton:_intf_nativefullscreenCheckbox forBoolValue: "macosx-nativefullscreenmode"];
[self setupButton: o_intf_embedded_ckb forBoolValue: "embedded-video"]; [self setupButton:_intf_embeddedCheckbox forBoolValue: "embedded-video"];
[self setupButton: o_intf_appleremote_ckb forBoolValue: "macosx-appleremote"]; [self setupButton:_intf_appleremoteCheckbox forBoolValue: "macosx-appleremote"];
[self setupButton: o_intf_appleremote_sysvol_ckb forBoolValue: "macosx-appleremote-sysvol"]; [self setupButton:_intf_appleremote_sysvolCheckbox forBoolValue: "macosx-appleremote-sysvol"];
[self setupButton: o_intf_mediakeys_ckb forBoolValue: "macosx-mediakeys"]; [self setupButton:_intf_mediakeysCheckbox forBoolValue: "macosx-mediakeys"];
#ifdef HAVE_SPARKLE #ifdef HAVE_SPARKLE
if ([[SUUpdater sharedUpdater] lastUpdateCheckDate] != NULL) if ([[SUUpdater sharedUpdater] lastUpdateCheckDate] != NULL)
[o_intf_last_update_lbl setStringValue: [NSString stringWithFormat: _NS("Last check on: %@"), [[[SUUpdater sharedUpdater] lastUpdateCheckDate] descriptionWithLocale: [[NSUserDefaults standardUserDefaults] dictionaryRepresentation]]]]; [_intf_last_updateLabel setStringValue: [NSString stringWithFormat: _NS("Last check on: %@"), [[[SUUpdater sharedUpdater] lastUpdateCheckDate] descriptionWithLocale: [[NSUserDefaults standardUserDefaults] dictionaryRepresentation]]]];
else else
[o_intf_last_update_lbl setStringValue: _NS("No check was performed yet.")]; [_intf_last_updateLabel setStringValue: _NS("No check was performed yet.")];
#endif #endif
psz_tmp = config_GetPsz(p_intf, "control"); psz_tmp = config_GetPsz(p_intf, "control");
if (psz_tmp) { if (psz_tmp) {
[o_intf_enableGrowl_ckb setState: (NSInteger)strstr(psz_tmp, "growl")]; [_intf_enableGrowlCheckbox setState: (NSInteger)strstr(psz_tmp, "growl")];
free(psz_tmp); free(psz_tmp);
} else } else
[o_intf_enableGrowl_ckb setState: NSOffState]; [_intf_enableGrowlCheckbox setState: NSOffState];
if (config_GetInt(p_intf, "macosx-interfacestyle")) { if (config_GetInt(p_intf, "macosx-interfacestyle")) {
[o_intf_style_dark_bcell setState: YES]; [_intf_style_darkButtonCell setState: YES];
[o_intf_style_bright_bcell setState: NO]; [_intf_style_brightButtonCell setState: NO];
} else { } else {
[o_intf_style_dark_bcell setState: NO]; [_intf_style_darkButtonCell setState: NO];
[o_intf_style_bright_bcell setState: YES]; [_intf_style_brightButtonCell setState: YES];
} }
[self setupButton: o_intf_autoresize_ckb forBoolValue: "macosx-video-autoresize"]; [self setupButton:_intf_autoresizeCheckbox forBoolValue: "macosx-video-autoresize"];
[self setupButton: o_intf_pauseminimized_ckb forBoolValue: "macosx-pause-minimized"]; [self setupButton:_intf_pauseminimizedCheckbox forBoolValue: "macosx-pause-minimized"];
[self setupField: o_intf_luahttppwd_fld forOption: "http-password"]; [self setupField:_intf_luahttppwdTextField forOption: "http-password"];
[self setupButton: o_intf_pauseitunes_pop forIntList: "macosx-control-itunes"]; [self setupButton:_intf_pauseitunesPopup forIntList: "macosx-control-itunes"];
[self setupButton: o_intf_continueplayback_pop forIntList: "macosx-continue-playback"]; [self setupButton:_intf_continueplaybackPopup forIntList: "macosx-continue-playback"];
/****************** /******************
* audio settings * * audio settings *
******************/ ******************/
[self setupButton: o_audio_enable_ckb forBoolValue: "audio"]; [self setupButton:_audio_enableCheckbox forBoolValue: "audio"];
if (config_GetInt(p_intf, "volume-save")) { if (config_GetInt(p_intf, "volume-save")) {
[o_audio_autosavevol_yes_bcell setState: NSOnState]; [_audio_autosavevol_yesButtonCell setState: NSOnState];
[o_audio_autosavevol_no_bcell setState: NSOffState]; [_audio_autosavevol_noButtonCell setState: NSOffState];
[o_audio_vol_fld setEnabled: NO]; [_audio_volTextField setEnabled: NO];
[o_audio_vol_sld setEnabled: NO]; [_audio_volSlider setEnabled: NO];
[o_audio_vol_sld setIntValue: 100]; [_audio_volSlider setIntValue: 100];
[o_audio_vol_fld setIntValue: 100]; [_audio_volTextField setIntValue: 100];
} else { } else {
[o_audio_autosavevol_yes_bcell setState: NSOffState]; [_audio_autosavevol_yesButtonCell setState: NSOffState];
[o_audio_autosavevol_no_bcell setState: NSOnState]; [_audio_autosavevol_noButtonCell setState: NSOnState];
[o_audio_vol_fld setEnabled: YES]; [_audio_volTextField setEnabled: YES];
[o_audio_vol_sld setEnabled: YES]; [_audio_volSlider setEnabled: YES];
i = var_InheritInteger(p_intf, "auhal-volume"); i = var_InheritInteger(p_intf, "auhal-volume");
i = i * 200. / AOUT_VOLUME_MAX; i = i * 200. / AOUT_VOLUME_MAX;
[o_audio_vol_sld setIntValue: i]; [_audio_volSlider setIntValue: i];
[o_audio_vol_fld setIntValue: i]; [_audio_volTextField setIntValue: i];
} }
[self setupButton: o_audio_spdif_ckb forBoolValue: "spdif"]; [self setupButton:_audio_spdifCheckbox forBoolValue: "spdif"];
[self setupButton: o_audio_dolby_pop forIntList: "force-dolby-surround"]; [self setupButton:_audio_dolbyPopup forIntList: "force-dolby-surround"];
[self setupField: o_audio_lang_fld forOption: "audio-language"]; [self setupField:_audio_langTextField forOption: "audio-language"];
[self setupButton: o_audio_visual_pop forModuleList: "audio-visual"]; [self setupButton:_audio_visualPopup forModuleList: "audio-visual"];
/* Last.FM is optional */ /* Last.FM is optional */
if (module_exists("audioscrobbler")) { if (module_exists("audioscrobbler")) {
[self setupField: o_audio_lastuser_fld forOption:"lastfm-username"]; [self setupField:_audio_lastuserTextField forOption:"lastfm-username"];
[self setupField: o_audio_lastpwd_sfld forOption:"lastfm-password"]; [self setupField:_audio_lastpwdSecureTextField forOption:"lastfm-password"];
if (config_ExistIntf(VLC_OBJECT(p_intf), "audioscrobbler")) { if (config_ExistIntf(VLC_OBJECT(p_intf), "audioscrobbler")) {
[o_audio_last_ckb setState: NSOnState]; [_audio_lastCheckbox setState: NSOnState];
[o_audio_lastuser_fld setEnabled: YES]; [_audio_lastuserTextField setEnabled: YES];
[o_audio_lastpwd_sfld setEnabled: YES]; [_audio_lastpwdSecureTextField setEnabled: YES];
} else { } else {
[o_audio_last_ckb setState: NSOffState]; [_audio_lastCheckbox setState: NSOffState];
[o_audio_lastuser_fld setEnabled: NO]; [_audio_lastuserTextField setEnabled: NO];
[o_audio_lastpwd_sfld setEnabled: NO]; [_audio_lastpwdSecureTextField setEnabled: NO];
} }
} else } else
[o_audio_last_ckb setEnabled: NO]; [_audio_lastCheckbox setEnabled: NO];
/****************** /******************
* video settings * * video settings *
******************/ ******************/
[self setupButton: o_video_enable_ckb forBoolValue: "video"]; [self setupButton:_video_enableCheckbox forBoolValue: "video"];
[self setupButton: o_video_fullscreen_ckb forBoolValue: "fullscreen"]; [self setupButton:_video_fullscreenCheckbox forBoolValue: "fullscreen"];
[self setupButton: o_video_onTop_ckb forBoolValue: "video-on-top"]; [self setupButton:_video_onTopCheckbox forBoolValue: "video-on-top"];
[self setupButton: o_video_skipFrames_ckb forBoolValue: "skip-frames"]; [self setupButton:_video_skipFramesCheckbox forBoolValue: "skip-frames"];
[self setupButton: o_video_black_ckb forBoolValue: "macosx-black"]; [self setupButton:_video_blackCheckbox forBoolValue: "macosx-black"];
[self setupButton: o_video_videodeco_ckb forBoolValue: "video-deco"]; [self setupButton:_video_videodecoCheckbox forBoolValue: "video-deco"];
[o_video_device_pop removeAllItems]; [_video_devicePopup removeAllItems];
i = 0; i = 0;
y = [[NSScreen screens] count]; y = [[NSScreen screens] count];
[o_video_device_pop addItemWithTitle: _NS("Default")]; [_video_devicePopup addItemWithTitle: _NS("Default")];
[[o_video_device_pop lastItem] setTag: 0]; [[_video_devicePopup lastItem] setTag: 0];
while (i < y) { while (i < y) {
NSRect s_rect = [[[NSScreen screens] objectAtIndex:i] frame]; NSRect s_rect = [[[NSScreen screens] objectAtIndex:i] frame];
[o_video_device_pop addItemWithTitle: [_video_devicePopup addItemWithTitle:
[NSString stringWithFormat: @"%@ %i (%ix%i)", _NS("Screen"), i+1, [NSString stringWithFormat: @"%@ %i (%ix%i)", _NS("Screen"), i+1,
(int)s_rect.size.width, (int)s_rect.size.height]]; (int)s_rect.size.width, (int)s_rect.size.height]];
[[o_video_device_pop lastItem] setTag: (int)[[[NSScreen screens] objectAtIndex:i] displayID]]; [[_video_devicePopup lastItem] setTag: (int)[[[NSScreen screens] objectAtIndex:i] displayID]];
i++; i++;
} }
[o_video_device_pop selectItemAtIndex: 0]; [_video_devicePopup selectItemAtIndex: 0];
[o_video_device_pop selectItemWithTag: config_GetInt(p_intf, "macosx-vdev")]; [_video_devicePopup selectItemWithTag: config_GetInt(p_intf, "macosx-vdev")];
[self setupField: o_video_snap_folder_fld forOption:"snapshot-path"]; [self setupField:_video_snap_folderTextField forOption:"snapshot-path"];
[self setupField: o_video_snap_prefix_fld forOption:"snapshot-prefix"]; [self setupField:_video_snap_prefixTextField forOption:"snapshot-prefix"];
[self setupButton: o_video_snap_seqnum_ckb forBoolValue: "snapshot-sequential"]; [self setupButton:_video_snap_seqnumCheckbox forBoolValue: "snapshot-sequential"];
[self setupButton: o_video_snap_format_pop forStringList: "snapshot-format"]; [self setupButton:_video_snap_formatPopup forStringList: "snapshot-format"];
[self setupButton: o_video_deinterlace_pop forIntList: "deinterlace"]; [self setupButton:_video_deinterlacePopup forIntList: "deinterlace"];
[self setupButton: o_video_deinterlace_mode_pop forStringList: "deinterlace-mode"]; [self setupButton:_video_deinterlace_modePopup forStringList: "deinterlace-mode"];
// set lion fullscreen mode restrictions // set lion fullscreen mode restrictions
[self enableLionFullscreenMode: [o_intf_nativefullscreen_ckb state]]; [self enableLionFullscreenMode: [_intf_nativefullscreenCheckbox state]];
/*************************** /***************************
* input & codecs settings * * input & codecs settings *
***************************/ ***************************/
[self setupField: o_input_record_fld forOption:"input-record-path"]; [self setupField:_input_recordTextField forOption:"input-record-path"];
[o_input_postproc_fld setIntValue: config_GetInt(p_intf, "postproc-q")]; [_input_postprocTextField setIntValue: config_GetInt(p_intf, "postproc-q")];
[o_input_postproc_fld setToolTip: _NS(config_GetLabel(p_intf, "postproc-q"))]; [_input_postprocTextField setToolTip: _NS(config_GetLabel(p_intf, "postproc-q"))];
[self setupButton: o_input_avcodec_hw_pop forModuleList: "avcodec-hw"]; [self setupButton:_input_avcodec_hwPopup forModuleList: "avcodec-hw"];
[self setupButton: o_input_avi_pop forIntList: "avi-index"]; [self setupButton:_input_aviPopup forIntList: "avi-index"];
[self setupButton: o_input_rtsp_ckb forBoolValue: "rtsp-tcp"]; [self setupButton:_input_rtspCheckbox forBoolValue: "rtsp-tcp"];
[self setupButton: o_input_skipLoop_pop forIntList: "avcodec-skiploopfilter"]; [self setupButton:_input_skipLoopPopup forIntList: "avcodec-skiploopfilter"];
[self setupButton: o_input_mkv_preload_dir_ckb forBoolValue: "mkv-preload-local-dir"]; [self setupButton:_input_mkv_preload_dirCheckbox forBoolValue: "mkv-preload-local-dir"];
[o_input_cachelevel_pop removeAllItems]; [_input_cachelevelPopup removeAllItems];
[o_input_cachelevel_pop addItemsWithTitles: [NSArray arrayWithObjects:_NS("Custom"), _NS("Lowest latency"), [_input_cachelevelPopup addItemsWithTitles: [NSArray arrayWithObjects:_NS("Custom"), _NS("Lowest latency"),
_NS("Low latency"), _NS("Normal"), _NS("High latency"), _NS("Higher latency"), nil]]; _NS("Low latency"), _NS("Normal"), _NS("High latency"), _NS("Higher latency"), nil]];
[[o_input_cachelevel_pop itemAtIndex: 0] setTag: 0]; [[_input_cachelevelPopup itemAtIndex: 0] setTag: 0];
[[o_input_cachelevel_pop itemAtIndex: 1] setTag: 100]; [[_input_cachelevelPopup itemAtIndex: 1] setTag: 100];
[[o_input_cachelevel_pop itemAtIndex: 2] setTag: 200]; [[_input_cachelevelPopup itemAtIndex: 2] setTag: 200];
[[o_input_cachelevel_pop itemAtIndex: 3] setTag: 300]; [[_input_cachelevelPopup itemAtIndex: 3] setTag: 300];
[[o_input_cachelevel_pop itemAtIndex: 4] setTag: 500]; [[_input_cachelevelPopup itemAtIndex: 4] setTag: 500];
[[o_input_cachelevel_pop itemAtIndex: 5] setTag: 1000]; [[_input_cachelevelPopup itemAtIndex: 5] setTag: 1000];
#define TestCaC(name, factor) \ #define TestCaC(name, factor) \
b_cache_equal = b_cache_equal && \ cache_equal = cache_equal && \
(i_cache * factor == config_GetInt(p_intf, name)); (i_cache * factor == config_GetInt(p_intf, name));
/* Select the accurate value of the PopupButton */ /* Select the accurate value of the PopupButton */
bool b_cache_equal = true; bool cache_equal = true;
int i_cache = config_GetInt(p_intf, "file-caching"); int i_cache = config_GetInt(p_intf, "file-caching");
TestCaC("network-caching", 10/3); TestCaC("network-caching", 10/3);
TestCaC("disc-caching", 1); TestCaC("disc-caching", 1);
TestCaC("live-caching", 1); TestCaC("live-caching", 1);
if (b_cache_equal) { if (cache_equal) {
[o_input_cachelevel_pop selectItemWithTag: i_cache]; [_input_cachelevelPopup selectItemWithTag: i_cache];
[o_input_cachelevel_custom_txt setHidden: YES]; [_input_cachelevel_customLabel setHidden: YES];
} else { } else {
[o_input_cachelevel_pop selectItemWithTitle: _NS("Custom")]; [_input_cachelevelPopup selectItemWithTitle: _NS("Custom")];
[o_input_cachelevel_custom_txt setHidden: NO]; [_input_cachelevel_customLabel setHidden: NO];
} }
#undef TestCaC #undef TestCaC
/********************* /*********************
* subtitle settings * * subtitle settings *
*********************/ *********************/
[self setupButton: o_osd_osd_ckb forBoolValue: "osd"]; [self setupButton:_osd_osdCheckbox forBoolValue: "osd"];
[self setupButton: o_osd_encoding_pop forStringList: "subsdec-encoding"]; [self setupButton:_osd_encodingPopup forStringList: "subsdec-encoding"];
[self setupField: o_osd_lang_fld forOption: "sub-language" ]; [self setupField:_osd_langTextField forOption: "sub-language" ];
[self setupField: o_osd_font_fld forOption: "freetype-font"]; [self setupField:_osd_fontTextField forOption: "freetype-font"];
[self setupButton: o_osd_font_color_pop forIntList: "freetype-color"]; [self setupButton:_osd_font_colorPopup forIntList: "freetype-color"];
[self setupButton: o_osd_font_size_pop forIntList: "freetype-rel-fontsize"]; [self setupButton:_osd_font_sizePopup forIntList: "freetype-rel-fontsize"];
i = config_GetInt(p_intf, "freetype-opacity") * 100.0 / 255.0 + 0.5; i = config_GetInt(p_intf, "freetype-opacity") * 100.0 / 255.0 + 0.5;
[o_osd_opacity_fld setIntValue: i]; [_osd_opacityTextField setIntValue: i];
[o_osd_opacity_sld setIntValue: i]; [_osd_opacitySlider setIntValue: i];
[o_osd_opacity_sld setToolTip: _NS(config_GetLabel(p_intf, "freetype-opacity"))]; [_osd_opacitySlider setToolTip: _NS(config_GetLabel(p_intf, "freetype-opacity"))];
[o_osd_opacity_fld setToolTip: [o_osd_opacity_sld toolTip]]; [_osd_opacityTextField setToolTip: [_osd_opacitySlider toolTip]];
[self setupButton: o_osd_forcebold_ckb forBoolValue: "freetype-bold"]; [self setupButton:_osd_forceboldCheckbox forBoolValue: "freetype-bold"];
[self setupButton: o_osd_outline_color_pop forIntList: "freetype-outline-color"]; [self setupButton:_osd_outline_colorPopup forIntList: "freetype-outline-color"];
[self setupButton: o_osd_outline_thickness_pop forIntList: "freetype-outline-thickness"]; [self setupButton:_osd_outline_thicknessPopup forIntList: "freetype-outline-thickness"];
/******************** /********************
* hotkeys settings * * hotkeys settings *
********************/ ********************/
const struct hotkey *p_hotkeys = p_intf->p_libvlc->p_hotkeys; const struct hotkey *p_hotkeys = p_intf->p_libvlc->p_hotkeys;
o_hotkeySettings = [[NSMutableArray alloc] init]; _hotkeySettings = [[NSMutableArray alloc] init];
NSMutableArray *o_tempArray_desc = [[NSMutableArray alloc] init]; NSMutableArray *tempArray_desc = [[NSMutableArray alloc] init];
NSMutableArray *o_tempArray_names = [[NSMutableArray alloc] init]; NSMutableArray *tempArray_names = [[NSMutableArray alloc] init];
/* Get the main Module */ /* Get the main Module */
module_t *p_main = module_get_main(); module_t *p_main = module_get_main();
...@@ -787,20 +787,20 @@ static inline char * __config_GetLabel(vlc_object_t *p_this, const char *psz_nam ...@@ -787,20 +787,20 @@ static inline char * __config_GetLabel(vlc_object_t *p_this, const char *psz_nam
if (CONFIG_ITEM(p_item->i_type) && p_item->psz_name != NULL if (CONFIG_ITEM(p_item->i_type) && p_item->psz_name != NULL
&& !strncmp(p_item->psz_name , "key-", 4) && !strncmp(p_item->psz_name , "key-", 4)
&& !EMPTY_STR(p_item->psz_text)) { && !EMPTY_STR(p_item->psz_text)) {
[o_tempArray_desc addObject: _NS(p_item->psz_text)]; [tempArray_desc addObject: _NS(p_item->psz_text)];
[o_tempArray_names addObject: [NSString stringWithUTF8String:p_item->psz_name]]; [tempArray_names addObject: [NSString stringWithUTF8String:p_item->psz_name]];
if (p_item->value.psz) if (p_item->value.psz)
[o_hotkeySettings addObject: [NSString stringWithUTF8String:p_item->value.psz]]; [_hotkeySettings addObject: [NSString stringWithUTF8String:p_item->value.psz]];
else else
[o_hotkeySettings addObject: [NSString string]]; [_hotkeySettings addObject: [NSString string]];
} }
} }
module_config_free (p_config); module_config_free (p_config);
o_hotkeyDescriptions = [[NSArray alloc] initWithArray: o_tempArray_desc copyItems: YES]; _hotkeyDescriptions = [[NSArray alloc] initWithArray:tempArray_desc copyItems: YES];
o_hotkeyNames = [[NSArray alloc] initWithArray: o_tempArray_names copyItems: YES]; _hotkeyNames = [[NSArray alloc] initWithArray:tempArray_names copyItems: YES];
[o_hotkeys_listbox reloadData]; [_hotkeys_listbox reloadData];
} }
#pragma mark - #pragma mark -
...@@ -809,35 +809,35 @@ static inline char * __config_GetLabel(vlc_object_t *p_this, const char *psz_nam ...@@ -809,35 +809,35 @@ static inline char * __config_GetLabel(vlc_object_t *p_this, const char *psz_nam
- (void)showSimplePrefs - (void)showSimplePrefs
{ {
/* we want to show the interface settings, if no category was chosen */ /* we want to show the interface settings, if no category was chosen */
if ([[o_sprefs_win toolbar] selectedItemIdentifier] == nil) { if ([[_window toolbar] selectedItemIdentifier] == nil) {
[[o_sprefs_win toolbar] setSelectedItemIdentifier: VLCIntfSettingToolbarIdentifier]; [[_window toolbar] setSelectedItemIdentifier: VLCIntfSettingToolbarIdentifier];
[self showInterfaceSettings]; [self showInterfaceSettings];
} }
[self resetControls]; [self resetControls];
[o_sprefs_win center]; [_window center];
[o_sprefs_win makeKeyAndOrderFront: self]; [_window makeKeyAndOrderFront: self];
} }
- (void)showSimplePrefsWithLevel:(NSInteger)i_window_level - (void)showSimplePrefsWithLevel:(NSInteger)i_window_level
{ {
[o_sprefs_win setLevel: i_window_level]; [_window setLevel: i_window_level];
[self showSimplePrefs]; [self showSimplePrefs];
} }
- (IBAction)buttonAction:(id)sender - (IBAction)buttonAction:(id)sender
{ {
if (sender == o_sprefs_cancel_btn) { if (sender == _cancelButton) {
[[NSFontPanel sharedFontPanel] close]; [[NSFontPanel sharedFontPanel] close];
[o_sprefs_win orderOut: sender]; [_window orderOut: sender];
} else if (sender == o_sprefs_save_btn) { } else if (sender == _saveButton) {
[self saveChangedSettings]; [self saveChangedSettings];
[[NSFontPanel sharedFontPanel] close]; [[NSFontPanel sharedFontPanel] close];
[o_sprefs_win orderOut: sender]; [_window orderOut: sender];
} else if (sender == o_sprefs_showAll_btn) { } else if (sender == _showAllButton) {
[o_sprefs_win orderOut: self]; [_window orderOut: self];
[[[VLCMain sharedInstance] preferences] showPrefsWithLevel:[o_sprefs_win level]]; [[[VLCMain sharedInstance] preferences] showPrefsWithLevel:[_window level]];
} else } else
msg_Warn(p_intf, "unknown buttonAction sender"); msg_Warn(p_intf, "unknown buttonAction sender");
} }
...@@ -915,25 +915,25 @@ static inline void save_string_list(intf_thread_t * p_intf, id object, const cha ...@@ -915,25 +915,25 @@ static inline void save_string_list(intf_thread_t * p_intf, id object, const cha
/********************** /**********************
* interface settings * * interface settings *
**********************/ **********************/
if (b_intfSettingChanged) { if (_intfSettingChanged) {
NSUInteger index = [o_intf_language_pop indexOfSelectedItem]; NSUInteger index = [_intf_languagePopup indexOfSelectedItem];
NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
[defaults setObject:[NSString stringWithUTF8String:ppsz_language[index]] forKey:@"language"]; [defaults setObject:[NSString stringWithUTF8String:ppsz_language[index]] forKey:@"language"];
[defaults synchronize]; [defaults synchronize];
config_PutInt(p_intf, "metadata-network-access", [o_intf_art_ckb state]); config_PutInt(p_intf, "metadata-network-access", [_intf_artCheckbox state]);
config_PutInt(p_intf, "macosx-fspanel", [o_intf_fspanel_ckb state]); config_PutInt(p_intf, "macosx-fspanel", [_intf_fspanelCheckbox state]);
config_PutInt(p_intf, "embedded-video", [o_intf_embedded_ckb state]); config_PutInt(p_intf, "embedded-video", [_intf_embeddedCheckbox state]);
config_PutInt(p_intf, "macosx-appleremote", [o_intf_appleremote_ckb state]); config_PutInt(p_intf, "macosx-appleremote", [_intf_appleremoteCheckbox state]);
config_PutInt(p_intf, "macosx-appleremote-sysvol", [o_intf_appleremote_sysvol_ckb state]); config_PutInt(p_intf, "macosx-appleremote-sysvol", [_intf_appleremote_sysvolCheckbox state]);
config_PutInt(p_intf, "macosx-mediakeys", [o_intf_mediakeys_ckb state]); config_PutInt(p_intf, "macosx-mediakeys", [_intf_mediakeysCheckbox state]);
config_PutInt(p_intf, "macosx-interfacestyle", [o_intf_style_dark_bcell state]); config_PutInt(p_intf, "macosx-interfacestyle", [_intf_style_darkButtonCell state]);
config_PutInt(p_intf, "macosx-nativefullscreenmode", [o_intf_nativefullscreen_ckb state]); config_PutInt(p_intf, "macosx-nativefullscreenmode", [_intf_nativefullscreenCheckbox state]);
config_PutInt(p_intf, "macosx-pause-minimized", [o_intf_pauseminimized_ckb state]); config_PutInt(p_intf, "macosx-pause-minimized", [_intf_pauseminimizedCheckbox state]);
config_PutInt(p_intf, "macosx-video-autoresize", [o_intf_autoresize_ckb state]); config_PutInt(p_intf, "macosx-video-autoresize", [_intf_autoresizeCheckbox state]);
if ([o_intf_enableGrowl_ckb state] == NSOnState) { if ([_intf_enableGrowlCheckbox state] == NSOnState) {
tmpString = getString("control"); tmpString = getString("control");
tmpRange = [tmpString rangeOfString:@"growl"]; tmpRange = [tmpString rangeOfString:@"growl"];
if ([tmpString length] > 0 && tmpRange.location == NSNotFound) if ([tmpString length] > 0 && tmpRange.location == NSNotFound)
...@@ -953,134 +953,134 @@ static inline void save_string_list(intf_thread_t * p_intf, id object, const cha ...@@ -953,134 +953,134 @@ static inline void save_string_list(intf_thread_t * p_intf, id object, const cha
config_PutPsz(p_intf, "control", [tmpString UTF8String]); config_PutPsz(p_intf, "control", [tmpString UTF8String]);
} }
} }
config_PutPsz(p_intf, "http-password", [[o_intf_luahttppwd_fld stringValue] UTF8String]); config_PutPsz(p_intf, "http-password", [[_intf_luahttppwdTextField stringValue] UTF8String]);
SaveIntList(o_intf_pauseitunes_pop, "macosx-control-itunes"); SaveIntList(_intf_pauseitunesPopup, "macosx-control-itunes");
SaveIntList(o_intf_continueplayback_pop, "macosx-continue-playback"); SaveIntList(_intf_continueplaybackPopup, "macosx-continue-playback");
/* activate stuff without restart */ /* activate stuff without restart */
if ([o_intf_appleremote_ckb state] == YES) if ([_intf_appleremoteCheckbox state] == YES)
[[[VLCMain sharedInstance] appleRemoteController] startListening: [VLCMain sharedInstance]]; [[[VLCMain sharedInstance] appleRemoteController] startListening: [VLCMain sharedInstance]];
else else
[[[VLCMain sharedInstance] appleRemoteController] stopListening: [VLCMain sharedInstance]]; [[[VLCMain sharedInstance] appleRemoteController] stopListening: [VLCMain sharedInstance]];
b_intfSettingChanged = NO; _intfSettingChanged = NO;
} }
/****************** /******************
* audio settings * * audio settings *
******************/ ******************/
if (b_audioSettingChanged) { if (_audioSettingChanged) {
config_PutInt(p_intf, "audio", [o_audio_enable_ckb state]); config_PutInt(p_intf, "audio", [_audio_enableCheckbox state]);
config_PutInt(p_intf, "volume-save", [o_audio_autosavevol_yes_bcell state]); config_PutInt(p_intf, "volume-save", [_audio_autosavevol_yesButtonCell state]);
var_SetBool(p_intf, "volume-save", [o_audio_autosavevol_yes_bcell state]); var_SetBool(p_intf, "volume-save", [_audio_autosavevol_yesButtonCell state]);
config_PutInt(p_intf, "spdif", [o_audio_spdif_ckb state]); config_PutInt(p_intf, "spdif", [_audio_spdifCheckbox state]);
if ([o_audio_vol_fld isEnabled]) if ([_audio_volTextField isEnabled])
config_PutInt(p_intf, "auhal-volume", ([o_audio_vol_fld intValue] * AOUT_VOLUME_MAX) / 200); config_PutInt(p_intf, "auhal-volume", ([_audio_volTextField intValue] * AOUT_VOLUME_MAX) / 200);
SaveIntList(o_audio_dolby_pop, "force-dolby-surround"); SaveIntList(_audio_dolbyPopup, "force-dolby-surround");
config_PutPsz(p_intf, "audio-language", [[o_audio_lang_fld stringValue] UTF8String]); config_PutPsz(p_intf, "audio-language", [[_audio_langTextField stringValue] UTF8String]);
SaveModuleList(o_audio_visual_pop, "audio-visual"); SaveModuleList(_audio_visualPopup, "audio-visual");
/* Last.FM is optional */ /* Last.FM is optional */
if (module_exists("audioscrobbler")) { if (module_exists("audioscrobbler")) {
[o_audio_last_ckb setEnabled: YES]; [_audio_lastCheckbox setEnabled: YES];
if ([o_audio_last_ckb state] == NSOnState) if ([_audio_lastCheckbox state] == NSOnState)
config_AddIntf(p_intf, "audioscrobbler"); config_AddIntf(p_intf, "audioscrobbler");
else else
config_RemoveIntf(p_intf, "audioscrobbler"); config_RemoveIntf(p_intf, "audioscrobbler");
config_PutPsz(p_intf, "lastfm-username", [[o_audio_lastuser_fld stringValue] UTF8String]); config_PutPsz(p_intf, "lastfm-username", [[_audio_lastuserTextField stringValue] UTF8String]);
config_PutPsz(p_intf, "lastfm-password", [[o_audio_lastpwd_sfld stringValue] UTF8String]); config_PutPsz(p_intf, "lastfm-password", [[_audio_lastpwdSecureTextField stringValue] UTF8String]);
} }
else else
[o_audio_last_ckb setEnabled: NO]; [_audio_lastCheckbox setEnabled: NO];
b_audioSettingChanged = NO; _audioSettingChanged = NO;
} }
/****************** /******************
* video settings * * video settings *
******************/ ******************/
if (b_videoSettingChanged) { if (_videoSettingChanged) {
config_PutInt(p_intf, "video", [o_video_enable_ckb state]); config_PutInt(p_intf, "video", [_video_enableCheckbox state]);
config_PutInt(p_intf, "fullscreen", [o_video_fullscreen_ckb state]); config_PutInt(p_intf, "fullscreen", [_video_fullscreenCheckbox state]);
config_PutInt(p_intf, "video-deco", [o_video_videodeco_ckb state]); config_PutInt(p_intf, "video-deco", [_video_videodecoCheckbox state]);
config_PutInt(p_intf, "video-on-top", [o_video_onTop_ckb state]); config_PutInt(p_intf, "video-on-top", [_video_onTopCheckbox state]);
config_PutInt(p_intf, "skip-frames", [o_video_skipFrames_ckb state]); config_PutInt(p_intf, "skip-frames", [_video_skipFramesCheckbox state]);
config_PutInt(p_intf, "macosx-black", [o_video_black_ckb state]); config_PutInt(p_intf, "macosx-black", [_video_blackCheckbox state]);
config_PutInt(p_intf, "macosx-vdev", [[o_video_device_pop selectedItem] tag]); config_PutInt(p_intf, "macosx-vdev", [[_video_devicePopup selectedItem] tag]);
config_PutPsz(p_intf, "snapshot-path", [[o_video_snap_folder_fld stringValue] UTF8String]); config_PutPsz(p_intf, "snapshot-path", [[_video_snap_folderTextField stringValue] UTF8String]);
config_PutPsz(p_intf, "snapshot-prefix", [[o_video_snap_prefix_fld stringValue] UTF8String]); config_PutPsz(p_intf, "snapshot-prefix", [[_video_snap_prefixTextField stringValue] UTF8String]);
config_PutInt(p_intf, "snapshot-sequential", [o_video_snap_seqnum_ckb state]); config_PutInt(p_intf, "snapshot-sequential", [_video_snap_seqnumCheckbox state]);
SaveStringList(o_video_snap_format_pop, "snapshot-format"); SaveStringList(_video_snap_formatPopup, "snapshot-format");
SaveIntList(o_video_deinterlace_pop, "deinterlace"); SaveIntList(_video_deinterlacePopup, "deinterlace");
SaveStringList(o_video_deinterlace_mode_pop, "deinterlace-mode"); SaveStringList(_video_deinterlace_modePopup, "deinterlace-mode");
b_videoSettingChanged = NO; _videoSettingChanged = NO;
} }
/*************************** /***************************
* input & codecs settings * * input & codecs settings *
***************************/ ***************************/
if (b_inputSettingChanged) { if (_inputSettingChanged) {
config_PutPsz(p_intf, "input-record-path", [[o_input_record_fld stringValue] UTF8String]); config_PutPsz(p_intf, "input-record-path", [[_input_recordTextField stringValue] UTF8String]);
config_PutInt(p_intf, "postproc-q", [o_input_postproc_fld intValue]); config_PutInt(p_intf, "postproc-q", [_input_postprocTextField intValue]);
SaveIntList(o_input_avi_pop, "avi-index"); SaveIntList(_input_aviPopup, "avi-index");
config_PutInt(p_intf, "rtsp-tcp", [o_input_rtsp_ckb state]); config_PutInt(p_intf, "rtsp-tcp", [_input_rtspCheckbox state]);
SaveModuleList(o_input_avcodec_hw_pop, "avcodec-hw"); SaveModuleList(_input_avcodec_hwPopup, "avcodec-hw");
SaveIntList(o_input_skipLoop_pop, "avcodec-skiploopfilter"); SaveIntList(_input_skipLoopPopup, "avcodec-skiploopfilter");
config_PutInt(p_intf, "mkv-preload-local-dir", [o_input_mkv_preload_dir_ckb state]); config_PutInt(p_intf, "mkv-preload-local-dir", [_input_mkv_preload_dirCheckbox state]);
#define CaC(name, factor) config_PutInt(p_intf, name, [[o_input_cachelevel_pop selectedItem] tag] * factor) #define CaC(name, factor) config_PutInt(p_intf, name, [[_input_cachelevelPopup selectedItem] tag] * factor)
if ([[o_input_cachelevel_pop selectedItem] tag] == 0) { if ([[_input_cachelevelPopup selectedItem] tag] == 0) {
msg_Dbg(p_intf, "Custom chosen, not adjusting cache values"); msg_Dbg(p_intf, "Custom chosen, not adjusting cache values");
} else { } else {
msg_Dbg(p_intf, "Adjusting all cache values to: %i", (int)[[o_input_cachelevel_pop selectedItem] tag]); msg_Dbg(p_intf, "Adjusting all cache values to: %i", (int)[[_input_cachelevelPopup selectedItem] tag]);
CaC("file-caching", 1); CaC("file-caching", 1);
CaC("network-caching", 10/3); CaC("network-caching", 10/3);
CaC("disc-caching", 1); CaC("disc-caching", 1);
CaC("live-caching", 1); CaC("live-caching", 1);
} }
#undef CaC #undef CaC
b_inputSettingChanged = NO; _inputSettingChanged = NO;
} }
/********************** /**********************
* subtitles settings * * subtitles settings *
**********************/ **********************/
if (b_osdSettingChanged) { if (_osdSettingChanged) {
config_PutInt(p_intf, "osd", [o_osd_osd_ckb state]); config_PutInt(p_intf, "osd", [_osd_osdCheckbox state]);
if ([o_osd_encoding_pop indexOfSelectedItem] >= 0) if ([_osd_encodingPopup indexOfSelectedItem] >= 0)
SaveStringList(o_osd_encoding_pop, "subsdec-encoding"); SaveStringList(_osd_encodingPopup, "subsdec-encoding");
else else
config_PutPsz(p_intf, "subsdec-encoding", ""); config_PutPsz(p_intf, "subsdec-encoding", "");
config_PutPsz(p_intf, "sub-language", [[o_osd_lang_fld stringValue] UTF8String]); config_PutPsz(p_intf, "sub-language", [[_osd_langTextField stringValue] UTF8String]);
config_PutPsz(p_intf, "freetype-font", [[o_osd_font_fld stringValue] UTF8String]); config_PutPsz(p_intf, "freetype-font", [[_osd_fontTextField stringValue] UTF8String]);
SaveIntList(o_osd_font_color_pop, "freetype-color"); SaveIntList(_osd_font_colorPopup, "freetype-color");
SaveIntList(o_osd_font_size_pop, "freetype-rel-fontsize"); SaveIntList(_osd_font_sizePopup, "freetype-rel-fontsize");
config_PutInt(p_intf, "freetype-opacity", [o_osd_opacity_fld intValue] * 255.0 / 100.0 + 0.5); config_PutInt(p_intf, "freetype-opacity", [_osd_opacityTextField intValue] * 255.0 / 100.0 + 0.5);
config_PutInt(p_intf, "freetype-bold", [o_osd_forcebold_ckb state]); config_PutInt(p_intf, "freetype-bold", [_osd_forceboldCheckbox state]);
SaveIntList(o_osd_outline_color_pop, "freetype-outline-color"); SaveIntList(_osd_outline_colorPopup, "freetype-outline-color");
SaveIntList(o_osd_outline_thickness_pop, "freetype-outline-thickness"); SaveIntList(_osd_outline_thicknessPopup, "freetype-outline-thickness");
b_osdSettingChanged = NO; _osdSettingChanged = NO;
} }
/******************** /********************
* hotkeys settings * * hotkeys settings *
********************/ ********************/
if (b_hotkeyChanged) { if (_hotkeyChanged) {
NSUInteger hotKeyCount = [o_hotkeySettings count]; NSUInteger hotKeyCount = [_hotkeySettings count];
for (NSUInteger i = 0; i < hotKeyCount; i++) for (NSUInteger i = 0; i < hotKeyCount; i++)
config_PutPsz(p_intf, [[o_hotkeyNames objectAtIndex:i] UTF8String], [[o_hotkeySettings objectAtIndex:i]UTF8String]); config_PutPsz(p_intf, [[_hotkeyNames objectAtIndex:i] UTF8String], [[_hotkeySettings objectAtIndex:i]UTF8String]);
b_hotkeyChanged = NO; _hotkeyChanged = NO;
} }
[[VLCCoreInteraction sharedInstance] fixPreferences]; [[VLCCoreInteraction sharedInstance] fixPreferences];
...@@ -1093,171 +1093,171 @@ static inline void save_string_list(intf_thread_t * p_intf, id object, const cha ...@@ -1093,171 +1093,171 @@ static inline void save_string_list(intf_thread_t * p_intf, id object, const cha
userInfo: nil]; userInfo: nil];
} }
- (void)showSettingsForCategory: (id)o_new_category_view - (void)showSettingsForCategory:(id)new_categoryView
{ {
NSRect o_win_rect, o_view_rect, o_old_view_rect; NSRect win_rect, view_rect, oldView_rect;
o_win_rect = [o_sprefs_win frame]; win_rect = [_window frame];
o_view_rect = [o_new_category_view frame]; view_rect = [new_categoryView frame];
if (o_currentlyShownCategoryView == o_new_category_view) if (_currentlyShownCategoryView == new_categoryView)
return; return;
if (o_currentlyShownCategoryView != nil) { if (_currentlyShownCategoryView != nil) {
/* restore our window's height, if we've shown another category previously */ /* restore our window's height, if we've shown another category previously */
o_old_view_rect = [o_currentlyShownCategoryView frame]; oldView_rect = [_currentlyShownCategoryView frame];
o_win_rect.size.height = o_win_rect.size.height - o_old_view_rect.size.height; win_rect.size.height = win_rect.size.height - oldView_rect.size.height;
o_win_rect.origin.y = (o_win_rect.origin.y + o_old_view_rect.size.height) - o_view_rect.size.height; win_rect.origin.y = (win_rect.origin.y + oldView_rect.size.height) - view_rect.size.height;
} }
o_win_rect.size.height = o_win_rect.size.height + o_view_rect.size.height; win_rect.size.height = win_rect.size.height + view_rect.size.height;
[o_new_category_view setFrame: NSMakeRect(0, [new_categoryView setFrame: NSMakeRect(0,
[o_sprefs_controls_box frame].size.height, [_controlsBox frame].size.height,
o_view_rect.size.width, view_rect.size.width,
o_view_rect.size.height)]; view_rect.size.height)];
[o_new_category_view setAutoresizesSubviews: YES]; [new_categoryView setAutoresizesSubviews: YES];
if (o_currentlyShownCategoryView) { if (_currentlyShownCategoryView) {
[[[o_sprefs_win contentView] animator] replaceSubview: o_currentlyShownCategoryView with: o_new_category_view]; [[[_window contentView] animator] replaceSubview:_currentlyShownCategoryView with:new_categoryView];
[[o_sprefs_win animator] setFrame: o_win_rect display:YES]; [[_window animator] setFrame:win_rect display:YES];
} else { } else {
[[o_sprefs_win contentView] addSubview: o_new_category_view]; [[_window contentView] addSubview:new_categoryView];
[o_sprefs_win setFrame: o_win_rect display:YES animate:NO]; [_window setFrame:win_rect display:YES animate:NO];
} }
/* keep our current category for further reference */ /* keep our current category for further reference */
o_currentlyShownCategoryView = o_new_category_view; _currentlyShownCategoryView = new_categoryView;
} }
#pragma mark - #pragma mark -
#pragma mark Specific actions #pragma mark Specific actions
// disables some video settings which do not work in lion mode // disables some video settings which do not work in lion mode
- (void)enableLionFullscreenMode: (BOOL)b_value - (void)enableLionFullscreenMode: (BOOL)_value
{ {
[o_video_videodeco_ckb setEnabled: !b_value]; [_video_videodecoCheckbox setEnabled: !_value];
[o_video_black_ckb setEnabled: !b_value]; [_video_blackCheckbox setEnabled: !_value];
if (b_value) { if (_value) {
[o_video_videodeco_ckb setState: NSOnState]; [_video_videodecoCheckbox setState: NSOnState];
[o_video_black_ckb setState: NSOffState]; [_video_blackCheckbox setState: NSOffState];
NSString *o_tooltipText = _NS("This setting cannot be changed because the native fullscreen mode is enabled."); NSString *tooltipText = _NS("This setting cannot be changed because the native fullscreen mode is enabled.");
[o_video_videodeco_ckb setToolTip: o_tooltipText]; [_video_videodecoCheckbox setToolTip:tooltipText];
[o_video_black_ckb setToolTip: o_tooltipText]; [_video_blackCheckbox setToolTip:tooltipText];
} else { } else {
[self setupButton: o_video_videodeco_ckb forBoolValue: "video-deco"]; [self setupButton:_video_videodecoCheckbox forBoolValue: "video-deco"];
[self setupButton: o_video_black_ckb forBoolValue: "macosx-black"]; [self setupButton:_video_blackCheckbox forBoolValue: "macosx-black"];
} }
} }
- (IBAction)interfaceSettingChanged:(id)sender - (IBAction)interfaceSettingChanged:(id)sender
{ {
if (sender == o_intf_nativefullscreen_ckb) if (sender == _intf_nativefullscreenCheckbox)
[self enableLionFullscreenMode:[sender state]]; [self enableLionFullscreenMode:[sender state]];
b_intfSettingChanged = YES; _intfSettingChanged = YES;
} }
- (void)showInterfaceSettings - (void)showInterfaceSettings
{ {
[self showSettingsForCategory: o_intf_view]; [self showSettingsForCategory:_intfView];
} }
- (IBAction)audioSettingChanged:(id)sender - (IBAction)audioSettingChanged:(id)sender
{ {
if (sender == o_audio_vol_sld) if (sender == _audio_volSlider)
[o_audio_vol_fld setIntValue: [o_audio_vol_sld intValue]]; [_audio_volTextField setIntValue: [_audio_volSlider intValue]];
if (sender == o_audio_vol_fld) if (sender == _audio_volTextField)
[o_audio_vol_sld setIntValue: [o_audio_vol_fld intValue]]; [_audio_volSlider setIntValue: [_audio_volTextField intValue]];
if (sender == o_audio_last_ckb) { if (sender == _audio_lastCheckbox) {
if ([o_audio_last_ckb state] == NSOnState) { if ([_audio_lastCheckbox state] == NSOnState) {
[o_audio_lastpwd_sfld setEnabled: YES]; [_audio_lastpwdSecureTextField setEnabled: YES];
[o_audio_lastuser_fld setEnabled: YES]; [_audio_lastuserTextField setEnabled: YES];
} else { } else {
[o_audio_lastpwd_sfld setEnabled: NO]; [_audio_lastpwdSecureTextField setEnabled: NO];
[o_audio_lastuser_fld setEnabled: NO]; [_audio_lastuserTextField setEnabled: NO];
} }
} }
if (sender == o_audio_autosavevol_matrix) { if (sender == _audio_autosavevolMatrix) {
BOOL enableVolumeSlider = [o_audio_autosavevol_matrix selectedTag] == 1; BOOL enableVolumeSlider = [_audio_autosavevolMatrix selectedTag] == 1;
[o_audio_vol_fld setEnabled: enableVolumeSlider]; [_audio_volTextField setEnabled: enableVolumeSlider];
[o_audio_vol_sld setEnabled: enableVolumeSlider]; [_audio_volSlider setEnabled: enableVolumeSlider];
} }
b_audioSettingChanged = YES; _audioSettingChanged = YES;
} }
- (void)showAudioSettings - (void)showAudioSettings
{ {
[self showSettingsForCategory: o_audio_view]; [self showSettingsForCategory:_audioView];
} }
- (IBAction)videoSettingChanged:(id)sender - (IBAction)videoSettingChanged:(id)sender
{ {
if (sender == o_video_snap_folder_btn) { if (sender == _video_snap_folderButton) {
o_selectFolderPanel = [[NSOpenPanel alloc] init]; _selectFolderPanel = [[NSOpenPanel alloc] init];
[o_selectFolderPanel setCanChooseDirectories: YES]; [_selectFolderPanel setCanChooseDirectories: YES];
[o_selectFolderPanel setCanChooseFiles: NO]; [_selectFolderPanel setCanChooseFiles: NO];
[o_selectFolderPanel setResolvesAliases: YES]; [_selectFolderPanel setResolvesAliases: YES];
[o_selectFolderPanel setAllowsMultipleSelection: NO]; [_selectFolderPanel setAllowsMultipleSelection: NO];
[o_selectFolderPanel setMessage: _NS("Choose the folder to save your video snapshots to.")]; [_selectFolderPanel setMessage: _NS("Choose the folder to save your video snapshots to.")];
[o_selectFolderPanel setCanCreateDirectories: YES]; [_selectFolderPanel setCanCreateDirectories: YES];
[o_selectFolderPanel setPrompt: _NS("Choose")]; [_selectFolderPanel setPrompt: _NS("Choose")];
[o_selectFolderPanel beginSheetModalForWindow: o_sprefs_win completionHandler: ^(NSInteger returnCode) { [_selectFolderPanel beginSheetModalForWindow:_window completionHandler: ^(NSInteger returnCode) {
if (returnCode == NSOKButton) if (returnCode == NSOKButton)
{ {
[o_video_snap_folder_fld setStringValue: [[o_selectFolderPanel URL] path]]; [_video_snap_folderTextField setStringValue: [[_selectFolderPanel URL] path]];
b_videoSettingChanged = YES; _videoSettingChanged = YES;
} }
}]; }];
} else } else
b_videoSettingChanged = YES; _videoSettingChanged = YES;
} }
- (void)showVideoSettings - (void)showVideoSettings
{ {
[self showSettingsForCategory: o_video_view]; [self showSettingsForCategory:_videoView];
} }
- (IBAction)osdSettingChanged:(id)sender - (IBAction)osdSettingChanged:(id)sender
{ {
if (sender == o_osd_opacity_fld) if (sender == _osd_opacityTextField)
[o_osd_opacity_sld setIntValue: [o_osd_opacity_fld intValue]]; [_osd_opacitySlider setIntValue: [_osd_opacityTextField intValue]];
if (sender == o_osd_opacity_sld) if (sender == _osd_opacitySlider)
[o_osd_opacity_fld setIntValue: [o_osd_opacity_sld intValue]]; [_osd_opacityTextField setIntValue: [_osd_opacitySlider intValue]];
b_osdSettingChanged = YES; _osdSettingChanged = YES;
} }
- (void)showOSDSettings - (void)showOSDSettings
{ {
[self showSettingsForCategory: o_osd_view]; [self showSettingsForCategory:_osdView];
} }
- (void)controlTextDidChange:(NSNotification *)o_notification - (void)controlTextDidChange:(NSNotification *)notification
{ {
id notificationObject = [o_notification object]; id notificationObject = [notification object];
if (notificationObject == o_audio_lang_fld || if (notificationObject == _audio_langTextField ||
notificationObject == o_audio_lastpwd_sfld || notificationObject == _audio_lastpwdSecureTextField ||
notificationObject == o_audio_lastuser_fld || notificationObject == _audio_lastuserTextField ||
notificationObject == o_audio_vol_fld) notificationObject == _audio_volTextField)
b_audioSettingChanged = YES; _audioSettingChanged = YES;
else if (notificationObject == o_input_record_fld || else if (notificationObject == _input_recordTextField ||
notificationObject == o_input_postproc_fld) notificationObject == _input_postprocTextField)
b_inputSettingChanged = YES; _inputSettingChanged = YES;
else if (notificationObject == o_osd_font_fld || else if (notificationObject == _osd_fontTextField ||
notificationObject == o_osd_lang_fld || notificationObject == _osd_langTextField ||
notificationObject == o_osd_opacity_fld) notificationObject == _osd_opacityTextField)
b_osdSettingChanged = YES; _osdSettingChanged = YES;
else if (notificationObject == o_video_snap_folder_fld || else if (notificationObject == _video_snap_folderTextField ||
notificationObject == o_video_snap_prefix_fld) notificationObject == _video_snap_prefixTextField)
b_videoSettingChanged = YES; _videoSettingChanged = YES;
else if (notificationObject == o_intf_luahttppwd_fld) else if (notificationObject == _intf_luahttppwdTextField)
b_intfSettingChanged = YES; _intfSettingChanged = YES;
} }
- (IBAction)showFontPicker:(id)sender - (IBAction)showFontPicker:(id)sender
...@@ -1281,7 +1281,7 @@ static inline void save_string_list(intf_thread_t * p_intf, id object, const cha ...@@ -1281,7 +1281,7 @@ static inline void save_string_list(intf_thread_t * p_intf, id object, const cha
// converts given font to changes in font panel. Original font is irrelevant // converts given font to changes in font panel. Original font is irrelevant
NSFont *selectedFont = [sender convertFont:someFont]; NSFont *selectedFont = [sender convertFont:someFont];
[o_osd_font_fld setStringValue:[selectedFont fontName]]; [_osd_fontTextField setStringValue:[selectedFont fontName]];
[self osdSettingChanged:self]; [self osdSettingChanged:self];
} }
...@@ -1292,37 +1292,37 @@ static inline void save_string_list(intf_thread_t * p_intf, id object, const cha ...@@ -1292,37 +1292,37 @@ static inline void save_string_list(intf_thread_t * p_intf, id object, const cha
- (IBAction)inputSettingChanged:(id)sender - (IBAction)inputSettingChanged:(id)sender
{ {
if (sender == o_input_cachelevel_pop) { if (sender == _input_cachelevelPopup) {
if ([[[o_input_cachelevel_pop selectedItem] title] isEqualToString: _NS("Custom")]) if ([[[_input_cachelevelPopup selectedItem] title] isEqualToString: _NS("Custom")])
[o_input_cachelevel_custom_txt setHidden: NO]; [_input_cachelevel_customLabel setHidden: NO];
else else
[o_input_cachelevel_custom_txt setHidden: YES]; [_input_cachelevel_customLabel setHidden: YES];
} else if (sender == o_input_record_btn) { } else if (sender == _input_recordButton) {
o_selectFolderPanel = [[NSOpenPanel alloc] init]; _selectFolderPanel = [[NSOpenPanel alloc] init];
[o_selectFolderPanel setCanChooseDirectories: YES]; [_selectFolderPanel setCanChooseDirectories: YES];
[o_selectFolderPanel setCanChooseFiles: YES]; [_selectFolderPanel setCanChooseFiles: YES];
[o_selectFolderPanel setResolvesAliases: YES]; [_selectFolderPanel setResolvesAliases: YES];
[o_selectFolderPanel setAllowsMultipleSelection: NO]; [_selectFolderPanel setAllowsMultipleSelection: NO];
[o_selectFolderPanel setMessage: _NS("Choose the directory or filename where the records will be stored.")]; [_selectFolderPanel setMessage: _NS("Choose the directory or filename where the records will be stored.")];
[o_selectFolderPanel setCanCreateDirectories: YES]; [_selectFolderPanel setCanCreateDirectories: YES];
[o_selectFolderPanel setPrompt: _NS("Choose")]; [_selectFolderPanel setPrompt: _NS("Choose")];
[o_selectFolderPanel beginSheetModalForWindow: o_sprefs_win completionHandler: ^(NSInteger returnCode) { [_selectFolderPanel beginSheetModalForWindow:_window completionHandler: ^(NSInteger returnCode) {
if (returnCode == NSOKButton) if (returnCode == NSOKButton)
{ {
[o_input_record_fld setStringValue: [[o_selectFolderPanel URL] path]]; [_input_recordTextField setStringValue: [[_selectFolderPanel URL] path]];
b_inputSettingChanged = YES; _inputSettingChanged = YES;
} }
}]; }];
return; return;
} }
b_inputSettingChanged = YES; _inputSettingChanged = YES;
} }
- (void)showInputSettings - (void)showInputSettings
{ {
[self showSettingsForCategory: o_input_view]; [self showSettingsForCategory:_inputView];
} }
- (NSString *)bundleIdentifierForApplicationName:(NSString *)appName - (NSString *)bundleIdentifierForApplicationName:(NSString *)appName
...@@ -1354,7 +1354,7 @@ static inline void save_string_list(intf_thread_t * p_intf, id object, const cha ...@@ -1354,7 +1354,7 @@ static inline void save_string_list(intf_thread_t * p_intf, id object, const cha
{ {
NSString *bundleIdentifier = [[NSBundle mainBundle] bundleIdentifier]; NSString *bundleIdentifier = [[NSBundle mainBundle] bundleIdentifier];
if (sender == o_input_urlhandler_btn) { if (sender == _input_urlhandlerButton) {
NSArray *handlers; NSArray *handlers;
NSString *handler; NSString *handler;
NSString *rawhandler; NSString *rawhandler;
...@@ -1377,32 +1377,32 @@ static inline void save_string_list(intf_thread_t * p_intf, id object, const cha ...@@ -1377,32 +1377,32 @@ static inline void save_string_list(intf_thread_t * p_intf, id object, const cha
} \ } \
[object selectItemAtIndex: [rawHandlers indexOfObject:(__bridge id)LSCopyDefaultHandlerForURLScheme(CFSTR( protocol ))]]; [object selectItemAtIndex: [rawHandlers indexOfObject:(__bridge id)LSCopyDefaultHandlerForURLScheme(CFSTR( protocol ))]];
fillUrlHandlerPopup( "ftp", o_urlhandler_ftp_pop); fillUrlHandlerPopup( "ftp", _urlhandler_ftpPopup);
fillUrlHandlerPopup( "mms", o_urlhandler_mms_pop); fillUrlHandlerPopup( "mms", _urlhandler_mmsPopup);
fillUrlHandlerPopup( "rtmp", o_urlhandler_rtmp_pop); fillUrlHandlerPopup( "rtmp", _urlhandler_rtmpPopup);
fillUrlHandlerPopup( "rtp", o_urlhandler_rtp_pop); fillUrlHandlerPopup( "rtp", _urlhandler_rtpPopup);
fillUrlHandlerPopup( "rtsp", o_urlhandler_rtsp_pop); fillUrlHandlerPopup( "rtsp", _urlhandler_rtspPopup);
fillUrlHandlerPopup( "sftp", o_urlhandler_sftp_pop); fillUrlHandlerPopup( "sftp", _urlhandler_sftpPopup);
fillUrlHandlerPopup( "smb", o_urlhandler_smb_pop); fillUrlHandlerPopup( "smb", _urlhandler_smbPopup);
fillUrlHandlerPopup( "udp", o_urlhandler_udp_pop); fillUrlHandlerPopup( "udp", _urlhandler_udpPopup);
#undef fillUrlHandlerPopup #undef fillUrlHandlerPopup
[NSApp beginSheet:o_urlhandler_win modalForWindow:o_sprefs_win modalDelegate:self didEndSelector:NULL contextInfo:nil]; [NSApp beginSheet:_urlhandler_win modalForWindow:_window modalDelegate:self didEndSelector:NULL contextInfo:nil];
} else { } else {
[o_urlhandler_win orderOut:sender]; [_urlhandler_win orderOut:sender];
[NSApp endSheet: o_urlhandler_win]; [NSApp endSheet:_urlhandler_win];
if (sender == o_urlhandler_save_btn) { if (sender == _urlhandler_saveButton) {
LSSetDefaultHandlerForURLScheme(CFSTR("ftp"), (__bridge CFStringRef)[self bundleIdentifierForApplicationName:[[o_urlhandler_ftp_pop selectedItem] title]]); LSSetDefaultHandlerForURLScheme(CFSTR("ftp"), (__bridge CFStringRef)[self bundleIdentifierForApplicationName:[[_urlhandler_ftpPopup selectedItem] title]]);
LSSetDefaultHandlerForURLScheme(CFSTR("mms"), (__bridge CFStringRef)[self bundleIdentifierForApplicationName:[[o_urlhandler_mms_pop selectedItem] title]]); LSSetDefaultHandlerForURLScheme(CFSTR("mms"), (__bridge CFStringRef)[self bundleIdentifierForApplicationName:[[_urlhandler_mmsPopup selectedItem] title]]);
LSSetDefaultHandlerForURLScheme(CFSTR("mmsh"), (__bridge CFStringRef)[self bundleIdentifierForApplicationName:[[o_urlhandler_mms_pop selectedItem] title]]); LSSetDefaultHandlerForURLScheme(CFSTR("mmsh"), (__bridge CFStringRef)[self bundleIdentifierForApplicationName:[[_urlhandler_mmsPopup selectedItem] title]]);
LSSetDefaultHandlerForURLScheme(CFSTR("rtmp"), (__bridge CFStringRef)[self bundleIdentifierForApplicationName:[[o_urlhandler_rtmp_pop selectedItem] title]]); LSSetDefaultHandlerForURLScheme(CFSTR("rtmp"), (__bridge CFStringRef)[self bundleIdentifierForApplicationName:[[_urlhandler_rtmpPopup selectedItem] title]]);
LSSetDefaultHandlerForURLScheme(CFSTR("rtp"), (__bridge CFStringRef)[self bundleIdentifierForApplicationName:[[o_urlhandler_rtp_pop selectedItem] title]]); LSSetDefaultHandlerForURLScheme(CFSTR("rtp"), (__bridge CFStringRef)[self bundleIdentifierForApplicationName:[[_urlhandler_rtpPopup selectedItem] title]]);
LSSetDefaultHandlerForURLScheme(CFSTR("rtsp"), (__bridge CFStringRef)[self bundleIdentifierForApplicationName:[[o_urlhandler_rtsp_pop selectedItem] title]]); LSSetDefaultHandlerForURLScheme(CFSTR("rtsp"), (__bridge CFStringRef)[self bundleIdentifierForApplicationName:[[_urlhandler_rtspPopup selectedItem] title]]);
LSSetDefaultHandlerForURLScheme(CFSTR("sftp"), (__bridge CFStringRef)[self bundleIdentifierForApplicationName:[[o_urlhandler_sftp_pop selectedItem] title]]); LSSetDefaultHandlerForURLScheme(CFSTR("sftp"), (__bridge CFStringRef)[self bundleIdentifierForApplicationName:[[_urlhandler_sftpPopup selectedItem] title]]);
LSSetDefaultHandlerForURLScheme(CFSTR("smb"), (__bridge CFStringRef)[self bundleIdentifierForApplicationName:[[o_urlhandler_smb_pop selectedItem] title]]); LSSetDefaultHandlerForURLScheme(CFSTR("smb"), (__bridge CFStringRef)[self bundleIdentifierForApplicationName:[[_urlhandler_smbPopup selectedItem] title]]);
LSSetDefaultHandlerForURLScheme(CFSTR("udp"), (__bridge CFStringRef)[self bundleIdentifierForApplicationName:[[o_urlhandler_udp_pop selectedItem] title]]); LSSetDefaultHandlerForURLScheme(CFSTR("udp"), (__bridge CFStringRef)[self bundleIdentifierForApplicationName:[[_urlhandler_udpPopup selectedItem] title]]);
} }
} }
} }
...@@ -1413,64 +1413,64 @@ static inline void save_string_list(intf_thread_t * p_intf, id object, const cha ...@@ -1413,64 +1413,64 @@ static inline void save_string_list(intf_thread_t * p_intf, id object, const cha
- (void)hotkeyTableDoubleClick:(id)object - (void)hotkeyTableDoubleClick:(id)object
{ {
// -1 is header // -1 is header
if ([o_hotkeys_listbox clickedRow] >= 0) if ([_hotkeys_listbox clickedRow] >= 0)
[self hotkeySettingChanged:o_hotkeys_listbox]; [self hotkeySettingChanged:_hotkeys_listbox];
} }
- (IBAction)hotkeySettingChanged:(id)sender - (IBAction)hotkeySettingChanged:(id)sender
{ {
if (sender == o_hotkeys_change_btn || sender == o_hotkeys_listbox) { if (sender == _hotkeys_changeButton || sender == _hotkeys_listbox) {
[o_hotkeys_change_lbl setStringValue: [NSString stringWithFormat: _NS("Press new keys for\n\"%@\""), [_hotkeys_changeLabel setStringValue: [NSString stringWithFormat: _NS("Press new keys for\n\"%@\""),
[o_hotkeyDescriptions objectAtIndex:[o_hotkeys_listbox selectedRow]]]]; [_hotkeyDescriptions objectAtIndex:[_hotkeys_listbox selectedRow]]]];
[o_hotkeys_change_keys_lbl setStringValue: [[VLCStringUtility sharedInstance] OSXStringKeyToString:[o_hotkeySettings objectAtIndex:[o_hotkeys_listbox selectedRow]]]]; [_hotkeys_change_keysLabel setStringValue: [[VLCStringUtility sharedInstance] OSXStringKeyToString:[_hotkeySettings objectAtIndex:[_hotkeys_listbox selectedRow]]]];
[o_hotkeys_change_taken_lbl setStringValue: @""]; [_hotkeys_change_takenLabel setStringValue: @""];
[o_hotkeys_change_win setInitialFirstResponder: [o_hotkeys_change_win contentView]]; [_hotkeys_change_win setInitialFirstResponder: [_hotkeys_change_win contentView]];
[o_hotkeys_change_win makeFirstResponder: [o_hotkeys_change_win contentView]]; [_hotkeys_change_win makeFirstResponder: [_hotkeys_change_win contentView]];
[NSApp runModalForWindow: o_hotkeys_change_win]; [NSApp runModalForWindow:_hotkeys_change_win];
} else if (sender == o_hotkeys_change_cancel_btn) { } else if (sender == _hotkeys_change_cancelButton) {
[NSApp stopModal]; [NSApp stopModal];
[o_hotkeys_change_win close]; [_hotkeys_change_win close];
} else if (sender == o_hotkeys_change_ok_btn) { } else if (sender == _hotkeys_change_okButton) {
NSInteger i_returnValue; NSInteger i_returnValue;
if (! o_keyInTransition) { if (! _keyInTransition) {
[NSApp stopModal]; [NSApp stopModal];
[o_hotkeys_change_win close]; [_hotkeys_change_win close];
msg_Err(p_intf, "internal error prevented the hotkey switch"); msg_Err(p_intf, "internal error prevented the hotkey switch");
return; return;
} }
b_hotkeyChanged = YES; _hotkeyChanged = YES;
i_returnValue = [o_hotkeySettings indexOfObject: o_keyInTransition]; i_returnValue = [_hotkeySettings indexOfObject: _keyInTransition];
if (i_returnValue != NSNotFound) if (i_returnValue != NSNotFound)
[o_hotkeySettings replaceObjectAtIndex: i_returnValue withObject: [NSString string]]; [_hotkeySettings replaceObjectAtIndex: i_returnValue withObject: [NSString string]];
NSString *tempString; NSString *tempString;
tempString = [o_keyInTransition stringByReplacingOccurrencesOfString:@"-" withString:@"+"]; tempString = [_keyInTransition stringByReplacingOccurrencesOfString:@"-" withString:@"+"];
i_returnValue = [o_hotkeySettings indexOfObject: tempString]; i_returnValue = [_hotkeySettings indexOfObject: tempString];
if (i_returnValue != NSNotFound) if (i_returnValue != NSNotFound)
[o_hotkeySettings replaceObjectAtIndex: i_returnValue withObject: [NSString string]]; [_hotkeySettings replaceObjectAtIndex: i_returnValue withObject: [NSString string]];
[o_hotkeySettings replaceObjectAtIndex: [o_hotkeys_listbox selectedRow] withObject:o_keyInTransition]; [_hotkeySettings replaceObjectAtIndex: [_hotkeys_listbox selectedRow] withObject:_keyInTransition];
[NSApp stopModal]; [NSApp stopModal];
[o_hotkeys_change_win close]; [_hotkeys_change_win close];
[o_hotkeys_listbox reloadData]; [_hotkeys_listbox reloadData];
} else if (sender == o_hotkeys_clear_btn) { } else if (sender == _hotkeys_clearButton) {
[o_hotkeySettings replaceObjectAtIndex: [o_hotkeys_listbox selectedRow] withObject: [NSString string]]; [_hotkeySettings replaceObjectAtIndex: [_hotkeys_listbox selectedRow] withObject: [NSString string]];
[o_hotkeys_listbox reloadData]; [_hotkeys_listbox reloadData];
b_hotkeyChanged = YES; _hotkeyChanged = YES;
} }
} }
- (void)showHotkeySettings - (void)showHotkeySettings
{ {
[self showSettingsForCategory: o_hotkeys_view]; [self showSettingsForCategory:_hotkeysView];
} }
- (int)numberOfRowsInTableView:(NSTableView *)aTableView - (int)numberOfRowsInTableView:(NSTableView *)aTableView
{ {
return [o_hotkeySettings count]; return [_hotkeySettings count];
} }
- (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex - (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex
...@@ -1478,9 +1478,9 @@ static inline void save_string_list(intf_thread_t * p_intf, id object, const cha ...@@ -1478,9 +1478,9 @@ static inline void save_string_list(intf_thread_t * p_intf, id object, const cha
NSString * identifier = [aTableColumn identifier]; NSString * identifier = [aTableColumn identifier];
if ([identifier isEqualToString: @"action"]) if ([identifier isEqualToString: @"action"])
return [o_hotkeyDescriptions objectAtIndex:rowIndex]; return [_hotkeyDescriptions objectAtIndex:rowIndex];
else if ([identifier isEqualToString: @"shortcut"]) else if ([identifier isEqualToString: @"shortcut"])
return [[VLCStringUtility sharedInstance] OSXStringKeyToString:[o_hotkeySettings objectAtIndex:rowIndex]]; return [[VLCStringUtility sharedInstance] OSXStringKeyToString:[_hotkeySettings objectAtIndex:rowIndex]];
else { else {
msg_Err(p_intf, "unknown TableColumn identifier (%s)!", [identifier UTF8String]); msg_Err(p_intf, "unknown TableColumn identifier (%s)!", [identifier UTF8String]);
return NULL; return NULL;
...@@ -1490,31 +1490,31 @@ static inline void save_string_list(intf_thread_t * p_intf, id object, const cha ...@@ -1490,31 +1490,31 @@ static inline void save_string_list(intf_thread_t * p_intf, id object, const cha
- (BOOL)changeHotkeyTo: (NSString *)theKey - (BOOL)changeHotkeyTo: (NSString *)theKey
{ {
NSInteger i_returnValue, i_returnValue2; NSInteger i_returnValue, i_returnValue2;
i_returnValue = [o_hotkeysNonUseableKeys indexOfObject: theKey]; i_returnValue = [_hotkeysNonUseableKeys indexOfObject: theKey];
if (i_returnValue != NSNotFound || [theKey isEqualToString:@""]) { if (i_returnValue != NSNotFound || [theKey isEqualToString:@""]) {
[o_hotkeys_change_keys_lbl setStringValue: _NS("Invalid combination")]; [_hotkeys_change_keysLabel setStringValue: _NS("Invalid combination")];
[o_hotkeys_change_taken_lbl setStringValue: _NS("Regrettably, these keys cannot be assigned as hotkey shortcuts.")]; [_hotkeys_change_takenLabel setStringValue: _NS("Regrettably, these keys cannot be assigned as hotkey shortcuts.")];
[o_hotkeys_change_ok_btn setEnabled: NO]; [_hotkeys_change_okButton setEnabled: NO];
return NO; return NO;
} else { } else {
[o_hotkeys_change_keys_lbl setStringValue: [[VLCStringUtility sharedInstance] OSXStringKeyToString:theKey]]; [_hotkeys_change_keysLabel setStringValue: [[VLCStringUtility sharedInstance] OSXStringKeyToString:theKey]];
i_returnValue = [o_hotkeySettings indexOfObject: theKey]; i_returnValue = [_hotkeySettings indexOfObject: theKey];
i_returnValue2 = [o_hotkeySettings indexOfObject: [theKey stringByReplacingOccurrencesOfString:@"-" withString:@"+"]]; i_returnValue2 = [_hotkeySettings indexOfObject: [theKey stringByReplacingOccurrencesOfString:@"-" withString:@"+"]];
if (i_returnValue != NSNotFound) if (i_returnValue != NSNotFound)
[o_hotkeys_change_taken_lbl setStringValue: [NSString stringWithFormat: [_hotkeys_change_takenLabel setStringValue: [NSString stringWithFormat:
_NS("This combination is already taken by \"%@\"."), _NS("This combination is already taken by \"%@\"."),
[o_hotkeyDescriptions objectAtIndex:i_returnValue]]]; [_hotkeyDescriptions objectAtIndex:i_returnValue]]];
else if (i_returnValue2 != NSNotFound) else if (i_returnValue2 != NSNotFound)
[o_hotkeys_change_taken_lbl setStringValue: [NSString stringWithFormat: [_hotkeys_change_takenLabel setStringValue: [NSString stringWithFormat:
_NS("This combination is already taken by \"%@\"."), _NS("This combination is already taken by \"%@\"."),
[o_hotkeyDescriptions objectAtIndex:i_returnValue2]]]; [_hotkeyDescriptions objectAtIndex:i_returnValue2]]];
else else
[o_hotkeys_change_taken_lbl setStringValue: @""]; [_hotkeys_change_takenLabel setStringValue: @""];
[o_hotkeys_change_ok_btn setEnabled: YES]; [_hotkeys_change_okButton setEnabled: YES];
o_keyInTransition = theKey; _keyInTransition = theKey;
return YES; return YES;
} }
} }
...@@ -1543,13 +1543,13 @@ static inline void save_string_list(intf_thread_t * p_intf, id object, const cha ...@@ -1543,13 +1543,13 @@ static inline void save_string_list(intf_thread_t * p_intf, id object, const cha
return NO; return NO;
} }
- (BOOL)performKeyEquivalent:(NSEvent *)o_theEvent - (BOOL)performKeyEquivalent:(NSEvent *)theEvent
{ {
NSMutableString *tempString = [[NSMutableString alloc] init]; NSMutableString *tempString = [[NSMutableString alloc] init];
NSString *keyString = [o_theEvent characters]; NSString *keyString = [theEvent characters];
unichar key = [keyString characterAtIndex:0]; unichar key = [keyString characterAtIndex:0];
NSUInteger i_modifiers = [o_theEvent modifierFlags]; NSUInteger i_modifiers = [theEvent modifierFlags];
/* modifiers */ /* modifiers */
if (i_modifiers & NSControlKeyMask) if (i_modifiers & NSControlKeyMask)
...@@ -1620,8 +1620,8 @@ static inline void save_string_list(intf_thread_t * p_intf, id object, const cha ...@@ -1620,8 +1620,8 @@ static inline void save_string_list(intf_thread_t * p_intf, id object, const cha
[tempString appendString:@"Esc"]; [tempString appendString:@"Esc"];
else if (key == ' ') else if (key == ' ')
[tempString appendString:@"Space"]; [tempString appendString:@"Space"];
else if (![[[o_theEvent charactersIgnoringModifiers] lowercaseString] isEqualToString:@""]) //plain characters else if (![[[theEvent charactersIgnoringModifiers] lowercaseString] isEqualToString:@""]) //plain characters
[tempString appendString:[[o_theEvent charactersIgnoringModifiers] lowercaseString]]; [tempString appendString:[[theEvent charactersIgnoringModifiers] lowercaseString]];
else else
return NO; return NO;
......
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