From cf01b38d70f6fdc3807de89a12cc07bb9fe4a96c Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter@praktik.cz>
Date: Fri, 21 Jan 2022 11:57:28 +0100
Subject: [PATCH] some UI changes

---
 .../desktop/com.github.rssguard.appdata.xml   |  2 +-
 src/librssguard/gui/dialogs/formsettings.cpp  |  2 +-
 src/librssguard/gui/dialogs/formsettings.ui   |  6 ++
 src/librssguard/gui/reusable/helpspoiler.cpp  |  1 +
 src/librssguard/gui/tabbar.cpp                |  2 +-
 .../standard/gui/standardfeeddetails.ui       | 90 +++++++++----------
 6 files changed, 55 insertions(+), 48 deletions(-)

diff --git a/resources/desktop/com.github.rssguard.appdata.xml b/resources/desktop/com.github.rssguard.appdata.xml
index 5257a05b0..a3b76e844 100644
--- a/resources/desktop/com.github.rssguard.appdata.xml
+++ b/resources/desktop/com.github.rssguard.appdata.xml
@@ -26,7 +26,7 @@
   <url type="donation">https://github.com/sponsors/martinrotter</url>
   <content_rating type="oars-1.1" />
   <releases>
-    <release version="4.1.2" date="2022-01-20"/>
+    <release version="4.1.2" date="2022-01-21"/>
   </releases>
   <content_rating type="oars-1.0">
     <content_attribute id="violence-cartoon">none</content_attribute>
diff --git a/src/librssguard/gui/dialogs/formsettings.cpp b/src/librssguard/gui/dialogs/formsettings.cpp
index 900fbf74e..10adb6f30 100644
--- a/src/librssguard/gui/dialogs/formsettings.cpp
+++ b/src/librssguard/gui/dialogs/formsettings.cpp
@@ -51,7 +51,7 @@ FormSettings::FormSettings(QWidget& parent)
   addSettingsPanel(new SettingsDownloads(&m_settings, this));
   addSettingsPanel(new SettingsFeedsMessages(&m_settings, this));
 
-  m_ui.m_listSettings->setMaximumWidth(m_ui.m_listSettings->sizeHintForColumn(0) + 4 * m_ui.m_listSettings->frameWidth());
+  m_ui.m_listSettings->setMaximumWidth(m_ui.m_listSettings->sizeHintForColumn(0) + 6 * m_ui.m_listSettings->frameWidth());
   m_ui.m_listSettings->setCurrentRow(0);
 
   resize(qApp->settings()->value(GROUP(GUI), GUI::SettingsWindowInitialSize, size()).toSize());
diff --git a/src/librssguard/gui/dialogs/formsettings.ui b/src/librssguard/gui/dialogs/formsettings.ui
index 925013b1e..b46e345b6 100644
--- a/src/librssguard/gui/dialogs/formsettings.ui
+++ b/src/librssguard/gui/dialogs/formsettings.ui
@@ -16,6 +16,12 @@
   <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="0">
     <widget class="QListWidget" name="m_listSettings">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
      <property name="showDropIndicator" stdset="0">
       <bool>false</bool>
      </property>
