Merge remote-tracking branch 'ivan/bug/update-ui-resources-path' into develop

4 files changed, 28 insertions, 25 deletions

diff --git a/src/leap/bitmask/gui/ui/loggerwindow.ui b/src/leap/bitmask/gui/ui/loggerwindow.ui
index 47a1e717..3de786f7 100644
--- a/src/leap/bitmask/gui/ui/loggerwindow.ui
+++ b/src/leap/bitmask/gui/ui/loggerwindow.ui
@@ -14,7 +14,7 @@
    <string>Logs</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="../../../../data/resources/mainwindow.qrc">
+   <iconset resource="../../../../../data/resources/mainwindow.qrc">
     <normaloff>:/images/mask-icon.png</normaloff>:/images/mask-icon.png</iconset>
   </property>
   <layout class="QGridLayout" name="gridLayout">
@@ -49,7 +49,7 @@
         <string>Debug</string>
        </property>
        <property name="icon">
-        <iconset resource="../../../../data/resources/loggerwindow.qrc">
+        <iconset resource="../../../../../data/resources/loggerwindow.qrc">
          <normaloff>:/images/oxygen-icons/script-error.png</normaloff>:/images/oxygen-icons/script-error.png</iconset>
        </property>
        <property name="checkable">
@@ -69,7 +69,7 @@
         <string>Info</string>
        </property>
        <property name="icon">
-        <iconset resource="../../../../data/resources/loggerwindow.qrc">
+        <iconset resource="../../../../../data/resources/loggerwindow.qrc">
          <normaloff>:/images/oxygen-icons/dialog-information.png</normaloff>:/images/oxygen-icons/dialog-information.png</iconset>
        </property>
        <property name="checkable">
@@ -89,7 +89,7 @@
         <string>Warning</string>
        </property>
        <property name="icon">
-        <iconset resource="../../../../data/resources/loggerwindow.qrc">
+        <iconset resource="../../../../../data/resources/loggerwindow.qrc">
          <normaloff>:/images/oxygen-icons/dialog-warning.png</normaloff>:/images/oxygen-icons/dialog-warning.png</iconset>
        </property>
        <property name="checkable">
@@ -109,7 +109,7 @@
         <string>Error</string>
        </property>
        <property name="icon">
-        <iconset resource="../../../../data/resources/loggerwindow.qrc">
+        <iconset resource="../../../../../data/resources/loggerwindow.qrc">
          <normaloff>:/images/oxygen-icons/dialog-error.png</normaloff>:/images/oxygen-icons/dialog-error.png</iconset>
        </property>
        <property name="checkable">
@@ -129,7 +129,7 @@
         <string>Critical</string>
        </property>
        <property name="icon">
-        <iconset resource="../../../../data/resources/loggerwindow.qrc">
+        <iconset resource="../../../../../data/resources/loggerwindow.qrc">
          <normaloff>:/images/oxygen-icons/edit-bomb.png</normaloff>:/images/oxygen-icons/edit-bomb.png</iconset>
        </property>
        <property name="checkable">
@@ -149,7 +149,7 @@
         <string>Save to file</string>
        </property>
        <property name="icon">
-        <iconset resource="../../../../data/resources/loggerwindow.qrc">
+        <iconset resource="../../../../../data/resources/loggerwindow.qrc">
          <normaloff>:/images/oxygen-icons/document-save-as.png</normaloff>:/images/oxygen-icons/document-save-as.png</iconset>
        </property>
       </widget>
@@ -168,8 +168,8 @@
   <tabstop>txtLogHistory</tabstop>
  </tabstops>
  <resources>
-  <include location="../../../../data/resources/loggerwindow.qrc"/>
-  <include location="../../../../data/resources/mainwindow.qrc"/>
+  <include location="../../../../../data/resources/loggerwindow.qrc"/>
+  <include location="../../../../../data/resources/mainwindow.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/src/leap/bitmask/gui/ui/mainwindow.ui b/src/leap/bitmask/gui/ui/mainwindow.ui
index ecd3cbe9..9c4e6ff0 100644
--- a/src/leap/bitmask/gui/ui/mainwindow.ui
+++ b/src/leap/bitmask/gui/ui/mainwindow.ui
@@ -14,7 +14,7 @@
    <string>Bitmask</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="../../../../data/resources/mainwindow.qrc">
+   <iconset resource="../../../../../data/resources/mainwindow.qrc">
     <normaloff>:/images/mask-icon.png</normaloff>:/images/mask-icon.png</iconset>
   </property>
   <property name="inputMethodHints">
@@ -166,7 +166,7 @@
        <string/>
       </property>
       <property name="pixmap">
-       <pixmap resource="../../../../data/resources/mainwindow.qrc">:/images/mask-launcher.png</pixmap>
+       <pixmap resource="../../../../../data/resources/mainwindow.qrc">:/images/mask-launcher.png</pixmap>
       </property>
       <property name="alignment">
        <set>Qt::AlignCenter</set>
@@ -308,8 +308,9 @@
   </action>
  </widget>
  <resources>
+  <include location="../../../../../data/resources/mainwindow.qrc"/>
+  <include location="../../../../../data/resources/locale.qrc"/>
   <include location="../../../../data/resources/mainwindow.qrc"/>
-  <include location="../../../../data/resources/locale.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/src/leap/bitmask/gui/ui/statuspanel.ui b/src/leap/bitmask/gui/ui/statuspanel.ui
index 3482ac7c..baf05421 100644
--- a/src/leap/bitmask/gui/ui/statuspanel.ui
+++ b/src/leap/bitmask/gui/ui/statuspanel.ui
@@ -114,7 +114,7 @@
          <string/>
         </property>
         <property name="pixmap">
