ShellExt: Option for separate instance (Qt)

MediaArea · Dec 23, 2024 · b286f51 · b286f51
1 parent 9f2c8e5
commit b286f51
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 28 deletions.
diff --git a/Source/GUI/Qt/prefs.cpp b/Source/GUI/Qt/prefs.cpp
@@ -47,6 +47,7 @@ Preferences::Preferences(QSettings* settings, Core* C, QWidget *parent) :
     ui->closeAllBeforeOpen->setChecked(settings->value("closeBeforeOpen",true).toBool());
     ui->comboBox_defaultview->setCurrentIndex(settings->value("defaultView",VIEW_EASY).toInt());
     ui->shellExtension->setChecked(settings->value("shellExtension",true).toBool());
+    ui->shellExtension_separateInstance->setChecked(settings->value("shellExtension_separateInstance",false).toBool());
     ui->informVersion->setChecked(settings->value("informVersion",false).toBool());
     ui->informTimestamp->setChecked(settings->value("informTimestamp",false).toBool());
     ui->displayCaptions->setCurrentIndex(settings->value("displayCaptions",1).toInt());
@@ -60,6 +61,12 @@ Preferences::Preferences(QSettings* settings, Core* C, QWidget *parent) :
     ui->checkForNewVersion->setVisible(false);
 #endif
 
+#ifndef _WIN32 // Shell extension not yet implemented for non-Windows
+    ui->shellExtension->setVisible(false);
+    ui->shellExtension_separateInstance->setVisible(false);
+#endif
+    ui->shellInfoTip->setVisible(false); // InfoTip not yet implemented
+
 #if defined(_WIN32) && defined(WINAPI_FAMILY) && (WINAPI_FAMILY==WINAPI_FAMILY_APP) //Setup UI for winRT
     ui->rememberToolBarPosition->setVisible(false);
     ui->rememberGeometry->setVisible(false);
@@ -115,6 +122,7 @@ void Preferences::saveSettings() {
     settings->setValue("rememberToolBarPosition",ui->rememberToolBarPosition->isChecked());
     settings->setValue("rememberGeometry",ui->rememberGeometry->isChecked());
     settings->setValue("shellExtension",ui->shellExtension->isChecked());
+    settings->setValue("shellExtension_separateInstance",ui->shellExtension_separateInstance->isChecked());
     settings->setValue("informVersion",ui->informVersion->isChecked());
     settings->setValue("informTimestamp",ui->informTimestamp->isChecked());
     settings->setValue("displayCaptions",ui->displayCaptions->currentIndex());

diff --git a/Source/GUI/Qt/prefs.ui b/Source/GUI/Qt/prefs.ui
@@ -120,32 +120,50 @@
          <property name="sizeConstraint">
           <enum>QLayout::SizeConstraint::SetFixedSize</enum>
          </property>
-         <item row="0" column="0">
-          <widget class="QLabel" name="label_2">
-           <property name="text">
-            <string>Default View</string>
+         <item row="0" column="1">
+          <widget class="QComboBox" name="comboBox_defaultview">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
            </property>
           </widget>
          </item>
          <item row="3" column="0">
+          <layout class="QHBoxLayout" name="horizontalLayout_4">
+           <property name="leftMargin">
+            <number>25</number>
+           </property>
+           <item>
+            <widget class="QCheckBox" name="shellExtension_separateInstance">
+             <property name="text">
+              <string>Open each file in a separate instance</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+         <item row="4" column="0">
           <widget class="QCheckBox" name="shellInfoTip">
            <property name="text">
             <string>Shell InfoTip</string>
            </property>
           </widget>
          </item>
-         <item row="4" column="0">
-          <spacer name="verticalSpacer_5">
-           <property name="orientation">
-            <enum>Qt::Orientation::Vertical</enum>
+         <item row="2" column="0">
+          <widget class="QCheckBox" name="shellExtension">
+           <property name="text">
+            <string>Shell extension</string>
            </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>20</width>
-             <height>40</height>
-            </size>
+          </widget>
+         </item>
+         <item row="0" column="0">
+          <widget class="QLabel" name="label_2">
+           <property name="text">
+            <string>Default View</string>
            </property>
-          </spacer>
+          </widget>
          </item>
          <item row="1" column="0">
           <widget class="QCheckBox" name="checkForNewVersion">
@@ -154,22 +172,18 @@
            </property>
           </widget>
          </item>
-         <item row="2" column="0">
-          <widget class="QCheckBox" name="shellExtension">
-           <property name="text">
-            <string>Shell extension</string>
+         <item row="5" column="0">
+          <spacer name="verticalSpacer_5">
+           <property name="orientation">
+            <enum>Qt::Orientation::Vertical</enum>
            </property>
-          </widget>
-         </item>
-         <item row="0" column="1">
-          <widget class="QComboBox" name="comboBox_defaultview">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>20</width>
+             <height>40</height>
+            </size>
            </property>
-          </widget>
+          </spacer>
          </item>
         </layout>
        </widget>