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

And add it to Qt simple preferences

Ref #6624

diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index fd9fc605fbb2b8d7be52f030d085a14ad0001bd2..a328a42a082951708b556e7705fb2acf5df643bc 100644 (file)
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -623,6 +623,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
                                                        ui.OneInterfaceMode->isChecked() );
                 CONNECT( ui.OneInterfaceMode, toggled( bool ),
                          ui.EnqueueOneInterfaceMode, setEnabled( bool ) );
+                CONFIG_BOOL( "one-instance-when-started-from-file", oneInstanceFromFile );
             }
 
             /* RECENTLY PLAYED options */

diff --git a/modules/gui/qt4/ui/sprefs_interface.ui b/modules/gui/qt4/ui/sprefs_interface.ui
index d1f3e5913951e5bf8954f712823210062ae43cde..7ff0c961c9222b3c7473e7554eba52a67d3861d9 100644 (file)
--- a/modules/gui/qt4/ui/sprefs_interface.ui
+++ b/modules/gui/qt4/ui/sprefs_interface.ui
@@ -7,8 +7,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>734</width>
-    <height>687</height>
+    <width>733</width>
+    <height>544</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -30,41 +30,6 @@
    <property name="bottomMargin">
     <number>0</number>
    </property>
-   <item row="1" column="0" colspan="2">
-    <widget class="QGroupBox" name="OneInterfaceBox">
-     <property name="title">
-      <string>Instances</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout_2">
-      <property name="verticalSpacing">
-       <number>0</number>
-      </property>
-      <property name="leftMargin">
-       <number>9</number>
-      </property>
-      <property name="rightMargin">
-       <number>9</number>
-      </property>
-      <property name="bottomMargin">
-       <number>9</number>
-      </property>
-      <item row="0" column="0">
-       <widget class="QCheckBox" name="OneInterfaceMode">
-        <property name="text">
-         <string>Allow only one instance</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1" colspan="2">
-       <widget class="QCheckBox" name="EnqueueOneInterfaceMode">
-        <property name="text">
-         <string>Enqueue files when in one instance mode</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
    <item row="2" column="0" colspan="2">
     <widget class="QGroupBox" name="groupBox_2">
      <property name="title">
@@ -106,9 +71,6 @@
         </property>
        </widget>
       </item>
-      <item row="0" column="3" colspan="2">
-       <widget class="QComboBox" name="artFetcher"/>
-      </item>
       <item row="2" column="2">
        <widget class="QLabel" name="filterLabel">
         <property name="text">
@@ -151,22 +113,6 @@
         </property>
        </widget>
       </item>
-      <item row="0" column="0">
-       <widget class="QLabel" name="artFetchLabel">
-        <property name="minimumSize">
-         <size>
-          <width>220</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>Album art download policy:</string>
-        </property>
-        <property name="buddy">
-         <cstring>artFetcher</cstring>
-        </property>
-       </widget>
-      </item>
       <item row="1" column="0">
        <widget class="QCheckBox" name="updatesBox">
         <property name="minimumSize">
@@ -183,97 +129,6 @@
      </layout>
     </widget>
    </item>
-   <item row="3" column="0" colspan="2">
-    <widget class="QGroupBox" name="playlistGroupBox">
-     <property name="title">
-      <string>Playlist</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout_4">
-      <item row="0" column="0">
-       <widget class="QCheckBox" name="treePlaylist">
-        <property name="text">
-         <string>Display playlist tree</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="2" colspan="2">
-       <widget class="QCheckBox" name="playPauseBox">
-        <property name="text">
-         <string>Pause on the last frame of a video</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="assocLabel">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>File extensions association</string>
-        </property>
-        <property name="buddy">
-         <cstring>assoButton</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1">
-       <spacer name="horizontalSpacer_6">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>40</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item row="2" column="2">
-       <widget class="QPushButton" name="assoButton">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>220</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>Set up associations...</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="3">
-       <spacer name="horizontalSpacer_8">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>135</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item row="1" column="0">
-       <widget class="QPushButton" name="sqlMLbtn">
-        <property name="text">
-         <string>Configure Media Library</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
    <item row="0" column="0" colspan="2">
     <widget class="QGroupBox" name="LooknfeelBox">
      <property name="title">
