From bc38b4d08f335a7f65cfec7248c88b6dd4d72847 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be>
Date: Fri, 4 Jun 2010 21:22:51 +0200
Subject: Put icons on windows.


diff --git a/Swift/QtUI/QtAboutWidget.cpp b/Swift/QtUI/QtAboutWidget.cpp
index b918c3b..c216d55 100644
--- a/Swift/QtUI/QtAboutWidget.cpp
+++ b/Swift/QtUI/QtAboutWidget.cpp
@@ -21,6 +21,9 @@
 namespace Swift {
 
 QtAboutWidget::QtAboutWidget() : QDialog() {
+	setWindowTitle("About Swift");
+	setWindowIcon(QIcon(":/logo-icon-16.png"));
+
 	resize(180, 240);
 	QVBoxLayout *mainLayout = new QVBoxLayout(this);
 	mainLayout->setAlignment(Qt::AlignHCenter);
diff --git a/Swift/QtUI/QtChatTabs.cpp b/Swift/QtUI/QtChatTabs.cpp
index 0d9f8d9..6d1a8a8 100644
--- a/Swift/QtUI/QtChatTabs.cpp
+++ b/Swift/QtUI/QtChatTabs.cpp
@@ -18,6 +18,8 @@
 
 namespace Swift {
 QtChatTabs::QtChatTabs() : QWidget() {
+	setWindowIcon(QIcon(":/logo-chat-16.png"));
+
 	tabs_ = new QtTabWidget(this);
 #if QT_VERSION >= 0x040500
 	/*For Macs, change the tab rendering.*/
diff --git a/Swift/QtUI/QtLoginWindow.cpp b/Swift/QtUI/QtLoginWindow.cpp
index cc75194..982a912 100644
--- a/Swift/QtUI/QtLoginWindow.cpp
+++ b/Swift/QtUI/QtLoginWindow.cpp
@@ -36,6 +36,7 @@ QtLoginWindow::QtLoginWindow(UIEventStream* uiEventStream) : QMainWindow() {
 	uiEventStream_ = uiEventStream;
 
 	setWindowTitle("Swift");
+	setWindowIcon(QIcon(":/logo-icon-16.png"));
 	QtUtilities::setX11Resource(this, "Main");
 
 	resize(200, 500);
diff --git a/Swift/QtUI/Swift.qrc b/Swift/QtUI/Swift.qrc
index 2d58eef..b14569e 100644
--- a/Swift/QtUI/Swift.qrc
+++ b/Swift/QtUI/Swift.qrc
@@ -1,6 +1,8 @@
 <!DOCTYPE RCC>
 <RCC version="1.0">
 	<qresource>
+		<file alias="logo-icon-16.png">../resources/logo/logo-icon-16.png</file>
+		<file alias="logo-chat-16.png">../resources/logo/logo-chat-16.png</file>
 		<file alias="logo-shaded-text.256.png">../resources/logo/logo-shaded-text.256.png</file>
 		<file alias="icons/online.png">../resources/icons/online.png</file>
 		<file alias="icons/away.png">../resources/icons/away.png</file>
diff --git a/Swift/resources/logo/logo-chat-100.png b/Swift/resources/logo/logo-chat-100.png
new file mode 100644
index 0000000..79529d7
Binary files /dev/null and b/Swift/resources/logo/logo-chat-100.png differ
diff --git a/Swift/resources/logo/logo-chat-16.png b/Swift/resources/logo/logo-chat-16.png
new file mode 100644
index 0000000..38ca099
Binary files /dev/null and b/Swift/resources/logo/logo-chat-16.png differ
-- 
cgit v0.10.2-6-g49f6