From b9ebf06188ccb0458500a630f61de211fe33a3d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Lemaire?= <michael@thunderk.net>
Date: Mon, 24 Feb 2014 22:30:27 +0100
Subject: [PATCH] Fixed path of resources in UI files

---
 src/interface/desktop/common/mainwindow.ui    | 36 +++++++++----------
 .../desktop/common/widgetglobalformbuttons.ui |  8 ++---
 .../desktop/lighting/DialogMaterialEditor.ui  | 10 +++---
 .../desktop/terrain/dialogterrainpainting.ui  |  4 +--
 .../desktop/terrain/mainterrainform.ui        | 10 +++---
 .../desktop/textures/DialogTexturesLayer.ui   | 14 ++++----
 .../desktop/textures/maintexturesform.ui      | 22 ++++++------
 7 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/src/interface/desktop/common/mainwindow.ui b/src/interface/desktop/common/mainwindow.ui
index 8958a02..6a676eb 100644
--- a/src/interface/desktop/common/mainwindow.ui
+++ b/src/interface/desktop/common/mainwindow.ui
@@ -14,7 +14,7 @@
    <string>Paysages 3D</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="../../../data/ui_pictures.qrc">
+   <iconset resource="../../../../data/ui_pictures.qrc">
     <normaloff>:/logo/images/logo_32.png</normaloff>:/logo/images/logo_32.png</iconset>
   </property>
   <widget class="QWidget" name="centralwidget">
@@ -162,7 +162,7 @@
              <string>Explore in 3D</string>
             </property>
             <property name="icon">
-             <iconset resource="../../../data/ui_pictures.qrc">
+             <iconset resource="../../../../data/ui_pictures.qrc">
               <normaloff>:/buttons/logo/images/explore.png</normaloff>:/buttons/logo/images/explore.png</iconset>
             </property>
             <property name="shortcut">
@@ -176,7 +176,7 @@
              <string>Render</string>
             </property>
             <property name="icon">
-             <iconset resource="../../../data/ui_pictures.qrc">
+             <iconset resource="../../../../data/ui_pictures.qrc">
               <normaloff>:/buttons/logo/images/render.png</normaloff>:/buttons/logo/images/render.png</iconset>
             </property>
            </widget>
@@ -209,7 +209,7 @@
              <string>New</string>
             </property>
             <property name="icon">
-             <iconset resource="../../../data/ui_pictures.qrc">
+             <iconset resource="../../../../data/ui_pictures.qrc">
               <normaloff>:/buttons/logo/images/new.png</normaloff>:/buttons/logo/images/new.png</iconset>
             </property>
            </widget>
@@ -220,7 +220,7 @@
              <string>Save</string>
             </property>
             <property name="icon">
-             <iconset resource="../../../data/ui_pictures.qrc">
+             <iconset resource="../../../../data/ui_pictures.qrc">
               <normaloff>:/buttons/logo/images/save.png</normaloff>:/buttons/logo/images/save.png</iconset>
             </property>
            </widget>
@@ -231,7 +231,7 @@
              <string>Load</string>
             </property>
             <property name="icon">
-             <iconset resource="../../../data/ui_pictures.qrc">
+             <iconset resource="../../../../data/ui_pictures.qrc">
               <normaloff>:/buttons/logo/images/load.png</normaloff>:/buttons/logo/images/load.png</iconset>
             </property>
            </widget>
@@ -268,7 +268,7 @@
       </property>
       <widget class="MainTerrainForm" name="tab_terrain">
        <attribute name="icon">
-        <iconset resource="../../../data/ui_pictures.qrc">
+        <iconset resource="../../../../data/ui_pictures.qrc">
          <normaloff>:/tabs/images/tab_terrain.png</normaloff>:/tabs/images/tab_terrain.png</iconset>
        </attribute>
        <attribute name="title">
@@ -277,7 +277,7 @@
       </widget>
       <widget class="MainTexturesForm" name="tab">
        <attribute name="icon">
-        <iconset resource="../../../data/ui_pictures.qrc">
+        <iconset resource="../../../../data/ui_pictures.qrc">
          <normaloff>:/tabs/images/tab_textures.png</normaloff>:/tabs/images/tab_textures.png</iconset>
        </attribute>
        <attribute name="title">
@@ -332,7 +332,7 @@
      <x>0</x>
      <y>0</y>
      <width>946</width>
