Merge pull request #3455 from Chocobo1/label_fix

Fix '&' character in label name becomes accelerator key, closes #3454.
This commit is contained in:
sledgehammer999 2015-07-29 23:30:25 +03:00
commit bf3a6d1c20

View file

@ -750,8 +750,10 @@ void TransferListWidget::displayListMenu(const QPoint&)
labelActions << labelMenu->addAction(GuiIconProvider::instance()->getIcon("list-add"), tr("New...", "New label..."));
labelActions << labelMenu->addAction(GuiIconProvider::instance()->getIcon("edit-clear"), tr("Reset", "Reset label"));
labelMenu->addSeparator();
foreach (const QString &label, customLabels)
foreach (QString label, customLabels) {
label.replace('&', "&&"); // avoid '&' becomes accelerator key
labelActions << labelMenu->addAction(GuiIconProvider::instance()->getIcon("inode-directory"), label);
}
listMenu.addSeparator();
if (one_not_seed)
listMenu.addAction(&actionSet_download_limit);