Refactorings

QtGameMaker.pro

@@ -161,5 +161,9 @@ FORMS += \
     src/editor/widgets/actionscontainerwidget.ui
 
 RESOURCES += \
-    resources_editor.qrc \
+    src/editor/resources_editor.qrc \
-    resources_engine.qrc
+    src/engine/resources_engine.qrc
+
+OTHER_FILES += \
+    src/engine/vulkan_shader_modules/color.frag \
+    src/engine/vulkan_shader_modules/color.vert

resources_engine.qrc

@@ -1,6 +0,0 @@
-<RCC>
-    <qresource prefix="/qtgameengine">
-        <file>shader_modules/color_frag.spv</file>
-        <file>shader_modules/color_vert.spv</file>
-    </qresource>
-</RCC>

src/editor/dialogs/addeventdialog.ui

@@ -22,7 +22,7 @@
         <string>Dra&amp;w</string>
        </property>
        <property name="icon">
-        <iconset resource="../../../resources.qrc">
+        <iconset resource="../resources_editor.qrc">
          <normaloff>:/qtgameengine/icons/event-draw.png</normaloff>:/qtgameengine/icons/event-draw.png</iconset>
        </property>
       </widget>
@@ -54,7 +54,7 @@
         <string>&amp;Step</string>
        </property>
        <property name="icon">
-        <iconset resource="../../../resources.qrc">
+        <iconset resource="../resources_editor.qrc">
          <normaloff>:/qtgameengine/icons/event-step.png</normaloff>:/qtgameengine/icons/event-step.png</iconset>
        </property>
       </widget>
@@ -65,7 +65,7 @@
         <string>C&amp;reate</string>
        </property>
        <property name="icon">
-        <iconset resource="../../../resources.qrc">
+        <iconset resource="../resources_editor.qrc">
          <normaloff>:/qtgameengine/icons/event-create.png</normaloff>:/qtgameengine/icons/event-create.png</iconset>
        </property>
       </widget>
@@ -90,7 +90,7 @@
         <string>&amp;Destroy</string>
        </property>
        <property name="icon">
-        <iconset resource="../../../resources.qrc">
+        <iconset resource="../resources_editor.qrc">
          <normaloff>:/qtgameengine/icons/event-destroy.png</normaloff>:/qtgameengine/icons/event-destroy.png</iconset>
        </property>
       </widget>
@@ -131,7 +131,7 @@
   </layout>
  </widget>
  <resources>
-  <include location="../../../resources.qrc"/>
+  <include location="../resources_editor.qrc"/>
  </resources>
  <connections>
   <connection>

src/editor/dialogs/backgroundpropertiesdialog.ui

@@ -14,7 +14,7 @@
    <string>Dialog</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="../../../resources.qrc">
+   <iconset resource="../resources_editor.qrc">
     <normaloff>:/qtgameengine/icons/background-file.png</normaloff>:/qtgameengine/icons/background-file.png</iconset>
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout" stretch="0,1">
@@ -69,7 +69,7 @@
         <string>&amp;Load Background</string>
        </property>
        <property name="icon">
-        <iconset resource="../../../resources.qrc">
+        <iconset resource="../resources_editor.qrc">
          <normaloff>:/qtgameengine/icons/open.png</normaloff>:/qtgameengine/icons/open.png</iconset>
        </property>
       </widget>
@@ -83,7 +83,7 @@
         <string>&amp;Save Background</string>
        </property>
        <property name="icon">
-        <iconset resource="../../../resources.qrc">
+        <iconset resource="../resources_editor.qrc">
          <normaloff>:/qtgameengine/icons/save.png</normaloff>:/qtgameengine/icons/save.png</iconset>
        </property>
       </widget>
@@ -97,7 +97,7 @@
         <string>&amp;Edit Background</string>
        </property>
        <property name="icon">
-        <iconset resource="../../../resources.qrc">
+        <iconset resource="../resources_editor.qrc">
          <normaloff>:/qtgameengine/icons/edit.png</normaloff>:/qtgameengine/icons/edit.png</iconset>
        </property>
       </widget>
@@ -178,7 +178,7 @@
   </layout>
  </widget>
  <resources>
-  <include location="../../../resources.qrc"/>
+  <include location="../resources_editor.qrc"/>
  </resources>
  <connections>
   <connection>

src/editor/dialogs/codeeditordialog.ui

@@ -14,7 +14,7 @@
    <string>Code Editor</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="../../../resources.qrc">
+   <iconset resource="../resources_editor.qrc">
     <normaloff>:/qtgameengine/icons/script-file.png</normaloff>:/qtgameengine/icons/script-file.png</iconset>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout" stretch="0,1">
@@ -225,7 +225,7 @@
   </layout>
   <action name="actionOk">
    <property name="icon">
-    <iconset resource="../../../resources.qrc">
+    <iconset resource="../resources_editor.qrc">
      <normaloff>:/qtgameengine/icons/ok.png</normaloff>:/qtgameengine/icons/ok.png</iconset>
    </property>
    <property name="text">
@@ -237,7 +237,7 @@
   </action>
   <action name="actionLoad">
    <property name="icon">
-    <iconset resource="../../../resources.qrc">
+    <iconset resource="../resources_editor.qrc">
      <normaloff>:/qtgameengine/icons/open.png</normaloff>:/qtgameengine/icons/open.png</iconset>
    </property>
    <property name="text">
@@ -249,7 +249,7 @@
   </action>
   <action name="actionSave">
    <property name="icon">
-    <iconset resource="../../../resources.qrc">
+    <iconset resource="../resources_editor.qrc">
      <normaloff>:/qtgameengine/icons/save.png</normaloff>:/qtgameengine/icons/save.png</iconset>
    </property>
    <property name="text">
@@ -261,7 +261,7 @@
   </action>
   <action name="actionPrint">
    <property name="icon">
-    <iconset resource="../../../resources.qrc">
+    <iconset resource="../resources_editor.qrc">
      <normaloff>:/qtgameengine/icons/print.png</normaloff>:/qtgameengine/icons/print.png</iconset>
    </property>
    <property name="text">
@@ -276,7 +276,7 @@
     <bool>false</bool>
    </property>
    <property name="icon">
-    <iconset resource="../../../resources.qrc">
+    <iconset resource="../resources_editor.qrc">
      <normaloff>:/qtgameengine/icons/undo.png</normaloff>:/qtgameengine/icons/undo.png</iconset>
    </property>
    <property name="text">
@@ -291,7 +291,7 @@
     <bool>false</bool>
    </property>
    <property name="icon">
-    <iconset resource="../../../resources.qrc">
+    <iconset resource="../resources_editor.qrc">
      <normaloff>:/qtgameengine/icons/redo.png</normaloff>:/qtgameengine/icons/redo.png</iconset>
    </property>
    <property name="text">
@@ -306,7 +306,7 @@
     <bool>false</bool>
    </property>
    <property name="icon">
-    <iconset resource="../../../resources.qrc">
+    <iconset resource="../resources_editor.qrc">
      <normaloff>:/qtgameengine/icons/cut.png</normaloff>:/qtgameengine/icons/cut.png</iconset>
    </property>
    <property name="text">
@@ -321,7 +321,7 @@
     <bool>false</bool>
    </property>
    <property name="icon">
-    <iconset resource="../../../resources.qrc">
+    <iconset resource="../resources_editor.qrc">
      <normaloff>:/qtgameengine/icons/copy.png</normaloff>:/qtgameengine/icons/copy.png</iconset>
    </property>
    <property name="text">
@@ -333,7 +333,7 @@
   </action>
   <action name="actionPaste">
    <property name="icon">
-    <iconset resource="../../../resources.qrc">
+    <iconset resource="../resources_editor.qrc">
      <normaloff>:/qtgameengine/icons/paste.png</normaloff>:/qtgameengine/icons/paste.png</iconset>
    </property>
    <property name="text">
@@ -351,7 +351,7 @@
     <bool>false</bool>
    </property>
    <property name="icon">
-    <iconset resource="../../../resources.qrc">
+    <iconset resource="../resources_editor.qrc">
      <normaloff>:/qtgameengine/icons/find.png</normaloff>:/qtgameengine/icons/find.png</iconset>
    </property>
    <property name="text">
@@ -369,7 +369,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset resource="../../../resources.qrc">
+    <iconset resource="../resources_editor.qrc">
      <normaloff>:/qtgameengine/icons/check.png</normaloff>:/qtgameengine/icons/check.png</iconset>
    </property>
    <property name="text">
@@ -388,7 +388,7 @@
   </customwidget>
  </customwidgets>
  <resources>
-  <include location="../../../resources.qrc"/>
+  <include location="../resources_editor.qrc"/>
  </resources>
  <connections>
   <connection>

src/editor/dialogs/editspritedialog.ui

@@ -168,7 +168,7 @@
   </layout>
   <action name="actionNew">
    <property name="icon">
-    <iconset resource="../../../resources.qrc">
+    <iconset resource="../resources_editor.qrc">
      <normaloff>:/qtgameengine/icons/new.png</normaloff>:/qtgameengine/icons/new.png</iconset>
    </property>
    <property name="text">
@@ -177,7 +177,7 @@
   </action>
   <action name="actionCreateFromFile">
    <property name="icon">
-    <iconset resource="../../../resources.qrc">
+    <iconset resource="../resources_editor.qrc">
      <normaloff>:/qtgameengine/icons/open.png</normaloff>:/qtgameengine/icons/open.png</iconset>
    </property>
    <property name="text">
@@ -186,7 +186,7 @@
   </action>
   <action name="actionAddFromFile">
    <property name="icon">
-    <iconset resource="../../../resources.qrc">
+    <iconset resource="../resources_editor.qrc">
      <normaloff>:/qtgameengine/icons/create-group.png</normaloff>:/qtgameengine/icons/create-group.png</iconset>
    </property>
    <property name="text">
@@ -198,7 +198,7 @@
   </action>
   <action name="actionSaveAsPngFile">
    <property name="icon">
-    <iconset resource="../../../resources.qrc">
+    <iconset resource="../resources_editor.qrc">
      <normaloff>:/qtgameengine/icons/save.png</normaloff>:/qtgameengine/icons/save.png</iconset>
    </property>
    <property name="text">
@@ -223,7 +223,7 @@
   </action>
   <action name="actionCloseSavingChanges">
    <property name="icon">
-    <iconset resource="../../../resources.qrc">
+    <iconset resource="../resources_editor.qrc">
      <normaloff>:/qtgameengine/icons/ok.png</normaloff>:/qtgameengine/icons/ok.png</iconset>
    </property>
    <property name="text">
@@ -232,7 +232,7 @@
   </action>
  </widget>
  <resources>
-  <include location="../../../resources.qrc"/>
+  <include location="../resources_editor.qrc"/>
  </resources>
  <connections>
   <connection>

src/editor/dialogs/fontpropertiesdialog.ui

@@ -14,7 +14,7 @@
    <string>Font Properties</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="../../../resources.qrc">
+   <iconset resource="../resources_editor.qrc">
     <normaloff>:/qtgameengine/icons/font-file.png</normaloff>:/qtgameengine/icons/font-file.png</iconset>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
