summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2010-06-04 19:22:51 (GMT)
committerRemko Tronçon <git@el-tramo.be>2010-06-04 19:22:51 (GMT)
commitbc38b4d08f335a7f65cfec7248c88b6dd4d72847 (patch)
tree4adb3a4cb25868979136f98c58f70cd6d455e857
parentdd2d1fbbce68afda9b9857a84564924f05935c4a (diff)
downloadswift-contrib-bc38b4d08f335a7f65cfec7248c88b6dd4d72847.zip
swift-contrib-bc38b4d08f335a7f65cfec7248c88b6dd4d72847.tar.bz2
Put icons on windows.
-rw-r--r--Swift/QtUI/QtAboutWidget.cpp3
-rw-r--r--Swift/QtUI/QtChatTabs.cpp2
-rw-r--r--Swift/QtUI/QtLoginWindow.cpp1
-rw-r--r--Swift/QtUI/Swift.qrc2
-rw-r--r--Swift/resources/logo/logo-chat-100.pngbin0 -> 5414 bytes
-rw-r--r--Swift/resources/logo/logo-chat-16.pngbin0 -> 3005 bytes
6 files changed, 8 insertions, 0 deletions
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
--- /dev/null
+++ b/Swift/resources/logo/logo-chat-100.png
Binary files 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
--- /dev/null
+++ b/Swift/resources/logo/logo-chat-16.png
Binary files differ