From d73ab89c932cd930aab5d553ca6d8b5b351db725 Mon Sep 17 00:00:00 2001
From: Kimmo Varis <kimmov@gmail.com>
Date: Thu, 28 May 2009 11:32:32 +0300
Subject: [PATCH] Add icon files to resource file. Having resource files
 compiled in the executable makes installing the application easier
 (especially on Windows).

---
 gui/gui.pro         |  1 +
 gui/gui.qrc         | 17 +++++++++++++++++
 gui/main.cpp        |  2 +-
 gui/mainwindow.cpp  | 14 +++++++-------
 gui/resultstree.cpp |  2 +-
 5 files changed, 27 insertions(+), 9 deletions(-)
 create mode 100644 gui/gui.qrc

diff --git a/gui/gui.pro b/gui/gui.pro
index 4c13a4dc6..8fd83184b 100644
--- a/gui/gui.pro
+++ b/gui/gui.pro
@@ -9,6 +9,7 @@ INCLUDEPATH += .
 MOC_DIR = temp
 OBJECTS_DIR = temp
 CONFIG += warn_on debug
+RESOURCES = gui.qrc
 
 # Input
 HEADERS += 	mainwindow.h \
diff --git a/gui/gui.qrc b/gui/gui.qrc
new file mode 100644
index 000000000..39f8f7ce5
--- /dev/null
+++ b/gui/gui.qrc
@@ -0,0 +1,17 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+    <file>icon.png</file>
+    <file>icon.svg</file>
+    <file>images/dialog-error.png</file>
+    <file>images/dialog-information.png</file>
+    <file>images/dialog-warning.png</file>
+    <file>images/edit-clear.png</file>
+    <file>images/go-down.png</file>
+    <file>images/help-browser.png</file>
+    <file>images/media-floppy.png</file>
+    <file>images/preferences-system.png</file>
+    <file>images/process-stop.png</file>
+    <file>images/text-x-generic.png</file>
+    <file>images/view-refresh.png</file>
+</qresource>
+</RCC>
diff --git a/gui/main.cpp b/gui/main.cpp
index 6f540b64c..f95fa4183 100644
--- a/gui/main.cpp
+++ b/gui/main.cpp
@@ -24,7 +24,7 @@
 int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
-    app.setWindowIcon(QIcon("icon.png"));
+    app.setWindowIcon(QIcon(":icon.png"));
 
     MainWindow window;
     window.show();
diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
index 9406f8983..6730b9467 100644
--- a/gui/mainwindow.cpp
+++ b/gui/mainwindow.cpp
@@ -109,13 +109,13 @@ MainWindow::MainWindow() :
     QToolBar *toolbar =  addToolBar("Toolbar");
     toolbar->setIconSize(QSize(22, 22));
 
-    mActionCheckDirectory.setIcon(QIcon("icon.svg"));
-    mActionReCheck.setIcon(QIcon("images/view-refresh.png"));
-    mActionSettings.setIcon(QIcon("images/preferences-system.png"));
-    mActionAbout.setIcon(QIcon("images/help-browser.png"));
-    mActionStop.setIcon(QIcon("images/process-stop.png"));
-    mActionSave.setIcon(QIcon("images/media-floppy.png"));
-    mActionClearResults.setIcon(QIcon("images/edit-clear.png"));
+    mActionCheckDirectory.setIcon(QIcon(":icon.svg"));
+    mActionReCheck.setIcon(QIcon(":images/view-refresh.png"));
+    mActionSettings.setIcon(QIcon(":images/preferences-system.png"));
+    mActionAbout.setIcon(QIcon(":images/help-browser.png"));
+    mActionStop.setIcon(QIcon(":images/process-stop.png"));
+    mActionSave.setIcon(QIcon(":images/media-floppy.png"));
+    mActionClearResults.setIcon(QIcon(":images/edit-clear.png"));
 
     toolbar->addAction(&mActionCheckDirectory);
     toolbar->addAction(&mActionSave);
diff --git a/gui/resultstree.cpp b/gui/resultstree.cpp
index 6dc97a89a..372daaf0d 100644
--- a/gui/resultstree.cpp
+++ b/gui/resultstree.cpp
@@ -285,7 +285,7 @@ QStandardItem *ResultsTree::EnsureFileItem(const QString &name)
     }
 
     item = CreateItem(name);
-    item->setIcon(QIcon("images/text-x-generic.png"));
+    item->setIcon(QIcon(":images/text-x-generic.png"));
 
     mModel.appendRow(item);