From af13803eddfe26c5ee0262d0d51fd44b7c101d0e Mon Sep 17 00:00:00 2001
From: Bo-Han Liao <hankofficer@gmail.com>
Date: Mon, 13 Jun 2016 11:49:28 +0800
Subject: [PATCH] Keyboard shortcut for "Goto Next/Previous frames" (#512)

* Fixed "Go to Next/Previous Frame" text name in Dropdown menu.

*  Added "Go to Next/Previous Frame" and Motified "Go to Next/Previous Keyframe" actions with keyboard.

* Motified default keyboard shortcut.

I think this would be more straightforward for users.
---
 app/actioncommands.cpp | 4 ++++
 app/mainwindow2.cpp    | 8 ++++----
 app/ui/mainwindow2.ui  | 6 +++---
 resources/kb.ini       | 8 ++++----
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/app/actioncommands.cpp b/app/actioncommands.cpp
index a66ab66c2..cdf4d4ac6 100644
--- a/app/actioncommands.cpp
+++ b/app/actioncommands.cpp
@@ -142,18 +142,22 @@ void ActionCommands::PlayStop()
 
 void ActionCommands::GotoNextFrame()
 {
+    mEditor->scrubForward();
 }
 
 void ActionCommands::GotoPrevFrame()
 {
+    mEditor->scrubBackward();
 }
 
 void ActionCommands::GotoNextKeyFrame()
 {
+    mEditor->scrubNextKeyFrame();
 }
 
 void ActionCommands::GotoPrevKeyFrame()
 {
+    mEditor->scrubPreviousKeyFrame();
 }
 
 Status ActionCommands::addNewBitmapLayer()
diff --git a/app/mainwindow2.cpp b/app/mainwindow2.cpp
index 5d7fe588a..2acee82be 100644
--- a/app/mainwindow2.cpp
+++ b/app/mainwindow2.cpp
@@ -292,10 +292,10 @@ void MainWindow2::createMenus()
 
     connect(ui->actionAdd_Frame, &QAction::triggered, mEditor, &Editor::addNewKey );
     connect(ui->actionRemove_Frame, &QAction::triggered, mEditor, &Editor::removeKey );
-    //connect(ui->actionNext_Frame, &QAction::triggered, m_pEditor, &Editor::playNextFrame );
-    //connect(ui->actionPrevious_Frame, &QAction::triggered, m_pEditor, &Editor::playPrevFrame );
-    connect(ui->actionNext_KeyFrame, &QAction::triggered, mEditor, &Editor::scrubNextKeyFrame );
-    connect(ui->actionPrev_KeyFrame, &QAction::triggered, mEditor, &Editor::scrubPreviousKeyFrame );
+    connect(ui->actionNext_Frame, &QAction::triggered, mCommands, &ActionCommands::GotoNextFrame );
+    connect(ui->actionPrevious_Frame, &QAction::triggered, mCommands, &ActionCommands::GotoPrevFrame );
+    connect(ui->actionNext_KeyFrame, &QAction::triggered, mCommands, &ActionCommands::GotoNextKeyFrame );
+    connect(ui->actionPrev_KeyFrame, &QAction::triggered, mCommands, &ActionCommands::GotoPrevKeyFrame );
     connect(ui->actionDuplicate_Frame, &QAction::triggered, mEditor, &Editor::duplicateKey );
     connect(ui->actionMove_Frame_Forward, &QAction::triggered, mEditor, &Editor::moveFrameForward ); //HERE
     connect(ui->actionMove_Frame_Backward, &QAction::triggered, mEditor, &Editor::moveFrameBackward );
diff --git a/app/ui/mainwindow2.ui b/app/ui/mainwindow2.ui
index e0f1801aa..a4f1796a4 100644
--- a/app/ui/mainwindow2.ui
+++ b/app/ui/mainwindow2.ui
@@ -785,7 +785,7 @@ background: #B6DBEA;
     </iconset>
    </property>
    <property name="text">
-    <string>Next_KeyFrame</string>
+    <string>Next KeyFrame</string>
    </property>
    <property name="toolTip">
     <string>Next KeyFrame</string>
@@ -798,7 +798,7 @@ background: #B6DBEA;
     </iconset>
    </property>
    <property name="text">
-    <string>Prev_KeyFrame</string>
+    <string>Previous KeyFrame</string>
    </property>
    <property name="toolTip">
     <string>Previous KeyFrame</string>
@@ -812,7 +812,7 @@ background: #B6DBEA;
     <bool>true</bool>
    </property>
    <property name="text">
-    <string>MultiLayerOnionSkin</string>
+    <string>MultiLayer Onion Skin</string>
    </property>
   </action>
   <action name="actionLoopControl">
diff --git a/resources/kb.ini b/resources/kb.ini
index cd4353bbc..62b3c438e 100644
--- a/resources/kb.ini
+++ b/resources/kb.ini
@@ -38,10 +38,10 @@ CmdOnionSkinPrevious=O
 CmdOnionSkinNext=Alt+O
 CmdPlay=Return
 CmdLoop=Ctrl+L
-CmdGotoNextFrame=
-CmdGotoPreviousFrame=
-CmdGotoNextKeyFrame=.
-CmdGotoPreviousKeyFrame=","
+CmdGotoNextFrame=.
+CmdGotoPreviousFrame=","
+CmdGotoNextKeyFrame=Alt+.
+CmdGotoPreviousKeyFrame=Alt+","
 CmdMoveFrameForward=Ctrl+.
 CmdMoveFrameBackward=ctrl+","
 CmdAddFrame=F7