Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Keyboard shortcuts - Added Selection: Flip and adjusted Display: Flip #1816

Merged
merged 4 commits into from
Mar 13, 2024
Merged

Keyboard shortcuts - Added Selection: Flip and adjusted Display: Flip #1816

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a7bf7fb
KB shortcuts: added Selection: Flip, adjusted View: Flip
CSinclair89 Mar 13, 2024
6f5ff08
Revert "KB shortcuts: added Selection: Flip, adjusted View: Flip"
CSinclair89 Mar 13, 2024
57d830d
KB shortcuts - Added Selection Flip, Renamed/Grouped Display Flip
CSinclair89 Mar 13, 2024
4280e4f
Review changes
J5lx Mar 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions app/src/mainwindow2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
6 changes: 4 additions & 2 deletions app/src/shortcutspage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_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_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")},
Expand Down
2 changes: 2 additions & 0 deletions core_lib/data/resources/kb.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ CmdMoveFrameForward=Ctrl+.
CmdMoveFrameBackward=ctrl+","
CmdAddFrame=F7
CmdDuplicateFrame=F6
CmdSelectionFlipHorizontal=
CmdSelectionFlipVertical=
CmdSelectionAddFrameExposure=Ctrl+"+"
CmdSelectionSubtractFrameExposure=Ctrl+"-"
CmdReverseSelectedFrames=
Expand Down
2 changes: 2 additions & 0 deletions core_lib/src/util/pencildef.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading