From f2844c2ec0d0d014cd73079f24c275820f7f9180 Mon Sep 17 00:00:00 2001
From: Marcus Huderle <huderlem@gmail.com>
Date: Wed, 12 Feb 2020 18:13:33 -0600
Subject: [PATCH] Update grid tooltip and update object event filepaths

---
 forms/mainwindow.ui | 28 ++++++++++++++--------------
 src/project.cpp     |  8 ++++----
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/forms/mainwindow.ui b/forms/mainwindow.ui
index f6921ee0..68d458c9 100644
--- a/forms/mainwindow.ui
+++ b/forms/mainwindow.ui
@@ -478,7 +478,7 @@
                 <item>
                  <widget class="QCheckBox" name="checkBox_ToggleGrid">
                   <property name="toolTip">
-                   <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Toggles a grid over the map's metatile boundaries.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                   <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Toggles a grid over the map's metatile boundaries.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Ctrl + G&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                   </property>
                   <property name="styleSheet">
                    <string notr="true"/>
@@ -561,8 +561,8 @@
                     <rect>
                      <x>0</x>
                      <y>0</y>
-                     <width>545</width>
-                     <height>587</height>
+                     <width>469</width>
+                     <height>608</height>
                     </rect>
                    </property>
                    <layout class="QGridLayout" name="gridLayout_8">
@@ -876,8 +876,8 @@
                            <rect>
                             <x>0</x>
                             <y>0</y>
-                            <width>256</width>
-                            <height>74</height>
+                            <width>324</width>
+                            <height>77</height>
                            </rect>
                           </property>
                           <layout class="QHBoxLayout" name="horizontalLayout_7">
@@ -1064,10 +1064,10 @@
                     </property>
                     <property name="geometry">
                      <rect>
-                      <x>8</x>
+                      <x>0</x>
                       <y>0</y>
-                      <width>221</width>
-                      <height>328</height>
+                      <width>307</width>
+                      <height>362</height>
                      </rect>
                     </property>
                     <property name="sizePolicy">
@@ -1344,8 +1344,8 @@
               <rect>
                <x>0</x>
                <y>0</y>
-               <width>371</width>
-               <height>643</height>
+               <width>381</width>
+               <height>657</height>
               </rect>
              </property>
              <layout class="QGridLayout" name="gridLayout_7">
@@ -1618,7 +1618,7 @@
                       <x>0</x>
                       <y>0</y>
                       <width>430</width>
-                      <height>534</height>
+                      <height>568</height>
                      </rect>
                     </property>
                     <property name="sizePolicy">
@@ -2531,8 +2531,8 @@
                    <rect>
                     <x>0</x>
                     <y>0</y>
-                    <width>818</width>
-                    <height>539</height>
+                    <width>826</width>
+                    <height>557</height>
                    </rect>
                   </property>
                   <layout class="QGridLayout" name="gridLayout_14">
@@ -2796,7 +2796,7 @@
      <x>0</x>
      <y>0</y>
      <width>1117</width>
-     <height>22</height>
+     <height>21</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">
diff --git a/src/project.cpp b/src/project.cpp
index b0477163..ee28cf6f 100644
--- a/src/project.cpp
+++ b/src/project.cpp
@@ -2029,7 +2029,7 @@ void Project::loadEventPixmaps(QList<Event*> objects) {
 
     QMap<QString, int> constants = getEventObjGfxConstants();
 
-    QMap<QString, QString> pointerHash = parser.readNamedIndexCArray("src/data/object_event/event_object_graphics_info_pointers.h", "gObjectEventGraphicsInfoPointers");
+    QMap<QString, QString> pointerHash = parser.readNamedIndexCArray("src/data/object_events/object_event_graphics_info_pointers.h", "gObjectEventGraphicsInfoPointers");
 
     for (Event *object : objects) {
         if (!object->pixmap.isNull()) {
@@ -2054,13 +2054,13 @@ void Project::loadEventPixmaps(QList<Event*> objects) {
 
         if (event_type == EventType::Object) {
             QString info_label = pointerHash[object->get("sprite")].replace("&", "");
-            QStringList gfx_info = parser.readCArray("src/data/object_event/event_object_graphics_info.h", info_label);
+            QStringList gfx_info = parser.readCArray("src/data/object_events/object_event_graphics_info.h", info_label);
             QString pic_label = gfx_info.value(14);
             QString dimensions_label = gfx_info.value(11);
             QString subsprites_label = gfx_info.value(12);
-            QString gfx_label = parser.readCArray("src/data/object_event/event_object_pic_tables.h", pic_label).value(0);
+            QString gfx_label = parser.readCArray("src/data/object_events/object_event_pic_tables.h", pic_label).value(0);
             gfx_label = gfx_label.section(QRegExp("[\\(\\)]"), 1, 1);
-            QString path = parser.readCIncbin("src/data/object_event/event_object_graphics.h", gfx_label);
+            QString path = parser.readCIncbin("src/data/object_events/object_event_graphics.h", gfx_label);
 
             if (!path.isNull()) {
                 path = fixGraphicPath(path);