@@ -220,7 +220,7 @@
   </layout>
  </widget>
  <resources>
-  <include location="../../../resources.qrc"/>
+  <include location="../resources_editor.qrc"/>
  </resources>
  <connections>
   <connection>

src/editor/dialogs/imageeditordialog.ui

@@ -178,7 +178,7 @@
   </layout>
   <action name="actionNew">
    <property name="icon">
-    <iconset resource="../../../resources.qrc">
+    <iconset resource="../resources_editor.qrc">
      <normaloff>:/qtgameengine/icons/new.png</normaloff>:/qtgameengine/icons/new.png</iconset>
    </property>
    <property name="text">
@@ -190,7 +190,7 @@
   </action>
   <action name="actionSaveAsPngFile">
    <property name="icon">
-    <iconset resource="../../../resources.qrc">
+    <iconset resource="../resources_editor.qrc">
      <normaloff>:/qtgameengine/icons/save.png</normaloff>:/qtgameengine/icons/save.png</iconset>
    </property>
    <property name="text">
@@ -202,7 +202,7 @@
   </action>
   <action name="actionPreviousImage">
    <property name="icon">
-    <iconset resource="../../../resources.qrc">
+    <iconset resource="../resources_editor.qrc">
      <normaloff>:/qtgameengine/icons/arrow-left.png</normaloff>:/qtgameengine/icons/arrow-left.png</iconset>
    </property>
    <property name="text">
@@ -214,7 +214,7 @@
   </action>
   <action name="actionNextImage">
    <property name="icon">
-    <iconset resource="../../../resources.qrc">
+    <iconset resource="../resources_editor.qrc">
      <normaloff>:/qtgameengine/icons/arrow-right.png</normaloff>:/qtgameengine/icons/arrow-right.png</iconset>
    </property>
    <property name="text">
@@ -226,7 +226,7 @@
   </action>
   <action name="actionCloseSavingChanges">
    <property name="icon">
-    <iconset resource="../../../resources.qrc">
+    <iconset resource="../resources_editor.qrc">
      <normaloff>:/qtgameengine/icons/ok.png</normaloff>:/qtgameengine/icons/ok.png</iconset>
    </property>
    <property name="text">
@@ -238,7 +238,7 @@
   </action>
   <action name="actionLoad">
    <property name="icon">
-    <iconset resource="../../../resources.qrc">
+    <iconset resource="../resources_editor.qrc">
      <normaloff>:/qtgameengine/icons/open.png</normaloff>:/qtgameengine/icons/open.png</iconset>
    </property>
    <property name="text">
@@ -247,7 +247,7 @@
   </action>
   <action name="actionUndo">
    <property name="icon">
-    <iconset resource="../../../resources.qrc">
+    <iconset resource="../resources_editor.qrc">
      <normaloff>:/qtgameengine/icons/undo.png</normaloff>:/qtgameengine/icons/undo.png</iconset>
    </property>
    <property name="text">
@@ -256,7 +256,7 @@
   </action>
   <action name="actionRedo">
    <property name="icon">
-    <iconset resource="../../../resources.qrc">
+    <iconset resource="../resources_editor.qrc">
      <normaloff>:/qtgameengine/icons/redo.png</normaloff>:/qtgameengine/icons/redo.png</iconset>
    </property>
    <property name="text">
@@ -307,7 +307,7 @@
   </customwidget>
  </customwidgets>
  <resources>
-  <include location="../../../resources.qrc"/>
+  <include location="../resources_editor.qrc"/>
  </resources>
  <connections>
   <connection>

src/editor/dialogs/includedfilesdialog.ui

@@ -42,7 +42,7 @@
            <string>&amp;Add</string>
           </property>
           <property name="icon">
-           <iconset resource="../../../resources.qrc">
+           <iconset resource="../resources_editor.qrc">
             <normaloff>:/qtgameengine/icons/add.png</normaloff>:/qtgameengine/icons/add.png</iconset>
           </property>
          </widget>
@@ -56,7 +56,7 @@
            <string>&amp;Change</string>
           </property>
           <property name="icon">
-           <iconset resource="../../../resources.qrc">
+           <iconset resource="../resources_editor.qrc">
             <normaloff>:/qtgameengine/icons/replace.png</normaloff>:/qtgameengine/icons/replace.png</iconset>
           </property>
          </widget>
@@ -70,7 +70,7 @@
            <string>&amp;Delete</string>
           </property>
           <property name="icon">
-           <iconset resource="../../../resources.qrc">
+           <iconset resource="../resources_editor.qrc">
             <normaloff>:/qtgameengine/icons/delete.png</normaloff>:/qtgameengine/icons/delete.png</iconset>
           </property>
          </widget>
@@ -84,7 +84,7 @@
            <string>&amp;Clear</string>
           </property>
           <property name="icon">
-           <iconset resource="../../../resources.qrc">
+           <iconset resource="../resources_editor.qrc">
             <normaloff>:/qtgameengine/icons/new.png</normaloff>:/qtgameengine/icons/new.png</iconset>
           </property>
          </widget>
@@ -107,7 +107,7 @@
   </layout>
  </widget>
  <resources>
-  <include location="../../../resources.qrc"/>
+  <include location="../resources_editor.qrc"/>
  </resources>
  <connections>
   <connection>

src/editor/dialogs/objectinformationdialog.ui

@@ -14,7 +14,7 @@
    <string>Information about all Objects</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="../../../resources.qrc">
+   <iconset resource="../resources_editor.qrc">
     <normaloff>:/qtgameengine/icons/object-file.png</normaloff>:/qtgameengine/icons/object-file.png</iconset>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout" stretch="0,1">
