From 61311940656e8dfff0e32af0c0659747ac86ce8a Mon Sep 17 00:00:00 2001
From: Marcus Huderle <huderlem@gmail.com>
Date: Thu, 13 Sep 2018 17:48:43 -0500
Subject: [PATCH] Add keyboard shortcuts for each of the editing tool buttons

---
 mainwindow.cpp | 30 ++++++++++++++++++++
 mainwindow.h   |  6 ++++
 mainwindow.ui  | 74 +++++++++++++++++++++++++++++++++++++++++++++-----
 3 files changed, 103 insertions(+), 7 deletions(-)

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 985f2831..bc0b41e3 100755
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -618,6 +618,36 @@ void MainWindow::on_actionBetter_Cursors_triggered() {
     settings.setValue("cursor_mode", QString::number(ui->actionBetter_Cursors->isChecked()));
 }
 
+void MainWindow::on_actionPencil_triggered()
+{
+    on_toolButton_Paint_clicked();
+}
+
+void MainWindow::on_actionPointer_triggered()
+{
+    on_toolButton_Select_clicked();
+}
+
+void MainWindow::on_actionFlood_Fill_triggered()
+{
+    on_toolButton_Fill_clicked();
+}
+
+void MainWindow::on_actionEyedropper_triggered()
+{
+    on_toolButton_Dropper_clicked();
+}
+
+void MainWindow::on_actionMove_triggered()
+{
+    on_toolButton_Move_clicked();
+}
+
+void MainWindow::on_actionMap_Shift_triggered()
+{
+    on_toolButton_Shift_clicked();
+}
+
 void MainWindow::scaleMapView(int s) {
     editor->map->scale_exp += s;
 
diff --git a/mainwindow.h b/mainwindow.h
index 58380406..b020ee52 100755
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -63,6 +63,12 @@ private slots:
     void on_actionZoom_In_triggered();
     void on_actionZoom_Out_triggered();
     void on_actionBetter_Cursors_triggered();
+    void on_actionPencil_triggered();
+    void on_actionPointer_triggered();
+    void on_actionFlood_Fill_triggered();
+    void on_actionEyedropper_triggered();
+    void on_actionMove_triggered();
+    void on_actionMap_Shift_triggered();
 
     void on_toolButton_deleteObject_clicked();
     void on_toolButton_Open_Scripts_clicked();
diff --git a/mainwindow.ui b/mainwindow.ui
index 6b4ce23d..cde58531 100755
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -171,7 +171,7 @@
                    <bool>true</bool>
                   </property>
                   <property name="toolTip">
-                   <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Editor&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Click&lt;/span&gt; and drag to draw on the map.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Right-click&lt;/span&gt; and drag to select tiles.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                   <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Pencil&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Click&lt;/span&gt; and drag to draw on the map.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Right-click&lt;/span&gt; and drag to select tiles.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                   </property>
                   <property name="text">
                    <string>Paint</string>
@@ -214,7 +214,7 @@
                 <item>
                  <widget class="QToolButton" name="toolButton_Fill">
                   <property name="toolTip">
-                   <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Flood Fill&lt;/p&gt;&lt;p&gt;Fills all similar tiles in a region with the selected metatiles or collision attributes&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                   <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Bucket Fill&lt;/p&gt;&lt;p&gt;Fills all similar tiles in a region with the selected metatiles or collision attributes&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                   </property>
                   <property name="text">
                    <string>Fill</string>
@@ -231,7 +231,7 @@
                 <item>
                  <widget class="QToolButton" name="toolButton_Dropper">
                   <property name="toolTip">
-                   <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Eye Dropper&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Click&lt;/span&gt; to select a metatile or collision attribute.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                   <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Eyedropper&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Click&lt;/span&gt; to select a metatile or collision attribute.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                   </property>
                   <property name="text">
                    <string>Dropper</string>
@@ -256,7 +256,7 @@
                   <property name="icon">
                    <iconset resource="resources/images.qrc">
                     <normaloff>:/icons/move.ico</normaloff>:/icons/move.ico</iconset>
-                    </property>
+                  </property>
                   <property name="checkable">
                    <bool>true</bool>
                   </property>
@@ -378,7 +378,7 @@
                     <rect>
                      <x>0</x>
                      <y>0</y>
-                     <width>442</width>
+                     <width>469</width>
                      <height>620</height>
                     </rect>
                    </property>
@@ -761,7 +761,7 @@
                         <rect>
                          <x>0</x>
                          <y>0</y>
-                         <width>302</width>
+                         <width>275</width>
                          <height>86</height>
                         </rect>
                        </property>
@@ -867,7 +867,7 @@
                      <rect>
                       <x>0</x>
                       <y>0</y>
-                      <width>352</width>
+                      <width>325</width>
                       <height>405</height>
                      </rect>
                     </property>
@@ -2128,9 +2128,21 @@
     <addaction name="actionZoom_Out"/>
     <addaction name="actionBetter_Cursors"/>
    </widget>
+   <widget class="QMenu" name="menuTools">
+    <property name="title">
+     <string>Tools</string>
+    </property>
+    <addaction name="actionPencil"/>
+    <addaction name="actionPointer"/>
+    <addaction name="actionFlood_Fill"/>
+    <addaction name="actionEyedropper"/>
+    <addaction name="actionMove"/>
+    <addaction name="actionMap_Shift"/>
+   </widget>
    <addaction name="menuFile"/>
    <addaction name="menuEdit"/>
    <addaction name="menuView"/>
+   <addaction name="menuTools"/>
   </widget>
   <widget class="QStatusBar" name="statusBar"/>
   <action name="action_Save_Project">
@@ -2219,6 +2231,54 @@
     <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use reticule-styled cursors with icon showing currently selected tool.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
    </property>
   </action>
+  <action name="actionPencil">
+   <property name="text">
+    <string>Pencil</string>
+   </property>
+   <property name="shortcut">
+    <string>N</string>
+   </property>
+  </action>
+  <action name="actionFlood_Fill">
+   <property name="text">
+    <string>Bucket Fill</string>
+   </property>
+   <property name="shortcut">
+    <string>B</string>
+   </property>
+  </action>
+  <action name="actionEyedropper">
+   <property name="text">
+    <string>Eyedropper</string>
+   </property>
+   <property name="shortcut">
+    <string>E</string>
+   </property>
+  </action>
+  <action name="actionMove">
+   <property name="text">
+    <string>Move</string>
+   </property>
+   <property name="shortcut">
+    <string>M</string>
+   </property>
+  </action>
+  <action name="actionMap_Shift">
+   <property name="text">
+    <string>Map Shift</string>
+   </property>
+   <property name="shortcut">
+    <string>S</string>
+   </property>
+  </action>
+  <action name="actionPointer">
+   <property name="text">
+    <string>Pointer</string>
+   </property>
+   <property name="shortcut">
+    <string>P</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>