@@ -402,42 +257,35 @@
              <property name="topMargin">
               <number>0</number>
              </property>
-             <item row="0" column="0" colspan="3">
-              <widget class="QCheckBox" name="fsController">
-               <property name="text">
-                <string>Show controls in full screen mode</string>
-               </property>
-              </widget>
-             </item>
-             <item row="1" column="0">
+             <item row="3" column="0">
               <widget class="QCheckBox" name="minimalviewBox">
                <property name="text">
                 <string>Start in minimal view mode</string>
                </property>
               </widget>
              </item>
-             <item row="1" column="2" colspan="2">
+             <item row="3" column="2" colspan="2">
               <widget class="QCheckBox" name="pauseMinimizedBox">
                <property name="text">
                 <string>Pause playback when minimized</string>
                </property>
               </widget>
              </item>
-             <item row="2" column="0">
-              <widget class="QCheckBox" name="embedVideo">
+             <item row="0" column="0" colspan="3">
+              <widget class="QCheckBox" name="fsController">
                <property name="text">
-                <string>Integrate video in interface</string>
+                <string>Show controls in full screen mode</string>
                </property>
               </widget>
              </item>
-             <item row="3" column="0" rowspan="2">
+             <item row="5" column="0" rowspan="2">
               <widget class="QCheckBox" name="systrayBox">
                <property name="text">
                 <string>Show systray icon</string>
                </property>
               </widget>
              </item>
-             <item row="6" column="0">
+             <item row="8" column="0">
               <widget class="QLabel" name="stylesLabel">
                <property name="sizePolicy">
                 <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
@@ -453,11 +301,22 @@
                </property>
               </widget>
              </item>
-             <item row="6" column="2" colspan="2">
-              <widget class="QComboBox" name="stylesCombo"/>
+             <item row="1" column="2" colspan="2">
+              <widget class="QCheckBox" name="resizingBox">
+               <property name="text">
+                <string>Resize interface to video size</string>
+               </property>
+              </widget>
              </item>
-             <item row="1" column="1">
-              <spacer name="horizontalSpacer_3">
+             <item row="1" column="0">
+              <widget class="QCheckBox" name="embedVideo">
+               <property name="text">
+                <string>Integrate video in interface</string>
+               </property>
+              </widget>
+             </item>
+             <item row="3" column="4">
+              <spacer name="horizontalSpacer_7">
                <property name="orientation">
                 <enum>Qt::Horizontal</enum>
                </property>
@@ -469,8 +328,8 @@
                </property>
               </spacer>
              </item>
-             <item row="1" column="4">
-              <spacer name="horizontalSpacer_7">
+             <item row="3" column="1">
+              <spacer name="horizontalSpacer_3">
                <property name="orientation">
                 <enum>Qt::Horizontal</enum>
                </property>
@@ -482,21 +341,17 @@
                </property>
               </spacer>
              </item>
-             <item row="2" column="2" colspan="2">
-              <widget class="QCheckBox" name="resizingBox">
-               <property name="text">
-                <string>Resize interface to video size</string>
-               </property>
-              </widget>
+             <item row="8" column="2" colspan="3">
+              <widget class="QComboBox" name="stylesCombo"/>
              </item>
-             <item row="5" column="0" colspan="2">
+             <item row="5" column="1" colspan="2">
               <widget class="QLabel" name="notificationComboLabel">
                <property name="text">
                 <string>Show media change popup:</string>
                </property>
               </widget>
              </item>
-             <item row="5" column="2" colspan="2">
+             <item row="5" column="3" colspan="2">
               <widget class="QComboBox" name="notificationCombo"/>
              </item>
             </layout>
@@ -629,6 +484,149 @@
      </layout>
     </widget>
    </item>