@@ -58,7 +58,7 @@
   </layout>
   <action name="actionOk">
    <property name="icon">
-    <iconset resource="../../../resources.qrc">
+    <iconset resource="../resources_editor.qrc">
      <normaloff>:/qtgameengine/icons/ok.png</normaloff>:/qtgameengine/icons/ok.png</iconset>
    </property>
    <property name="text">
@@ -70,7 +70,7 @@
   </action>
   <action name="actionSave">
    <property name="icon">
-    <iconset resource="../../../resources.qrc">
+    <iconset resource="../resources_editor.qrc">
      <normaloff>:/qtgameengine/icons/save.png</normaloff>:/qtgameengine/icons/save.png</iconset>
    </property>
    <property name="text">
@@ -82,7 +82,7 @@
   </action>
   <action name="actionPrint">
    <property name="icon">
-    <iconset resource="../../../resources.qrc">
+    <iconset resource="../resources_editor.qrc">
      <normaloff>:/qtgameengine/icons/print.png</normaloff>:/qtgameengine/icons/print.png</iconset>
    </property>
    <property name="text">
@@ -94,7 +94,7 @@
   </action>
  </widget>
  <resources>
-  <include location="../../../resources.qrc"/>
+  <include location="../resources_editor.qrc"/>
  </resources>
  <connections>
   <connection>

src/editor/dialogs/objectpropertiesdialog.ui

@@ -14,7 +14,7 @@
    <string>Object Properties</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="../../../resources.qrc">
+   <iconset resource="../resources_editor.qrc">
     <normaloff>:/qtgameengine/icons/object-file.png</normaloff>:/qtgameengine/icons/object-file.png</iconset>
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout_4" stretch="0,0,1">
@@ -305,7 +305,7 @@
         <string>Show Information</string>
        </property>
        <property name="icon">
-        <iconset resource="../../../resources.qrc">
+        <iconset resource="../resources_editor.qrc">
          <normaloff>:/qtgameengine/icons/info.png</normaloff>:/qtgameengine/icons/info.png</iconset>
        </property>
       </widget>
@@ -421,7 +421,7 @@
   </customwidget>
  </customwidgets>
  <resources>
-  <include location="../../../resources.qrc"/>
+  <include location="../resources_editor.qrc"/>
  </resources>
  <connections>
   <connection>

src/editor/dialogs/pathpropertiesdialog.ui

@@ -14,7 +14,7 @@
    <string>Path Properties</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="../../../resources.qrc">
+   <iconset resource="../resources_editor.qrc">
     <normaloff>:/qtgameengine/icons/path-file.png</normaloff>:/qtgameengine/icons/path-file.png</iconset>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2" stretch="0,1">
@@ -412,7 +412,7 @@
   </layout>
   <action name="actionOk">
    <property name="icon">
-    <iconset resource="../../../resources.qrc">
+    <iconset resource="../resources_editor.qrc">
      <normaloff>:/qtgameengine/icons/ok.png</normaloff>:/qtgameengine/icons/ok.png</iconset>
    </property>
    <property name="text">
@@ -424,7 +424,7 @@
   </action>
   <action name="actionUndo">
    <property name="icon">
-    <iconset resource="../../../resources.qrc">
+    <iconset resource="../resources_editor.qrc">
      <normaloff>:/qtgameengine/icons/undo.png</normaloff>:/qtgameengine/icons/undo.png</iconset>
    </property>
    <property name="text">
@@ -436,7 +436,7 @@
   </action>
   <action name="actionClear">
    <property name="icon">
-    <iconset resource="../../../resources.qrc">
+    <iconset resource="../resources_editor.qrc">
      <normaloff>:/qtgameengine/icons/new.png</normaloff>:/qtgameengine/icons/new.png</iconset>
    </property>
    <property name="text">
@@ -448,7 +448,7 @@
   </action>
   <action name="actionReverse">
    <property name="icon">
-    <iconset resource="../../../resources.qrc">
+    <iconset resource="../resources_editor.qrc">
      <normaloff>:/qtgameengine/icons/rotate.png</normaloff>:/qtgameengine/icons/rotate.png</iconset>
    </property>
    <property name="text">
@@ -460,7 +460,7 @@
   </action>
   <action name="actionShift">
    <property name="icon">
-    <iconset resource="../../../resources.qrc">
+    <iconset resource="../resources_editor.qrc">
      <normaloff>:/qtgameengine/icons/move.png</normaloff>:/qtgameengine/icons/move.png</iconset>
    </property>
    <property name="text">
@@ -472,7 +472,7 @@
   </action>
   <action name="actionMirrorHorizontally">
    <property name="icon">
-    <iconset resource="../../../resources.qrc">
+    <iconset resource="../resources_editor.qrc">
      <normaloff>:/qtgameengine/icons/flip-horizontal.png</normaloff>:/qtgameengine/icons/flip-horizontal.png</iconset>
    </property>
    <property name="text">
@@ -484,7 +484,7 @@
   </action>
   <action name="actionMirrorVertically">
    <property name="icon">
-    <iconset resource="../../../resources.qrc">
+    <iconset resource="../resources_editor.qrc">
      <normaloff>:/qtgameengine/icons/flip-vertical.png</normaloff>:/qtgameengine/icons/flip-vertical.png</iconset>
    </property>
    <property name="text">
@@ -496,7 +496,7 @@
   </action>
   <action name="actionRotate">
    <property name="icon">
-    <iconset resource="../../../resources.qrc">
+    <iconset resource="../resources_editor.qrc">
      <normaloff>:/qtgameengine/icons/rotate.png</normaloff>:/qtgameengine/icons/rotate.png</iconset>
    </property>
    <property name="text">
