summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'Swift/QtUI/EventViewer/QtEventWindow.cpp')
-rw-r--r--Swift/QtUI/EventViewer/QtEventWindow.cpp28
1 files changed, 16 insertions, 12 deletions
diff --git a/Swift/QtUI/EventViewer/QtEventWindow.cpp b/Swift/QtUI/EventViewer/QtEventWindow.cpp
index 3072497..f92cd07 100644
--- a/Swift/QtUI/EventViewer/QtEventWindow.cpp
+++ b/Swift/QtUI/EventViewer/QtEventWindow.cpp
@@ -1,29 +1,29 @@
1
2/* 1/*
3 * Copyright (c) 2010-2015 Isode Limited. 2 * Copyright (c) 2010-2015 Isode Limited.
4 * All rights reserved. 3 * All rights reserved.
5 * See the COPYING file for more information. 4 * See the COPYING file for more information.
6 */ 5 */
7 6
8#include "Swift/QtUI/EventViewer/QtEventWindow.h" 7#include <Swift/QtUI/EventViewer/QtEventWindow.h>
9 8
10#include <QtDebug>
11#include <QBoxLayout> 9#include <QBoxLayout>
12#include <QPushButton>
13#include <QMessageBox> 10#include <QMessageBox>
11#include <QPushButton>
12#include <QtDebug>
14 13
15#include "Swift/Controllers/XMPPEvents/MessageEvent.h" 14#include <Swiften/Base/Platform.h>
16#include "Swift/Controllers/XMPPEvents/ErrorEvent.h"
17#include "Swift/QtUI/QtSubscriptionRequestWindow.h"
18#include "Swift/Controllers/XMPPEvents/SubscriptionRequestEvent.h"
19#include "Swift/Controllers/XMPPEvents/MUCInviteEvent.h"
20#include "Swift/Controllers/UIEvents/RequestChatUIEvent.h"
21#include "Swift/Controllers/UIEvents/JoinMUCUIEvent.h"
22 15
16#include <Swift/Controllers/UIEvents/JoinMUCUIEvent.h>
17#include <Swift/Controllers/UIEvents/RequestChatUIEvent.h>
18#include <Swift/Controllers/XMPPEvents/ErrorEvent.h>
19#include <Swift/Controllers/XMPPEvents/IncomingFileTransferEvent.h>
20#include <Swift/Controllers/XMPPEvents/MUCInviteEvent.h>
21#include <Swift/Controllers/XMPPEvents/MessageEvent.h>
22#include <Swift/Controllers/XMPPEvents/SubscriptionRequestEvent.h>
23 23
24#include "Swiften/Base/Platform.h" 24#include <Swift/QtUI/QtSubscriptionRequestWindow.h>
25 25
26namespace Swift { 26namespace Swift {
27 27
28QtEventWindow::QtEventWindow(UIEventStream* eventStream) : EventWindow(false) { 28QtEventWindow::QtEventWindow(UIEventStream* eventStream) : EventWindow(false) {
29 QBoxLayout* layout = new QBoxLayout(QBoxLayout::TopToBottom, this); 29 QBoxLayout* layout = new QBoxLayout(QBoxLayout::TopToBottom, this);
@@ -74,10 +74,11 @@ void QtEventWindow::handleReadClicked() {
74void QtEventWindow::handleItemActivated(const QModelIndex& item) { 74void QtEventWindow::handleItemActivated(const QModelIndex& item) {
75 QtEvent* event = model_->getItem(item.row()); 75 QtEvent* event = model_->getItem(item.row());
76 boost::shared_ptr<MessageEvent> messageEvent = boost::dynamic_pointer_cast<MessageEvent>(event->getEvent()); 76 boost::shared_ptr<MessageEvent> messageEvent = boost::dynamic_pointer_cast<MessageEvent>(event->getEvent());
77 boost::shared_ptr<SubscriptionRequestEvent> subscriptionEvent = boost::dynamic_pointer_cast<SubscriptionRequestEvent>(event->getEvent()); 77 boost::shared_ptr<SubscriptionRequestEvent> subscriptionEvent = boost::dynamic_pointer_cast<SubscriptionRequestEvent>(event->getEvent());
78 boost::shared_ptr<MUCInviteEvent> mucInviteEvent = boost::dynamic_pointer_cast<MUCInviteEvent>(event->getEvent()); 78 boost::shared_ptr<MUCInviteEvent> mucInviteEvent = boost::dynamic_pointer_cast<MUCInviteEvent>(event->getEvent());
79 boost::shared_ptr<IncomingFileTransferEvent> incomingFTEvent = boost::dynamic_pointer_cast<IncomingFileTransferEvent>(event->getEvent());
79 boost::shared_ptr<ErrorEvent> errorEvent = boost::dynamic_pointer_cast<ErrorEvent>(event->getEvent()); 80 boost::shared_ptr<ErrorEvent> errorEvent = boost::dynamic_pointer_cast<ErrorEvent>(event->getEvent());
80 81
81 if (messageEvent) { 82 if (messageEvent) {
82 if (messageEvent->getStanza()->getType() == Message::Groupchat) { 83 if (messageEvent->getStanza()->getType() == Message::Groupchat) {
83 eventStream_->send(boost::shared_ptr<UIEvent>(new JoinMUCUIEvent(messageEvent->getStanza()->getFrom().toBare(), messageEvent->getStanza()->getTo().getResource()))); 84 eventStream_->send(boost::shared_ptr<UIEvent>(new JoinMUCUIEvent(messageEvent->getStanza()->getFrom().toBare(), messageEvent->getStanza()->getTo().getResource())));
@@ -88,10 +89,13 @@ void QtEventWindow::handleItemActivated(const QModelIndex& item) {
88 QtSubscriptionRequestWindow* window = QtSubscriptionRequestWindow::getWindow(subscriptionEvent, this); 89 QtSubscriptionRequestWindow* window = QtSubscriptionRequestWindow::getWindow(subscriptionEvent, this);
89 window->show(); 90 window->show();
90 } else if (mucInviteEvent) { 91 } else if (mucInviteEvent) {
91 eventStream_->send(boost::shared_ptr<UIEvent>(new RequestChatUIEvent(mucInviteEvent->getInviter()))); 92 eventStream_->send(boost::shared_ptr<UIEvent>(new RequestChatUIEvent(mucInviteEvent->getInviter())));
92 mucInviteEvent->conclude(); 93 mucInviteEvent->conclude();
94 } else if (incomingFTEvent) {
95 eventStream_->send(boost::shared_ptr<UIEvent>(new RequestChatUIEvent(incomingFTEvent->getSender())));
96 incomingFTEvent->conclude();
93 } else { 97 } else {
94 if (errorEvent) { 98 if (errorEvent) {
95 errorEvent->conclude(); 99 errorEvent->conclude();
96 } 100 }
97 QMessageBox msgBox; 101 QMessageBox msgBox;