d4708
/
qBittorrent
mirror of https://github.com/d47081/qBittorrent.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Fix rule selection behavior

adaptive-webui-19844
Christophe Dumez 14 years ago
parent
578a5c9551
commit
4de980c1a1
1 changed files with 7 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      src/rss/automatedrssdownloader.cpp

12
src/rss/automatedrssdownloader.cpp
Unescape View File

@ -48,7 +48,7 @@ AutomatedRssDownloader::AutomatedRssDownloader(QWidget *parent) :
{ {
ui->setupUi(this); ui->setupUi(this);
ui->listRules->setSortingEnabled(true); ui->listRules->setSortingEnabled(true);
ui->listRules->setSelectionMode(QAbstractItemView::MultiSelection); ui->listRules->setSelectionMode(QAbstractItemView::ExtendedSelection);
connect(ui->listRules, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(displayRulesListMenu(const QPoint&))); connect(ui->listRules, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(displayRulesListMenu(const QPoint&)));
m_ruleList = RssDownloadRuleList::instance(); m_ruleList = RssDownloadRuleList::instance();
initLabelCombobox(); initLabelCombobox();
@ -154,8 +154,9 @@ void AutomatedRssDownloader::updateRuleDefinitionBox(QListWidgetItem* current, Q
// Save previous item // Save previous item
saveCurrentRule(previous); saveCurrentRule(previous);
// Update rule definition box // Update rule definition box
const QList<QListWidgetItem*> selection = ui->listRules->selectedItems();
RssDownloadRule rule = getCurrentRule(); RssDownloadRule rule = getCurrentRule();
if(rule.isValid()) { if(selection.count() == 1 && rule.isValid()) {
ui->lineContains->setText(rule.mustContain()); ui->lineContains->setText(rule.mustContain());
ui->lineNotContains->setText(rule.mustNotContain()); ui->lineNotContains->setText(rule.mustNotContain());
ui->saveDiffDir_check->setChecked(!rule.savePath().isEmpty()); ui->saveDiffDir_check->setChecked(!rule.savePath().isEmpty());
@ -174,7 +175,7 @@ void AutomatedRssDownloader::updateRuleDefinitionBox(QListWidgetItem* current, Q
ui->saveDiffDir_check->setChecked(false); ui->saveDiffDir_check->setChecked(false);
ui->lineSavePath->clear(); ui->lineSavePath->clear();
ui->comboLabel->clearEditText(); ui->comboLabel->clearEditText();
if(current) { if(current && selection.count() == 1) {
// Use the rule name as a default for the "contains" field // Use the rule name as a default for the "contains" field
ui->lineContains->setText(current->text()); ui->lineContains->setText(current->text());
ui->ruleDefBox->setEnabled(true); ui->ruleDefBox->setEnabled(true);
@ -315,8 +316,9 @@ void AutomatedRssDownloader::displayRulesListMenu(const QPoint &pos)
QAction *addAct = menu.addAction(QIcon(":/Icons/oxygen/list-add.png"), tr("Add new rule...")); QAction *addAct = menu.addAction(QIcon(":/Icons/oxygen/list-add.png"), tr("Add new rule..."));
QAction *delAct = 0; QAction *delAct = 0;
QAction *renameAct = 0; QAction *renameAct = 0;
if(!ui->listRules->selectedItems().isEmpty()) { const QList<QListWidgetItem*> selection = ui->listRules->selectedItems();
if(ui->listRules->selectedItems().count() == 1) { if(!selection.isEmpty()) {
if(selection.count() == 1) {
delAct = menu.addAction(QIcon(":/Icons/oxygen/list-remove.png"), tr("Delete rule")); delAct = menu.addAction(QIcon(":/Icons/oxygen/list-remove.png"), tr("Delete rule"));
menu.addSeparator(); menu.addSeparator();
renameAct = menu.addAction(QIcon(":/Icons/oxygen/edit_clear.png"), tr("Rename rule...")); renameAct = menu.addAction(QIcon(":/Icons/oxygen/edit_clear.png"), tr("Rename rule..."));

Write Preview
Loading…
Cancel
Save