From aaf25f4cc343f5ca5157ab473a60452acfbcd7b5 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 23 Apr 2017 13:57:23 +0200
Subject: [PATCH] Fix path of resource files

---
 tray/gui/connectionoptionpage.ui | 22 +++++++++++-----------
 tray/gui/launcheroptionpage.ui   | 18 +++++++++---------
 tray/gui/traywidget.ui           | 27 ++++++++++++++-------------
 3 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/tray/gui/connectionoptionpage.ui b/tray/gui/connectionoptionpage.ui
index b0c0aeb..6d31b77 100644
--- a/tray/gui/connectionoptionpage.ui
+++ b/tray/gui/connectionoptionpage.ui
@@ -75,7 +75,7 @@
          <string>Add secondary instance</string>
         </property>
         <property name="icon">
-         <iconset theme="list-add" resource="../resources/icons.qrc">
+         <iconset theme="list-add" resource="../resources/syncthingtrayicons.qrc">
           <normaloff>:/icons/hicolor/scalable/actions/list-add.svg</normaloff>:/icons/hicolor/scalable/actions/list-add.svg</iconset>
         </property>
        </widget>
@@ -92,7 +92,7 @@
          <string>Remove currently selected secondary instance</string>
         </property>
         <property name="icon">
-         <iconset theme="list-remove" resource="../resources/icons.qrc">
+         <iconset theme="list-remove" resource="../resources/syncthingtrayicons.qrc">
           <normaloff>:/icons/hicolor/scalable/actions/list-remove.svg</normaloff>:/icons/hicolor/scalable/actions/list-remove.svg</iconset>
         </property>
        </widget>
@@ -232,7 +232,7 @@
       <string>Insert values from local Syncthing configuration</string>
      </property>
      <property name="icon">
-      <iconset theme="edit-paste" resource="../resources/icons.qrc">
+      <iconset theme="edit-paste" resource="../resources/syncthingtrayicons.qrc">
        <normaloff>:/icons/hicolor/scalable/actions/edit-paste.svg</normaloff>:/icons/hicolor/scalable/actions/edit-paste.svg</iconset>
      </property>
     </widget>
@@ -408,7 +408,7 @@
       <string>Apply connection settings and try to reconnect with the currently selected config</string>
      </property>
      <property name="icon">
-      <iconset theme="view-refresh" resource="../resources/icons.qrc">
+      <iconset theme="view-refresh" resource="../resources/syncthingtrayicons.qrc">
        <normaloff>:/icons/hicolor/scalable/actions/view-refresh.svg</normaloff>:/icons/hicolor/scalable/actions/view-refresh.svg</iconset>
      </property>
     </widget>
@@ -416,20 +416,20 @@
   </layout>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>Widgets::PathSelection</class>
+   <extends>QWidget</extends>
+   <header>widgets/pathselection.h</header>
+   <container>1</container>
+  </customwidget>
   <customwidget>
    <class>Widgets::ClearLineEdit</class>
    <extends>QLineEdit</extends>
    <header location="global">qtutilities/widgets/clearlineedit.h</header>
   </customwidget>
-  <customwidget>
-   <class>Widgets::PathSelection</class>
-   <extends>QWidget</extends>
-   <header location="global">qtutilities/widgets/pathselection.h</header>
-   <container>1</container>
-  </customwidget>
  </customwidgets>
  <resources>
-  <include location="../resources/icons.qrc"/>
+  <include location="../resources/syncthingtrayicons.qrc"/>
  </resources>
  <connections>
   <connection>
diff --git a/tray/gui/launcheroptionpage.ui b/tray/gui/launcheroptionpage.ui
index 8aadd5f..afbe873 100644
--- a/tray/gui/launcheroptionpage.ui
+++ b/tray/gui/launcheroptionpage.ui
@@ -103,7 +103,7 @@
         <string>Apply and launch now</string>
        </property>
        <property name="icon">
-        <iconset theme="view-refresh" resource="../resources/icons.qrc">
+        <iconset theme="view-refresh" resource="../resources/syncthingtrayicons.qrc">
          <normaloff>:/icons/hicolor/scalable/actions/view-refresh.svg</normaloff>:/icons/hicolor/scalable/actions/view-refresh.svg</iconset>
        </property>
       </widget>
