From 7a4f6d5344031db828f5dc2257c1d19f251e7f05 Mon Sep 17 00:00:00 2001
From: Mikaël Capelle <capelle.mikael@gmail.com>
Date: Wed, 11 Nov 2020 13:39:53 +0100
Subject: Improve requirements handling.

---
 src/settingsdialog.ui | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'src/settingsdialog.ui')

diff --git a/src/settingsdialog.ui b/src/settingsdialog.ui
index 85c5a4e4..4fd34b21 100644
--- a/src/settingsdialog.ui
+++ b/src/settingsdialog.ui
@@ -1127,6 +1127,9 @@
                </property>
                <item>
                 <layout class="QFormLayout" name="formLayout_2">
+                 <property name="leftMargin">
+                  <number>6</number>
+                 </property>
                  <item row="0" column="0">
                   <widget class="QLabel" name="label_13">
                    <property name="text">
@@ -1172,6 +1175,13 @@
                    </property>
                   </widget>
                  </item>
+                 <item row="3" column="0">
+                  <widget class="QCheckBox" name="enabledCheckbox">
+                   <property name="text">
+                    <string>Enabled</string>
+                   </property>
+                  </widget>
+                 </item>
                 </layout>
                </item>
                <item>
-- 
cgit v1.3.1


From e0b73a7d7d27d42b87b3061c51d5d22f57646c45 Mon Sep 17 00:00:00 2001
From: Mikaël Capelle <capelle.mikael@gmail.com>
Date: Tue, 17 Nov 2020 10:45:29 +0100
Subject: Fix selection in Plugins settings.

---
 src/settingsdialog.ui         | 130 +++++++++++++++++++++++-------------------
 src/settingsdialogplugins.cpp |  22 +++++--
 2 files changed, 87 insertions(+), 65 deletions(-)

(limited to 'src/settingsdialog.ui')

diff --git a/src/settingsdialog.ui b/src/settingsdialog.ui
index 4fd34b21..d05910cb 100644
--- a/src/settingsdialog.ui
+++ b/src/settingsdialog.ui
@@ -1111,8 +1111,8 @@
                </item>
               </layout>
              </widget>
-             <widget class="QWidget" name="widget" native="true">
-              <layout class="QVBoxLayout" name="verticalLayout_7" stretch="0,1">
+             <widget class="QWidget" name="pluginWidget" native="true">
+              <layout class="QVBoxLayout" name="verticalLayout_7" stretch="0,1,0">
                <property name="leftMargin">
                 <number>0</number>
                </property>
@@ -1126,63 +1126,65 @@
                 <number>0</number>
                </property>
                <item>
-                <layout class="QFormLayout" name="formLayout_2">
-                 <property name="leftMargin">
-                  <number>6</number>
-                 </property>
-                 <item row="0" column="0">
-                  <widget class="QLabel" name="label_13">
-                   <property name="text">
-                    <string>Author:</string>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="0" column="1">
-                  <widget class="QLabel" name="authorLabel">
-                   <property name="text">
-                    <string/>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="1" column="0">
-                  <widget class="QLabel" name="label_15">
-                   <property name="text">
-                    <string>Version:</string>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="1" column="1">
-                  <widget class="QLabel" name="versionLabel">
-                   <property name="text">
-                    <string/>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="2" column="1">
-                  <widget class="QLabel" name="descriptionLabel">
-                   <property name="text">
-                    <string/>
-                   </property>
-                   <property name="wordWrap">
-                    <bool>true</bool>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="2" column="0">
-                  <widget class="QLabel" name="label_14">
-                   <property name="text">
-                    <string>Description:</string>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="3" column="0">
-                  <widget class="QCheckBox" name="enabledCheckbox">
-                   <property name="text">
-                    <string>Enabled</string>
-                   </property>
-                  </widget>
-                 </item>
-                </layout>
+                <widget class="QWidget" name="pluginDescription" native="true">
+                 <layout class="QFormLayout" name="pluginDescriptionLayout">
+                  <property name="leftMargin">
+                   <number>6</number>
+                  </property>
+                  <item row="0" column="0">
+                   <widget class="QLabel" name="label_13">
+                    <property name="text">
+                     <string>Author:</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="0" column="1">
+                   <widget class="QLabel" name="authorLabel">
+                    <property name="text">
+                     <string/>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="1" column="0">
+                   <widget class="QLabel" name="label_15">
+                    <property name="text">
+                     <string>Version:</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="1" column="1">
+                   <widget class="QLabel" name="versionLabel">
+                    <property name="text">
+                     <string/>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="2" column="0">
+                   <widget class="QLabel" name="label_14">
+                    <property name="text">
+                     <string>Description:</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="2" column="1">
+                   <widget class="QLabel" name="descriptionLabel">
+                    <property name="text">
+                     <string/>
+                    </property>
+                    <property name="wordWrap">
+                     <bool>true</bool>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="3" column="0">
+                   <widget class="QCheckBox" name="enabledCheckbox">
+                    <property name="text">
+                     <string>Enabled</string>
+                    </property>
+                   </widget>
+                  </item>
+                 </layout>
+                </widget>
                </item>
                <item>
                 <widget class="QTreeWidget" name="pluginSettingsList">
