kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

fixes 0001673: Assign already assigned keyboard shortcuts without searching old assigned action

Browse Source
This commit is contained in:
wmayer
2019-01-18 00:55:34 +01:00
parent 307bb7744f
commit be257336b9
1 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/Gui/DlgKeyboardImp.cpp
View File

@@ -360,10 +360,11 @@ void DlgCustomKeyboardImp::on_editShortcut_textChanged(const QString& sc)
buttonAssign->setEnabled(true);
QKeySequence ks(sc);
if (!ks.isEmpty()) {
if (!ks.isEmpty() && !editShortcut->isNone()) {
int countAmbiguous = 0;
QString ambiguousCommand;
QString ambiguousMenu;
std::vector<Command*> ambiguousCommands;
CommandManager & cCmdMgr = Application::Instance->commandManager();
std::vector<Command*> cmds = cCmdMgr.getAllCommands();
@@ -375,6 +376,7 @@ void DlgCustomKeyboardImp::on_editShortcut_textChanged(const QString& sc)
for (QList<QAction*>::iterator jt = acts.begin(); jt != acts.end(); ++jt) {
if ((*jt)->shortcut() == ks) {
++countAmbiguous;
ambiguousCommands.push_back(*it);
ambiguousCommand = QString::fromLatin1((*it)->getName()); // store the last one
ambiguousMenu = qApp->translate((*it)->className(), (*it)->getMenuText());
@@ -399,16 +401,28 @@ void DlgCustomKeyboardImp::on_editShortcut_textChanged(const QString& sc)
tr("The shortcut '%1' is defined more than once. This could result into unexpected behaviour.").arg(sc) );
editShortcut->setFocus();
buttonAssign->setEnabled(false);
} else if (countAmbiguous == 1 && ambiguousCommand != QLatin1String(name)) {
QMessageBox::warning(this, tr("Already defined shortcut"),
tr("The shortcut '%1' is already assigned to '%2'.\n\nPlease define another shortcut.").arg(sc).arg(ambiguousMenu) );
editShortcut->setFocus();
buttonAssign->setEnabled(false);
} else {
}
else if (countAmbiguous == 1 && ambiguousCommand != QLatin1String(name)) {
int ret = QMessageBox::warning(this, tr("Already defined shortcut"),
tr("The shortcut '%1' is already assigned to '%2'.\n\nDo you want to override it?")
.arg(sc).arg(ambiguousMenu), QMessageBox::Yes | QMessageBox::No);
if (ret == QMessageBox::Yes) {
for (auto* cmd : ambiguousCommands) {
Action* action = cmd->getAction();
action->setShortcut(QString());
}
}
else {
editShortcut->setFocus();
buttonAssign->setEnabled(false);
}
}
else {
if (cmd && cmd->getAction() && cmd->getAction()->shortcut() == ks)
buttonAssign->setEnabled(false);
}
} else {
}
else {
if (cmd && cmd->getAction() && cmd->getAction()->shortcut().isEmpty())
buttonAssign->setEnabled(false); // both key sequences are empty
}