Fix multiple shortcuts (ed.2)

royqh1979 · Jan 18, 2025 · 02f6ac1 · 02f6ac1
1 parent df411a3
commit 02f6ac1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 12 deletions.
diff --git a/RedPandaIDE/settingsdialog/environmentshortcutwidget.cpp b/RedPandaIDE/settingsdialog/environmentshortcutwidget.cpp
@@ -85,8 +85,7 @@ void EnvironmentShortcutModel::reload()
             else
                 item->fullPath = QString("%1 > %2").arg(tr("action"),action->text());
             item->action = action;
-            //item->shortcut = action->shortcut().toString().trimmed();
-            item->shortcut = QKeySequence::listToString(action->shortcuts()).replace(';',',');
+            item->shortcut = QKeySequence::listToString(action->shortcuts());
             item->isAction = true;
             mShortcuts.append(item);
         }
@@ -199,8 +198,7 @@ void EnvironmentShortcutModel::loadShortCutsOfMenu(const QMenu *menu, QList<QAct
             item->name = action->objectName();
             item->fullPath = QString("%1 > %2").arg(menu->title(),action->text());
             item->action = action;
-            //item->shortcut = action->shortcut().toString().trimmed();
-            item->shortcut = QKeySequence::listToString(action->shortcuts()).replace(';',',');
+            item->shortcut = QKeySequence::listToString(action->shortcuts());
             item->isAction = true;
             mShortcuts.append(item);
         }

diff --git a/RedPandaIDE/shortcutmanager.cpp b/RedPandaIDE/shortcutmanager.cpp
@@ -127,15 +127,10 @@ void ShortcutManager::applyTo(QAction *action)
 {
     PEnvironmentShortcut item = mShortcuts.value(action->objectName(), PEnvironmentShortcut());
     if (item && item->isAction) {
-        //action->setShortcut(QKeySequence::fromString(item->shortcut));
-        QStringList SL = item->shortcut.split(',');
-        QList<QKeySequence> KL;
-        for (int i=0;i<SL.size();i++) KL.append(QKeySequence::fromString(SL[i]));
-        action->setShortcuts(KL);
+        action->setShortcuts(QKeySequence::listFromString(item->shortcut));
     }
     if (!action->shortcut().isEmpty()){
-        //action->setToolTip(action->text()+QString("(%1)").arg(action->shortcut().toString()));
-        action->setToolTip(action->text()+QString("(%1)").arg(QKeySequence::listToString(action->shortcuts()).replace(';',',')));
+        action->setToolTip(action->text()+QString("(%1)").arg(QKeySequence::listToString(action->shortcuts())));
     } else {
         action->setToolTip(action->text());
     }

diff --git a/RedPandaIDE/widgets/shortcutinputedit.cpp b/RedPandaIDE/widgets/shortcutinputedit.cpp
@@ -68,7 +68,7 @@ void ShortcutInputEdit::keyPressEvent(QKeyEvent *event)
             s = s.mid(0,s.lastIndexOf('+')+1) + event->text().at(0);
         }
         if (!lastKeys.isEmpty())
-            s=lastKeys+","+s;
+            s=lastKeys+"; "+s;
         setText(s);
 //        if (key!=Qt::Key_Tab
 //                && key!=Qt::Key_Enter