d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-01-11 15:27:54 +00:00
Code Issues Projects Releases Wiki Activity

Remove buttons from search widget

Browse Source 
These buttons are replaced by right-click menu actions.
This commit is contained in:
Chocobo1 2019-06-26 11:41:23 +08:00
parent 4f5302adf8
commit 5b9b5ce577
No known key found for this signature in database
GPG Key ID: 210D9C873253A68C
3 changed files with 0 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/gui/search/searchwidget.cpp
View File

@ -104,10 +104,7 @@ SearchWidget::SearchWidget(MainWindow *mainWindow)
#ifndef Q_OS_MAC #ifndef Q_OS_MAC
// Icons // Icons
m_ui->searchButton->setIcon(GuiIconProvider::instance()->getIcon("edit-find")); 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->pluginsButton->setIcon(GuiIconProvider::instance()->getIcon("preferences-system-network"));
m_ui->copyURLBtn->setIcon(GuiIconProvider::instance()->getIcon("edit-copy"));
#else #else
// On macOS the icons overlap the text otherwise // On macOS the icons overlap the text otherwise
QSize iconSize = m_ui->tabWidget->iconSize(); QSize iconSize = m_ui->tabWidget->iconSize();
@ -217,26 +214,11 @@ SearchWidget::~SearchWidget()
delete m_ui; 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) void SearchWidget::tabChanged(int index)
{ {
// when we switch from a tab that is not empty to another that is empty // when we switch from a tab that is not empty to another that is empty
// the download button doesn't have to be available // the download button doesn't have to be available
m_currentSearchTab = ((index < 0) ? nullptr : m_allTabs.at(m_ui->tabWidget->currentIndex())); m_currentSearchTab = ((index < 0) ? nullptr : m_allTabs.at(m_ui->tabWidget->currentIndex()));
updateButtons();
} }
void SearchWidget::selectMultipleBox(int index) void SearchWidget::selectMultipleBox(int index)
@ -324,7 +306,6 @@ void SearchWidget::on_searchButton_clicked()
m_ui->tabWidget->addTab(newTab, tabName); m_ui->tabWidget->addTab(newTab, tabName);
m_ui->tabWidget->setCurrentWidget(newTab); m_ui->tabWidget->setCurrentWidget(newTab);
connect(newTab, &SearchJobWidget::resultsCountUpdated, this, &SearchWidget::resultsCountUpdated);
connect(newTab, &SearchJobWidget::statusChanged, this, [this, newTab]() { tabStatusChanged(newTab); }); connect(newTab, &SearchJobWidget::statusChanged, this, [this, newTab]() { tabStatusChanged(newTab); });
m_ui->searchButton->setText(tr("Stop")); m_ui->searchButton->setText(tr("Stop"));
@ -332,11 +313,6 @@ void SearchWidget::on_searchButton_clicked()
tabStatusChanged(newTab); tabStatusChanged(newTab);
} }
void SearchWidget::resultsCountUpdated()
{
updateButtons();
}
void SearchWidget::tabStatusChanged(QWidget *tab) void SearchWidget::tabStatusChanged(QWidget *tab)
{ {
const int tabIndex = m_ui->tabWidget->indexOf(tab); const int tabIndex = m_ui->tabWidget->indexOf(tab);
@ -367,19 +343,3 @@ void SearchWidget::closeTab(int index)
delete tab; 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();
}

5
src/gui/search/searchwidget.h
View File

@ -57,15 +57,11 @@ public:
private slots: private slots:
void on_searchButton_clicked(); void on_searchButton_clicked();
void on_downloadButton_clicked();
void on_goToDescBtn_clicked();
void on_copyURLBtn_clicked();
void on_pluginsButton_clicked(); void on_pluginsButton_clicked();
private: private:
void tabChanged(int index); void tabChanged(int index);
void closeTab(int index); void closeTab(int index);
void resultsCountUpdated();
void tabStatusChanged(QWidget *tab); void tabStatusChanged(QWidget *tab);
void selectMultipleBox(int index); void selectMultipleBox(int index);
void toggleFocusBetweenLineEdits(); void toggleFocusBetweenLineEdits();
@ -74,7 +70,6 @@ private:
void fillPluginComboBox(); void fillPluginComboBox();
void selectActivePage(); void selectActivePage();
void searchTextEdited(const QString &); void searchTextEdited(const QString &);
void updateButtons();
QString selectedCategory() const; QString selectedCategory() const;
QString selectedPlugin() const; QString selectedPlugin() const;

30
src/gui/search/searchwidget.ui
View File

@ -113,36 +113,6 @@ Click the &quot;Search plugins...&quot; button at the bottom right of the window
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="layout2"> <layout class="QHBoxLayout" name="layout2">
<item>
<widget class="QPushButton" name="downloadButton">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Download</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="goToDescBtn">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Open description page</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="copyURLBtn">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Copy description page URL</string>
</property>
</widget>
</item>
<item> <item>
<spacer name="spacer2"> <spacer name="spacer2">
<property name="orientation"> <property name="orientation">