summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'Swift/Controllers/UIInterfaces')
-rw-r--r--Swift/Controllers/UIInterfaces/ChatWindow.h11
-rw-r--r--Swift/Controllers/UIInterfaces/RemoteScreenWindow.h5
2 files changed, 16 insertions, 0 deletions
diff --git a/Swift/Controllers/UIInterfaces/ChatWindow.h b/Swift/Controllers/UIInterfaces/ChatWindow.h
index 5db1a54..d54f2aa 100644
--- a/Swift/Controllers/UIInterfaces/ChatWindow.h
+++ b/Swift/Controllers/UIInterfaces/ChatWindow.h
@@ -16,8 +16,9 @@
#include <Swiften/Elements/SecurityLabelsCatalog.h>
#include <Swiften/Elements/ChatState.h>
#include <Swiften/Elements/Form.h>
#include <Swiften/Elements/MUCOccupant.h>
+#include <Swiften/ScreenSharing/ScreenSharing.h>
namespace Swift {
class AvatarManager;
@@ -58,8 +59,13 @@ namespace Swift {
// File transfer related stuff
virtual std::string addFileTransfer(const std::string& senderName, bool senderIsSelf, const std::string& filename, const boost::uintmax_t sizeInBytes) = 0;
virtual void setFileTransferProgress(std::string, const int percentageDone) = 0;
virtual void setFileTransferStatus(std::string, const FileTransferState state, const std::string& msg = "") = 0;
+
+ // Screen sharing related stuff
+ virtual std::string addScreenSharing(const std::string& senderName, bool incoming) = 0;
+ virtual void setScreenSharingStatus(std::string, const ScreenSharing::SCState state, const std::string& msg = "") = 0;
+
virtual void addMUCInvitation(const std::string& senderName, const JID& jid, const std::string& reason, const std::string& password, bool direct = true) = 0;
virtual std::string addWhiteboardRequest(bool senderIsSelf) = 0;
virtual void setWhiteboardSessionStatus(std::string id, const ChatWindow::WhiteboardSessionState state) = 0;
@@ -136,8 +142,13 @@ namespace Swift {
boost::signal<void (std::string /* id */, std::string /* description */)> onFileTransferStart;
boost::signal<void (std::string /* id */, std::string /* path */)> onFileTransferAccept;
boost::signal<void (std::string /* path */)> onSendFileRequest;
+ // Screen sharing related
+ boost::signal<void (std::string /* id */)> onScreenSharingCancel;
+ boost::signal<void (std::string /* id */)> onScreenSharingStop;
+ boost::signal<void (std::string /* id */)> onScreenSharingAccept;
+
//Whiteboard related
boost::signal<void ()> onWhiteboardSessionAccept;
boost::signal<void ()> onWhiteboardSessionCancel;
boost::signal<void ()> onWhiteboardWindowShow;
diff --git a/Swift/Controllers/UIInterfaces/RemoteScreenWindow.h b/Swift/Controllers/UIInterfaces/RemoteScreenWindow.h
index c31ca91..a5bdb36 100644
--- a/Swift/Controllers/UIInterfaces/RemoteScreenWindow.h
+++ b/Swift/Controllers/UIInterfaces/RemoteScreenWindow.h
@@ -5,8 +5,10 @@
*/
#pragma once
+#include <Swiften/Base/boost_bsignals.h>
+
#include <boost/shared_ptr.hpp>
namespace Swift {
class IncomingScreenSharing;
@@ -17,8 +19,11 @@ namespace Swift {
RemoteScreenWindow(boost::shared_ptr<IncomingScreenSharing> incScreenSharing)
: iss(incScreenSharing) {}
virtual ~RemoteScreenWindow() {}
+ public:
+ boost::signal<void ()> onStopRequest;
+
protected:
boost::shared_ptr<IncomingScreenSharing> iss;
};
}