summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2015-10-20 13:03:41 (GMT)
committerSwift Review <review@swift.im>2015-10-27 08:38:54 (GMT)
commit193335248b00556f0011b7e32b148a7a2c0eefe2 (patch)
tree38e4018d41a6f13ee6fbc977b88eeefa75e5af33 /Swift/QtUI/QtLoginWindow.cpp
parent375937b46f941a7e266b1e3aca9a95002a0483bd (diff)
downloadswift-193335248b00556f0011b7e32b148a7a2c0eefe2.zip
swift-193335248b00556f0011b7e32b148a7a2c0eefe2.tar.bz2
Change window icon to default avatar on Windows
The task bar in Windows 10 has black as the default color. The mainly black Swift application icon is hardly visible on black background. Thus this patch changes the Window icon on Windows to the default avatar icon in Swift. Test-Information: Tested on Windows 8 and Windows 10. Change-Id: I1965cf37ba5a714094cff24ab971c0fc9f9d7fe1
Diffstat (limited to 'Swift/QtUI/QtLoginWindow.cpp')
-rw-r--r--Swift/QtUI/QtLoginWindow.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/Swift/QtUI/QtLoginWindow.cpp b/Swift/QtUI/QtLoginWindow.cpp
index 1e771ff..17176a9 100644
--- a/Swift/QtUI/QtLoginWindow.cpp
+++ b/Swift/QtUI/QtLoginWindow.cpp
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (c) 2010-2012 Isode Limited. 2 * Copyright (c) 2010-2015 Isode Limited.
3 * All rights reserved. 3 * All rights reserved.
4 * See the COPYING file for more information. 4 * See the COPYING file for more information.
5 */ 5 */
@@ -56,8 +56,12 @@ QtLoginWindow::QtLoginWindow(UIEventStream* uiEventStream, SettingsProvider* set
56 56
57 setWindowTitle("Swift"); 57 setWindowTitle("Swift");
58#ifndef Q_OS_MAC 58#ifndef Q_OS_MAC
59#ifdef Q_OS_WIN32
60 setWindowIcon(QIcon(":/logo-icon-16-win.png"));
61#else
59 setWindowIcon(QIcon(":/logo-icon-16.png")); 62 setWindowIcon(QIcon(":/logo-icon-16.png"));
60#endif 63#endif
64#endif
61 QtUtilities::setX11Resource(this, "Main"); 65 QtUtilities::setX11Resource(this, "Main");
62 setAccessibleName(tr("Swift Login Window")); 66 setAccessibleName(tr("Swift Login Window"));
63 //setAccessibleDescription(tr("This window is used for providing credentials to log into your XMPP service")); 67 //setAccessibleDescription(tr("This window is used for providing credentials to log into your XMPP service"));