From 57d830ded199eaea4da871464e5a33f1ee555a0b Mon Sep 17 00:00:00 2001
From: Chris Sinclair <chrissinclair89@gmail.com>
Date: Tue, 12 Mar 2024 22:44:44 -0500
Subject: [PATCH] KB shortcuts - Added Selection Flip, Renamed/Grouped Display
 Flip

---
 app/src/mainwindow2.cpp        | 6 ++++--
 app/src/shortcutspage.cpp      | 6 ++++--
 core_lib/data/resources/kb.ini | 6 ++++--
 core_lib/src/util/pencildef.h  | 6 ++++--
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/app/src/mainwindow2.cpp b/app/src/mainwindow2.cpp
index 480ff2e38..9d30ecf31 100644
--- a/app/src/mainwindow2.cpp
+++ b/app/src/mainwindow2.cpp
@@ -1190,6 +1190,8 @@ void MainWindow2::setupKeyboardShortcuts()
     ui->actionPaste_Previous->setShortcut(cmdKeySeq(CMD_PASTE_FROM_PREVIOUS));
     ui->actionPaste->setShortcut(cmdKeySeq(CMD_PASTE));
     ui->actionClearFrame->setShortcut(cmdKeySeq(CMD_CLEAR_FRAME));
+    ui->actionFlip_X->setShortcut(cmdKeySeq(CMD_SELECTION_FLIP_HORIZONTAL));
+    ui->actionFlip_Y->setShortcut(cmdKeySeq(CMD_SELECTION_FLIP_VERTICAL));
     ui->actionSelect_All->setShortcut(cmdKeySeq(CMD_SELECT_ALL));
     ui->actionDeselect_All->setShortcut(cmdKeySeq(CMD_DESELECT_ALL));
     ui->actionPreference->setShortcut(cmdKeySeq(CMD_PREFERENCE));
@@ -1210,8 +1212,8 @@ void MainWindow2::setupKeyboardShortcuts()
     ui->actionRotate_Clockwise->setShortcut(cmdKeySeq(CMD_ROTATE_CLOCK));
     ui->actionRotate_Anticlockwise->setShortcut(cmdKeySeq(CMD_ROTATE_ANTI_CLOCK));
     ui->actionReset_Rotation->setShortcut(cmdKeySeq(CMD_RESET_ROTATION));
-    ui->actionHorizontal_Flip->setShortcut(cmdKeySeq(CMD_FLIP_HORIZONTAL));
-    ui->actionVertical_Flip->setShortcut(cmdKeySeq(CMD_FLIP_VERTICAL));
+    ui->actionHorizontal_Flip->setShortcut(cmdKeySeq(CMD_DISPLAY_FLIP_HORIZONTAL));
+    ui->actionVertical_Flip->setShortcut(cmdKeySeq(CMD_DISPLAY_FLIP_VERTICAL));
     ui->actionPreview->setShortcut(cmdKeySeq(CMD_PREVIEW));
     ui->actionGrid->setShortcut(cmdKeySeq(CMD_GRID));
     ui->actionOnionPrev->setShortcut(cmdKeySeq(CMD_ONIONSKIN_PREV));
diff --git a/app/src/shortcutspage.cpp b/app/src/shortcutspage.cpp
index 3cc3e4798..f57f8aa77 100644
--- a/app/src/shortcutspage.cpp
+++ b/app/src/shortcutspage.cpp
@@ -312,13 +312,15 @@ static QString getHumanReadableShortcutName(const QString& cmdName)
         {CMD_EXPORT_MOVIE, ShortcutsPage::tr("Export Movie", "Shortcut")},
         {CMD_EXPORT_PALETTE, ShortcutsPage::tr("Export Palette", "Shortcut")},
         {CMD_EXPORT_SOUND, ShortcutsPage::tr("Export Sound", "Shortcut")},
-        {CMD_FLIP_HORIZONTAL, ShortcutsPage::tr("Horizontal Flip", "Shortcut")},
+        {CMD_DISPLAY_FLIP_HORIZONTAL, ShortcutsPage::tr("Display: Horizontal Flip", "Shortcut")},
+        {CMD_DISPLAY_FLIP_VERTICAL, ShortcutsPage::tr("Display: Vertical Flip", "Shortcut")},
         {CMD_FLIP_INBETWEEN, ShortcutsPage::tr("Flip In-Between", "Shortcut")},
         {CMD_FLIP_ROLLING, ShortcutsPage::tr("Flip Rolling", "Shortcut")},