-     <height>25</height>
+     <height>20</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">
@@ -364,7 +364,7 @@
   </widget>
   <action name="action_explore">
    <property name="icon">
-    <iconset resource="../../../data/ui_pictures.qrc">
+    <iconset resource="../../../../data/ui_pictures.qrc">
      <normaloff>:/buttons/logo/images/explore.png</normaloff>:/buttons/logo/images/explore.png</iconset>
    </property>
    <property name="text">
@@ -379,7 +379,7 @@
   </action>
   <action name="action_file_new">
    <property name="icon">
-    <iconset resource="../../../data/ui_pictures.qrc">
+    <iconset resource="../../../../data/ui_pictures.qrc">
      <normaloff>:/buttons/logo/images/new.png</normaloff>:/buttons/logo/images/new.png</iconset>
    </property>
    <property name="text">
@@ -394,7 +394,7 @@
   </action>
   <action name="action_file_load">
    <property name="icon">
-    <iconset resource="../../../data/ui_pictures.qrc">
+    <iconset resource="../../../../data/ui_pictures.qrc">
      <normaloff>:/buttons/logo/images/load.png</normaloff>:/buttons/logo/images/load.png</iconset>
    </property>
    <property name="text">
@@ -409,7 +409,7 @@
   </action>
   <action name="action_file_save">
    <property name="icon">
-    <iconset resource="../../../data/ui_pictures.qrc">
+    <iconset resource="../../../../data/ui_pictures.qrc">
      <normaloff>:/buttons/logo/images/save.png</normaloff>:/buttons/logo/images/save.png</iconset>
    </property>
    <property name="text">
@@ -424,7 +424,7 @@
   </action>
   <action name="action_quick_render">
    <property name="icon">
-    <iconset resource="../../../data/ui_pictures.qrc">
+    <iconset resource="../../../../data/ui_pictures.qrc">
      <normaloff>:/buttons/logo/images/render.png</normaloff>:/buttons/logo/images/render.png</iconset>
    </property>
    <property name="text">
@@ -439,7 +439,7 @@
   </action>
   <action name="action_final_render">
    <property name="icon">
-    <iconset resource="../../../data/ui_pictures.qrc">
+    <iconset resource="../../../../data/ui_pictures.qrc">
      <normaloff>:/buttons/logo/images/render.png</normaloff>:/buttons/logo/images/render.png</iconset>
    </property>
    <property name="text">
@@ -454,7 +454,7 @@
   </action>
   <action name="action_about">
    <property name="icon">
-    <iconset resource="../../../data/ui_pictures.qrc">
+    <iconset resource="../../../../data/ui_pictures.qrc">
      <normaloff>:/buttons/logo/images/about.png</normaloff>:/buttons/logo/images/about.png</iconset>
    </property>
    <property name="text">
@@ -469,7 +469,7 @@
   </action>
   <action name="action_last_render">
    <property name="icon">
-    <iconset resource="../../../data/ui_pictures.qrc">
+    <iconset resource="../../../../data/ui_pictures.qrc">
      <normaloff>:/buttons/logo/images/render.png</normaloff>:/buttons/logo/images/render.png</iconset>
    </property>
    <property name="text">
@@ -498,7 +498,7 @@
   </customwidget>
  </customwidgets>
  <resources>
-  <include location="../../../data/ui_pictures.qrc"/>
+  <include location="../../../../data/ui_pictures.qrc"/>
  </resources>
  <connections>
   <connection>
diff --git a/src/interface/desktop/common/widgetglobalformbuttons.ui b/src/interface/desktop/common/widgetglobalformbuttons.ui
index ff5bfdd..e8c5c32 100644
--- a/src/interface/desktop/common/widgetglobalformbuttons.ui
+++ b/src/interface/desktop/common/widgetglobalformbuttons.ui
@@ -32,7 +32,7 @@
       <string>Cancel</string>
      </property>
      <property name="icon">
-      <iconset resource="../../../data/ui_pictures.qrc">
+      <iconset resource="../../../../data/ui_pictures.qrc">
        <normaloff>:/buttons/logo/images/cancel.png</normaloff>:/buttons/logo/images/cancel.png</iconset>
      </property>
     </widget>
@@ -49,7 +49,7 @@
       <string>Revert modifications</string>
      </property>
      <property name="icon">
-      <iconset resource="../../../data/ui_pictures.qrc">
+      <iconset resource="../../../../data/ui_pictures.qrc">
        <normaloff>:/buttons/logo/images/revert.png</normaloff>:/buttons/logo/images/revert.png</iconset>
      </property>
     </widget>
