From 5b9b5ce577f882fb58284ccfd3f1570f931dac6f Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Wed, 26 Jun 2019 11:41:23 +0800 Subject: [PATCH] Remove buttons from search widget These buttons are replaced by right-click menu actions. --- src/gui/search/searchwidget.cpp | 40 --------------------------------- src/gui/search/searchwidget.h | 5 ----- src/gui/search/searchwidget.ui | 30 ------------------------- 3 files changed, 75 deletions(-) diff --git a/src/gui/search/searchwidget.cpp b/src/gui/search/searchwidget.cpp index 3fac10a2c..15af96484 100644 --- a/src/gui/search/searchwidget.cpp +++ b/src/gui/search/searchwidget.cpp @@ -104,10 +104,7 @@ SearchWidget::SearchWidget(MainWindow *mainWindow) #ifndef Q_OS_MAC // Icons m_ui->searchButton->setIcon(GuiIconProvider::instance()->getIcon("edit-find")); - m_ui->downloadButton->setIcon(GuiIconProvider::instance()->getIcon("download")); - m_ui->goToDescBtn->setIcon(GuiIconProvider::instance()->getIcon("application-x-mswinurl")); m_ui->pluginsButton->setIcon(GuiIconProvider::instance()->getIcon("preferences-system-network")); - m_ui->copyURLBtn->setIcon(GuiIconProvider::instance()->getIcon("edit-copy")); #else // On macOS the icons overlap the text otherwise QSize iconSize = m_ui->tabWidget->iconSize(); @@ -217,26 +214,11 @@ SearchWidget::~SearchWidget() delete m_ui; } -void SearchWidget::updateButtons() -{ - if (m_currentSearchTab && (m_currentSearchTab->visibleResultsCount() > 0)) { - m_ui->downloadButton->setEnabled(true); - m_ui->goToDescBtn->setEnabled(true); - m_ui->copyURLBtn->setEnabled(true); - } - else { - m_ui->downloadButton->setEnabled(false); - m_ui->goToDescBtn->setEnabled(false); - m_ui->copyURLBtn->setEnabled(false); - } -} - void SearchWidget::tabChanged(int index) { // when we switch from a tab that is not empty to another that is empty // the download button doesn't have to be available m_currentSearchTab = ((index < 0) ? nullptr : m_allTabs.at(m_ui->tabWidget->currentIndex())); - updateButtons(); } void SearchWidget::selectMultipleBox(int index) @@ -324,7 +306,6 @@ void SearchWidget::on_searchButton_clicked() m_ui->tabWidget->addTab(newTab, tabName); m_ui->tabWidget->setCurrentWidget(newTab); - connect(newTab, &SearchJobWidget::resultsCountUpdated, this, &SearchWidget::resultsCountUpdated); connect(newTab, &SearchJobWidget::statusChanged, this, [this, newTab]() { tabStatusChanged(newTab); }); m_ui->searchButton->setText(tr("Stop")); @@ -332,11 +313,6 @@ void SearchWidget::on_searchButton_clicked() tabStatusChanged(newTab); } -void SearchWidget::resultsCountUpdated() -{ - updateButtons(); -} - void SearchWidget::tabStatusChanged(QWidget *tab) { const int tabIndex = m_ui->tabWidget->indexOf(tab); @@ -367,19 +343,3 @@ void SearchWidget::closeTab(int index) delete tab; } - -// Download selected items in search results list -void SearchWidget::on_downloadButton_clicked() -{ - m_allTabs.at(m_ui->tabWidget->currentIndex())->downloadTorrents(); -} - -void SearchWidget::on_goToDescBtn_clicked() -{ - m_allTabs.at(m_ui->tabWidget->currentIndex())->openTorrentPages(); -} - -void SearchWidget::on_copyURLBtn_clicked() -{ - m_allTabs.at(m_ui->tabWidget->currentIndex())->copyTorrentURLs(); -} diff --git a/src/gui/search/searchwidget.h b/src/gui/search/searchwidget.h index 46a8315a7..cbfbfe321 100644 --- a/src/gui/search/searchwidget.h +++ b/src/gui/search/searchwidget.h @@ -57,15 +57,11 @@ public: private slots: void on_searchButton_clicked(); - void on_downloadButton_clicked(); - void on_goToDescBtn_clicked(); - void on_copyURLBtn_clicked(); void on_pluginsButton_clicked(); private: void tabChanged(int index); void closeTab(int index); - void resultsCountUpdated(); void tabStatusChanged(QWidget *tab); void selectMultipleBox(int index); void toggleFocusBetweenLineEdits(); @@ -74,7 +70,6 @@ private: void fillPluginComboBox(); void selectActivePage(); void searchTextEdited(const QString &); - void updateButtons(); QString selectedCategory() const; QString selectedPlugin() const; diff --git a/src/gui/search/searchwidget.ui b/src/gui/search/searchwidget.ui index d908b683c..51029f8f6 100644 --- a/src/gui/search/searchwidget.ui +++ b/src/gui/search/searchwidget.ui @@ -113,36 +113,6 @@ Click the "Search plugins..." button at the bottom right of the window - - - - false - - - Download - - - - - - - false - - - Open description page - - - - - - - false - - - Copy description page URL - - -