Merge pull request #10786 from Chocobo1/dialog

Avoid creating unnecessary event loops
This commit is contained in:
Mike Tzou
2019-06-19 11:02:09 +08:00
committed by GitHub
22 changed files with 509 additions and 476 deletions

View File

@@ -163,19 +163,22 @@ void PluginSelectDialog::togglePluginState(QTreeWidgetItem *item, int)
}
}
void PluginSelectDialog::displayContextMenu(const QPoint&)
void PluginSelectDialog::displayContextMenu(const QPoint &)
{
QMenu myContextMenu(this);
// Enable/disable pause/start action given the DL state
QList<QTreeWidgetItem *> items = m_ui->pluginsTree->selectedItems();
const QList<QTreeWidgetItem *> items = m_ui->pluginsTree->selectedItems();
if (items.isEmpty()) return;
QString firstID = items.first()->text(PLUGIN_ID);
QMenu *myContextMenu = new QMenu(this);
myContextMenu->setAttribute(Qt::WA_DeleteOnClose);
const QString firstID = items.first()->text(PLUGIN_ID);
m_ui->actionEnable->setChecked(m_pluginManager->pluginInfo(firstID)->enabled);
myContextMenu.addAction(m_ui->actionEnable);
myContextMenu.addSeparator();
myContextMenu.addAction(m_ui->actionUninstall);
myContextMenu.exec(QCursor::pos());
myContextMenu->addAction(m_ui->actionEnable);
myContextMenu->addSeparator();
myContextMenu->addAction(m_ui->actionUninstall);
myContextMenu->popup(QCursor::pos());
}
void PluginSelectDialog::on_closeButton_clicked()

View File

@@ -71,7 +71,7 @@ private slots:
void on_closeButton_clicked();
void togglePluginState(QTreeWidgetItem*, int);
void setRowColor(int row, const QString &color);
void displayContextMenu(const QPoint &pos);
void displayContextMenu(const QPoint &);
void enableSelection(bool enable);
void askForLocalPlugin();
void askForPluginUrl();

View File

@@ -358,7 +358,9 @@ void SearchJobWidget::showFilterContextMenu(const QPoint &)
const Preferences *pref = Preferences::instance();
QMenu *menu = m_lineEditSearchResultsFilter->createStandardContextMenu();
menu->setAttribute(Qt::WA_DeleteOnClose);
menu->addSeparator();
QAction *useRegexAct = new QAction(tr("Use regular expressions"), menu);
useRegexAct->setCheckable(true);
useRegexAct->setChecked(pref->getRegexAsFilteringPatternForSearchJob());
@@ -367,7 +369,7 @@ void SearchJobWidget::showFilterContextMenu(const QPoint &)
connect(useRegexAct, &QAction::toggled, pref, &Preferences::setRegexAsFilteringPatternForSearchJob);
connect(useRegexAct, &QAction::toggled, this, [this]() { filterSearchResults(m_lineEditSearchResultsFilter->text()); });
menu->exec(QCursor::pos());
menu->popup(QCursor::pos());
}
QString SearchJobWidget::statusText(SearchJobWidget::Status st)