@@ -66,7 +66,7 @@
       <string>Validate</string>
      </property>
      <property name="icon">
-      <iconset resource="../../../data/ui_pictures.qrc">
+      <iconset resource="../../../../data/ui_pictures.qrc">
        <normaloff>:/buttons/logo/images/apply.png</normaloff>:/buttons/logo/images/apply.png</iconset>
      </property>
     </widget>
@@ -74,7 +74,7 @@
   </layout>
  </widget>
  <resources>
-  <include location="../../../data/ui_pictures.qrc"/>
+  <include location="../../../../data/ui_pictures.qrc"/>
  </resources>
  <connections/>
  <slots>
diff --git a/src/interface/desktop/lighting/DialogMaterialEditor.ui b/src/interface/desktop/lighting/DialogMaterialEditor.ui
index 3b0eea4..2cd6599 100644
--- a/src/interface/desktop/lighting/DialogMaterialEditor.ui
+++ b/src/interface/desktop/lighting/DialogMaterialEditor.ui
@@ -9,7 +9,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1091</width>
+    <width>1139</width>
     <height>627</height>
    </rect>
   </property>
@@ -350,7 +350,7 @@
            <string>Cancel</string>
           </property>
           <property name="icon">
-           <iconset resource="../../../data/ui_pictures.qrc">
+           <iconset resource="../../../../data/ui_pictures.qrc">
             <normaloff>:/buttons/logo/images/cancel.png</normaloff>:/buttons/logo/images/cancel.png</iconset>
           </property>
          </widget>
@@ -361,7 +361,7 @@
            <string>Revert</string>
           </property>
           <property name="icon">
-           <iconset resource="../../../data/ui_pictures.qrc">
+           <iconset resource="../../../../data/ui_pictures.qrc">
             <normaloff>:/buttons/logo/images/revert.png</normaloff>:/buttons/logo/images/revert.png</iconset>
           </property>
          </widget>
@@ -372,7 +372,7 @@
            <string>Ok</string>
           </property>
           <property name="icon">
-           <iconset resource="../../../data/ui_pictures.qrc">
+           <iconset resource="../../../../data/ui_pictures.qrc">
             <normaloff>:/buttons/logo/images/apply.png</normaloff>:/buttons/logo/images/apply.png</iconset>
           </property>
          </widget>
@@ -410,7 +410,7 @@
   </customwidget>
  </customwidgets>
  <resources>
-  <include location="../../../data/ui_pictures.qrc"/>
+  <include location="../../../../data/ui_pictures.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/src/interface/desktop/terrain/dialogterrainpainting.ui b/src/interface/desktop/terrain/dialogterrainpainting.ui
index eb2b84b..bef6f50 100644
--- a/src/interface/desktop/terrain/dialogterrainpainting.ui
+++ b/src/interface/desktop/terrain/dialogterrainpainting.ui
@@ -101,7 +101,7 @@
              <string>Commands</string>
             </property>
             <property name="icon">
-             <iconset resource="../../../data/ui_pictures.qrc">
+             <iconset resource="../../../../data/ui_pictures.qrc">
               <normaloff>:/buttons/logo/images/about.png</normaloff>:/buttons/logo/images/about.png</iconset>
             </property>
             <property name="iconSize">
@@ -788,7 +788,7 @@
   <tabstop>input_brush_strength</tabstop>
  </tabstops>
  <resources>
-  <include location="../../../data/ui_pictures.qrc"/>
+  <include location="../../../../data/ui_pictures.qrc"/>
  </resources>
  <connections>
   <connection>
diff --git a/src/interface/desktop/terrain/mainterrainform.ui b/src/interface/desktop/terrain/mainterrainform.ui
index b6b4958..fdfe52d 100644
--- a/src/interface/desktop/terrain/mainterrainform.ui
+++ b/src/interface/desktop/terrain/mainterrainform.ui
@@ -442,7 +442,7 @@
            <string>Render preview</string>
           </property>
           <property name="icon">
-           <iconset resource="../../../data/ui_pictures.qrc">
+           <iconset resource="../../../../data/ui_pictures.qrc">
             <normaloff>:/buttons/logo/images/render.png</normaloff>:/buttons/logo/images/render.png</iconset>
           </property>
          </widget>
@@ -453,7 +453,7 @@
            <string>Explore in 3D</string>
           </property>
           <property name="icon">