@@ -120,7 +120,7 @@
         <string>Stop launched instance</string>
        </property>
        <property name="icon">
-        <iconset theme="process-stop" resource="../resources/icons.qrc">
+        <iconset theme="process-stop" resource="../resources/syncthingtrayicons.qrc">
          <normaloff>:/icons/hicolor/scalable/actions/process-stop.svg</normaloff>:/icons/hicolor/scalable/actions/process-stop.svg</iconset>
        </property>
       </widget>
@@ -153,17 +153,17 @@
   </layout>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>Widgets::PathSelection</class>
+   <extends>QWidget</extends>
+   <header>widgets/pathselection.h</header>
+   <container>1</container>
+  </customwidget>
   <customwidget>
    <class>Widgets::ClearLineEdit</class>
    <extends>QLineEdit</extends>
    <header location="global">qtutilities/widgets/clearlineedit.h</header>
   </customwidget>
-  <customwidget>
-   <class>Widgets::PathSelection</class>
-   <extends>QWidget</extends>
-   <header location="global">qtutilities/widgets/pathselection.h</header>
-   <container>1</container>
-  </customwidget>
   <customwidget>
    <class>Widgets::ClearPlainTextEdit</class>
    <extends>QPlainTextEdit</extends>
@@ -171,7 +171,7 @@
   </customwidget>
  </customwidgets>
  <resources>
-  <include location="../resources/icons.qrc"/>
+  <include location="../resources/syncthingtrayicons.qrc"/>
  </resources>
  <connections>
   <connection>
diff --git a/tray/gui/traywidget.ui b/tray/gui/traywidget.ui
index 7373543..636d045 100644
--- a/tray/gui/traywidget.ui
+++ b/tray/gui/traywidget.ui
@@ -6,7 +6,7 @@
    <string>Syncthing Tray</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="../resources/icons.qrc">
+   <iconset resource="../resources/syncthingtrayicons.qrc">
     <normaloff>:/icons/hicolor/scalable/app/syncthingtray.svg</normaloff>:/icons/hicolor/scalable/app/syncthingtray.svg</iconset>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
@@ -58,7 +58,7 @@
          <string>Close</string>
         </property>
         <property name="icon">
-         <iconset theme="window-close" resource="../resources/icons.qrc">
+         <iconset theme="window-close" resource="../resources/syncthingtrayicons.qrc">
           <normaloff>:/icons/hicolor/scalable/actions/window-close.svg</normaloff>:/icons/hicolor/scalable/actions/window-close.svg</iconset>
         </property>
         <property name="flat">
@@ -72,7 +72,7 @@
          <string>About</string>
         </property>
         <property name="icon">
-         <iconset theme="help-about" resource="../resources/icons.qrc">
+         <iconset theme="help-about" resource="../resources/syncthingtrayicons.qrc">
           <normaloff>:/icons/hicolor/scalable/actions/help-about.svg</normaloff>:/icons/hicolor/scalable/actions/help-about.svg</iconset>
         </property>
         <property name="flat">
@@ -99,7 +99,7 @@
          <string>Connect</string>
         </property>
         <property name="icon">
-         <iconset theme="view-refresh" resource="../resources/icons.qrc">
+         <iconset theme="view-refresh" resource="../resources/syncthingtrayicons.qrc">
           <normaloff>:/icons/hicolor/scalable/actions/view-refresh.svg</normaloff>:/icons/hicolor/scalable/actions/view-refresh.svg</iconset>
         </property>
         <property name="flat">
@@ -113,7 +113,7 @@
          <string>Start</string>
         </property>
         <property name="icon">
-         <iconset theme="system-run" resource="../resources/icons.qrc">
+         <iconset theme="system-run" resource="../resources/syncthingtrayicons.qrc">
           <normaloff>:/icons/hicolor/scalable/apps/system-run.svg</normaloff>:/icons/hicolor/scalable/apps/system-run.svg</iconset>
         </property>
         <property name="flat">
@@ -140,7 +140,7 @@
          <string>Settings</string>
         </property>
         <property name="icon">
