Swift
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Swift/QtUI/QtLoginWindow.cpp6
-rw-r--r--Swift/QtUI/Swift.qrc1
-rw-r--r--Swift/QtUI/UserSearch/QtUserSearchWindow.cpp4
-rw-r--r--Swift/QtUI/Whiteboard/QtWhiteboardWindow.cpp29
-rw-r--r--Swift/resources/logo/logo-icon-16-win.pngbin0 -> 1464 bytes
5 files changed, 30 insertions, 10 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,7 +1,7 @@
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 */
6 6
7#include "QtLoginWindow.h" 7#include "QtLoginWindow.h"
@@ -54,12 +54,16 @@ namespace Swift{
54QtLoginWindow::QtLoginWindow(UIEventStream* uiEventStream, SettingsProvider* settings, TimerFactory* timerFactory) : QMainWindow(), settings_(settings), timerFactory_(timerFactory) { 54QtLoginWindow::QtLoginWindow(UIEventStream* uiEventStream, SettingsProvider* settings, TimerFactory* timerFactory) : QMainWindow(), settings_(settings), timerFactory_(timerFactory) {
55 uiEventStream_ = uiEventStream; 55 uiEventStream_ = uiEventStream;
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"));
64 68
65 resize(200, 500); 69 resize(200, 500);
diff --git a/Swift/QtUI/Swift.qrc b/Swift/QtUI/Swift.qrc
index eeef80d..0478d76 100644
--- a/Swift/QtUI/Swift.qrc
+++ b/Swift/QtUI/Swift.qrc
@@ -1,9 +1,10 @@
1<!DOCTYPE RCC> 1<!DOCTYPE RCC>
2<RCC version="1.0"> 2<RCC version="1.0">
3 <qresource> 3 <qresource>
4 <file alias="logo-icon-16.png">../resources/logo/logo-icon-16.png</file> 4 <file alias="logo-icon-16.png">../resources/logo/logo-icon-16.png</file>
5 <file alias="logo-icon-16-win.png">../resources/logo/logo-icon-16-win.png</file>
5 <file alias="logo-chat-16.png">../resources/logo/logo-chat-16.png</file> 6 <file alias="logo-chat-16.png">../resources/logo/logo-chat-16.png</file>
6 <file alias="logo-shaded-text.256.png">../resources/logo/logo-shaded-text.256.png</file> 7 <file alias="logo-shaded-text.256.png">../resources/logo/logo-shaded-text.256.png</file>
7 <file alias="icons/online.png">../resources/icons/online.png</file> 8 <file alias="icons/online.png">../resources/icons/online.png</file>
8 <file alias="icons/connecting.mng">../resources/icons/connecting.mng</file> 9 <file alias="icons/connecting.mng">../resources/icons/connecting.mng</file>
9 <file alias="icons/away.png">../resources/icons/away.png</file> 10 <file alias="icons/away.png">../resources/icons/away.png</file>
diff --git a/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp b/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp
index bb6fc31..52b17b0 100644
--- a/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp
+++ b/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp
@@ -37,12 +37,16 @@
37namespace Swift { 37namespace Swift {
38 38
39QtUserSearchWindow::QtUserSearchWindow(UIEventStream* eventStream, UserSearchWindow::Type type, const std::set<std::string>& groups, SettingsProvider* settingsProvider) : eventStream_(eventStream), type_(type), model_(NULL), firstMultiJIDPage_(NULL), settings_(settingsProvider), searchNext_(false), supportsImpromptu_(false) { 39QtUserSearchWindow::QtUserSearchWindow(UIEventStream* eventStream, UserSearchWindow::Type type, const std::set<std::string>& groups, SettingsProvider* settingsProvider) : eventStream_(eventStream), type_(type), model_(NULL), firstMultiJIDPage_(NULL), settings_(settingsProvider), searchNext_(false), supportsImpromptu_(false) {
40 setupUi(this); 40 setupUi(this);
41#ifndef Q_OS_MAC 41#ifndef Q_OS_MAC
42#ifdef Q_OS_WIN32
43 setWindowIcon(QIcon(":/logo-icon-16-win.png"));
44#else
42 setWindowIcon(QIcon(":/logo-icon-16.png")); 45 setWindowIcon(QIcon(":/logo-icon-16.png"));
43#endif 46#endif
47#endif
44 QString title; 48 QString title;
45 switch(type) { 49 switch(type) {
46 case AddContact: 50 case AddContact:
47 title = tr("Add Contact"); 51 title = tr("Add Contact");
48 break; 52 break;
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
@@ -2,34 +2,45 @@
2 * Copyright (c) 2012 Mateusz Piękos 2 * Copyright (c) 2012 Mateusz Piękos
3 * Licensed under the simplified BSD license. 3 * Licensed under the simplified BSD license.
4 * See Documentation/Licenses/BSD-simplified.txt for more information. 4 * See Documentation/Licenses/BSD-simplified.txt for more information.
5 */ 5 */
6 6
7/*
8 * Copyright (c) 2015 Isode Limited.
9 * All rights reserved.
10 * See the COPYING file for more information.
11 */
12
7#include "QtWhiteboardWindow.h" 13#include "QtWhiteboardWindow.h"
8 14
9#include <iostream> 15#include <iostream>
10 16
11#include <boost/bind.hpp> 17#include <boost/bind.hpp>
12#include <boost/smart_ptr/make_shared.hpp>
13#include <boost/numeric/conversion/cast.hpp> 18#include <boost/numeric/conversion/cast.hpp>
19#include <boost/smart_ptr/make_shared.hpp>
14 20
15#include <Swiften/Whiteboard/WhiteboardSession.h> 21#include <QLabel>
16#include <Swiften/Elements/WhiteboardPayload.h> 22#include <QMessageBox>
23
24#include <Swiften/Elements/Whiteboard/WhiteboardDeleteOperation.h>
25#include <Swiften/Elements/Whiteboard/WhiteboardInsertOperation.h>
17#include <Swiften/Elements/Whiteboard/WhiteboardLineElement.h> 26#include <Swiften/Elements/Whiteboard/WhiteboardLineElement.h>
18#include <Swiften/Elements/Whiteboard/WhiteboardRectElement.h> 27#include <Swiften/Elements/Whiteboard/WhiteboardRectElement.h>
19#include <Swiften/Elements/Whiteboard/WhiteboardInsertOperation.h>
20#include <Swiften/Elements/Whiteboard/WhiteboardUpdateOperation.h> 28#include <Swiften/Elements/Whiteboard/WhiteboardUpdateOperation.h>
21#include <Swiften/Elements/Whiteboard/WhiteboardDeleteOperation.h> 29#include <Swiften/Elements/WhiteboardPayload.h>
22#include <Swift/QtUI/Whiteboard/WhiteboardElementDrawingVisitor.h> 30#include <Swiften/Whiteboard/WhiteboardSession.h>
23 31
24#include <QMessageBox> 32#include <Swift/QtUI/Whiteboard/WhiteboardElementDrawingVisitor.h>
25#include <QLabel>
26 33
27namespace Swift { 34namespace Swift {
28 QtWhiteboardWindow::QtWhiteboardWindow(WhiteboardSession::ref whiteboardSession) : QWidget() { 35 QtWhiteboardWindow::QtWhiteboardWindow(WhiteboardSession::ref whiteboardSession) : QWidget() {
29#ifndef Q_OS_MAC 36#ifndef Q_OS_MAC
30 setWindowIcon(QIcon(":/logo-icon-16.png")); 37#ifdef Q_OS_WIN32
38 setWindowIcon(QIcon(":/logo-icon-16-win.png"));
39#else
40 setWindowIcon(QIcon(":/logo-icon-16.png"));
41#endif
31#endif 42#endif
32 layout = new QVBoxLayout(this); 43 layout = new QVBoxLayout(this);
33 hLayout = new QHBoxLayout; 44 hLayout = new QHBoxLayout;
34 sidebarLayout = new QVBoxLayout; 45 sidebarLayout = new QVBoxLayout;
35 toolboxLayout = new QGridLayout; 46 toolboxLayout = new QGridLayout;
diff --git a/Swift/resources/logo/logo-icon-16-win.png b/Swift/resources/logo/logo-icon-16-win.png
new file mode 100644
index 0000000..84642b9
--- /dev/null
+++ b/Swift/resources/logo/logo-icon-16-win.png
Binary files differ