From a7bf7fb86048e1f0fb52bc570f798abada2a61a8 Mon Sep 17 00:00:00 2001 From: Chris Sinclair Date: Tue, 12 Mar 2024 21:48:15 -0500 Subject: [PATCH 1/4] KB shortcuts: added Selection: Flip, adjusted View: Flip --- app/src/mainwindow2.cpp | 6 ++++-- app/src/shortcutspage.cpp | 6 ++++-- app/ui/mainwindow2.ui | 2 +- core_lib/data/resources/kb.ini | 6 ++++-- core_lib/src/util/pencildef.h | 6 ++++-- 5 files changed, 17 insertions(+), 9 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..cc6774272 100644 --- a/app/src/shortcutspage.cpp +++ b/app/src/shortcutspage.cpp @@ -312,10 +312,10 @@ 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("View: Horizontal Flip", "Shortcut")}, + {CMD_DISPLAY_FLIP_VERTICAL, ShortcutsPage::tr("View: 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")}, @@ -357,6 +357,8 @@ static QString getHumanReadableShortcutName(const QString& cmdName) {CMD_SAVE_AS, ShortcutsPage::tr("Save File As", "Shortcut")}, {CMD_SAVE_FILE, ShortcutsPage::tr("Save File", "Shortcut")}, {CMD_SELECT_ALL, ShortcutsPage::tr("Select All", "Shortcut")}, + {CMD_SELECTION_FLIP_HORIZONTAL, ShortcutsPage::tr("Selection: Horizontal Flip", "Shortcut")}, + {CMD_SELECTION_FLIP_VERTICAL, ShortcutsPage::tr("Selection: Vertical Flip", "Shortcut")}, {CMD_TOGGLE_STATUS_BAR, ShortcutsPage::tr("Toggle Status Bar Visibility", "Shortcut")}, {CMD_TOGGLE_COLOR_INSPECTOR, ShortcutsPage::tr("Toggle Color Inspector Window Visibility", "Shortcut")}, {CMD_TOGGLE_COLOR_LIBRARY, ShortcutsPage::tr("Toggle Color Palette Window Visibility", "Shortcut")}, diff --git a/app/ui/mainwindow2.ui b/app/ui/mainwindow2.ui index ca958065c..d868988cf 100644 --- a/app/ui/mainwindow2.ui +++ b/app/ui/mainwindow2.ui @@ -46,7 +46,7 @@ 0 0 831 - 24 + 21 diff --git a/core_lib/data/resources/kb.ini b/core_lib/data/resources/kb.ini index 7c394f65d..9ee3399cf 100644 --- a/core_lib/data/resources/kb.ini +++ b/core_lib/data/resources/kb.ini @@ -37,8 +37,10 @@ CmdRotateAntiClockwise=Z CmdResetRotation=Alt+H CmdResetZoomRotate=Ctrl+H CmdCenterView=Ctrl+Shift+H -CmdFlipHorizontal=Shift+H -CmdFlipVertical=Shift+V +CmdDisplayFlipHorizontal=Shift+H +CmdDisplayFlipVertical=Shift+V +CmdSelectionFlipHorizontal= +CmdSelectionFlipVertical= CmdPreview=Alt+P CmdGrid=G CmdOnionSkinPrevious=O diff --git a/core_lib/src/util/pencildef.h b/core_lib/src/util/pencildef.h index adf5aceb0..50c7667d2 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" @@ -178,6 +178,8 @@ const static int MaxFramesBound = 9999; #define CMD_REMOVE_FRAME "CmdRemoveFrame" #define CMD_REVERSE_SELECTED_FRAMES "CmdReverseSelectedFrames" #define CMD_REMOVE_SELECTED_FRAMES "CmdRemoveSelectedFrames" +#define CMD_SELECTION_FLIP_HORIZONTAL "CmdSelectionFlipHorizontal" +#define CMD_SELECTION_FLIP_VERTICAL "CmdSelectionFlipVertical" #define CMD_SELECTION_ADD_FRAME_EXPOSURE "CmdSelectionAddFrameExposure" #define CMD_SELECTION_SUBTRACT_FRAME_EXPOSURE "CmdSelectionSubtractFrameExposure" #define CMD_MOVE_FRAME_BACKWARD "CmdMoveFrameBackward" From 6f5ff08cd82042974b7463eec5e481bab05b4ae0 Mon Sep 17 00:00:00 2001 From: Chris Sinclair Date: Tue, 12 Mar 2024 22:11:46 -0500 Subject: [PATCH 2/4] Revert "KB shortcuts: added Selection: Flip, adjusted View: Flip" This reverts commit a7bf7fb86048e1f0fb52bc570f798abada2a61a8. --- app/src/mainwindow2.cpp | 6 ++---- app/src/shortcutspage.cpp | 6 ++---- app/ui/mainwindow2.ui | 2 +- core_lib/data/resources/kb.ini | 6 ++---- core_lib/src/util/pencildef.h | 6 ++---- 5 files changed, 9 insertions(+), 17 deletions(-) diff --git a/app/src/mainwindow2.cpp b/app/src/mainwindow2.cpp index 9d30ecf31..480ff2e38 100644 --- a/app/src/mainwindow2.cpp +++ b/app/src/mainwindow2.cpp @@ -1190,8 +1190,6 @@ 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)); @@ -1212,8 +1210,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_DISPLAY_FLIP_HORIZONTAL)); - ui->actionVertical_Flip->setShortcut(cmdKeySeq(CMD_DISPLAY_FLIP_VERTICAL)); + ui->actionHorizontal_Flip->setShortcut(cmdKeySeq(CMD_FLIP_HORIZONTAL)); + ui->actionVertical_Flip->setShortcut(cmdKeySeq(CMD_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 cc6774272..3cc3e4798 100644 --- a/app/src/shortcutspage.cpp +++ b/app/src/shortcutspage.cpp @@ -312,10 +312,10 @@ 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_DISPLAY_FLIP_HORIZONTAL, ShortcutsPage::tr("View: Horizontal Flip", "Shortcut")}, - {CMD_DISPLAY_FLIP_VERTICAL, ShortcutsPage::tr("View: Vertical Flip", "Shortcut")}, + {CMD_FLIP_HORIZONTAL, ShortcutsPage::tr("Horizontal 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")}, @@ -357,8 +357,6 @@ static QString getHumanReadableShortcutName(const QString& cmdName) {CMD_SAVE_AS, ShortcutsPage::tr("Save File As", "Shortcut")}, {CMD_SAVE_FILE, ShortcutsPage::tr("Save File", "Shortcut")}, {CMD_SELECT_ALL, ShortcutsPage::tr("Select All", "Shortcut")}, - {CMD_SELECTION_FLIP_HORIZONTAL, ShortcutsPage::tr("Selection: Horizontal Flip", "Shortcut")}, - {CMD_SELECTION_FLIP_VERTICAL, ShortcutsPage::tr("Selection: Vertical Flip", "Shortcut")}, {CMD_TOGGLE_STATUS_BAR, ShortcutsPage::tr("Toggle Status Bar Visibility", "Shortcut")}, {CMD_TOGGLE_COLOR_INSPECTOR, ShortcutsPage::tr("Toggle Color Inspector Window Visibility", "Shortcut")}, {CMD_TOGGLE_COLOR_LIBRARY, ShortcutsPage::tr("Toggle Color Palette Window Visibility", "Shortcut")}, diff --git a/app/ui/mainwindow2.ui b/app/ui/mainwindow2.ui index d868988cf..ca958065c 100644 --- a/app/ui/mainwindow2.ui +++ b/app/ui/mainwindow2.ui @@ -46,7 +46,7 @@ 0 0 831 - 21 + 24 diff --git a/core_lib/data/resources/kb.ini b/core_lib/data/resources/kb.ini index 9ee3399cf..7c394f65d 100644 --- a/core_lib/data/resources/kb.ini +++ b/core_lib/data/resources/kb.ini @@ -37,10 +37,8 @@ CmdRotateAntiClockwise=Z CmdResetRotation=Alt+H CmdResetZoomRotate=Ctrl+H CmdCenterView=Ctrl+Shift+H -CmdDisplayFlipHorizontal=Shift+H -CmdDisplayFlipVertical=Shift+V -CmdSelectionFlipHorizontal= -CmdSelectionFlipVertical= +CmdFlipHorizontal=Shift+H +CmdFlipVertical=Shift+V CmdPreview=Alt+P CmdGrid=G CmdOnionSkinPrevious=O diff --git a/core_lib/src/util/pencildef.h b/core_lib/src/util/pencildef.h index 50c7667d2..adf5aceb0 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_DISPLAY_FLIP_HORIZONTAL "CmdDisplayFlipHorizontal" -#define CMD_DISPLAY_FLIP_VERTICAL "CmdDisplayFlipVertical" +#define CMD_FLIP_HORIZONTAL "CmdFlipHorizontal" +#define CMD_FLIP_VERTICAL "CmdFlipVertical" #define CMD_PREVIEW "CmdPreview" #define CMD_GRID "CmdGrid" #define CMD_ONIONSKIN_PREV "CmdOnionSkinPrevious" @@ -178,8 +178,6 @@ const static int MaxFramesBound = 9999; #define CMD_REMOVE_FRAME "CmdRemoveFrame" #define CMD_REVERSE_SELECTED_FRAMES "CmdReverseSelectedFrames" #define CMD_REMOVE_SELECTED_FRAMES "CmdRemoveSelectedFrames" -#define CMD_SELECTION_FLIP_HORIZONTAL "CmdSelectionFlipHorizontal" -#define CMD_SELECTION_FLIP_VERTICAL "CmdSelectionFlipVertical" #define CMD_SELECTION_ADD_FRAME_EXPOSURE "CmdSelectionAddFrameExposure" #define CMD_SELECTION_SUBTRACT_FRAME_EXPOSURE "CmdSelectionSubtractFrameExposure" #define CMD_MOVE_FRAME_BACKWARD "CmdMoveFrameBackward" From 57d830ded199eaea4da871464e5a33f1ee555a0b Mon Sep 17 00:00:00 2001 From: Chris Sinclair Date: Tue, 12 Mar 2024 22:44:44 -0500 Subject: [PATCH 3/4] 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" From 4280e4fa0f35be0900f140a34ec9df372540a8f7 Mon Sep 17 00:00:00 2001 From: Jakob Gahde Date: Wed, 13 Mar 2024 21:13:24 +0100 Subject: [PATCH 4/4] Review changes --- app/src/mainwindow2.cpp | 4 ++-- app/src/shortcutspage.cpp | 4 ++-- core_lib/data/resources/kb.ini | 4 ++-- core_lib/src/util/pencildef.h | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/src/mainwindow2.cpp b/app/src/mainwindow2.cpp index 9d30ecf31..0426ebe9f 100644 --- a/app/src/mainwindow2.cpp +++ b/app/src/mainwindow2.cpp @@ -1212,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_DISPLAY_FLIP_HORIZONTAL)); - ui->actionVertical_Flip->setShortcut(cmdKeySeq(CMD_DISPLAY_FLIP_VERTICAL)); + ui->actionHorizontal_Flip->setShortcut(cmdKeySeq(CMD_FLIP_HORIZONTAL)); + ui->actionVertical_Flip->setShortcut(cmdKeySeq(CMD_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 f57f8aa77..74fd65818 100644 --- a/app/src/shortcutspage.cpp +++ b/app/src/shortcutspage.cpp @@ -312,8 +312,8 @@ 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_DISPLAY_FLIP_HORIZONTAL, ShortcutsPage::tr("Display: Horizontal Flip", "Shortcut")}, - {CMD_DISPLAY_FLIP_VERTICAL, ShortcutsPage::tr("Display: Vertical Flip", "Shortcut")}, + {CMD_FLIP_HORIZONTAL, ShortcutsPage::tr("View: Horizontal Flip", "Shortcut")}, + {CMD_FLIP_VERTICAL, ShortcutsPage::tr("View: Vertical Flip", "Shortcut")}, {CMD_FLIP_INBETWEEN, ShortcutsPage::tr("Flip In-Between", "Shortcut")}, {CMD_FLIP_ROLLING, ShortcutsPage::tr("Flip Rolling", "Shortcut")}, {CMD_GOTO_NEXT_FRAME, ShortcutsPage::tr("Next Frame", "Shortcut")}, diff --git a/core_lib/data/resources/kb.ini b/core_lib/data/resources/kb.ini index 58f07b7f5..d48613335 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 -CmdDisplayFlipHorizontal=Shift+H -CmdDisplayFlipVertical=Shift+V +CmdFlipHorizontal=Shift+H +CmdFlipVertical=Shift+V CmdPreview=Alt+P CmdGrid=G CmdOnionSkinPrevious=O diff --git a/core_lib/src/util/pencildef.h b/core_lib/src/util/pencildef.h index c84fe8a98..3ca2c6fdd 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_DISPLAY_FLIP_HORIZONTAL "CmdDisplayFlipHorizontal" -#define CMD_DISPLAY_FLIP_VERTICAL "CmdDisplayFlipVertical" +#define CMD_FLIP_HORIZONTAL "CmdFlipHorizontal" +#define CMD_FLIP_VERTICAL "CmdFlipVertical" #define CMD_PREVIEW "CmdPreview" #define CMD_GRID "CmdGrid" #define CMD_ONIONSKIN_PREV "CmdOnionSkinPrevious"