From 505af2c9f209bd6f3abbe38db86b48213a11613d Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter@praktik.cz>
Date: Wed, 23 Jun 2021 11:20:16 +0200
Subject: [PATCH] fixed #438 and related stuff

---
 .../notifications/singlenotificationeditor.cpp  |  2 --
 .../notifications/singlenotificationeditor.ui   | 17 ++++++++---------
 src/librssguard/gui/reusable/baselineedit.cpp   |  4 +++-
 .../gui/reusable/networkproxydetails.ui         | 13 ++++++++++---
 .../gui/reusable/searchtextwidget.cpp           |  3 ---
 .../gui/reusable/searchtextwidget.ui            | 13 +------------
 .../gui/settings/settingsfeedsmessages.ui       |  2 +-
 src/librssguard/gui/settings/settingsgui.ui     |  2 +-
 8 files changed, 24 insertions(+), 32 deletions(-)

diff --git a/src/librssguard/gui/notifications/singlenotificationeditor.cpp b/src/librssguard/gui/notifications/singlenotificationeditor.cpp
index 7d0dfef1d..1e188a230 100755
--- a/src/librssguard/gui/notifications/singlenotificationeditor.cpp
+++ b/src/librssguard/gui/notifications/singlenotificationeditor.cpp
@@ -12,14 +12,12 @@ SingleNotificationEditor::SingleNotificationEditor(const Notification& notificat
   m_ui.setupUi(this);
 
   m_ui.m_btnBrowseSound->setIcon(qApp->icons()->fromTheme(QSL("document-open")));
-  m_ui.m_btnClearSound->setIcon(qApp->icons()->fromTheme(QSL("edit-clear")));
   m_ui.m_btnPlaySound->setIcon(qApp->icons()->fromTheme(QSL("media-playback-start")));
 
   loadNotification(notification);
 
   connect(m_ui.m_btnPlaySound, &QPushButton::clicked, this, &SingleNotificationEditor::playSound);
   connect(m_ui.m_btnBrowseSound, &QPushButton::clicked, this, &SingleNotificationEditor::selectSoundFile);
-  connect(m_ui.m_btnClearSound, &QPushButton::clicked, m_ui.m_txtSound, &QLineEdit::clear);
   connect(m_ui.m_txtSound, &QLineEdit::textChanged, this, &SingleNotificationEditor::notificationChanged);
   connect(m_ui.m_cbBalloon, &QCheckBox::toggled, this, &SingleNotificationEditor::notificationChanged);
 
diff --git a/src/librssguard/gui/notifications/singlenotificationeditor.ui b/src/librssguard/gui/notifications/singlenotificationeditor.ui
index 4194f2946..b5d43cfef 100755
--- a/src/librssguard/gui/notifications/singlenotificationeditor.ui
+++ b/src/librssguard/gui/notifications/singlenotificationeditor.ui
@@ -36,19 +36,12 @@
    <item row="1" column="1">
     <layout class="QHBoxLayout" name="horizontalLayout_2">
      <item>
-      <widget class="QLineEdit" name="m_txtSound">
+      <widget class="BaseLineEdit" name="m_txtSound">
        <property name="placeholderText">
         <string>Full path to your WAV sound file</string>
        </property>
       </widget>
      </item>
-     <item>
-      <widget class="QPushButton" name="m_btnClearSound">
-       <property name="text">
-        <string>&amp;Clear</string>
-       </property>
-      </widget>
-     </item>
      <item>
       <widget class="QPushButton" name="m_btnBrowseSound">
        <property name="text">
@@ -74,10 +67,16 @@
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>BaseLineEdit</class>
+   <extends>QLineEdit</extends>
+   <header>baselineedit.h</header>
+  </customwidget>
+ </customwidgets>
  <tabstops>
   <tabstop>m_cbBalloon</tabstop>
   <tabstop>m_txtSound</tabstop>
-  <tabstop>m_btnClearSound</tabstop>
   <tabstop>m_btnBrowseSound</tabstop>
   <tabstop>m_btnPlaySound</tabstop>
  </tabstops>
diff --git a/src/librssguard/gui/reusable/baselineedit.cpp b/src/librssguard/gui/reusable/baselineedit.cpp
index b71eae11c..9f2073290 100755
--- a/src/librssguard/gui/reusable/baselineedit.cpp
+++ b/src/librssguard/gui/reusable/baselineedit.cpp
@@ -4,7 +4,9 @@
 
 #include <QKeyEvent>
 
-BaseLineEdit::BaseLineEdit(QWidget* parent) : QLineEdit(parent) {}
+BaseLineEdit::BaseLineEdit(QWidget* parent) : QLineEdit(parent) {
+  setClearButtonEnabled(true);
+}
 
 void BaseLineEdit::submit(const QString& text) {
   setText(text);
diff --git a/src/librssguard/gui/reusable/networkproxydetails.ui b/src/librssguard/gui/reusable/networkproxydetails.ui
index 1974c1084..c57d92ffa 100755
--- a/src/librssguard/gui/reusable/networkproxydetails.ui
+++ b/src/librssguard/gui/reusable/networkproxydetails.ui
@@ -33,7 +33,7 @@
       <item row="0" column="1">
        <layout class="QHBoxLayout" name="horizontalLayout_7">
         <item>
-         <widget class="QLineEdit" name="m_txtProxyHost">
+         <widget class="BaseLineEdit" name="m_txtProxyHost">
           <property name="enabled">
            <bool>true</bool>
           </property>
@@ -84,7 +84,7 @@
        </widget>
       </item>
       <item row="1" column="1">
-       <widget class="QLineEdit" name="m_txtProxyUsername">
+       <widget class="BaseLineEdit" name="m_txtProxyUsername">
         <property name="enabled">
          <bool>true</bool>
         </property>
@@ -107,7 +107,7 @@
        </widget>
       </item>
       <item row="2" column="1">
-       <widget class="QLineEdit" name="m_txtProxyPassword">
+       <widget class="BaseLineEdit" name="m_txtProxyPassword">
         <property name="enabled">
          <bool>true</bool>
         </property>
@@ -193,6 +193,13 @@
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>BaseLineEdit</class>
+   <extends>QLineEdit</extends>
+   <header>baselineedit.h</header>
+  </customwidget>
+ </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/src/librssguard/gui/reusable/searchtextwidget.cpp b/src/librssguard/gui/reusable/searchtextwidget.cpp
index df3eba959..a9473da8d 100755
--- a/src/librssguard/gui/reusable/searchtextwidget.cpp
+++ b/src/librssguard/gui/reusable/searchtextwidget.cpp
@@ -12,11 +12,9 @@ SearchTextWidget::SearchTextWidget(QWidget* parent) : QWidget(parent) {
   setFocusProxy(m_ui.m_txtSearch);
   setFixedHeight(28);
 
-  m_ui.m_btnClear->setIcon(qApp->icons()->fromTheme(QSL("edit-clear")));
   m_ui.m_btnSearchBackward->setIcon(qApp->icons()->fromTheme(QSL("back")));
   m_ui.m_btnSearchForward->setIcon(qApp->icons()->fromTheme(QSL("forward")));
 
-  connect(m_ui.m_btnClear, &QToolButton::clicked, m_ui.m_txtSearch, &QLineEdit::clear);
   connect(m_ui.m_txtSearch, &BaseLineEdit::textChanged, this, &SearchTextWidget::onTextChanged);
   connect(m_ui.m_txtSearch, &BaseLineEdit::submitted, this, [this]() {
     emit searchForText(m_ui.m_txtSearch->text(), false);
@@ -42,7 +40,6 @@ void SearchTextWidget::cancelSearch() {
 void SearchTextWidget::onTextChanged(const QString& text) {
   m_ui.m_btnSearchBackward->setDisabled(text.isEmpty());
   m_ui.m_btnSearchForward->setDisabled(text.isEmpty());
-  m_ui.m_btnClear->setDisabled(text.isEmpty());
 
   if (!text.isEmpty()) {
     emit searchForText(text, false);
diff --git a/src/librssguard/gui/reusable/searchtextwidget.ui b/src/librssguard/gui/reusable/searchtextwidget.ui
index f9041a187..0c3a489a4 100755
--- a/src/librssguard/gui/reusable/searchtextwidget.ui
+++ b/src/librssguard/gui/reusable/searchtextwidget.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>461</width>
-    <height>25</height>
+    <height>28</height>
    </rect>
   </property>
   <layout class="QHBoxLayout">
@@ -26,16 +26,6 @@
    <property name="bottomMargin">
     <number>3</number>
    </property>
-   <item>
-    <widget class="QToolButton" name="m_btnClear">
-     <property name="toolTip">
-      <string>Clear searched phrase</string>
-     </property>
-     <property name="text">
-      <string/>
-     </property>
-    </widget>
-   </item>
    <item>
     <widget class="BaseLineEdit" name="m_txtSearch">
      <property name="placeholderText">
@@ -86,7 +76,6 @@
   </customwidget>
  </customwidgets>
  <tabstops>
-  <tabstop>m_btnClear</tabstop>
   <tabstop>m_txtSearch</tabstop>
   <tabstop>m_btnSearchBackward</tabstop>
   <tabstop>m_btnSearchForward</tabstop>
diff --git a/src/librssguard/gui/settings/settingsfeedsmessages.ui b/src/librssguard/gui/settings/settingsfeedsmessages.ui
index 272b11f4b..706d9b317 100644
--- a/src/librssguard/gui/settings/settingsfeedsmessages.ui
+++ b/src/librssguard/gui/settings/settingsfeedsmessages.ui
@@ -264,7 +264,7 @@
        <item row="4" column="0" colspan="2">
         <widget class="QCheckBox" name="m_checkKeppMessagesInTheMiddle">
          <property name="text">
-          <string>Keep message selection in the middle of the article list viewport</string>
+          <string>Keep article selection in the middle of the article list viewport</string>
          </property>
         </widget>
        </item>
diff --git a/src/librssguard/gui/settings/settingsgui.ui b/src/librssguard/gui/settings/settingsgui.ui
index 2c2d5171a..a73a1eaa0 100644
--- a/src/librssguard/gui/settings/settingsgui.ui
+++ b/src/librssguard/gui/settings/settingsgui.ui
@@ -26,7 +26,7 @@
    <item>
     <widget class="QTabWidget" name="m_tabUi">
      <property name="currentIndex">
-      <number>1</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="m_tabIconSkin">
       <attribute name="title">