From d52bce55df43c53c8087edba8795a672fb18b6f3 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Mon, 17 Oct 2016 22:07:58 +0200
Subject: [PATCH] Improve fallback icons

---
 tray/gui/connectionoptionpage.ui              | 20 +++++-----
 tray/gui/launcheroptionpage.ui                | 12 +++---
 tray/gui/traywidget.ui                        | 39 +++++++++----------
 tray/resources/icons.qrc                      |  5 +++
 .../hicolor/scalable/actions/edit-paste.svg   | 13 +++++++
 .../hicolor/scalable/actions/list-add.svg     | 13 +++++++
 .../hicolor/scalable/actions/list-remove.svg  | 16 ++++++++
 .../hicolor/scalable/actions/process-stop.svg | 17 ++++++++
 .../scalable/places/folder-download.svg       | 14 +++++++
 9 files changed, 115 insertions(+), 34 deletions(-)
 create mode 100644 tray/resources/icons/hicolor/scalable/actions/edit-paste.svg
 create mode 100644 tray/resources/icons/hicolor/scalable/actions/list-add.svg
 create mode 100644 tray/resources/icons/hicolor/scalable/actions/list-remove.svg
 create mode 100644 tray/resources/icons/hicolor/scalable/actions/process-stop.svg
 create mode 100644 tray/resources/icons/hicolor/scalable/places/folder-download.svg

diff --git a/tray/gui/connectionoptionpage.ui b/tray/gui/connectionoptionpage.ui
index 464b5c1..4216f83 100644
--- a/tray/gui/connectionoptionpage.ui
+++ b/tray/gui/connectionoptionpage.ui
@@ -75,8 +75,8 @@
          <string>Add secondary instance</string>
         </property>
         <property name="icon">
-         <iconset theme="list-add">
-          <normaloff>.</normaloff>.</iconset>
+         <iconset theme="list-add" resource="../resources/icons.qrc">
+          <normaloff>:/icons/hicolor/scalable/actions/list-add.svg</normaloff>:/icons/hicolor/scalable/actions/list-add.svg</iconset>
         </property>
        </widget>
       </item>
@@ -92,8 +92,8 @@
          <string>Remove currently selected secondary instance</string>
         </property>
         <property name="icon">
-         <iconset theme="list-remove">
-          <normaloff>.</normaloff>.</iconset>
+         <iconset theme="list-remove" resource="../resources/icons.qrc">
+          <normaloff>:/icons/hicolor/scalable/actions/list-remove.svg</normaloff>:/icons/hicolor/scalable/actions/list-remove.svg</iconset>
         </property>
        </widget>
       </item>
@@ -228,8 +228,8 @@
       <string>Insert values from local Syncthing configuration</string>
      </property>
      <property name="icon">
-      <iconset theme="edit-paste">
-       <normaloff>.</normaloff>.</iconset>
+      <iconset theme="edit-paste" resource="../resources/icons.qrc">
+       <normaloff>:/icons/hicolor/scalable/actions/edit-paste.svg</normaloff>:/icons/hicolor/scalable/actions/edit-paste.svg</iconset>
      </property>
     </widget>
    </item>
@@ -266,8 +266,8 @@
       <string>Apply connection settings and try to reconnect with the currently selected config</string>
      </property>
      <property name="icon">
-      <iconset theme="view-refresh">
-       <normaloff>.</normaloff>.</iconset>
+      <iconset theme="view-refresh" resource="../resources/icons.qrc">
+       <normaloff>:/icons/hicolor/scalable/actions/view-refresh.svg</normaloff>:/icons/hicolor/scalable/actions/view-refresh.svg</iconset>
      </property>
     </widget>
    </item>
@@ -395,7 +395,9 @@
    <container>1</container>
   </customwidget>
  </customwidgets>
- <resources/>
+ <resources>
+  <include location="../resources/icons.qrc"/>
+ </resources>
  <connections>
   <connection>
    <sender>authCheckBox</sender>
diff --git a/tray/gui/launcheroptionpage.ui b/tray/gui/launcheroptionpage.ui
index cfbef8b..e3dce3c 100644
--- a/tray/gui/launcheroptionpage.ui
+++ b/tray/gui/launcheroptionpage.ui
@@ -111,8 +111,8 @@
         <string>Apply and launch now</string>
        </property>
        <property name="icon">