@@ -508,7 +508,7 @@
   </action>
   <action name="actionScale">
    <property name="icon">
-    <iconset resource="../../../resources.qrc">
+    <iconset resource="../resources_editor.qrc">
      <normaloff>:/qtgameengine/icons/scale.png</normaloff>:/qtgameengine/icons/scale.png</iconset>
    </property>
    <property name="text">
@@ -520,7 +520,7 @@
   </action>
   <action name="actionShiftLeft">
    <property name="icon">
-    <iconset resource="../../../resources.qrc">
+    <iconset resource="../resources_editor.qrc">
      <normaloff>:/qtgameengine/icons/arrow-left.png</normaloff>:/qtgameengine/icons/arrow-left.png</iconset>
    </property>
    <property name="text">
@@ -532,7 +532,7 @@
   </action>
   <action name="actionShiftRight">
    <property name="icon">
-    <iconset resource="../../../resources.qrc">
+    <iconset resource="../resources_editor.qrc">
      <normaloff>:/qtgameengine/icons/arrow-right.png</normaloff>:/qtgameengine/icons/arrow-right.png</iconset>
    </property>
    <property name="text">
@@ -544,7 +544,7 @@
   </action>
   <action name="actionShiftUp">
    <property name="icon">
-    <iconset resource="../../../resources.qrc">
+    <iconset resource="../resources_editor.qrc">
      <normaloff>:/qtgameengine/icons/arrow-up.png</normaloff>:/qtgameengine/icons/arrow-up.png</iconset>
    </property>
    <property name="text">
@@ -556,7 +556,7 @@
   </action>
   <action name="actionShiftDown">
    <property name="icon">
-    <iconset resource="../../../resources.qrc">
+    <iconset resource="../resources_editor.qrc">
      <normaloff>:/qtgameengine/icons/arrow-down.png</normaloff>:/qtgameengine/icons/arrow-down.png</iconset>
    </property>
    <property name="text">
@@ -568,7 +568,7 @@
   </action>
   <action name="actionCenterView">
    <property name="icon">
-    <iconset resource="../../../resources.qrc">
+    <iconset resource="../resources_editor.qrc">
      <normaloff>:/qtgameengine/icons/center.png</normaloff>:/qtgameengine/icons/center.png</iconset>
    </property>
    <property name="text">
@@ -586,7 +586,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset resource="../../../resources.qrc">
+    <iconset resource="../resources_editor.qrc">
      <normaloff>:/qtgameengine/icons/grid.png</normaloff>:/qtgameengine/icons/grid.png</iconset>
    </property>
    <property name="text">
@@ -606,7 +606,7 @@
   </customwidget>
  </customwidgets>
  <resources>
-  <include location="../../../resources.qrc"/>
+  <include location="../resources_editor.qrc"/>
  </resources>
  <connections>
   <connection>

src/editor/dialogs/roompropertiesdialog.ui

@@ -14,7 +14,7 @@
    <string>Room Properties</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="../../../resources.qrc">
+   <iconset resource="../resources_editor.qrc">
     <normaloff>:/qtgameengine/icons/room-file.png</normaloff>:/qtgameengine/icons/room-file.png</iconset>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2" stretch="0,1">
@@ -92,8 +92,10 @@
     </widget>
    </item>
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout" stretch="0,1">
+    <widget class="QSplitter" name="splitter">
-     <item>
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
      <widget class="QTabWidget" name="tabWidget">
       <property name="tabPosition">
        <enum>QTabWidget::West</enum>
@@ -131,8 +133,8 @@
             <rect>
              <x>0</x>
              <y>0</y>
-              <width>222</width>
+             <width>683</width>
-              <height>331</height>
+             <height>333</height>
             </rect>
            </property>
            <property name="alignment">
@@ -327,7 +329,7 @@
              <string>CreationCode</string>
             </property>
             <property name="icon">
-              <iconset resource="../../../resources.qrc">
+             <iconset resource="../resources_editor.qrc">
               <normaloff>:/qtgameengine/icons/script.png</normaloff>:/qtgameengine/icons/script.png</iconset>
             </property>
            </widget>
@@ -378,9 +380,8 @@
        </attribute>
       </widget>
      </widget>
-     </item>
+     <widget class="QWidget" name="layoutWidget">
-     <item>
+      <layout class="QVBoxLayout">
-      <layout class="QVBoxLayout" name="verticalLayout_7" stretch="1,0">
        <item>
         <widget class="QScrollArea" name="scrollAreaRoom">
          <property name="alignment">
@@ -402,13 +403,13 @@
         <widget class="QStatusBar" name="statusbar"/>
        </item>
       </layout>
-     </item>
+     </widget>
-    </layout>
+    </widget>
    </item>
   </layout>
   <action name="actionOk">
    <property name="icon">
-    <iconset resource="../../../resources.qrc">
+    <iconset resource="../resources_editor.qrc">
      <normaloff>:/qtgameengine/icons/ok.png</normaloff>:/qtgameengine/icons/ok.png</iconset>
    </property>
    <property name="text">
@@ -420,7 +421,7 @@
   </action>
   <action name="actionUndo">
    <property name="icon">
-    <iconset resource="../../../resources.qrc">
+    <iconset resource="../resources_editor.qrc">
      <normaloff>:/qtgameengine/icons/undo.png</normaloff>:/qtgameengine/icons/undo.png</iconset>
    </property>
    <property name="text">
@@ -432,7 +433,7 @@
   </action>
   <action name="actionClear">
    <property name="icon">
-    <iconset resource="../../../resources.qrc">
+    <iconset resource="../resources_editor.qrc">
      <normaloff>:/qtgameengine/icons/new.png</normaloff>:/qtgameengine/icons/new.png</iconset>
    </property>
    <property name="text">
