From 15d258f55a104c666ec11a84821060504eb8df3a Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 8 Oct 2022 11:40:15 +0300 Subject: [PATCH 36/36] 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 | 6 +++--- client/gui-qt/shortcuts.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/client/gui-qt/menu.cpp b/client/gui-qt/menu.cpp index e2b7bc3f46..027f9416dc 100644 --- a/client/gui-qt/menu.cpp +++ b/client/gui-qt/menu.cpp @@ -1251,11 +1251,11 @@ void mr_menu::setup_menus() connect(act, &QAction::triggered, this, &mr_menu::slot_board); act = menu->addAction(_("Unload")); act->setShortcut(QKeySequence(shortcut_to_string( - fc_shortcuts::sc()->get_shortcut(SC_DEBOARD)))); + fc_shortcuts::sc()->get_shortcut(SC_DEBOARD)))); menu_list.insert(DEBOARD, act); connect(act, &QAction::triggered, this, &mr_menu::slot_deboard); act = 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); menu->addSeparator(); @@ -1272,7 +1272,7 @@ void mr_menu::setup_menus() menu_list.insert(UPGRADE, act); connect(act, &QAction::triggered, this, &mr_menu::slot_upgrade); act = 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 = menu->addAction(_("Disband")); diff --git a/client/gui-qt/shortcuts.cpp b/client/gui-qt/shortcuts.cpp index 2825984e65..861b3cac2a 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