Skip to content

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

macosx: Implemented the Subs/OSD and Input categories of the Simple Prefs

parent 9ab3a054
Expand all Show whitespace changes
Inline Side-by-side
Showing with 453 additions and 71 deletions
extras/package/macosx/Resources/English.lproj/Preferences.nib/classes.nib
View file @ 887efa47
......@@ -27,7 +27,9 @@
ACTIONS = {
audioSettingChanged = id;
buttonAction = id;
inputSettingChanged = id;
interfaceSettingChanged = id;
osdSettingChanged = id;
videoSettingChanged = id;
};
CLASS = VLCSimplePrefs;
......@@ -56,6 +58,26 @@
"o_audio_vol_fld" = id;
"o_audio_vol_sld" = id;
"o_audio_vol_txt" = id;
"o_input_access_box" = id;
"o_input_avi_pop" = id;
"o_input_avi_txt" = id;
"o_input_bandwidth_ckb" = id;
"o_input_cachelevel_pop" = id;
"o_input_cachelevel_txt" = id;
"o_input_caching_box" = id;
"o_input_dump_ckb" = id;
"o_input_httpproxy_fld" = id;
"o_input_httpproxy_txt" = id;
"o_input_mux_box" = id;
"o_input_net_box" = id;
"o_input_postproc_fld" = id;
"o_input_postproc_txt" = id;
"o_input_record_ckb" = id;
"o_input_rtsp_ckb" = id;
"o_input_serverport_fld" = id;
"o_input_serverport_txt" = id;
"o_input_timeshift_ckb" = id;
"o_input_view" = id;
"o_intf_art_pop" = id;
"o_intf_art_txt" = id;
"o_intf_embedded_ckb" = id;
......@@ -65,6 +87,24 @@
"o_intf_meta_ckb" = id;
"o_intf_network_box" = id;
"o_intf_view" = id;
"o_osd_encoding_pop" = id;
"o_osd_encoding_txt" = id;
"o_osd_font_box" = id;
"o_osd_font_btn" = id;
"o_osd_font_color_pop" = id;
"o_osd_font_color_txt" = id;
"o_osd_font_effect_pop" = id;
"o_osd_font_effect_txt" = id;
"o_osd_font_fld" = id;
"o_osd_font_size_pop" = id;
"o_osd_font_size_txt" = id;
"o_osd_font_txt" = id;
"o_osd_lang_box" = id;
"o_osd_lang_fld" = id;
"o_osd_lang_txt" = id;
"o_osd_osd_box" = id;
"o_osd_osd_ckb" = id;
"o_osd_view" = id;
"o_sprefs_basicFull_matrix" = id;
"o_sprefs_basic_box" = id;
"o_sprefs_cancel_btn" = id;
......
extras/package/macosx/Resources/English.lproj/Preferences.nib/info.nib
View file @ 887efa47
......@@ -3,15 +3,19 @@
<plist version="1.0">
<dict>
<key>IBDocumentLocation</key>
<string>113 117 505 518 0 0 1280 778 </string>
<string>391 94 505 518 0 0 1280 778 </string>
<key>IBEditorPositions</key>
<dict>
<key>2311</key>
<string>345 406 590 264 0 0 1280 778 </string>
<key>2330</key>
<string>450 263 590 502 0 0 1280 778 </string>
<string>345 266 590 502 0 0 1280 778 </string>
<key>2440</key>
<string>345 343 590 389 0 0 1280 778 </string>
<key>2523</key>
<string>345 351 590 373 0 0 1280 778 </string>
<key>2562</key>
<string>345 310 590 455 0 0 1280 778 </string>
</dict>
<key>IBFramework Version</key>
<string>446.1</string>
......@@ -24,7 +28,7 @@
</array>
</dict>
<key>IBLastGroupID</key>
<string>2</string>
<string>3</string>
<key>IBLockedObjects</key>
<array>
<integer>2203</integer>
......@@ -34,10 +38,11 @@
</array>
<key>IBOpenObjects</key>
<array>
<integer>2311</integer>
<integer>2440</integer>
<integer>2265</integer>
<integer>2330</integer>
<integer>2523</integer>
<integer>2562</integer>
<integer>2440</integer>
<integer>2311</integer>
</array>
<key>IBSystem Version</key>
<string>8S2167</string>
......
modules/gui/macosx/simple_prefs.h
View file @ 887efa47
......@@ -51,6 +51,27 @@
IBOutlet id o_audio_vol_sld;
IBOutlet id o_audio_vol_txt;
IBOutlet id o_input_access_box;
IBOutlet id o_input_avi_pop;
IBOutlet id o_input_avi_txt;
IBOutlet id o_input_bandwidth_ckb;
IBOutlet id o_input_cachelevel_pop;
IBOutlet id o_input_cachelevel_txt;
IBOutlet id o_input_caching_box;
IBOutlet id o_input_dump_ckb;
IBOutlet id o_input_httpproxy_fld;
IBOutlet id o_input_httpproxy_txt;
IBOutlet id o_input_mux_box;
IBOutlet id o_input_net_box;
IBOutlet id o_input_postproc_fld;
IBOutlet id o_input_postproc_txt;
IBOutlet id o_input_record_ckb;
IBOutlet id o_input_rtsp_ckb;
IBOutlet id o_input_serverport_fld;
IBOutlet id o_input_serverport_txt;
IBOutlet id o_input_timeshift_ckb;
IBOutlet id o_input_view;
IBOutlet id o_intf_art_pop;
IBOutlet id o_intf_art_txt;
IBOutlet id o_intf_embedded_ckb;
......@@ -61,6 +82,25 @@
IBOutlet id o_intf_network_box;
IBOutlet id o_intf_view;
IBOutlet id o_osd_encoding_pop;
IBOutlet id o_osd_encoding_txt;
IBOutlet id o_osd_font_box;
IBOutlet id o_osd_font_btn;
IBOutlet id o_osd_font_color_pop;
IBOutlet id o_osd_font_color_txt;
IBOutlet id o_osd_font_effect_pop;
IBOutlet id o_osd_font_effect_txt;
IBOutlet id o_osd_font_fld;
IBOutlet id 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_osd_box;
IBOutlet id o_osd_osd_ckb;
IBOutlet id o_osd_view;
IBOutlet id o_sprefs_basic_box;
IBOutlet id o_sprefs_basicFull_matrix;
IBOutlet id o_sprefs_cancel_btn;
......@@ -93,6 +133,8 @@
BOOL b_audioSettingChanged;
BOOL b_intfSettingChanged;
BOOL b_videoSettingChanged;
BOOL b_osdSettingChanged;
BOOL b_inputSettingChanged;
id o_currentlyShownCategoryView;
NSToolbar *o_sprefs_toolbar;
......@@ -132,9 +174,13 @@
- (IBAction)videoSettingChanged:(id)sender;
- (void)showVideoSettings;
/* subtitles */
/* OSD / subtitles */
- (IBAction)osdSettingChanged:(id)sender;
- (void)showOSDSettings;
/* input & codecs */
- (IBAction)inputSettingChanged:(id)sender;
- (void)showInputSettings;
/* hotkeys */
......
modules/gui/macosx/simple_prefs.m
View file @ 887efa47
This diff is collapsed.
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