@@ -444,7 +445,7 @@
   </action>
   <action name="actionShift">
    <property name="icon">
-    <iconset resource="../../../resources.qrc">
+    <iconset resource="../resources_editor.qrc">
      <normaloff>:/qtgameengine/icons/arrow-right.png</normaloff>:/qtgameengine/icons/arrow-right.png</iconset>
    </property>
    <property name="text">
@@ -456,7 +457,7 @@
   </action>
   <action name="actionSortX">
    <property name="icon">
-    <iconset resource="../../../resources.qrc">
+    <iconset resource="../resources_editor.qrc">
      <normaloff>:/qtgameengine/icons/sort-x.png</normaloff>:/qtgameengine/icons/sort-x.png</iconset>
    </property>
    <property name="text">
@@ -468,7 +469,7 @@
   </action>
   <action name="actionSortY">
    <property name="icon">
-    <iconset resource="../../../resources.qrc">
+    <iconset resource="../resources_editor.qrc">
      <normaloff>:/qtgameengine/icons/sort-y.png</normaloff>:/qtgameengine/icons/sort-y.png</iconset>
    </property>
    <property name="text">
@@ -480,7 +481,7 @@
   </action>
   <action name="actionLock">
    <property name="icon">
-    <iconset resource="../../../resources.qrc">
+    <iconset resource="../resources_editor.qrc">
      <normaloff>:/qtgameengine/icons/lock.png</normaloff>:/qtgameengine/icons/lock.png</iconset>
    </property>
    <property name="text">
@@ -492,7 +493,7 @@
   </action>
   <action name="actionUnlock">
    <property name="icon">
-    <iconset resource="../../../resources.qrc">
+    <iconset resource="../resources_editor.qrc">
      <normaloff>:/qtgameengine/icons/unlock.png</normaloff>:/qtgameengine/icons/unlock.png</iconset>
    </property>
    <property name="text">
@@ -510,7 +511,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset resource="../../../resources.qrc">
+    <iconset resource="../resources_editor.qrc">
      <normaloff>:/qtgameengine/icons/grid.png</normaloff>:/qtgameengine/icons/grid.png</iconset>
    </property>
    <property name="text">
@@ -525,7 +526,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset resource="../../../resources.qrc">
+    <iconset resource="../resources_editor.qrc">
      <normaloff>:/qtgameengine/icons/isometric.png</normaloff>:/qtgameengine/icons/isometric.png</iconset>
    </property>
    <property name="text">
@@ -608,7 +609,7 @@
   </customwidget>
  </customwidgets>
  <resources>
-  <include location="../../../resources.qrc"/>
+  <include location="../resources_editor.qrc"/>
  </resources>
  <connections>
   <connection>

src/editor/dialogs/soundpropertiesdialog.ui

@@ -14,7 +14,7 @@
    <string>Sound Properties</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="../../../resources.qrc">
+   <iconset resource="../resources_editor.qrc">
     <normaloff>:/qtgameengine/icons/sound-file.png</normaloff>:/qtgameengine/icons/sound-file.png</iconset>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_4">
@@ -50,7 +50,7 @@
         <string>&amp;Load Sound</string>
        </property>
        <property name="icon">
-        <iconset resource="../../../resources.qrc">
+        <iconset resource="../resources_editor.qrc">
          <normaloff>:/qtgameengine/icons/open.png</normaloff>:/qtgameengine/icons/open.png</iconset>
        </property>
       </widget>
@@ -64,7 +64,7 @@
         <string notr="true"/>
        </property>
        <property name="icon">
-        <iconset resource="../../../resources.qrc">
+        <iconset resource="../resources_editor.qrc">
          <normaloff>:/qtgameengine/icons/run.png</normaloff>:/qtgameengine/icons/run.png</iconset>
        </property>
       </widget>
@@ -78,7 +78,7 @@
         <string notr="true"/>
        </property>
        <property name="icon">
-        <iconset resource="../../../resources.qrc">
+        <iconset resource="../resources_editor.qrc">
          <normaloff>:/qtgameengine/icons/exit.png</normaloff>:/qtgameengine/icons/exit.png</iconset>
        </property>
       </widget>
@@ -94,7 +94,7 @@
       <string>Sa&amp;ve Sound</string>
      </property>
      <property name="icon">
-      <iconset resource="../../../resources.qrc">
+      <iconset resource="../resources_editor.qrc">
        <normaloff>:/qtgameengine/icons/save.png</normaloff>:/qtgameengine/icons/save.png</iconset>
      </property>
     </widget>
@@ -292,7 +292,7 @@
         <string>&amp;Edit Sound</string>
        </property>
        <property name="icon">
-        <iconset resource="../../../resources.qrc">
+        <iconset resource="../resources_editor.qrc">
          <normaloff>:/qtgameengine/icons/sound.png</normaloff>:/qtgameengine/icons/sound.png</iconset>
        </property>
       </widget>
@@ -325,7 +325,7 @@
   </layout>
  </widget>
  <resources>
-  <include location="../../../resources.qrc"/>
+  <include location="../resources_editor.qrc"/>
  </resources>
  <connections>
   <connection>

src/editor/dialogs/spritepropertiesdialog.ui

@@ -14,7 +14,7 @@
    <string>Sprite Properties</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="../../../resources.qrc">
+   <iconset resource="../resources_editor.qrc">
     <normaloff>:/qtgameengine/icons/sprite-file.png</normaloff>:/qtgameengine/icons/sprite-file.png</iconset>
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout" stretch="0,0,1">
@@ -67,7 +67,7 @@
             <string>&amp;Load Sprite</string>
            </property>
            <property name="icon">