-        <iconset theme="view-refresh">
-         <normaloff>.</normaloff>.</iconset>
+        <iconset theme="view-refresh" resource="../resources/icons.qrc">
+         <normaloff>:/icons/hicolor/scalable/actions/view-refresh.svg</normaloff>:/icons/hicolor/scalable/actions/view-refresh.svg</iconset>
        </property>
       </widget>
      </item>
@@ -128,8 +128,8 @@
         <string>Stop launched instance</string>
        </property>
        <property name="icon">
-        <iconset theme="process-stop">
-         <normaloff>.</normaloff>.</iconset>
+        <iconset theme="process-stop" resource="../resources/icons.qrc">
+         <normaloff>:/icons/hicolor/scalable/actions/process-stop.svg</normaloff>:/icons/hicolor/scalable/actions/process-stop.svg</iconset>
        </property>
       </widget>
      </item>
@@ -178,7 +178,9 @@
    <header location="global">qtutilities/widgets/clearplaintextedit.h</header>
   </customwidget>
  </customwidgets>
- <resources/>
+ <resources>
+  <include location="../resources/icons.qrc"/>
+ </resources>
  <connections>
   <connection>
    <sender>enabledCheckBox</sender>
diff --git a/tray/gui/traywidget.ui b/tray/gui/traywidget.ui
index 5fc6d2c..f96f864 100644
--- a/tray/gui/traywidget.ui
+++ b/tray/gui/traywidget.ui
@@ -66,8 +66,8 @@
          <string>Close</string>
         </property>
         <property name="icon">
-         <iconset theme="window-close">
-          <normaloff>.</normaloff>.</iconset>
+         <iconset theme="window-close" resource="../resources/icons.qrc">
+          <normaloff>:/icons/hicolor/scalable/actions/window-close.svg</normaloff>:/icons/hicolor/scalable/actions/window-close.svg</iconset>
         </property>
         <property name="flat">
          <bool>true</bool>
@@ -80,8 +80,8 @@
          <string>About</string>
         </property>
         <property name="icon">
-         <iconset theme="help-about">
-          <normaloff>.</normaloff>.</iconset>
+         <iconset theme="help-about" resource="../resources/icons.qrc">
+          <normaloff>:/icons/hicolor/scalable/actions/help-about.svg</normaloff>:/icons/hicolor/scalable/actions/help-about.svg</iconset>
         </property>
         <property name="flat">
          <bool>true</bool>
@@ -107,8 +107,8 @@
          <string>Connect</string>
         </property>
         <property name="icon">
-         <iconset theme="view-refresh">
-          <normaloff>.</normaloff>.</iconset>
+         <iconset theme="view-refresh" resource="../resources/icons.qrc">
+          <normaloff>:/icons/hicolor/scalable/actions/view-refresh.svg</normaloff>:/icons/hicolor/scalable/actions/view-refresh.svg</iconset>
         </property>
         <property name="flat">
          <bool>true</bool>
@@ -134,8 +134,8 @@
          <string>Settings</string>
         </property>
         <property name="icon">
-         <iconset theme="preferences-other">
-          <normaloff>.</normaloff>.</iconset>
+         <iconset theme="preferences-other" resource="../resources/icons.qrc">
+          <normaloff>:/icons/hicolor/scalable/actions/application-menu.svg</normaloff>:/icons/hicolor/scalable/actions/application-menu.svg</iconset>
         </property>
         <property name="flat">
          <bool>true</bool>
@@ -148,8 +148,8 @@
          <string>Web UI</string>
         </property>
         <property name="icon">
-         <iconset theme="internet-web-browser">
-          <normaloff>.</normaloff>.</iconset>
+         <iconset theme="internet-web-browser" resource="../resources/icons.qrc">
+          <normaloff>:/icons/hicolor/scalable/apps/internet-web-browser.svg</normaloff>:/icons/hicolor/scalable/apps/internet-web-browser.svg</iconset>
         </property>
         <property name="flat">
          <bool>true</bool>
@@ -276,8 +276,7 @@ For &lt;i&gt;all&lt;/i&gt; notifications, checkout the log</string>
          <string>New notifications</string>
         </property>
         <property name="icon">