-           <iconset resource="../../../data/ui_pictures.qrc">
+           <iconset resource="../../../../data/ui_pictures.qrc">
             <normaloff>:/buttons/logo/images/explore.png</normaloff>:/buttons/logo/images/explore.png</iconset>
           </property>
          </widget>
@@ -489,7 +489,7 @@
            <string>Revert modifications</string>
           </property>
           <property name="icon">
-           <iconset resource="../../../data/ui_pictures.qrc">
+           <iconset resource="../../../../data/ui_pictures.qrc">
             <normaloff>:/buttons/logo/images/revert.png</normaloff>:/buttons/logo/images/revert.png</iconset>
           </property>
          </widget>
@@ -500,7 +500,7 @@
            <string>Apply modifications</string>
           </property>
           <property name="icon">
-           <iconset resource="../../../data/ui_pictures.qrc">
+           <iconset resource="../../../../data/ui_pictures.qrc">
             <normaloff>:/buttons/logo/images/apply.png</normaloff>:/buttons/logo/images/apply.png</iconset>
           </property>
          </widget>
@@ -532,7 +532,7 @@
   </customwidget>
  </customwidgets>
  <resources>
-  <include location="../../../data/ui_pictures.qrc"/>
+  <include location="../../../../data/ui_pictures.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/src/interface/desktop/textures/DialogTexturesLayer.ui b/src/interface/desktop/textures/DialogTexturesLayer.ui
index 599eb8d..723bb78 100644
--- a/src/interface/desktop/textures/DialogTexturesLayer.ui
+++ b/src/interface/desktop/textures/DialogTexturesLayer.ui
@@ -209,7 +209,7 @@
            <string>Explore in 3D</string>
           </property>
           <property name="icon">
-           <iconset resource="../../../data/ui_pictures.qrc">
+           <iconset resource="../../../../data/ui_pictures.qrc">
             <normaloff>:/buttons/logo/images/explore.png</normaloff>:/buttons/logo/images/explore.png</iconset>
           </property>
          </widget>
@@ -220,7 +220,7 @@
            <string>Cancel</string>
           </property>
           <property name="icon">
-           <iconset resource="../../../data/ui_pictures.qrc">
+           <iconset resource="../../../../data/ui_pictures.qrc">
             <normaloff>:/buttons/logo/images/cancel.png</normaloff>:/buttons/logo/images/cancel.png</iconset>
           </property>
          </widget>
@@ -231,7 +231,7 @@
            <string>Validate</string>
           </property>
           <property name="icon">
-           <iconset resource="../../../data/ui_pictures.qrc">
+           <iconset resource="../../../../data/ui_pictures.qrc">
             <normaloff>:/buttons/logo/images/apply.png</normaloff>:/buttons/logo/images/apply.png</iconset>
           </property>
           <property name="default">
@@ -245,7 +245,7 @@
            <string>Render preview</string>
           </property>
           <property name="icon">
-           <iconset resource="../../../data/ui_pictures.qrc">
+           <iconset resource="../../../../data/ui_pictures.qrc">
             <normaloff>:/buttons/logo/images/render.png</normaloff>:/buttons/logo/images/render.png</iconset>
           </property>
          </widget>
@@ -256,7 +256,7 @@
            <string>Load preset</string>
           </property>
           <property name="icon">
-           <iconset resource="../../../data/ui_pictures.qrc">
+           <iconset resource="../../../../data/ui_pictures.qrc">
             <normaloff>:/buttons/logo/images/auto.png</normaloff>:/buttons/logo/images/auto.png</iconset>
           </property>
          </widget>
@@ -267,7 +267,7 @@
            <string>Revert</string>
           </property>
           <property name="icon">
-           <iconset resource="../../../data/ui_pictures.qrc">
+           <iconset resource="../../../../data/ui_pictures.qrc">
             <normaloff>:/buttons/logo/images/revert.png</normaloff>:/buttons/logo/images/revert.png</iconset>
           </property>
          </widget>
@@ -288,7 +288,7 @@
   </customwidget>
  </customwidgets>
  <resources>
-  <include location="../../../data/ui_pictures.qrc"/>
+  <include location="../../../../data/ui_pictures.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/src/interface/desktop/textures/maintexturesform.ui b/src/interface/desktop/textures/maintexturesform.ui
index e703b30..c8b515d 100644
--- a/src/interface/desktop/textures/maintexturesform.ui
+++ b/src/interface/desktop/textures/maintexturesform.ui
@@ -100,7 +100,7 @@
                <string>Add layer</string>
               </property>
               <property name="icon">