-            <iconset resource="../../../resources.qrc">
+            <iconset resource="../resources_editor.qrc">
              <normaloff>:/qtgameengine/icons/open.png</normaloff>:/qtgameengine/icons/open.png</iconset>
            </property>
           </widget>
@@ -81,7 +81,7 @@
             <string>&amp;Save Sprite</string>
            </property>
            <property name="icon">
-            <iconset resource="../../../resources.qrc">
+            <iconset resource="../resources_editor.qrc">
              <normaloff>:/qtgameengine/icons/save.png</normaloff>:/qtgameengine/icons/save.png</iconset>
            </property>
           </widget>
@@ -95,7 +95,7 @@
             <string>&amp;Edit Sprite</string>
            </property>
            <property name="icon">
-            <iconset resource="../../../resources.qrc">
+            <iconset resource="../resources_editor.qrc">
              <normaloff>:/qtgameengine/icons/edit.png</normaloff>:/qtgameengine/icons/edit.png</iconset>
            </property>
           </widget>
@@ -339,7 +339,7 @@
   </layout>
  </widget>
  <resources>
-  <include location="../../../resources.qrc"/>
+  <include location="../resources_editor.qrc"/>
  </resources>
  <connections>
   <connection>

src/editor/dialogs/timelinepropertiesdialog.ui

@@ -14,7 +14,7 @@
    <string>Time Line Properties</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="../../../resources.qrc">
+   <iconset resource="../resources_editor.qrc">
     <normaloff>:/qtgameengine/icons/timeline-file.png</normaloff>:/qtgameengine/icons/timeline-file.png</iconset>
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout" stretch="0,0,1">
@@ -61,7 +61,7 @@
           <string>&amp;Add</string>
          </property>
          <property name="icon">
-          <iconset resource="../../../resources.qrc">
+          <iconset resource="../resources_editor.qrc">
            <normaloff>:/qtgameengine/icons/add.png</normaloff>:/qtgameengine/icons/add.png</iconset>
          </property>
         </widget>
@@ -75,7 +75,7 @@
           <string>&amp;Change</string>
          </property>
          <property name="icon">
-          <iconset resource="../../../resources.qrc">
+          <iconset resource="../resources_editor.qrc">
            <normaloff>:/qtgameengine/icons/replace.png</normaloff>:/qtgameengine/icons/replace.png</iconset>
          </property>
         </widget>
@@ -89,7 +89,7 @@
           <string>&amp;Delete</string>
          </property>
          <property name="icon">
-          <iconset resource="../../../resources.qrc">
+          <iconset resource="../resources_editor.qrc">
            <normaloff>:/qtgameengine/icons/delete.png</normaloff>:/qtgameengine/icons/delete.png</iconset>
          </property>
         </widget>
@@ -103,7 +103,7 @@
           <string>&amp;Shift</string>
          </property>
          <property name="icon">
-          <iconset resource="../../../resources.qrc">
+          <iconset resource="../resources_editor.qrc">
            <normaloff>:/qtgameengine/icons/arrow-right.png</normaloff>:/qtgameengine/icons/arrow-right.png</iconset>
          </property>
         </widget>
@@ -117,7 +117,7 @@
           <string>C&amp;lear</string>
          </property>
          <property name="icon">
-          <iconset resource="../../../resources.qrc">
+          <iconset resource="../resources_editor.qrc">
            <normaloff>:/qtgameengine/icons/new.png</normaloff>:/qtgameengine/icons/new.png</iconset>
          </property>
         </widget>
@@ -131,7 +131,7 @@
           <string>D&amp;uplicate</string>
          </property>
          <property name="icon">
-          <iconset resource="../../../resources.qrc">
+          <iconset resource="../resources_editor.qrc">
            <normaloff>:/qtgameengine/icons/copy.png</normaloff>:/qtgameengine/icons/copy.png</iconset>
          </property>
         </widget>
@@ -158,7 +158,7 @@
           <string>S&amp;pread</string>
          </property>
          <property name="icon">
-          <iconset resource="../../../resources.qrc">
+          <iconset resource="../resources_editor.qrc">
            <normaloff>:/qtgameengine/icons/scale.png</normaloff>:/qtgameengine/icons/scale.png</iconset>
          </property>
         </widget>
@@ -172,7 +172,7 @@
           <string>&amp;Merge</string>
          </property>
          <property name="icon">
-          <iconset resource="../../../resources.qrc">
+          <iconset resource="../resources_editor.qrc">
            <normaloff>:/qtgameengine/icons/merge.png</normaloff>:/qtgameengine/icons/merge.png</iconset>
          </property>
         </widget>
@@ -201,7 +201,7 @@
         <string>Show &amp;Information</string>
        </property>
        <property name="icon">
-        <iconset resource="../../../resources.qrc">
+        <iconset resource="../resources_editor.qrc">
          <normaloff>:/qtgameengine/icons/info.png</normaloff>:/qtgameengine/icons/info.png</iconset>
        </property>
       </widget>
@@ -278,7 +278,7 @@
   </customwidget>
  </customwidgets>
  <resources>
-  <include location="../../../resources.qrc"/>
+  <include location="../resources_editor.qrc"/>
  </resources>
  <connections>
   <connection>

src/editor/dialogs/triggersdialog.ui

@@ -40,7 +40,7 @@
           <string>&amp;Load</string>
          </property>
          <property name="icon">
-          <iconset resource="../../../resources.qrc">
+          <iconset resource="../resources_editor.qrc">
            <normaloff>:/qtgameengine/icons/open.png</normaloff>:/qtgameengine/icons/open.png</iconset>
          </property>
         </widget>