-         <iconset theme="dialog-warning">
-          <normaloff>.</normaloff>.</iconset>
+         <iconset theme="dialog-warning"/>
         </property>
         <property name="flat">
          <bool>true</bool>
@@ -293,8 +292,8 @@ For &lt;i&gt;all&lt;/i&gt; notifications, checkout the log</string>
          </sizepolicy>
         </property>
         <property name="icon">
-         <iconset theme="network-connect">
-          <normaloff>.</normaloff>.</iconset>
+         <iconset theme="network-connect" resource="../resources/icons.qrc">
+          <normaloff>:/icons/hicolor/scalable/actions/network-connect.svg</normaloff>:/icons/hicolor/scalable/actions/network-connect.svg</iconset>
         </property>
         <property name="flat">
          <bool>true</bool>
@@ -317,8 +316,8 @@ 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">
-        <normaloff>.</normaloff>.</iconset>
+       <iconset theme="folder" resource="../resources/icons.qrc">
+        <normaloff>:/icons/hicolor/scalable/places/folder.svg</normaloff>:/icons/hicolor/scalable/places/folder.svg</iconset>
       </attribute>
       <attribute name="title">
        <string>Directories</string>
@@ -346,8 +345,8 @@ 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">
-        <normaloff>.</normaloff>.</iconset>
+       <iconset theme="network-server" resource="../resources/icons.qrc">
+        <normaloff>:/icons/hicolor/scalable/places/network-workgroup.svg</normaloff>:/icons/hicolor/scalable/places/network-workgroup.svg</iconset>
       </attribute>
       <attribute name="title">
        <string>Devices</string>
@@ -375,8 +374,8 @@ 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">
-        <normaloff>.</normaloff>.</iconset>
+       <iconset theme="folder-download" resource="../resources/icons.qrc">
+        <normaloff>:/icons/hicolor/scalable/places/folder-download.svg</normaloff>:/icons/hicolor/scalable/places/folder-download.svg</iconset>
       </attribute>
       <attribute name="title">
        <string>Downloads</string>
diff --git a/tray/resources/icons.qrc b/tray/resources/icons.qrc
index f1b31ca..b0b62e4 100644
--- a/tray/resources/icons.qrc
+++ b/tray/resources/icons.qrc
@@ -28,5 +28,10 @@
         <file>icons/hicolor/scalable/apps/system-run.svg</file>
         <file>icons/hicolor/scalable/actions/network-connect.svg</file>
         <file>icons/hicolor/scalable/status/syncthing-error-sync.svg</file>
+        <file>icons/hicolor/scalable/places/folder-download.svg</file>
+        <file>icons/hicolor/scalable/actions/process-stop.svg</file>
+        <file>icons/hicolor/scalable/actions/list-add.svg</file>
+        <file>icons/hicolor/scalable/actions/list-remove.svg</file>
+        <file>icons/hicolor/scalable/actions/edit-paste.svg</file>
     </qresource>
 </RCC>
