Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2015-10-20 13:03:41 (GMT) |
|---|---|---|
| committer | Swift Review <review@swift.im> | 2015-10-27 08:38:54 (GMT) |
| commit | 193335248b00556f0011b7e32b148a7a2c0eefe2 (patch) | |
| tree | 38e4018d41a6f13ee6fbc977b88eeefa75e5af33 /Swift/QtUI/Whiteboard | |
| parent | 375937b46f941a7e266b1e3aca9a95002a0483bd (diff) | |
| download | swift-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/Whiteboard')
| -rw-r--r-- | Swift/QtUI/Whiteboard/QtWhiteboardWindow.cpp | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/Swift/QtUI/Whiteboard/QtWhiteboardWindow.cpp b/Swift/QtUI/Whiteboard/QtWhiteboardWindow.cpp index 89de95e..916246c 100644 --- a/Swift/QtUI/Whiteboard/QtWhiteboardWindow.cpp +++ b/Swift/QtUI/Whiteboard/QtWhiteboardWindow.cpp @@ -4,30 +4,41 @@ * See Documentation/Licenses/BSD-simplified.txt for more information. */ +/* + * Copyright (c) 2015 Isode Limited. + * All rights reserved. + * See the COPYING file for more information. + */ + #include "QtWhiteboardWindow.h" #include <iostream> #include <boost/bind.hpp> -#include <boost/smart_ptr/make_shared.hpp> #include <boost/numeric/conversion/cast.hpp> +#include <boost/smart_ptr/make_shared.hpp> -#include <Swiften/Whiteboard/WhiteboardSession.h> -#include <Swiften/Elements/WhiteboardPayload.h> +#include <QLabel> +#include <QMessageBox> + +#include <Swiften/Elements/Whiteboard/WhiteboardDeleteOperation.h> +#include <Swiften/Elements/Whiteboard/WhiteboardInsertOperation.h> #include <Swiften/Elements/Whiteboard/WhiteboardLineElement.h> #include <Swiften/Elements/Whiteboard/WhiteboardRectElement.h> -#include <Swiften/Elements/Whiteboard/WhiteboardInsertOperation.h> #include <Swiften/Elements/Whiteboard/WhiteboardUpdateOperation.h> -#include <Swiften/Elements/Whiteboard/WhiteboardDeleteOperation.h> -#include <Swift/QtUI/Whiteboard/WhiteboardElementDrawingVisitor.h> +#include <Swiften/Elements/WhiteboardPayload.h> +#include <Swiften/Whiteboard/WhiteboardSession.h> -#include <QMessageBox> -#include <QLabel> +#include <Swift/QtUI/Whiteboard/WhiteboardElementDrawingVisitor.h> namespace Swift { QtWhiteboardWindow::QtWhiteboardWindow(WhiteboardSession::ref whiteboardSession) : QWidget() { #ifndef Q_OS_MAC - setWindowIcon(QIcon(":/logo-icon-16.png")); +#ifdef Q_OS_WIN32 + setWindowIcon(QIcon(":/logo-icon-16-win.png")); +#else + setWindowIcon(QIcon(":/logo-icon-16.png")); +#endif #endif layout = new QVBoxLayout(this); hLayout = new QHBoxLayout; |