Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions src/base/preferences.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions src/base/preferences.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 3 additions & 0 deletions src/gui/optionsdialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
7 changes: 7 additions & 0 deletions src/gui/optionsdialog.ui
Original file line number Diff line number Diff line change
Expand Up @@ -3479,6 +3479,13 @@ Disable encryption: Only connect to peers without protocol encryption</string>
</item>
</layout>
</item>
<item>
<widget class="QCheckBox" name="checkCloseSearchTabWithMiddleClick">
<property name="text">
<string>Allow closing tabs with middle-click</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
Expand Down
6 changes: 4 additions & 2 deletions src/gui/search/searchwidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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;
}

Expand Down
Loading