diff --git a/src/librssguard/gui/reusable/helpspoiler.cpp b/src/librssguard/gui/reusable/helpspoiler.cpp
index 26f7f3b02..d1339bc16 100644
--- a/src/librssguard/gui/reusable/helpspoiler.cpp
+++ b/src/librssguard/gui/reusable/helpspoiler.cpp
@@ -18,6 +18,7 @@
 HelpSpoiler::HelpSpoiler(QWidget* parent) : QWidget(parent),
   m_btnToggle(new QToolButton(this)), m_content(new QScrollArea(this)), m_animation(new QParallelAnimationGroup(this)),
   m_layout(new QGridLayout(this)), m_text(new QLabel(this)) {
+
   m_btnToggle->setStyleSheet(QSL("QToolButton { border: none; }"));
   m_btnToggle->setToolButtonStyle(Qt::ToolButtonStyle::ToolButtonTextBesideIcon);
   m_btnToggle->setArrowType(Qt::ArrowType::RightArrow);
diff --git a/src/librssguard/gui/tabbar.cpp b/src/librssguard/gui/tabbar.cpp
index 84d932c67..c33db4c90 100644
--- a/src/librssguard/gui/tabbar.cpp
+++ b/src/librssguard/gui/tabbar.cpp
@@ -11,7 +11,7 @@
 #include <QStyle>
 
 TabBar::TabBar(QWidget* parent) : QTabBar(parent) {
-  setDocumentMode(false);
+  setDocumentMode(true);
   setUsesScrollButtons(true);
   setContextMenuPolicy(Qt::ContextMenuPolicy::CustomContextMenu);
 }
diff --git a/src/librssguard/services/standard/gui/standardfeeddetails.ui b/src/librssguard/services/standard/gui/standardfeeddetails.ui
index a9c2cefa8..bb7f4684a 100644
--- a/src/librssguard/services/standard/gui/standardfeeddetails.ui
+++ b/src/librssguard/services/standard/gui/standardfeeddetails.ui
@@ -113,49 +113,10 @@
    <item row="5" column="1">
     <widget class="QComboBox" name="m_cmbSourceType"/>
    </item>
-   <item row="6" column="1">
-    <widget class="TextEditWithStatus" name="m_txtSource" native="true">
-     <property name="minimumSize">
-      <size>
-       <width>0</width>
-       <height>100</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>16777215</width>
-       <height>100</height>
-      </size>
-     </property>
-    </widget>
-   </item>
-   <item row="7" column="0">
-    <widget class="QLabel" name="label_4">
-     <property name="text">
-      <string>Post-processing script</string>
-     </property>
-    </widget>
-   </item>
-   <item row="7" column="1">
-    <widget class="TextEditWithStatus" name="m_txtPostProcessScript" native="true">
-     <property name="minimumSize">
-      <size>
-       <width>0</width>
-       <height>100</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>16777215</width>
-       <height>100</height>
-      </size>
-     </property>
-    </widget>
-   </item>
-   <item row="8" column="0" colspan="2">
+   <item row="9" column="0" colspan="2">
     <widget class="HelpSpoiler" name="m_lblScriptInfo" native="true"/>
    </item>
-   <item row="9" column="0">
+   <item row="10" column="0">
     <widget class="QLabel" name="label_7">
      <property name="text">
       <string>Fetch metadata</string>
@@ -165,7 +126,7 @@
      </property>
     </widget>
    </item>
-   <item row="9" column="1">
+   <item row="10" column="1">
     <layout class="QHBoxLayout" name="horizontalLayout_2">
      <item>
       <widget class="QPushButton" name="m_btnFetchMetadata">
@@ -189,7 +150,7 @@
      </item>
     </layout>
    </item>
-   <item row="10" column="0">
+   <item row="11" column="0">
     <widget class="QLabel" name="m_lblIcon">
      <property name="text">
       <string>Icon</string>
@@ -199,7 +160,7 @@
      </property>
     </widget>
    </item>
-   <item row="10" column="1">
+   <item row="11" column="1">
     <widget class="QToolButton" name="m_btnIcon">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@@ -236,7 +197,7 @@
      </property>
     </widget>
    </item>
-   <item row="11" column="0" colspan="2">
+   <item row="12" column="0" colspan="2">
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
@@ -249,6 +210,45 @@
      </property>
     </spacer>
    </item>
+   <item row="6" column="0" colspan="2">
+    <widget class="TextEditWithStatus" name="m_txtSource" native="true">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>70</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>16777215</width>
+       <height>100</height>
+      </size>
+     </property>
+    </widget>
+   </item>
+   <item row="8" column="0" colspan="2">
+    <widget class="TextEditWithStatus" name="m_txtPostProcessScript" native="true">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>70</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>16777215</width>
+       <height>100</height>
+      </size>
+     </property>
+    </widget>
+   </item>
+   <item row="7" column="0" colspan="2">
+    <widget class="QLabel" name="label_4">
+     <property name="text">
+      <string>Post-processing script</string>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <customwidgets>