@@ -1216,6 +1218,16 @@
                  </column>
                 </widget>
                </item>
+               <item>
+                <widget class="QLabel" name="noPluginLabel">
+                 <property name="text">
+                  <string>No plugin found.</string>
+                 </property>
+                 <property name="alignment">
+                  <set>Qt::AlignCenter</set>
+                 </property>
+                </widget>
+               </item>
               </layout>
              </widget>
             </widget>
diff --git a/src/settingsdialogplugins.cpp b/src/settingsdialogplugins.cpp
index 19515426..a86ba5c9 100644
--- a/src/settingsdialogplugins.cpp
+++ b/src/settingsdialogplugins.cpp
@@ -25,6 +25,7 @@ PluginsSettingsTab::PluginsSettingsTab(Settings& s, PluginContainer* pluginConta
     item->setFont(0, font);
     topItems[interfaceName] = item;
     item->setExpanded(true);
+    item->setFlags(item->flags() & ~Qt::ItemIsSelectable);
   }
   ui->pluginsList->setHeaderHidden(true);
 
@@ -112,6 +113,7 @@ void PluginsSettingsTab::updateListItems()
 
 void PluginsSettingsTab::filterPluginList()
 {
+  auto selectedItems = ui->pluginsList->selectedItems();
   QTreeWidgetItem* firstNotHidden = nullptr;
 
   for (auto i = 0; i < ui->pluginsList->topLevelItemCount(); ++i) {
@@ -150,13 +152,21 @@ void PluginsSettingsTab::filterPluginList()
   }
 
   // Unselect item if hidden:
-  auto selectedItems = ui->pluginsList->selectedItems();
-  if (!selectedItems.isEmpty() && selectedItems[0]->isHidden()) {
-    selectedItems[0]->setSelected(false);
-
-    if (firstNotHidden) {
-      firstNotHidden->setSelected(true);
+  if (firstNotHidden) {
+    ui->pluginDescription->setVisible(true);
+    ui->pluginSettingsList->setVisible(true);
+    ui->noPluginLabel->setVisible(false);
+    if (selectedItems.isEmpty()) {
+      ui->pluginsList->setCurrentItem(firstNotHidden);
     }
+    else if (selectedItems[0]->isHidden()) {
+      ui->pluginsList->setCurrentItem(firstNotHidden);
+    }
+  }
+  else {
+    ui->pluginDescription->setVisible(false);
+    ui->pluginSettingsList->setVisible(false);
+    ui->noPluginLabel->setVisible(true);
   }
 
 }
-- 
cgit v1.3.1


From 61554d3df7be909acf6609b4b7465b03d7f16081 Mon Sep 17 00:00:00 2001
From: Mikaël Capelle <capelle.mikael@gmail.com>
Date: Tue, 17 Nov 2020 18:27:21 +0100
Subject: Better vertical alignment for plugin descriptions.

---
 src/settingsdialog.ui | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'src/settingsdialog.ui')

diff --git a/src/settingsdialog.ui b/src/settingsdialog.ui
index d05910cb..2d4ca993 100644
--- a/src/settingsdialog.ui
+++ b/src/settingsdialog.ui
@@ -1128,6 +1128,9 @@
                <item>
                 <widget class="QWidget" name="pluginDescription" native="true">
                  <layout class="QFormLayout" name="pluginDescriptionLayout">
+                  <property name="labelAlignment">
+                   <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+                  </property>
                   <property name="leftMargin">
                    <number>6</number>
                   </property>
@@ -1136,6 +1139,9 @@
                     <property name="text">
                      <string>Author:</string>
                     </property>
+                    <property name="alignment">
+                     <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+                    </property>
                    </widget>
                   </item>
                   <item row="0" column="1">
@@ -1143,6 +1149,9 @@
                     <property name="text">
                      <string/>
                     </property>
+                    <property name="alignment">
+                     <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+                    </property>
                    </widget>
                   </item>
                   <item row="1" column="0">
@@ -1150,6 +1159,9 @@
                     <property name="text">
                      <string>Version:</string>
                     </property>
+                    <property name="alignment">
+                     <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+                    </property>
                    </widget>
                   </item>
                   <item row="1" column="1">
@@ -1157,6 +1169,9 @@
                     <property name="text">
                      <string/>
                     </property>
+                    <property name="alignment">
+                     <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+                    </property>
                    </widget>
                   </item>
                   <item row="2" column="0">
@@ -1164,6 +1179,9 @@
                     <property name="text">
                      <string>Description:</string>
                     </property>
+                    <property name="alignment">
+                     <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+                    </property>
                    </widget>
                   </item>
                   <item row="2" column="1">
@@ -1171,6 +1189,9 @@
                     <property name="text">
                      <string/>
                     </property>
+                    <property name="alignment">
+                     <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+                    </property>
                     <property name="wordWrap">
                      <bool>true</bool>
                     </property>
-- 
cgit v1.3.1