From: Joel Holdsworth <joel@airwebreathe.org.uk>
Date: Fri, 11 May 2012 09:05:52 +0000 (+0100)
Subject: Added application icon
X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=commitdiff_plain;h=f1bf525a3aff65cd2d88e0f9e24b609f1f90d233

Added application icon
---

diff --git a/icons/sigrok-logo-notext.png b/icons/sigrok-logo-notext.png
new file mode 100644
index 0000000..cf01c3f
Binary files /dev/null and b/icons/sigrok-logo-notext.png differ
diff --git a/mainwindow.ui b/mainwindow.ui
index 532063c..85bbcef 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -13,6 +13,10 @@
   <property name="windowTitle" >
    <string>MainWindow</string>
   </property>
+  <property name="windowIcon">
+   <iconset>
+    <normaloff>:/icons/sigrok-logo-notext.png</normaloff>:/icons/sigrok-logo-notext.png</iconset>
+  </property>
   <widget class="QMenuBar" name="menuBar" />
   <widget class="QWidget" name="centralWidget" />
   <widget class="QStatusBar" name="statusBar" />
@@ -20,5 +24,8 @@
  <layoutDefault spacing="6" margin="11" />
  <pixmapfunction></pixmapfunction>
  <resources/>
+ <resources>
+  <include location="sigrok-qt2.qrc"/>
+ </resources>
  <connections/>
 </ui>
diff --git a/sigrok-qt2.pro b/sigrok-qt2.pro
index dde5399..4741d76 100644
--- a/sigrok-qt2.pro
+++ b/sigrok-qt2.pro
@@ -20,6 +20,8 @@ HEADERS  += mainwindow.h
 
 FORMS    += mainwindow.ui
 
+RESOURCES    += sigrok-qt2.qrc
+
 # libsigrok and libsigrokdecode
 # TODO: Check for the minimum versions of libsigrok/libsigrokdecode we need.
 win32 {
diff --git a/sigrok-qt2.qrc b/sigrok-qt2.qrc
new file mode 100644
index 0000000..c94ab73
--- /dev/null
+++ b/sigrok-qt2.qrc
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/" >
+        <file>icons/sigrok-logo-notext.png</file>
+    </qresource>
+</RCC>