Commit cd4a142c authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Clear confusion about --started-from-file-and-one-instance-when-sunset-is-beautiful

And add it to Qt simple preferences

Ref #6624
parent 5f1f8253
...@@ -623,6 +623,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ...@@ -623,6 +623,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
ui.OneInterfaceMode->isChecked() ); ui.OneInterfaceMode->isChecked() );
CONNECT( ui.OneInterfaceMode, toggled( bool ), CONNECT( ui.OneInterfaceMode, toggled( bool ),
ui.EnqueueOneInterfaceMode, setEnabled( bool ) ); ui.EnqueueOneInterfaceMode, setEnabled( bool ) );
CONFIG_BOOL( "one-instance-when-started-from-file", oneInstanceFromFile );
} }
/* RECENTLY PLAYED options */ /* RECENTLY PLAYED options */
......
This diff is collapsed.
...@@ -1082,9 +1082,7 @@ static const char *const ppsz_prefres[] = { ...@@ -1082,9 +1082,7 @@ static const char *const ppsz_prefres[] = {
"Tell VLC that it is being launched due to a file association in the OS" ) "Tell VLC that it is being launched due to a file association in the OS" )
#define ONEINSTANCEWHENSTARTEDFROMFILE_TEXT N_( \ #define ONEINSTANCEWHENSTARTEDFROMFILE_TEXT N_( \
"One instance when started from file") "Use only one instance when started from file manager")
#define ONEINSTANCEWHENSTARTEDFROMFILE_LONGTEXT N_( \
"Allow only one running instance when started from file.")
#define HPRIORITY_TEXT N_("Increase the priority of the process") #define HPRIORITY_TEXT N_("Increase the priority of the process")
#define HPRIORITY_LONGTEXT N_( \ #define HPRIORITY_LONGTEXT N_( \
...@@ -1096,7 +1094,7 @@ static const char *const ppsz_prefres[] = { ...@@ -1096,7 +1094,7 @@ static const char *const ppsz_prefres[] = {
"might require a reboot of your machine.") "might require a reboot of your machine.")
#define PLAYLISTENQUEUE_TEXT N_( \ #define PLAYLISTENQUEUE_TEXT N_( \
"Enqueue items to playlist when in one instance mode") "Enqueue items to playlist into one instance mode")
#define PLAYLISTENQUEUE_LONGTEXT N_( \ #define PLAYLISTENQUEUE_LONGTEXT N_( \
"When using the one instance only option, enqueue items to playlist " \ "When using the one instance only option, enqueue items to playlist " \
"and keep playing current item.") "and keep playing current item.")
...@@ -2027,7 +2025,7 @@ vlc_module_begin () ...@@ -2027,7 +2025,7 @@ vlc_module_begin ()
change_volatile () change_volatile ()
add_bool( "one-instance-when-started-from-file", 1, add_bool( "one-instance-when-started-from-file", 1,
ONEINSTANCEWHENSTARTEDFROMFILE_TEXT, ONEINSTANCEWHENSTARTEDFROMFILE_TEXT,
ONEINSTANCEWHENSTARTEDFROMFILE_LONGTEXT, true ) ONEINSTANCEWHENSTARTEDFROMFILE_TEXT, true )
add_bool( "playlist-enqueue", 0, PLAYLISTENQUEUE_TEXT, add_bool( "playlist-enqueue", 0, PLAYLISTENQUEUE_TEXT,
PLAYLISTENQUEUE_LONGTEXT, true ) PLAYLISTENQUEUE_LONGTEXT, true )
#endif #endif
......
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