Merge branch 'master' of openslx.org:pvs

Conflicts:
	CMakeLists.txt
	src/core/pvsConnectionManager.cpp
	src/pvs.cpp
	src/pvs.h

1 files changed, 21 insertions, 0 deletions

diff --git a/src/gui/clientFileSendDialog.h b/src/gui/clientFileSendDialog.h
index d8afc3a..7abdcc7 100644
--- a/src/gui/clientFileSendDialog.h
+++ b/src/gui/clientFileSendDialog.h
@@ -30,9 +30,17 @@ public:
     ~ClientNicklistDialog();
 
     QString getNick();
+    bool isSendToAll() const
+    {
+        return _isSendToAll;
+    }
+
+private Q_SLOTS:
+    void sendToAllStateChanged(int state);
 
 private:
     OrgOpenslxPvsInterface *_ifaceDBus;
+    bool _isSendToAll;
 
 };
 
@@ -51,14 +59,22 @@ public:
     void open();
     void open(QString nick);
     void open(QString nick, QString filename);
+    void sendToAll();
+    void sendToAll(QString filename);
 
 private Q_SLOTS:
     void sendHeader();
     void receiveAck();
     void sendFile();
     void close();
+    void canceled();
     void error(QAbstractSocket::SocketError error);
 
+    void multicastTransferStarted(qulonglong transferID);
+    void multicastTransferProgress(qulonglong transferID, qulonglong bytes, qulonglong of);
+    void multicastTransferFinished(qulonglong transferID);
+    void multicastTransferFailed(qulonglong transferID, QString const& reason);
+
 private:
     QString formatSize(qint64 size);
 
@@ -71,6 +87,11 @@ private:
     OrgOpenslxPvsInterface *_ifaceDBus;
     QString _nickname;
 
+    quint64 _transferID;
+    bool _error;
+    QString _reason;
+    bool _isMulticast;
+
 };
 
 #endif /* CLIENTFILESENDDIALOG_H_ */