diff --git a/tray/resources/icons/hicolor/scalable/actions/edit-paste.svg b/tray/resources/icons/hicolor/scalable/actions/edit-paste.svg
new file mode 100644
index 0000000..a44fa96
--- /dev/null
+++ b/tray/resources/icons/hicolor/scalable/actions/edit-paste.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#4d4d4d;
+      }
+      </style>
+  </defs>
+ <path style="fill:currentColor;fill-opacity:1;stroke:none" 
+       d="M 5 2 L 5 3 L 3 3 L 3 14 L 7 14 L 8 14 L 12 14 L 13 14 L 13 13 L 13 9 L 13 3 L 11 3 L 11 2 L 5 2 z M 4 4 L 5 4 L 5 5 L 11 5 L 11 4 L 12 4 L 12 6 L 12 12 L 12 13 L 8 13 L 7 13 L 4 13 L 4 12 L 4 6 L 4 4 z M 5 7 L 5 8 L 10 8 L 10 7 L 5 7 z M 5 10 L 5 11 L 8 11 L 8 10 L 5 10 z "
+     class="ColorScheme-Text"
+     />
+</svg>
diff --git a/tray/resources/icons/hicolor/scalable/actions/list-add.svg b/tray/resources/icons/hicolor/scalable/actions/list-add.svg
new file mode 100644
index 0000000..1d51e24
--- /dev/null
+++ b/tray/resources/icons/hicolor/scalable/actions/list-add.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#4d4d4d;
+      }
+      </style>
+  </defs>
+ <path style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 7 3.0058594 L 7 8 L 2 8 L 2 8.9980469 L 7 8.9980469 L 7 14.007812 L 8 14.007812 L 8 8.9980469 L 13 8.9980469 L 13 8 L 8 8 L 8 3.0058594 L 7 3.0058594 z "
+     class="ColorScheme-Text"
+     />
+</svg>
diff --git a/tray/resources/icons/hicolor/scalable/actions/list-remove.svg b/tray/resources/icons/hicolor/scalable/actions/list-remove.svg
new file mode 100644
index 0000000..405bd4a
--- /dev/null
+++ b/tray/resources/icons/hicolor/scalable/actions/list-remove.svg
@@ -0,0 +1,16 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#4d4d4d;
+      }
+      .ColorScheme-NegativeText {
+        color:#da4453;
+      }
+      </style>
+  </defs>
+  <path
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     class="ColorScheme-NegativeText"
+    d="m8 2c-3.314 0-6 2.686-6 6 0 3.314 2.686 6 6 6 3.314 0 6-2.686 6-6 0-3.314-2.686-6-6-6m0 1c2.761 0 5 2.239 5 5 0 1.2-.452 2.263-1.156 3.125l-6.969-6.969c.862-.704 1.925-1.156 3.125-1.156m-3.844 1.875l6.969 6.969c-.862.704-1.925 1.156-3.125 1.156-2.761 0-5-2.239-5-5 0-1.2.452-2.263 1.156-3.125" />
+</svg>
diff --git a/tray/resources/icons/hicolor/scalable/actions/process-stop.svg b/tray/resources/icons/hicolor/scalable/actions/process-stop.svg
new file mode 100644
index 0000000..24ed518
--- /dev/null
+++ b/tray/resources/icons/hicolor/scalable/actions/process-stop.svg
@@ -0,0 +1,17 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#4d4d4d;
+      }
+      .ColorScheme-NegativeText {
+        color:#da4453;
+      }
+      </style>
+  </defs>
+  <path
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     class="ColorScheme-NegativeText"
+    d="M 8 2 A 6 5.9999852 0 0 0 4.5273438 3.1132812 L 5.2460938 3.8320312 A 5 5 0 0 1 8 3 A 5 5 0 0 1 13 8 A 5 5 0 0 1 12.167969 10.753906 L 12.884766 11.470703 A 6 5.9999852 0 0 0 14 8 A 6 5.9999852 0 0 0 8 2 z M 3.1152344 4.5292969 A 6 5.9999852 0 0 0 2 8 A 6 5.9999852 0 0 0 8 14 A 6 5.9999852 0 0 0 11.472656 12.886719 L 10.753906 12.167969 A 5 5 0 0 1 8 13 A 5 5 0 0 1 3 8 A 5 5 0 0 1 3.8320312 5.2460938 L 3.1152344 4.5292969 z M 5 7 L 5 9 L 11 9 L 11 7 L 5 7 z "
+          />
+</svg>
diff --git a/tray/resources/icons/hicolor/scalable/places/folder-download.svg b/tray/resources/icons/hicolor/scalable/places/folder-download.svg
new file mode 100644
index 0000000..dda006f
--- /dev/null
+++ b/tray/resources/icons/hicolor/scalable/places/folder-download.svg
@@ -0,0 +1,14 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#4d4d4d;
+      }
+      </style>
+  </defs>
+    <path 
+        style="fill:currentColor;fill-opacity:1;stroke:none" 
+        d="M 6 2 L 6 3 L 6 6 L 7 6 L 7 3 L 9 3 L 9 6 L 10 6 L 10 3 L 10 2 L 6 2 z M 3.7070312 6 L 3 6.7070312 L 6.2929688 10 L 8 11.707031 L 9.7070312 10 L 13 6.7070312 L 12.292969 6 L 9 9.2929688 L 8 10.292969 L 7 9.2929688 L 3.7070312 6 z M 2 12 L 2 14 L 3 14 L 14 14 L 14 13 L 14 12 L 13 12 L 13 13 L 3 13 L 3 12 L 2 12 z " 
+          id="rect4099" 
+          class="ColorScheme-Text"/>
+</svg>