]> sigrok.org Git - pulseview.git/commitdiff
Added application icon
authorJoel Holdsworth <redacted>
Fri, 11 May 2012 09:05:52 +0000 (10:05 +0100)
committerJoel Holdsworth <redacted>
Mon, 3 Sep 2012 12:49:38 +0000 (13:49 +0100)
icons/sigrok-logo-notext.png [new file with mode: 0644]
mainwindow.ui
sigrok-qt2.pro
sigrok-qt2.qrc [new file with mode: 0644]

diff --git a/icons/sigrok-logo-notext.png b/icons/sigrok-logo-notext.png
new file mode 100644 (file)
index 0000000..cf01c3f
Binary files /dev/null and b/icons/sigrok-logo-notext.png differ
index 532063cd75cf2baefc69eb457aa4ccb2e63d9ab3..85bbcefe96d433eca15d61beba167ea8f4258eb0 100644 (file)
   <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>
index dde53996a74f5d1d977ba6258691f13c432313f5..4741d7692f1792d809ffcec02aa26293370f8cec 100644 (file)
@@ -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 (file)
index 0000000..c94ab73
--- /dev/null
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/" >
+        <file>icons/sigrok-logo-notext.png</file>
+    </qresource>
+</RCC>