From 3eb34ce66b04b74ec8cbd5605c54cc59c3d3c270 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 8 Oct 2022 11:32:56 +0300 Subject: [PATCH 44/44] Qt: Correct key bindings of some unit activities Make the following default key bindings to match documentation and gtk-clients: - Unload All From Transport: "shift+u" -> "shift+t" - Upgrade Unit: "ctrl+u" -> "shift+u" - Convert Unit: "ctrl+o" -> "shift+o" See osdn #45798 Signed-off-by: Marko Lindqvist --- client/gui-qt/menu.cpp | 4 ++-- client/gui-qt/shortcuts.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client/gui-qt/menu.cpp b/client/gui-qt/menu.cpp index 4d1e49a764..adf5d3e0a9 100644 --- a/client/gui-qt/menu.cpp +++ b/client/gui-qt/menu.cpp @@ -1233,7 +1233,7 @@ void mr_menu::setup_menus() menu_list.insert(DEBOARD, act); connect(act, &QAction::triggered, this, &mr_menu::slot_deboard); act = main_menu->addAction(_("Unload All From Transporter")); - act->setShortcut(QKeySequence(tr("shift+u"))); + act->setShortcut(QKeySequence(tr("shift+t"))); menu_list.insert(TRANSPORTER, act); connect(act, &QAction::triggered, this, &mr_menu::slot_unload_all); main_menu->addSeparator(); @@ -1251,7 +1251,7 @@ void mr_menu::setup_menus() menu_list.insert(UPGRADE, act); connect(act, &QAction::triggered, this, &mr_menu::slot_upgrade); act = main_menu->addAction(_("Convert")); - act->setShortcut(QKeySequence(tr("ctrl+o"))); + act->setShortcut(QKeySequence(tr("shift+o"))); menu_list.insert(CONVERT, act); connect(act, &QAction::triggered, this, &mr_menu::slot_convert); act = main_menu->addAction(_("Disband")); diff --git a/client/gui-qt/shortcuts.cpp b/client/gui-qt/shortcuts.cpp index d59bbb5e63..e8a3116b9b 100644 --- a/client/gui-qt/shortcuts.cpp +++ b/client/gui-qt/shortcuts.cpp @@ -110,7 +110,7 @@ fc_shortcut default_shortcuts[] = { {SC_UNSENTRY_TILE, Qt::Key_D, Qt::AllButtons, Qt::ShiftModifier | Qt::ControlModifier, _("Unsentry All On Tile") }, {SC_DO, Qt::Key_D, Qt::AllButtons, Qt::NoModifier, _("Do...") }, - {SC_UPGRADE_UNIT, Qt::Key_U, Qt::AllButtons, Qt::ControlModifier, + {SC_UPGRADE_UNIT, Qt::Key_U, Qt::AllButtons, Qt::ShiftModifier, _("Upgrade") }, {SC_SETHOME, Qt::Key_H, Qt::AllButtons, Qt::NoModifier, _("Set Home City") }, -- 2.35.1