-               <iconset resource="../../../data/ui_pictures.qrc">
+               <iconset resource="../../../../data/ui_pictures.qrc">
                 <normaloff>:/buttons/logo/images/layer_add.png</normaloff>:/buttons/logo/images/layer_add.png</iconset>
               </property>
               <property name="iconSize">
@@ -120,7 +120,7 @@
                <string>Remove layer</string>
               </property>
               <property name="icon">
-               <iconset resource="../../../data/ui_pictures.qrc">
+               <iconset resource="../../../../data/ui_pictures.qrc">
                 <normaloff>:/buttons/logo/images/layer_del.png</normaloff>:/buttons/logo/images/layer_del.png</iconset>
               </property>
               <property name="iconSize">
@@ -153,7 +153,7 @@
                <string>Edit layer</string>
               </property>
               <property name="icon">
-               <iconset resource="../../../data/ui_pictures.qrc">
+               <iconset resource="../../../../data/ui_pictures.qrc">
                 <normaloff>:/buttons/logo/images/layer_rename.png</normaloff>:/buttons/logo/images/layer_rename.png</iconset>
               </property>
               <property name="iconSize">
@@ -186,7 +186,7 @@
                <string>Move layer up</string>
               </property>
               <property name="icon">
-               <iconset resource="../../../data/ui_pictures.qrc">
+               <iconset resource="../../../../data/ui_pictures.qrc">
                 <normaloff>:/buttons/logo/images/layer_up.png</normaloff>:/buttons/logo/images/layer_up.png</iconset>
               </property>
               <property name="iconSize">
@@ -203,7 +203,7 @@
                <string>Move layer down</string>
               </property>
               <property name="icon">
-               <iconset resource="../../../data/ui_pictures.qrc">
+               <iconset resource="../../../../data/ui_pictures.qrc">
                 <normaloff>:/buttons/logo/images/layer_down.png</normaloff>:/buttons/logo/images/layer_down.png</iconset>
               </property>
               <property name="iconSize">
@@ -358,7 +358,7 @@
         <string>Explore in 3D</string>
        </property>
        <property name="icon">
-        <iconset resource="../../../data/ui_pictures.qrc">
+        <iconset resource="../../../../data/ui_pictures.qrc">
          <normaloff>:/buttons/logo/images/explore.png</normaloff>:/buttons/logo/images/explore.png</iconset>
        </property>
       </widget>
@@ -369,7 +369,7 @@
         <string>Render preview</string>
        </property>
        <property name="icon">
-        <iconset resource="../../../data/ui_pictures.qrc">
+        <iconset resource="../../../../data/ui_pictures.qrc">
          <normaloff>:/buttons/logo/images/render.png</normaloff>:/buttons/logo/images/render.png</iconset>
        </property>
       </widget>
@@ -402,7 +402,7 @@
            <string>Load preset</string>
           </property>
           <property name="icon">
-           <iconset resource="../../../data/ui_pictures.qrc">
+           <iconset resource="../../../../data/ui_pictures.qrc">
             <normaloff>:/buttons/logo/images/auto.png</normaloff>:/buttons/logo/images/auto.png</iconset>
           </property>
          </widget>
@@ -413,7 +413,7 @@
            <string>Revert modifications</string>
           </property>
           <property name="icon">
-           <iconset resource="../../../data/ui_pictures.qrc">
+           <iconset resource="../../../../data/ui_pictures.qrc">
             <normaloff>:/buttons/logo/images/revert.png</normaloff>:/buttons/logo/images/revert.png</iconset>
           </property>
          </widget>
@@ -424,7 +424,7 @@
            <string>Apply modifications</string>
           </property>
           <property name="icon">
-           <iconset resource="../../../data/ui_pictures.qrc">
+           <iconset resource="../../../../data/ui_pictures.qrc">
             <normaloff>:/buttons/logo/images/apply.png</normaloff>:/buttons/logo/images/apply.png</iconset>
           </property>
          </widget>
@@ -445,7 +445,7 @@
   </customwidget>
  </customwidgets>
  <resources>
-  <include location="../../../data/ui_pictures.qrc"/>
+  <include location="../../../../data/ui_pictures.qrc"/>
  </resources>
  <connections/>
 </ui>