-        {CMD_FLIP_VERTICAL, ShortcutsPage::tr("Vertical Flip", "Shortcut")},
         {CMD_GOTO_NEXT_FRAME, ShortcutsPage::tr("Next Frame", "Shortcut")},
         {CMD_GOTO_NEXT_KEY_FRAME, ShortcutsPage::tr("Next Keyframe", "Shortcut")},
         {CMD_GOTO_PREV_FRAME, ShortcutsPage::tr("Previous Frame", "Shortcut")},
+        {CMD_SELECTION_FLIP_HORIZONTAL, ShortcutsPage::tr("Selection: Horizontal Flip", "Shortcut")},
+        {CMD_SELECTION_FLIP_VERTICAL, ShortcutsPage::tr("Selection: Vertical Flip", "Shortcut")},
         {CMD_GOTO_PREV_KEY_FRAME, ShortcutsPage::tr("Previous Keyframe", "Shortcut")},
         {CMD_SELECTION_ADD_FRAME_EXPOSURE, ShortcutsPage::tr("Selection: Add Frame Exposure", "Shortcut")},
         {CMD_SELECTION_SUBTRACT_FRAME_EXPOSURE, ShortcutsPage::tr("Selection: Subtract Frame Exposure", "Shortcut")},
diff --git a/core_lib/data/resources/kb.ini b/core_lib/data/resources/kb.ini
index 7c394f65d..58f07b7f5 100644
--- a/core_lib/data/resources/kb.ini
+++ b/core_lib/data/resources/kb.ini
@@ -37,8 +37,8 @@ CmdRotateAntiClockwise=Z
 CmdResetRotation=Alt+H
 CmdResetZoomRotate=Ctrl+H
 CmdCenterView=Ctrl+Shift+H
-CmdFlipHorizontal=Shift+H
-CmdFlipVertical=Shift+V
+CmdDisplayFlipHorizontal=Shift+H
+CmdDisplayFlipVertical=Shift+V
 CmdPreview=Alt+P
 CmdGrid=G
 CmdOnionSkinPrevious=O
@@ -56,6 +56,8 @@ CmdMoveFrameForward=Ctrl+.
 CmdMoveFrameBackward=ctrl+","
 CmdAddFrame=F7
 CmdDuplicateFrame=F6
+CmdSelectionFlipHorizontal=
+CmdSelectionFlipVertical=
 CmdSelectionAddFrameExposure=Ctrl+"+"
 CmdSelectionSubtractFrameExposure=Ctrl+"-"
 CmdReverseSelectedFrames=
diff --git a/core_lib/src/util/pencildef.h b/core_lib/src/util/pencildef.h
index adf5aceb0..c84fe8a98 100644
--- a/core_lib/src/util/pencildef.h
+++ b/core_lib/src/util/pencildef.h
@@ -158,8 +158,8 @@ const static int MaxFramesBound = 9999;
 #define CMD_ZOOM_50 "CmdZoom50"
 #define CMD_ZOOM_33 "CmdZoom33"
 #define CMD_ZOOM_25 "CmdZoom25"
-#define CMD_FLIP_HORIZONTAL "CmdFlipHorizontal"
-#define CMD_FLIP_VERTICAL "CmdFlipVertical"
+#define CMD_DISPLAY_FLIP_HORIZONTAL "CmdDisplayFlipHorizontal"
+#define CMD_DISPLAY_FLIP_VERTICAL "CmdDisplayFlipVertical"
 #define CMD_PREVIEW "CmdPreview"
 #define CMD_GRID "CmdGrid"
 #define CMD_ONIONSKIN_PREV "CmdOnionSkinPrevious"
@@ -180,6 +180,8 @@ const static int MaxFramesBound = 9999;
 #define CMD_REMOVE_SELECTED_FRAMES "CmdRemoveSelectedFrames"
 #define CMD_SELECTION_ADD_FRAME_EXPOSURE "CmdSelectionAddFrameExposure"
 #define CMD_SELECTION_SUBTRACT_FRAME_EXPOSURE "CmdSelectionSubtractFrameExposure"
+#define CMD_SELECTION_FLIP_HORIZONTAL "CmdSelectionFlipHorizontal"
+#define CMD_SELECTION_FLIP_VERTICAL "CmdSelectionFlipVertical"
 #define CMD_MOVE_FRAME_BACKWARD "CmdMoveFrameBackward"
 #define CMD_MOVE_FRAME_FORWARD "CmdMoveFrameForward"
 #define CMD_TOOL_MOVE "CmdToolMove"