-         <pixmap resource="../../../../data/resources/icons.qrc">:/images/light/64/network-eip-down.png</pixmap>
+         <pixmap resource="../../../../../data/resources/icons.qrc">:/images/light/64/network-eip-down.png</pixmap>
         </property>
         <property name="alignment">
          <set>Qt::AlignCenter</set>
@@ -135,7 +135,7 @@
            <string/>
           </property>
           <property name="pixmap">
-           <pixmap resource="../../../../data/resources/icons.qrc">:/images/light/16/down-arrow.png</pixmap>
+           <pixmap resource="../../../../../data/resources/icons.qrc">:/images/light/16/down-arrow.png</pixmap>
           </property>
          </widget>
         </item>
@@ -192,7 +192,7 @@
            <string/>
           </property>
           <property name="pixmap">
-           <pixmap resource="../../../../data/resources/icons.qrc">:/images/light/16/up-arrow.png</pixmap>
+           <pixmap resource="../../../../../data/resources/icons.qrc">:/images/light/16/up-arrow.png</pixmap>
           </property>
          </widget>
         </item>
@@ -283,6 +283,7 @@
   </layout>
  </widget>
  <resources>
+  <include location="../../../../../data/resources/icons.qrc"/>
   <include location="../../../../data/resources/icons.qrc"/>
  </resources>
  <connections/>
diff --git a/src/leap/bitmask/gui/ui/wizard.ui b/src/leap/bitmask/gui/ui/wizard.ui
index 5e0108dc..d52b8a7c 100644
--- a/src/leap/bitmask/gui/ui/wizard.ui
+++ b/src/leap/bitmask/gui/ui/wizard.ui
@@ -14,7 +14,7 @@
    <string>Bitmask first run</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="../../../../data/resources/mainwindow.qrc">
+   <iconset resource="../../../../../data/resources/mainwindow.qrc">
     <normaloff>:/images/mask-icon.png</normaloff>:/images/mask-icon.png</iconset>
   </property>
   <property name="modal">
@@ -193,7 +193,7 @@
           <string/>
          </property>
          <property name="pixmap">
-          <pixmap resource="../../../../data/resources/mainwindow.qrc">:/images/Emblem-question.png</pixmap>
+          <pixmap resource="../../../../../data/resources/mainwindow.qrc">:/images/Emblem-question.png</pixmap>
          </property>
         </widget>
        </item>
@@ -215,7 +215,7 @@
           <string/>
          </property>
          <property name="pixmap">
-          <pixmap resource="../../../../data/resources/mainwindow.qrc">:/images/Emblem-question.png</pixmap>
+          <pixmap resource="../../../../../data/resources/mainwindow.qrc">:/images/Emblem-question.png</pixmap>
          </property>
         </widget>
        </item>
@@ -237,7 +237,7 @@
           <string/>
          </property>
          <property name="pixmap">
-          <pixmap resource="../../../../data/resources/mainwindow.qrc">:/images/Emblem-question.png</pixmap>
+          <pixmap resource="../../../../../data/resources/mainwindow.qrc">:/images/Emblem-question.png</pixmap>
          </property>
         </widget>
        </item>
@@ -486,7 +486,7 @@
           <string/>
          </property>
          <property name="pixmap">
-          <pixmap resource="../../../../data/resources/mainwindow.qrc">:/images/Emblem-question.png</pixmap>
+          <pixmap resource="../../../../../data/resources/mainwindow.qrc">:/images/Emblem-question.png</pixmap>
          </property>
         </widget>
        </item>
@@ -508,7 +508,7 @@
           <string/>
          </property>
          <property name="pixmap">
-          <pixmap resource="../../../../data/resources/mainwindow.qrc">:/images/Emblem-question.png</pixmap>
+          <pixmap resource="../../../../../data/resources/mainwindow.qrc">:/images/Emblem-question.png</pixmap>
          </property>
         </widget>
        </item>
@@ -551,7 +551,7 @@
           <string/>
          </property>
          <property name="pixmap">
-          <pixmap resource="../../../../data/resources/mainwindow.qrc">:/images/Emblem-question.png</pixmap>
+          <pixmap resource="../../../../../data/resources/mainwindow.qrc">:/images/Emblem-question.png</pixmap>
          </property>
         </widget>
        </item>
@@ -771,7 +771,7 @@
        <string/>
       </property>
       <property name="pixmap">
-       <pixmap resource="../../../../data/resources/mainwindow.qrc">:/images/mask-icon.png</pixmap>
+       <pixmap resource="../../../../../data/resources/mainwindow.qrc">:/images/mask-icon.png</pixmap>
       </property>
      </widget>
     </item>
@@ -787,7 +787,7 @@
        <string/>
       </property>
       <property name="pixmap">
-       <pixmap resource="../../../../data/resources/mainwindow.qrc">:/images/Globe.png</pixmap>
+       <pixmap resource="../../../../../data/resources/mainwindow.qrc">:/images/Globe.png</pixmap>
       </property>
      </widget>
     </item>
@@ -839,8 +839,9 @@
   <tabstop>btnCheck</tabstop>
  </tabstops>
  <resources>
+  <include location="../../../../../data/resources/mainwindow.qrc"/>
+  <include location="../../../../../data/resources/locale.qrc"/>
   <include location="../../../../data/resources/mainwindow.qrc"/>
-  <include location="../../../../data/resources/locale.qrc"/>
  </resources>
  <connections/>
 </ui>