Add option to toggle closing search tabs with middle-click

Author: thalieht

src/base/preferences.cpp

@@ -753,6 +753,19 @@ void Preferences::setStoreOpenedSearchTabResults(const bool enabled)
     setValue(u"Search/StoreOpenedSearchTabResults"_s, enabled);
 }
 
+bool Preferences::closeSearchTabWithMiddleClick() const
+{
+    return value(u"Search/CloseSearchTabWithMiddleClick"_s, true);
+}
+
+void Preferences::setCloseSearchTabWithMiddleClick(const bool enabled)
+{
+    if (enabled == closeSearchTabWithMiddleClick())
+        return;
+
+    setValue(u"Search/CloseSearchTabWithMiddleClick"_s, enabled);
+}
+
 bool Preferences::isWebUIEnabled() const
 {
 #ifdef DISABLE_GUI

src/base/preferences.h

@@ -175,6 +175,8 @@ class Preferences final : public QObject
     void setStoreOpenedSearchTabs(bool enabled);
     bool storeOpenedSearchTabResults() const;
     void setStoreOpenedSearchTabResults(bool enabled);
+    bool closeSearchTabWithMiddleClick() const;
+    void setCloseSearchTabWithMiddleClick(bool enabled);
 
     // HTTP Server
     bool isWebUIEnabled() const;

src/gui/optionsdialog.cpp

@@ -1387,10 +1387,12 @@ void OptionsDialog::loadSearchTabOptions()
     m_ui->groupStoreOpenedTabs->setChecked(pref->storeOpenedSearchTabs());
     m_ui->checkStoreTabsSearchResults->setChecked(pref->storeOpenedSearchTabResults());
     m_ui->searchHistoryLengthSpinBox->setValue(pref->searchHistoryLength());
+    m_ui->checkCloseSearchTabWithMiddleClick->setChecked(pref->closeSearchTabWithMiddleClick());
 
     connect(m_ui->groupStoreOpenedTabs, &QGroupBox::toggled, this, &OptionsDialog::enableApplyButton);
     connect(m_ui->checkStoreTabsSearchResults, &QCheckBox::toggled, this, &OptionsDialog::enableApplyButton);
     connect(m_ui->searchHistoryLengthSpinBox, qSpinBoxValueChanged, this, &OptionsDialog::enableApplyButton);
+    connect(m_ui->checkCloseSearchTabWithMiddleClick, &QCheckBox::toggled, this, &OptionsDialog::enableApplyButton);
 }
 
 void OptionsDialog::saveSearchTabOptions() const
@@ -1400,6 +1402,7 @@ void OptionsDialog::saveSearchTabOptions() const
     pref->setStoreOpenedSearchTabs(m_ui->groupStoreOpenedTabs->isChecked());
     pref->setStoreOpenedSearchTabResults(m_ui->checkStoreTabsSearchResults->isChecked());
     pref->setSearchHistoryLength(m_ui->searchHistoryLengthSpinBox->value());
+    pref->setCloseSearchTabWithMiddleClick(m_ui->checkCloseSearchTabWithMiddleClick->isChecked());
 }
 
 #ifndef DISABLE_WEBUI

src/gui/optionsdialog.ui

@@ -3449,34 +3449,45 @@ Disable encryption: Only connect to peers without protocol encryption</string>
                 </widget>
                </item>
                <item>
-                <layout class="QHBoxLayout" name="searchHistoryLayout">
-                 <item>
-                  <widget class="QLabel" name="searchHistoryLengthLabel">
-                   <property name="text">
-                    <string>History length</string>
-                   </property>
-                  </widget>
+                <layout class="QGridLayout" name="gridLayout_8">
+                 <item row="0" column="0">
+                  <layout class="QHBoxLayout" name="searchHistoryLayout">
+                   <item>
+                    <widget class="QLabel" name="searchHistoryLengthLabel">
+                     <property name="text">
+                      <string>History length</string>
+                     </property>
+                    </widget>
+                   </item>
+                   <item>
+                    <widget class="QSpinBox" name="searchHistoryLengthSpinBox">
+                     <property name="maximum">
+                      <number>99</number>
+                     </property>
+                    </widget>
+                   </item>
+                   <item>
+                    <spacer name="searchHistoryLengthSpacer">
+                     <property name="orientation">
+                      <enum>Qt::Orientation::Horizontal</enum>
+                     </property>
+                     <property name="sizeHint" stdset="0">
+                      <size>
+                       <width>40</width>
+                       <height>20</height>
+                      </size>
+                     </property>
+                    </spacer>
+                   </item>
+                  </layout>
                  </item>
-                 <item>
-                  <widget class="QSpinBox" name="searchHistoryLengthSpinBox">
-                   <property name="maximum">
-                    <number>99</number>
+                 <item row="1" column="0">
+                  <widget class="QCheckBox" name="checkCloseSearchTabWithMiddleClick">
+                   <property name="text">
+                    <string>Allow closing tabs with middle-click</string>
                    </property>
                   </widget>
                  </item>
-                 <item>
-                  <spacer name="searchHistoryLengthSpacer">
-                   <property name="orientation">
-                    <enum>Qt::Orientation::Horizontal</enum>
-                   </property>
-                   <property name="sizeHint" stdset="0">
-                    <size>
-                     <width>40</width>
-                     <height>20</height>
-                    </size>
-                   </property>
-                  </spacer>
-                 </item>
                 </layout>
                </item>
               </layout>

src/gui/search/searchwidget.cpp

@@ -63,8 +63,8 @@
 #include "base/utils/bytearray.h"
 #include "base/utils/compare.h"
 #include "base/utils/datetime.h"
-#include "base/utils/fs.h"
 #include "base/utils/foreignapps.h"
+#include "base/utils/fs.h"
 #include "base/utils/io.h"
 #include "gui/desktopintegration.h"
 #include "gui/interfaces/iguiapplication.h"
@@ -467,7 +467,9 @@ bool SearchWidget::eventFilter(QObject *object, QEvent *event)
         {
             if (mouseEvent->button() == Qt::MiddleButton)
             {
-                closeTab(tabIndex);
+                if (Preferences::instance()->closeSearchTabWithMiddleClick())
+                    closeTab(tabIndex);
+
                 return true;
             }