From c5d244eeea0583eaef3a30e01e7efb2e8a060af8 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago@macieira.org>
Date: Sat, 13 Apr 2013 23:24:47 -0700
Subject: Add support for Qt resources in Subsurface

Signed-off-by: Thiago Macieira <thiago@macieira.org>
---
 subsurface.qrc | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 subsurface.qrc

(limited to 'subsurface.qrc')

diff --git a/subsurface.qrc b/subsurface.qrc
new file mode 100644
index 000000000..2496c8778
--- /dev/null
+++ b/subsurface.qrc
@@ -0,0 +1 @@
+<RCC/>
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2


From d72f4e470a42b50ad70a33fd4c389c1318b45bf1 Mon Sep 17 00:00:00 2001
From: Dirk Hohndel <dirk@hohndel.org>
Date: Tue, 23 Apr 2013 08:30:10 -0700
Subject: Consolidate the two .qrc files

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 resources.qrc  | 5 -----
 subsurface.qrc | 6 +++++-
 2 files changed, 5 insertions(+), 6 deletions(-)
 delete mode 100644 resources.qrc

(limited to 'subsurface.qrc')

diff --git a/resources.qrc b/resources.qrc
deleted file mode 100644
index e257bf8f5..000000000
--- a/resources.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
- <!DOCTYPE RCC><RCC version="1.0">
- <qresource>
-    <file alias="star">star.svg</file>
- </qresource>
- </RCC>
diff --git a/subsurface.qrc b/subsurface.qrc
index 2496c8778..e257bf8f5 100644
--- a/subsurface.qrc
+++ b/subsurface.qrc
@@ -1 +1,5 @@
-<RCC/>
\ No newline at end of file
+ <!DOCTYPE RCC><RCC version="1.0">
+ <qresource>
+    <file alias="star">star.svg</file>
+ </qresource>
+ </RCC>
-- 
cgit v1.2.3-70-g09d2


From 315c0b505c94e0a4cc14948ff47180576e4786ed Mon Sep 17 00:00:00 2001
From: Dirk Hohndel <dirk@hohndel.org>
Date: Tue, 23 Apr 2013 09:53:51 -0700
Subject: Set the window icon in Qt

And even use the resource file to allow me to use an alias for it in the
actual code.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 qt-ui/mainwindow.cpp | 1 +
 subsurface.qrc       | 1 +
 2 files changed, 2 insertions(+)

(limited to 'subsurface.qrc')

diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp
index bb4bda1af..adfb3c74a 100644
--- a/qt-ui/mainwindow.cpp
+++ b/qt-ui/mainwindow.cpp
@@ -26,6 +26,7 @@ MainWindow::MainWindow() : ui(new Ui::MainWindow()),
 {
 	ui->setupUi(this);
 	ui->ListWidget->setModel(model);
+	this->setWindowIcon(QIcon(":subsurface-icon"));
 	// Just to test the star widgets, can be safely removed.
 	StarWidget *star = new StarWidget(0);
 	star->setMaximumStars(10);
diff --git a/subsurface.qrc b/subsurface.qrc
index e257bf8f5..e1939f28e 100644
--- a/subsurface.qrc
+++ b/subsurface.qrc
@@ -1,5 +1,6 @@
  <!DOCTYPE RCC><RCC version="1.0">
  <qresource>
     <file alias="star">star.svg</file>
+    <file alias="subsurface-icon">subsurface-icon.png</file>
  </qresource>
  </RCC>
-- 
cgit v1.2.3-70-g09d2