vlc | branch: master | David Fuhrmann <[email protected]> | Sat Mar 2 13:47:25 2013 +0100| [0a85cad3a42124153cd0a1111e371cc095e515cc] | committer: David Fuhrmann
macosx: categorize options and improve some tooltip messages > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0a85cad3a42124153cd0a1111e371cc095e515cc --- modules/gui/macosx/macosx.m | 56 +++++++++++++++++++++++++------------------ 1 file changed, 33 insertions(+), 23 deletions(-) diff --git a/modules/gui/macosx/macosx.m b/modules/gui/macosx/macosx.m index a3b6434..c993cdf 100644 --- a/modules/gui/macosx/macosx.m +++ b/modules/gui/macosx/macosx.m @@ -84,14 +84,14 @@ void WindowClose (vout_window_t *); #define USE_APPLE_REMOTE_VOLUME_LONGTEXT N_("By default, VLC will control its own volume with the Apple Remote. However, you can choose to control the global system volume instead.") #define USE_APPLE_REMOTE_PREVNEXT_TEXT N_("Control playlist items with the Apple Remote") -#define USE_APPLE_REMOTE_PREVNEXT_LONGTEXT N_("By default, VLC will allow you to switch to the next or previous item with the Apple Remote. Remote. You can disable this behavior with this option.") +#define USE_APPLE_REMOTE_PREVNEXT_LONGTEXT N_("By default, VLC will allow you to switch to the next or previous item with the Apple Remote. You can disable this behavior with this option.") #define USE_MEDIAKEYS_TEXT N_("Control playback with media keys") #define USE_MEDIAKEYS_LONGTEXT N_("By default, VLC can be controlled using the media keys on modern Apple " \ "keyboards.") #define INTERFACE_STYLE_TEXT N_("Run VLC with dark interface style") -#define INTERFACE_STYLE_LONGTEXT N_("By default, VLC will use the dark interface style.") +#define INTERFACE_STYLE_LONGTEXT N_("If this option is enabled, VLC will use the dark interface style. Otherwise, the grey interface style is used.") #define NATIVE_FULLSCREEN_MODE_ON_LION_TEXT N_("Use the native fullscreen mode") #define NATIVE_FULLSCREEN_MODE_ON_LION_LONGTEXT N_("By default, VLC uses the fullscreen mode known from previous Mac OS X releases. It can also use the native fullscreen mode on Mac OS X 10.7 and later.") @@ -112,13 +112,13 @@ void WindowClose (vout_window_t *); #define LOCK_ASPECT_RATIO_TEXT N_("Lock Aspect Ratio") #define JUMPBUTTONS_TEXT N_("Shows playlist item control buttons") -#define JUMPBUTTONS_LONGTEXT N_("Shows the previous and next buttons in the main window") +#define JUMPBUTTONS_LONGTEXT N_("Shows the previous and next buttons in the main window.") #define PLAYMODEBUTTONS_TEXT N_("Show play mode control buttons") -#define PLAYMODEBUTTONS_LONGTEXT N_("Shows the shuffle and repeat buttons in the main window") +#define PLAYMODEBUTTONS_LONGTEXT N_("Shows the shuffle and repeat buttons in the main window.") #define SIDEBAR_TEXT N_("Show sidebar") -#define SIDEBAR_LONGTEXT N_("Shows a sidebar in the main window listing media sources") +#define SIDEBAR_LONGTEXT N_("Shows a sidebar in the main window listing media sources.") #define ITUNES_TEXT N_("Pause iTunes during VLC playback") #define ITUNES_LONGTEXT N_("Pauses iTunes playback when VLC playback starts. If selected, iTunes playback will be resumed again if VLC playback is finished.") @@ -136,33 +136,43 @@ vlc_module_begin() set_category(CAT_INTERFACE) set_subcategory(SUBCAT_INTERFACE_MAIN) cannot_unload_broken_library() - add_bool("macosx-autoplay", true, AUTOPLAY_OSX_TEST, AUTOPLAY_OSX_LONGTEXT, false) - add_bool("macosx-recentitems", true, RECENT_ITEMS_TEXT, RECENT_ITEMS_LONGTEXT, false) - add_bool("macosx-fspanel", true, FSPANEL_TEXT, FSPANEL_LONGTEXT, false) - add_bool("macosx-appleremote", true, USE_APPLE_REMOTE_TEXT, USE_APPLE_REMOTE_LONGTEXT, false) - add_bool("macosx-appleremote-sysvol", false, USE_APPLE_REMOTE_VOLUME_TEXT, USE_APPLE_REMOTE_VOLUME_LONGTEXT, false) - add_bool("macosx-appleremote-prevnext", false, USE_APPLE_REMOTE_PREVNEXT_TEXT, USE_APPLE_REMOTE_PREVNEXT_LONGTEXT, false) - add_bool("macosx-mediakeys", true, USE_MEDIAKEYS_TEXT, USE_MEDIAKEYS_LONGTEXT, false) - add_bool("macosx-interfacestyle", false, INTERFACE_STYLE_TEXT, INTERFACE_STYLE_LONGTEXT, false) - add_bool("macosx-nativefullscreenmode", false, NATIVE_FULLSCREEN_MODE_ON_LION_TEXT, NATIVE_FULLSCREEN_MODE_ON_LION_LONGTEXT, false) + + set_section(N_("Appearance"), 0) + add_bool("macosx-interfacestyle", false, INTERFACE_STYLE_TEXT, INTERFACE_STYLE_LONGTEXT, false) + add_bool("macosx-nativefullscreenmode", false, NATIVE_FULLSCREEN_MODE_ON_LION_TEXT, NATIVE_FULLSCREEN_MODE_ON_LION_LONGTEXT, false) + add_bool("macosx-icon-change", true, ICONCHANGE_TEXT, ICONCHANGE_LONGTEXT, true) + add_bool("macosx-show-playback-buttons", false, JUMPBUTTONS_TEXT, JUMPBUTTONS_LONGTEXT, false) + add_bool("macosx-show-playmode-buttons", true, PLAYMODEBUTTONS_TEXT, PLAYMODEBUTTONS_LONGTEXT, false) + add_bool("macosx-show-sidebar", true, SIDEBAR_TEXT, SIDEBAR_LONGTEXT, false) + + set_section(N_("Behaviour"), 0) + add_bool("macosx-autoplay", true, AUTOPLAY_OSX_TEST, AUTOPLAY_OSX_LONGTEXT, false) + add_bool("macosx-recentitems", true, RECENT_ITEMS_TEXT, RECENT_ITEMS_LONGTEXT, false) + add_bool("macosx-fspanel", true, FSPANEL_TEXT, FSPANEL_LONGTEXT, false) + add_bool("macosx-video-autoresize", true, KEEPSIZE_TEXT, KEEPSIZE_LONGTEXT, false) + add_bool("macosx-pause-minimized", false, PAUSE_MINIMIZED_TEXT, PAUSE_MINIMIZED_LONGTEXT, false) + add_bool("macosx-lock-aspect-ratio", true, LOCK_ASPECT_RATIO_TEXT, LOCK_ASPECT_RATIO_TEXT, true) + add_integer("macosx-control-itunes", 1, ITUNES_TEXT, ITUNES_LONGTEXT, false) + change_integer_list(itunes_list, itunes_list_text) + + + set_section(N_("Apple Remote and media keys"), 0) + add_bool("macosx-appleremote", true, USE_APPLE_REMOTE_TEXT, USE_APPLE_REMOTE_LONGTEXT, false) + add_bool("macosx-appleremote-sysvol", false, USE_APPLE_REMOTE_VOLUME_TEXT, USE_APPLE_REMOTE_VOLUME_LONGTEXT, false) + add_bool("macosx-appleremote-prevnext", false, USE_APPLE_REMOTE_PREVNEXT_TEXT, USE_APPLE_REMOTE_PREVNEXT_LONGTEXT, false) + add_bool("macosx-mediakeys", true, USE_MEDIAKEYS_TEXT, USE_MEDIAKEYS_LONGTEXT, false) + + add_obsolete_bool("macosx-stretch") /* since 2.0.0 */ add_obsolete_bool("macosx-eq-keep") /* since 2.0.0 */ add_obsolete_bool("macosx-autosave-volume") /* since 2.1.0 */ - add_bool("macosx-video-autoresize", true, KEEPSIZE_TEXT, KEEPSIZE_LONGTEXT, false) - add_bool("macosx-pause-minimized", false, PAUSE_MINIMIZED_TEXT, PAUSE_MINIMIZED_LONGTEXT, false) - add_bool("macosx-lock-aspect-ratio", true, LOCK_ASPECT_RATIO_TEXT, LOCK_ASPECT_RATIO_TEXT, true) - add_bool("macosx-icon-change", true, ICONCHANGE_TEXT, ICONCHANGE_LONGTEXT, true) - add_bool("macosx-show-playback-buttons", false, JUMPBUTTONS_TEXT, JUMPBUTTONS_LONGTEXT, false) - add_bool("macosx-show-playmode-buttons", true, PLAYMODEBUTTONS_TEXT, PLAYMODEBUTTONS_LONGTEXT, false) - add_bool("macosx-show-sidebar", true, SIDEBAR_TEXT, SIDEBAR_LONGTEXT, false) - add_integer("macosx-control-itunes", 1, ITUNES_TEXT, ITUNES_LONGTEXT, false) - change_integer_list(itunes_list, itunes_list_text) add_submodule() set_description("Mac OS X Video Output Provider") set_capability("vout window nsobject", 100) set_callbacks(WindowOpen, WindowClose) + set_section(N_("Video output"), 0) add_integer("macosx-vdev", 0, VDEV_TEXT, VDEV_LONGTEXT, false) add_float_with_range("macosx-opaqueness", 1, 0, 1, OPAQUENESS_TEXT, OPAQUENESS_LONGTEXT, true); add_bool("macosx-black", true, BLACK_TEXT, BLACK_LONGTEXT, false) _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