-         <iconset theme="preferences-other" resource="../resources/icons.qrc">
+         <iconset theme="preferences-other" resource="../resources/syncthingtrayicons.qrc">
           <normaloff>:/icons/hicolor/scalable/actions/application-menu.svg</normaloff>:/icons/hicolor/scalable/actions/application-menu.svg</iconset>
         </property>
         <property name="flat">
@@ -154,7 +154,7 @@
          <string>Web UI</string>
         </property>
         <property name="icon">
-         <iconset theme="internet-web-browser" resource="../resources/icons.qrc">
+         <iconset theme="internet-web-browser" resource="../resources/syncthingtrayicons.qrc">
           <normaloff>:/icons/hicolor/scalable/apps/internet-web-browser.svg</normaloff>:/icons/hicolor/scalable/apps/internet-web-browser.svg</iconset>
         </property>
         <property name="flat">
@@ -346,7 +346,7 @@ For &lt;i&gt;all&lt;/i&gt; notifications, checkout the log</string>
            </sizepolicy>
           </property>
           <property name="icon">
-           <iconset theme="network-connect" resource="../resources/icons.qrc">
+           <iconset theme="network-connect" resource="../resources/syncthingtrayicons.qrc">
             <normaloff>:/icons/hicolor/scalable/actions/network-connect.svg</normaloff>:/icons/hicolor/scalable/actions/network-connect.svg</iconset>
           </property>
           <property name="flat">
@@ -372,7 +372,7 @@ For &lt;i&gt;all&lt;/i&gt; notifications, checkout the log</string>
      </property>
      <widget class="QWidget" name="dirsTab">
       <attribute name="icon">
-       <iconset theme="folder" resource="../resources/icons.qrc">
+       <iconset theme="folder" resource="../resources/syncthingtrayicons.qrc">
         <normaloff>:/icons/hicolor/scalable/places/folder.svg</normaloff>:/icons/hicolor/scalable/places/folder.svg</iconset>
       </attribute>
       <attribute name="title">
@@ -401,7 +401,7 @@ For &lt;i&gt;all&lt;/i&gt; notifications, checkout the log</string>
      </widget>
      <widget class="QWidget" name="devsTab">
       <attribute name="icon">
-       <iconset theme="network-server" resource="../resources/icons.qrc">
+       <iconset theme="network-server" resource="../resources/syncthingtrayicons.qrc">
         <normaloff>:/icons/hicolor/scalable/places/network-workgroup.svg</normaloff>:/icons/hicolor/scalable/places/network-workgroup.svg</iconset>
       </attribute>
       <attribute name="title">
@@ -430,7 +430,7 @@ For &lt;i&gt;all&lt;/i&gt; notifications, checkout the log</string>
      </widget>
      <widget class="QWidget" name="downloadsTab">
       <attribute name="icon">
-       <iconset theme="folder-download" resource="../resources/icons.qrc">
+       <iconset theme="folder-download" resource="../resources/syncthingtrayicons.qrc">
         <normaloff>:/icons/hicolor/scalable/places/folder-download.svg</normaloff>:/icons/hicolor/scalable/places/folder-download.svg</iconset>
       </attribute>
       <attribute name="title">
@@ -462,7 +462,7 @@ For &lt;i&gt;all&lt;/i&gt; notifications, checkout the log</string>
   </layout>
   <action name="actionShowNotifications">
    <property name="icon">
-    <iconset theme="text-x-generic" resource="../resources/icons.qrc">
+    <iconset theme="text-x-generic" resource="../../model/resources/syncthingmodelicons.qrc">
      <normaloff>:/icons/hicolor/scalable/mimetypes/text-x-generic.svg</normaloff>:/icons/hicolor/scalable/mimetypes/text-x-generic.svg</iconset>
    </property>
    <property name="text">
@@ -498,7 +498,8 @@ For &lt;i&gt;all&lt;/i&gt; notifications, checkout the log</string>
   </customwidget>
  </customwidgets>
  <resources>
-  <include location="../resources/icons.qrc"/>
+  <include location="../../model/resources/syncthingmodelicons.qrc"/>
+  <include location="../resources/syncthingtrayicons.qrc"/>
  </resources>
  <connections/>
 </ui>