From 9b53cda24c375ab73184f5a883eb154504a32e2a Mon Sep 17 00:00:00 2001 From: yjd Date: Tue, 5 Jul 2022 11:15:36 +0800 Subject: [PATCH 1/3] Fix Shift key combination bug --- src/gui/Src/BasicView/ShortcutEdit.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/gui/Src/BasicView/ShortcutEdit.cpp b/src/gui/Src/BasicView/ShortcutEdit.cpp index dd6b74c8..8e676469 100644 --- a/src/gui/Src/BasicView/ShortcutEdit.cpp +++ b/src/gui/Src/BasicView/ShortcutEdit.cpp @@ -52,10 +52,13 @@ void ShortcutEdit::keyPressEvent(QKeyEvent* event) // The shift modifier only counts when it is not used to type a symbol // that is only reachable using the shift key anyway // Fix from: https://bbs.pediy.com/thread-270394.htm - if(modifiers.testFlag(Qt::ShiftModifier) && ( - ((keyInt >= Qt::Key_Exclam) && (keyInt <= Qt::Key_Slash)) || - ((keyInt >= Qt::Key_Colon) && (keyInt <= Qt::Key_At)) || - ((keyInt >= Qt::Key_BracketLeft) && (keyInt <= Qt::Key_QuoteLeft)))) + if(modifiers.testFlag(Qt::ShiftModifier) && (text.isEmpty() || + !text.at(0).isPrint() || + text.at(0).isLetterOrNumber() || + text.at(0).isSpace()) && + (!((keyInt >= Qt::Key_Exclam) && (keyInt <= Qt::Key_Slash)) || + ((keyInt >= Qt::Key_Colon) && (keyInt <= Qt::Key_At)) || + ((keyInt >= Qt::Key_BracketLeft) && (keyInt <= Qt::Key_QuoteLeft)))) keyInt += Qt::SHIFT; if(modifiers.testFlag(Qt::ControlModifier)) keyInt += Qt::CTRL; From 23a3f92d6bf0a9936a7b5a698529721153b9b1f7 Mon Sep 17 00:00:00 2001 From: Duncan Ogilvie Date: Sat, 3 Sep 2022 13:54:20 +0200 Subject: [PATCH 2/3] AStyle --- src/gui/Src/BasicView/ShortcutEdit.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/Src/BasicView/ShortcutEdit.cpp b/src/gui/Src/BasicView/ShortcutEdit.cpp index 8e676469..b9441ce1 100644 --- a/src/gui/Src/BasicView/ShortcutEdit.cpp +++ b/src/gui/Src/BasicView/ShortcutEdit.cpp @@ -56,7 +56,7 @@ void ShortcutEdit::keyPressEvent(QKeyEvent* event) !text.at(0).isPrint() || text.at(0).isLetterOrNumber() || text.at(0).isSpace()) && - (!((keyInt >= Qt::Key_Exclam) && (keyInt <= Qt::Key_Slash)) || + (!((keyInt >= Qt::Key_Exclam) && (keyInt <= Qt::Key_Slash)) || ((keyInt >= Qt::Key_Colon) && (keyInt <= Qt::Key_At)) || ((keyInt >= Qt::Key_BracketLeft) && (keyInt <= Qt::Key_QuoteLeft)))) keyInt += Qt::SHIFT; From 1b3e462969acdf255d43812c61c00ada377c1677 Mon Sep 17 00:00:00 2001 From: Duncan Ogilvie Date: Sat, 3 Sep 2022 14:06:15 +0200 Subject: [PATCH 3/3] Rename "Shortcuts" to "Hotkeys" --- src/gui/Src/Gui/MainWindow.ui | 4 ++-- src/gui/Src/Gui/ShortcutsDialog.cpp | 4 ++-- src/gui/Src/Gui/ShortcutsDialog.ui | 4 ++-- src/gui/Src/Utils/Configuration.cpp | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/gui/Src/Gui/MainWindow.ui b/src/gui/Src/Gui/MainWindow.ui index cf7db7e1..9a0da903 100644 --- a/src/gui/Src/Gui/MainWindow.ui +++ b/src/gui/Src/Gui/MainWindow.ui @@ -771,10 +771,10 @@ :/icons/images/shortcut.png:/icons/images/shortcut.png - Shortcuts + Hotkeys - Open the Shortcuts dialog to customize keyboard shortcuts. + Open the Hotkeys dialog to customize keyboard hotkeys. diff --git a/src/gui/Src/Gui/ShortcutsDialog.cpp b/src/gui/Src/Gui/ShortcutsDialog.cpp index cf2d3803..21a870d0 100644 --- a/src/gui/Src/Gui/ShortcutsDialog.cpp +++ b/src/gui/Src/Gui/ShortcutsDialog.cpp @@ -12,7 +12,7 @@ ShortcutsDialog::ShortcutsDialog(QWidget* parent) : QDialog(parent), ui(new Ui:: // x64 has no model-view-controler pattern QStringList tblHeader; - tblHeader << tr("Action") << tr("Shortcut"); + tblHeader << tr("Action") << tr("Hotkey"); currentRow = 0; @@ -96,7 +96,7 @@ void ShortcutsDialog::updateShortcut() // Ask user if they want to override the shortcut. QMessageBox mbox; mbox.setIcon(QMessageBox::Question); - mbox.setText("This shortcut is already used by action \"" + i.value().Name + "\".\n" + mbox.setText("This hotkey is already used by the action \"" + i.value().Name + "\".\n" "Do you want to override it?"); mbox.setStandardButtons(QMessageBox::No | QMessageBox::Yes); mbox.setDefaultButton(QMessageBox::Yes); diff --git a/src/gui/Src/Gui/ShortcutsDialog.ui b/src/gui/Src/Gui/ShortcutsDialog.ui index a46f257c..c7c809de 100644 --- a/src/gui/Src/Gui/ShortcutsDialog.ui +++ b/src/gui/Src/Gui/ShortcutsDialog.ui @@ -11,7 +11,7 @@ - Shortcuts + Hotkeys @@ -33,7 +33,7 @@ - Shortcut + Hotkey diff --git a/src/gui/Src/Utils/Configuration.cpp b/src/gui/Src/Utils/Configuration.cpp index 6061adf9..103989e1 100644 --- a/src/gui/Src/Utils/Configuration.cpp +++ b/src/gui/Src/Utils/Configuration.cpp @@ -465,7 +465,7 @@ Configuration::Configuration() : QObject(), noMoreMsgbox(false) defaultShortcuts.insert("OptionsPreferences", Shortcut({tr("Options"), tr("Preferences")}, "", true)); defaultShortcuts.insert("OptionsAppearance", Shortcut({tr("Options"), tr("Appearance")}, "", true)); - defaultShortcuts.insert("OptionsShortcuts", Shortcut({tr("Options"), tr("Shortcuts")}, "", true)); + defaultShortcuts.insert("OptionsShortcuts", Shortcut({tr("Options"), tr("Hotkeys")}, "", true)); defaultShortcuts.insert("OptionsTopmost", Shortcut({tr("Options"), tr("Topmost")}, "Ctrl+F5", true)); defaultShortcuts.insert("OptionsReloadStylesheet", Shortcut({tr("Options"), tr("Reload style.css")}, "", true));