From e17f0cc081237ff2cf3df580da61f05b24fd09e5 Mon Sep 17 00:00:00 2001
From: Alison Watson <marrub.xz@gmail.com>
Date: Mon, 10 Jun 2019 12:05:52 -0400
Subject: [PATCH] tycho: add application icon

---
 source/tycho/resources/resources.qrc |  2 +-
 source/tycho/ui/about.ui             |  2 +-
 source/tycho/ui/menu.ui              | 23 +++++++++++++++++------
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/source/tycho/resources/resources.qrc b/source/tycho/resources/resources.qrc
index 374c078..bd03f04 100644
--- a/source/tycho/resources/resources.qrc
+++ b/source/tycho/resources/resources.qrc
@@ -1,5 +1,5 @@
 <RCC>
-  <qresource prefix="/">
+  <qresource prefix="/tycho">
     <file>color/lines.png</file>
     <file>color/map.png</file>
     <file>color/points.png</file>
diff --git a/source/tycho/ui/about.ui b/source/tycho/ui/about.ui
index e062008..4b89b8b 100644
--- a/source/tycho/ui/about.ui
+++ b/source/tycho/ui/about.ui
@@ -23,7 +23,7 @@
    <item>
     <widget class="QLabel" name="label">
      <property name="text">
-      <string>&lt;img src=&quot;qrc:///misc/tycho2.png&quot;/&gt;</string>
+      <string>&lt;img src=&quot;qrc:///tycho/misc/tycho2.png&quot;/&gt;</string>
      </property>
     </widget>
    </item>
diff --git a/source/tycho/ui/menu.ui b/source/tycho/ui/menu.ui
index 103ef1d..4142b16 100644
--- a/source/tycho/ui/menu.ui
+++ b/source/tycho/ui/menu.ui
@@ -19,6 +19,10 @@
   <property name="windowTitle">
    <string>Tycho</string>
   </property>
+  <property name="windowIcon">
+   <iconset resource="../resources/resources.qrc">
+    <normaloff>:/tycho/color/map.png</normaloff>:/tycho/color/map.png</iconset>
+  </property>
   <widget class="QWidget" name="widget">
    <layout class="QHBoxLayout" name="horizontalLayout">
     <property name="spacing">
@@ -78,7 +82,8 @@
   <widget class="QStatusBar" name="statusBar"/>
   <action name="actionOpen">
    <property name="icon">
-    <iconset theme="document-open"/>
+    <iconset theme="document-open">
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>&amp;Open Project</string>
@@ -89,7 +94,8 @@
   </action>
   <action name="actionNew">
    <property name="icon">
-    <iconset theme="document-new"/>
+    <iconset theme="document-new">
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>&amp;New Project</string>
@@ -100,7 +106,8 @@
   </action>
   <action name="actionMapProps">
    <property name="icon">
-    <iconset theme="document-properties"/>
+    <iconset theme="document-properties">
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>Map P&amp;roperties</string>
@@ -108,7 +115,8 @@
   </action>
   <action name="actionQuit">
    <property name="icon">
-    <iconset theme="application-exit"/>
+    <iconset theme="application-exit">
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>&amp;Quit</string>
@@ -119,7 +127,8 @@
   </action>
   <action name="actionAbout">
    <property name="icon">
-    <iconset theme="help-about"/>
+    <iconset theme="help-about">
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>&amp;About Tycho</string>
@@ -130,7 +139,9 @@
   </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
- <resources/>
+ <resources>
+  <include location="../resources/resources.qrc"/>
+ </resources>
  <connections>
   <connection>
    <sender>actionMapProps</sender>