@@ -54,7 +54,7 @@
           <string>&amp;Delete</string>
          </property>
          <property name="icon">
-          <iconset resource="../../../resources.qrc">
+          <iconset resource="../resources_editor.qrc">
            <normaloff>:/qtgameengine/icons/delete.png</normaloff>:/qtgameengine/icons/delete.png</iconset>
          </property>
         </widget>
@@ -68,7 +68,7 @@
           <string>&amp;Add</string>
          </property>
          <property name="icon">
-          <iconset resource="../../../resources.qrc">
+          <iconset resource="../resources_editor.qrc">
            <normaloff>:/qtgameengine/icons/add.png</normaloff>:/qtgameengine/icons/add.png</iconset>
          </property>
         </widget>
@@ -82,7 +82,7 @@
           <string>&amp;Clear</string>
          </property>
          <property name="icon">
-          <iconset resource="../../../resources.qrc">
+          <iconset resource="../resources_editor.qrc">
            <normaloff>:/qtgameengine/icons/new.png</normaloff>:/qtgameengine/icons/new.png</iconset>
          </property>
         </widget>
@@ -96,7 +96,7 @@
           <string>&amp;Save</string>
          </property>
          <property name="icon">
-          <iconset resource="../../../resources.qrc">
+          <iconset resource="../resources_editor.qrc">
            <normaloff>:/qtgameengine/icons/save.png</normaloff>:/qtgameengine/icons/save.png</iconset>
          </property>
         </widget>
@@ -246,7 +246,7 @@
   </layout>
  </widget>
  <resources>
-  <include location="../../../resources.qrc"/>
+  <include location="../resources_editor.qrc"/>
  </resources>
  <connections>
   <connection>

src/editor/dialogs/userdefinedconstantsdialog.ui

@@ -14,7 +14,7 @@
    <string>User-Defined Constants</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="../../../resources.qrc">
+   <iconset resource="../resources_editor.qrc">
     <normaloff>:/qtgameengine/icons/constants.png</normaloff>:/qtgameengine/icons/constants.png</iconset>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2" stretch="1,0">
@@ -39,7 +39,7 @@
            <string>&amp;Insert</string>
           </property>
           <property name="icon">
-           <iconset resource="../../../resources.qrc">
+           <iconset resource="../resources_editor.qrc">
             <normaloff>:/qtgameengine/icons/add.png</normaloff>:/qtgameengine/icons/add.png</iconset>
           </property>
          </widget>
@@ -53,7 +53,7 @@
            <string>&amp;Sort</string>
           </property>
           <property name="icon">
-           <iconset resource="../../../resources.qrc">
+           <iconset resource="../resources_editor.qrc">
             <normaloff>:/qtgameengine/icons/sort.png</normaloff>:/qtgameengine/icons/sort.png</iconset>
           </property>
          </widget>
@@ -67,7 +67,7 @@
            <string>&amp;Delete</string>
           </property>
           <property name="icon">
-           <iconset resource="../../../resources.qrc">
+           <iconset resource="../resources_editor.qrc">
             <normaloff>:/qtgameengine/icons/delete.png</normaloff>:/qtgameengine/icons/delete.png</iconset>
           </property>
          </widget>
@@ -81,7 +81,7 @@
            <string>&amp;Load</string>
           </property>
           <property name="icon">
-           <iconset resource="../../../resources.qrc">
+           <iconset resource="../resources_editor.qrc">
             <normaloff>:/qtgameengine/icons/open.png</normaloff>:/qtgameengine/icons/open.png</iconset>
           </property>
          </widget>
@@ -95,7 +95,7 @@
            <string>&amp;Up</string>
           </property>
           <property name="icon">
-           <iconset resource="../../../resources.qrc">
+           <iconset resource="../resources_editor.qrc">
             <normaloff>:/qtgameengine/icons/arrow-up.png</normaloff>:/qtgameengine/icons/arrow-up.png</iconset>
           </property>
          </widget>
@@ -109,7 +109,7 @@
            <string>&amp;Add</string>
           </property>
           <property name="icon">
-           <iconset resource="../../../resources.qrc">
+           <iconset resource="../resources_editor.qrc">
             <normaloff>:/qtgameengine/icons/add.png</normaloff>:/qtgameengine/icons/add.png</iconset>
           </property>
          </widget>
@@ -123,7 +123,7 @@
            <string>&amp;Clear</string>
           </property>
           <property name="icon">
-           <iconset resource="../../../resources.qrc">
+           <iconset resource="../resources_editor.qrc">
             <normaloff>:/qtgameengine/icons/new.png</normaloff>:/qtgameengine/icons/new.png</iconset>
           </property>
          </widget>
@@ -137,7 +137,7 @@
            <string>Do&amp;wn</string>
           </property>
           <property name="icon">
-           <iconset resource="../../../resources.qrc">
+           <iconset resource="../resources_editor.qrc">
             <normaloff>:/qtgameengine/icons/arrow-down.png</normaloff>:/qtgameengine/icons/arrow-down.png</iconset>
           </property>
          </widget>
@@ -151,7 +151,7 @@
            <string>Sa&amp;ve</string>
           </property>
           <property name="icon">
-           <iconset resource="../../../resources.qrc">
+           <iconset resource="../resources_editor.qrc">
             <normaloff>:/qtgameengine/icons/save.png</normaloff>:/qtgameengine/icons/save.png</iconset>
           </property>
          </widget>
@@ -174,7 +174,7 @@
   </layout>
  </widget>
  <resources>
-  <include location="../../../resources.qrc"/>
+  <include location="../resources_editor.qrc"/>
  </resources>
  <connections>
   <connection>