Skip to content

V
vlc-2-2
Commit 28bfab09 authored by Clément Stenac's avatar Clément Stenac
Browse files
Options

* Improve strings for jumps 

* Move jump size definitions to libvlc to avoid having 2 categories (still need to move bookmarks)
* Don't show bookmarks settings in GUI - speeds up dramatically config panel creation
parent c1a2c613
Hide whitespace changes
Inline Side-by-side
Showing with 50 additions and 47 deletions
modules/control/hotkeys.c
View file @ 28bfab09
...@@ -94,31 +94,12 @@ static void ClearChannels ( intf_thread_t *, vout_thread_t * ); ...@@ -94,31 +94,12 @@ static void ClearChannels ( intf_thread_t *, vout_thread_t * );
#define BOOKMARK_LONGTEXT N_( \ #define BOOKMARK_LONGTEXT N_( \
"This option allows you to define playlist bookmarks.") "This option allows you to define playlist bookmarks.")
#define JIEXTRASHORT_TEXT N_("Extra short jump key interval")
#define JIEXTRASHORT_LONGTEXT N_("Extra short jump key interval in seconds")
#define JISHORT_TEXT N_("Short jump key interval")
#define JISHORT_LONGTEXT N_("Short jump key interval in seconds")
#define JIMEDIUM_TEXT N_("Medium jump key interval")
#define JIMEDIUM_LONGTEXT N_("Medium jump key interval in seconds")
#define JILONG_TEXT N_("Long jump key interval")
#define JILONG_LONGTEXT N_("Long jump key interval in seconds")
vlc_module_begin(); vlc_module_begin();
set_shortname( _("Hotkeys") ); set_shortname( _("Hotkeys") );
set_description( _("Hotkeys management interface") ); set_description( _("Hotkeys management interface") );
set_category( CAT_INTERFACE ); set_category( CAT_INTERFACE );
// set_subcategory( SUBCAT_INTERFACE_GENERAL ); // set_subcategory( SUBCAT_INTERFACE_GENERAL );
/* jump key user defined time intervals */
add_integer( "key-jump-extrashort-interval", 3, NULL, JIEXTRASHORT_TEXT,
JIEXTRASHORT_LONGTEXT, VLC_FALSE );
add_integer( "key-jump-short-interval", 10, NULL, JISHORT_TEXT,
JISHORT_LONGTEXT, VLC_FALSE );
add_integer( "key-jump-medium-interval", 60, NULL, JIMEDIUM_TEXT,
JIMEDIUM_LONGTEXT, VLC_FALSE );
add_integer( "key-jump-long-interval", 300, NULL, JILONG_TEXT,
JILONG_LONGTEXT, VLC_FALSE );
add_string( "bookmark1", NULL, NULL, add_string( "bookmark1", NULL, NULL,
BOOKMARK1_TEXT, BOOKMARK_LONGTEXT, VLC_FALSE ); BOOKMARK1_TEXT, BOOKMARK_LONGTEXT, VLC_FALSE );
add_string( "bookmark2", NULL, NULL, add_string( "bookmark2", NULL, NULL,
...@@ -418,7 +399,7 @@ static void Run( intf_thread_t *p_intf ) ...@@ -418,7 +399,7 @@ static void Run( intf_thread_t *p_intf )
else if( i_action == ACTIONID_JUMP_BACKWARD_EXTRASHORT && b_seekable ) else if( i_action == ACTIONID_JUMP_BACKWARD_EXTRASHORT && b_seekable )
{ {
#define SET_TIME( a, b ) \ #define SET_TIME( a, b ) \
i_interval = config_GetInt( p_input, "key-jump-" a "-interval" ); \ i_interval = config_GetInt( p_input, a "-jump-size" ); \
if( i_interval > 0 ) { \ if( i_interval > 0 ) { \
val.i_time = ( (mtime_t)(i_interval * b) * 1000000L \ val.i_time = ( (mtime_t)(i_interval * b) * 1000000L \
* ((mtime_t)(1 << i_times))); \ * ((mtime_t)(1 << i_times))); \
......
modules/gui/wxwidgets/dialogs/preferences.cpp
View file @ 28bfab09
...@@ -369,6 +369,7 @@ PrefsTreeCtrl::PrefsTreeCtrl( wxWindow *_p_parent, intf_thread_t *_p_intf, ...@@ -369,6 +369,7 @@ PrefsTreeCtrl::PrefsTreeCtrl( wxWindow *_p_parent, intf_thread_t *_p_intf,
{ {
case CONFIG_CATEGORY: case CONFIG_CATEGORY:
config_data = new ConfigTreeData; config_data = new ConfigTreeData;
if( p_item->i_value == -1 ) break; // Don't display it
config_data->psz_name = strdup( config_CategoryNameGet( config_data->psz_name = strdup( config_CategoryNameGet(
p_item->i_value ) ); p_item->i_value ) );
psz_help = config_CategoryHelpGet( p_item->i_value ); psz_help = config_CategoryHelpGet( p_item->i_value );
...@@ -408,6 +409,7 @@ PrefsTreeCtrl::PrefsTreeCtrl( wxWindow *_p_parent, intf_thread_t *_p_intf, ...@@ -408,6 +409,7 @@ PrefsTreeCtrl::PrefsTreeCtrl( wxWindow *_p_parent, intf_thread_t *_p_intf,
break; break;
case CONFIG_SUBCATEGORY: case CONFIG_SUBCATEGORY:
if( p_item->i_value == -1 ) break; // Don't display it
if( p_item->i_value == SUBCAT_VIDEO_GENERAL || if( p_item->i_value == SUBCAT_VIDEO_GENERAL ||
p_item->i_value == SUBCAT_AUDIO_GENERAL ) p_item->i_value == SUBCAT_AUDIO_GENERAL )
{ {
......
src/libvlc.h
View file @ 28bfab09
...@@ -808,34 +808,45 @@ static char *ppsz_clock_descriptions[] = ...@@ -808,34 +808,45 @@ static char *ppsz_clock_descriptions[] =
#define POSITION_KEY_TEXT N_("Position") #define POSITION_KEY_TEXT N_("Position")
#define POSITION_KEY_LONGTEXT N_("Select the hotkey to display the position.") #define POSITION_KEY_LONGTEXT N_("Select the hotkey to display the position.")
/* FIXME : jump keys descriptions */ #define JBEXTRASHORT_KEY_TEXT N_("Very short backwards jump")
#define JBEXTRASHORT_KEY_TEXT N_("Jump 'extrashort' seconds backwards")
#define JBEXTRASHORT_KEY_LONGTEXT \ #define JBEXTRASHORT_KEY_LONGTEXT \
N_("Select the hotkey to jump 'extrashort' seconds backwards.") N_("Select the hotkey to make a very short backwards jump.")
#define JBSHORT_KEY_TEXT N_("Jump 'short' seconds backwards") #define JBSHORT_KEY_TEXT N_("Short backwards jump")
#define JBSHORT_KEY_LONGTEXT \ #define JBSHORT_KEY_LONGTEXT \
N_("Select the hotkey to jump 'short' seconds backwards.") N_("Select the hotkey to make a short backwards jump.")
#define JBMEDIUM_KEY_TEXT N_("Jump 'medium' seconds backwards") #define JBMEDIUM_KEY_TEXT N_("Medium backwards jump")
#define JBMEDIUM_KEY_LONGTEXT \ #define JBMEDIUM_KEY_LONGTEXT \
N_("Select the hotkey to jump 'medium' seconds backwards.") N_("Select the hotkey to make a medium backwards jump.")
#define JBLONG_KEY_TEXT N_("Jump 'long' seconds backwards") #define JBLONG_KEY_TEXT N_("Long backwards jump")
#define JBLONG_KEY_LONGTEXT \ #define JBLONG_KEY_LONGTEXT \
N_("Select the hotkey to jump 'long seconds' backwards.") N_("Select the hotkey to make a long backwards jump.")
#define JFEXTRASHORT_KEY_TEXT N_("Jump 'extrashort' seconds forward") #define JFEXTRASHORT_KEY_TEXT N_("Very short forward jump")
#define JFEXTRASHORT_KEY_LONGTEXT \ #define JFEXTRASHORT_KEY_LONGTEXT \
N_("Select the hotkey to jump 'extrashort' seconds forward.") N_("Select the hotkey to make a very short forward jump.")
#define JFSHORT_KEY_TEXT N_("Jump 'short' seconds forward") #define JFSHORT_KEY_TEXT N_("Short forward jump")
#define JFSHORT_KEY_LONGTEXT \ #define JFSHORT_KEY_LONGTEXT \
N_("Select the hotkey to jump 'short' seconds forward.") N_("Select the hotkey to make a short forward jump.")
#define JFMEDIUM_KEY_TEXT N_("Jump 'medium' seconds forward") #define JFMEDIUM_KEY_TEXT N_("Medium forward jump")
#define JFMEDIUM_KEY_LONGTEXT \ #define JFMEDIUM_KEY_LONGTEXT \
N_("Select the hotkey to jump 'medium' seconds forward.") N_("Select the hotkey to make a medium forward jump.")
#define JFLONG_KEY_TEXT N_("Jump 'long' seconds forward") #define JFLONG_KEY_TEXT N_("Long forward jump")
#define JFLONG_KEY_LONGTEXT \ #define JFLONG_KEY_LONGTEXT \
N_("Select the hotkey to jump 'long' seconds forward.") N_("Select the hotkey to make a long forward jump.")
#define JIEXTRASHORT_TEXT N_("Very short jump size")
#define JIEXTRASHORT_LONGTEXT N_("Very short jump \"size\", in seconds")
#define JISHORT_TEXT N_("Short jump size")
#define JISHORT_LONGTEXT N_("Short jump \"size\", in seconds")
#define JIMEDIUM_TEXT N_("Medium jump size")
#define JIMEDIUM_LONGTEXT N_("Medium jump \"size\", in seconds")
#define JILONG_TEXT N_("Long jump size")
#define JILONG_LONGTEXT N_("Long jump \"size\", in seconds")
#define QUIT_KEY_TEXT N_("Quit") #define QUIT_KEY_TEXT N_("Quit")
#define QUIT_KEY_LONGTEXT N_("Select the hotkey to quit the application.") #define QUIT_KEY_LONGTEXT N_("Select the hotkey to quit the application.")
...@@ -1566,7 +1577,6 @@ vlc_module_begin(); ...@@ -1566,7 +1577,6 @@ vlc_module_begin();
JBLONG_KEY_LONGTEXT, VLC_FALSE ); JBLONG_KEY_LONGTEXT, VLC_FALSE );
add_key( "key-jump+long", KEY_JUMP_PLONG, NULL, JFLONG_KEY_TEXT, add_key( "key-jump+long", KEY_JUMP_PLONG, NULL, JFLONG_KEY_TEXT,
JFLONG_KEY_LONGTEXT, VLC_FALSE ); JFLONG_KEY_LONGTEXT, VLC_FALSE );
add_key( "key-nav-activate", KEY_NAV_ACTIVATE, NULL, NAV_ACTIVATE_KEY_TEXT, add_key( "key-nav-activate", KEY_NAV_ACTIVATE, NULL, NAV_ACTIVATE_KEY_TEXT,
NAV_ACTIVATE_KEY_LONGTEXT, VLC_TRUE ); NAV_ACTIVATE_KEY_LONGTEXT, VLC_TRUE );
add_key( "key-nav-up", KEY_NAV_UP, NULL, NAV_UP_KEY_TEXT, add_key( "key-nav-up", KEY_NAV_UP, NULL, NAV_UP_KEY_TEXT,
...@@ -1588,7 +1598,6 @@ vlc_module_begin(); ...@@ -1588,7 +1598,6 @@ vlc_module_begin();
CHAPTER_PREV_LONGTEXT, VLC_TRUE ); CHAPTER_PREV_LONGTEXT, VLC_TRUE );
add_key( "key-chapter-next", KEY_CHAPTER_NEXT, NULL, CHAPTER_NEXT_TEXT, add_key( "key-chapter-next", KEY_CHAPTER_NEXT, NULL, CHAPTER_NEXT_TEXT,
CHAPTER_NEXT_LONGTEXT, VLC_TRUE ); CHAPTER_NEXT_LONGTEXT, VLC_TRUE );
add_key( "key-quit", KEY_QUIT, NULL, QUIT_KEY_TEXT, add_key( "key-quit", KEY_QUIT, NULL, QUIT_KEY_TEXT,
QUIT_KEY_LONGTEXT, VLC_FALSE ); QUIT_KEY_LONGTEXT, VLC_FALSE );
add_key( "key-vol-up", KEY_VOL_UP, NULL, VOL_UP_KEY_TEXT, add_key( "key-vol-up", KEY_VOL_UP, NULL, VOL_UP_KEY_TEXT,
...@@ -1614,8 +1623,25 @@ vlc_module_begin(); ...@@ -1614,8 +1623,25 @@ vlc_module_begin();
add_key( "key-intf-hide", KEY_INTF_HIDE, NULL, add_key( "key-intf-hide", KEY_INTF_HIDE, NULL,
INTF_HIDE_KEY_TEXT, INTF_HIDE_KEY_LONGTEXT, VLC_TRUE ); INTF_HIDE_KEY_TEXT, INTF_HIDE_KEY_LONGTEXT, VLC_TRUE );
add_key( "key-snapshot", KEY_SNAPSHOT, NULL, add_key( "key-snapshot", KEY_SNAPSHOT, NULL,
SNAP_KEY_TEXT, SNAP_KEY_LONGTEXT, VLC_TRUE ); SNAP_KEY_TEXT, SNAP_KEY_LONGTEXT, VLC_TRUE );
add_key( "key-history-back", KEY_HISTORY_BACK, NULL, HISTORY_BACK_TEXT,
HISTORY_BACK_LONGTEXT, VLC_TRUE );
add_key( "key-history-forward", KEY_HISTORY_FORWARD, NULL,
HISTORY_FORWARD_TEXT, HISTORY_FORWARD_LONGTEXT, VLC_TRUE );
add_key( "key-record", KEY_RECORD, NULL,
RECORD_KEY_TEXT, RECORD_KEY_LONGTEXT, VLC_TRUE );
add_integer( "extrashort-jump-size", 3, NULL, JIEXTRASHORT_TEXT,
JIEXTRASHORT_LONGTEXT, VLC_FALSE );
add_integer( "short-jump-size", 10, NULL, JISHORT_TEXT,
JISHORT_LONGTEXT, VLC_FALSE );
add_integer( "medium-jump-size", 60, NULL, JIMEDIUM_TEXT,
JIMEDIUM_LONGTEXT, VLC_FALSE );
add_integer( "long-jump-size", 300, NULL, JILONG_TEXT,
JILONG_LONGTEXT, VLC_FALSE );
/* HACK so these don't get displayed */
set_category( -1 );
set_subcategory( -1 );
add_key( "key-set-bookmark1", KEY_SET_BOOKMARK1, NULL, add_key( "key-set-bookmark1", KEY_SET_BOOKMARK1, NULL,
SET_BOOKMARK1_KEY_TEXT, SET_BOOKMARK_KEY_LONGTEXT, VLC_TRUE ); SET_BOOKMARK1_KEY_TEXT, SET_BOOKMARK_KEY_LONGTEXT, VLC_TRUE );
add_key( "key-set-bookmark2", KEY_SET_BOOKMARK2, NULL, add_key( "key-set-bookmark2", KEY_SET_BOOKMARK2, NULL,
...@@ -1656,12 +1682,6 @@ vlc_module_begin(); ...@@ -1656,12 +1682,6 @@ vlc_module_begin();
PLAY_BOOKMARK9_KEY_TEXT, PLAY_BOOKMARK_KEY_LONGTEXT, VLC_TRUE ); PLAY_BOOKMARK9_KEY_TEXT, PLAY_BOOKMARK_KEY_LONGTEXT, VLC_TRUE );
add_key( "key-play-bookmark10", KEY_PLAY_BOOKMARK10, NULL, add_key( "key-play-bookmark10", KEY_PLAY_BOOKMARK10, NULL,
PLAY_BOOKMARK10_KEY_TEXT, PLAY_BOOKMARK_KEY_LONGTEXT, VLC_TRUE ); PLAY_BOOKMARK10_KEY_TEXT, PLAY_BOOKMARK_KEY_LONGTEXT, VLC_TRUE );
add_key( "key-history-back", KEY_HISTORY_BACK, NULL, HISTORY_BACK_TEXT,
HISTORY_BACK_LONGTEXT, VLC_TRUE );
add_key( "key-history-forward", KEY_HISTORY_FORWARD, NULL,
HISTORY_FORWARD_TEXT, HISTORY_FORWARD_LONGTEXT, VLC_TRUE );
add_key( "key-record", KEY_RECORD, NULL,
RECORD_KEY_TEXT, RECORD_KEY_LONGTEXT, VLC_TRUE );
/* Usage (mainly useful for cmd line stuff) */ /* Usage (mainly useful for cmd line stuff) */
/* add_usage_hint( PLAYLIST_USAGE ); */ /* add_usage_hint( PLAYLIST_USAGE ); */
......
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