+   <item row="3" column="0" colspan="2">
+    <widget class="QGroupBox" name="playlistGroupBox">
+     <property name="title">
+      <string>Playlist</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_4">
+      <item row="2" column="0">
+       <widget class="QLabel" name="assocLabel">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>File extensions association</string>
+        </property>
+        <property name="buddy">
+         <cstring>assoButton</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <spacer name="horizontalSpacer_6">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="2" column="2">
+       <widget class="QPushButton" name="assoButton">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimumSize">
+         <size>
+          <width>220</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>Set up associations...</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="3">
+       <spacer name="horizontalSpacer_8">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeType">
+         <enum>QSizePolicy::Minimum</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>135</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="1" column="0" colspan="2">
+    <widget class="QGroupBox" name="OneInterfaceBox">
+     <property name="title">
+      <string>Playlist and Instances</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_2">
+      <item row="4" column="0">
+       <widget class="QLabel" name="artFetchLabel">
+        <property name="minimumSize">
+         <size>
+          <width>220</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>Album art download policy:</string>
+        </property>
+        <property name="buddy">
+         <cstring>artFetcher</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0">
+       <widget class="QCheckBox" name="treePlaylist">
+        <property name="text">
+         <string>Display playlist tree</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QCheckBox" name="EnqueueOneInterfaceMode">
+        <property name="text">
+         <string>Enqueue items in playlist in one instance mode</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <widget class="QCheckBox" name="playPauseBox">
+        <property name="text">
+         <string>Pause on the last frame of a video</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0">
+       <widget class="QCheckBox" name="OneInterfaceMode">
+        <property name="text">
+         <string>Allow only one instance</string>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="1">
+       <widget class="QComboBox" name="artFetcher"/>
+      </item>
+      <item row="5" column="0">
+       <widget class="QPushButton" name="sqlMLbtn">
+        <property name="text">
+         <string>Configure Media Library</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" colspan="2">
+       <widget class="QCheckBox" name="oneInstanceFromFile">
+        <property name="text">
+         <string>Use only one instance when started from file manager</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
   </layout>
  </widget>
  <customwidgets>
@@ -644,18 +642,14 @@
   <tabstop>fsController</tabstop>
   <tabstop>minimalviewBox</tabstop>
   <tabstop>pauseMinimizedBox</tabstop>
-  <tabstop>embedVideo</tabstop>
-  <tabstop>resizingBox</tabstop>
   <tabstop>systrayBox</tabstop>
   <tabstop>stylesCombo</tabstop>
   <tabstop>OneInterfaceMode</tabstop>
   <tabstop>EnqueueOneInterfaceMode</tabstop>
-  <tabstop>artFetcher</tabstop>
   <tabstop>updatesBox</tabstop>
   <tabstop>updatesDays</tabstop>
   <tabstop>saveRecentlyPlayed</tabstop>
   <tabstop>recentlyPlayedFilters</tabstop>
-  <tabstop>treePlaylist</tabstop>
   <tabstop>assoButton</tabstop>
   <tabstop>fileSkin</tabstop>
   <tabstop>skinBrowse</tabstop>

diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index 83983bc61ddb2938674a787d2ecf5f468f7ccf48..9572b6ef7035dd0350fcf5c8693767b76cc6a0f4 100644 (file)
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -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" )
 
 #define ONEINSTANCEWHENSTARTEDFROMFILE_TEXT N_( \
-    "One instance when started from file")
-#define ONEINSTANCEWHENSTARTEDFROMFILE_LONGTEXT N_( \
-    "Allow only one running instance when started from file.")
+    "Use only one instance when started from file manager")
 
 #define HPRIORITY_TEXT N_("Increase the priority of the process")
 #define HPRIORITY_LONGTEXT N_( \
@@ -1096,7 +1094,7 @@ static const char *const ppsz_prefres[] = {
     "might require a reboot of your machine.")
 
 #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_( \
     "When using the one instance only option, enqueue items to playlist " \
     "and keep playing current item.")
@@ -2027,7 +2025,7 @@ vlc_module_begin ()
         change_volatile ()
     add_bool( "one-instance-when-started-from-file", 1,
               ONEINSTANCEWHENSTARTEDFROMFILE_TEXT,
-              ONEINSTANCEWHENSTARTEDFROMFILE_LONGTEXT, true )
+              ONEINSTANCEWHENSTARTEDFROMFILE_TEXT, true )
     add_bool( "playlist-enqueue", 0, PLAYLISTENQUEUE_TEXT,
               PLAYLISTENQUEUE_LONGTEXT, true )
 #endif