Merge remote branch 'openslx/mcastft' into input

Conflicts:
	CMakeLists.txt
	i18n/pvs_ar_JO.ts
	i18n/pvs_de_DE.ts
	i18n/pvs_es_MX.ts
	i18n/pvs_fr_FR.ts
	i18n/pvs_pl_PL.ts
	i18n/pvsmgr_ar_JO.ts
	i18n/pvsmgr_de_DE.ts
	i18n/pvsmgr_es_MX.ts
	i18n/pvsmgr_fr_FR.ts
	i18n/pvsmgr_pl_PL.ts
	icons/README
	pvsmgr.qrc
	src/gui/mainWindow.cpp
	src/pvs.cpp
	src/pvs.h
	src/pvsDaemon.cpp
	src/util/clientGUIUtils.h

1 files changed, 14 insertions, 0 deletions

diff --git a/src/gui/clientFileReceiveDialog.h b/src/gui/clientFileReceiveDialog.h
index c13d7b7..c9ed220 100644
--- a/src/gui/clientFileReceiveDialog.h
+++ b/src/gui/clientFileReceiveDialog.h
@@ -18,6 +18,8 @@
 #include <QtNetwork>
 #include "ui_clientFileReceiveDialog.h"
 
+class OrgOpenslxPvsInterface;
+
 class ClientFileReceiveDialog: public QDialog,
         private Ui::ClientFileReceiveDialogClass
 {
@@ -25,6 +27,7 @@ Q_OBJECT
 
 public:
     ClientFileReceiveDialog(QTcpSocket *socket, QWidget *parent = 0);
+    ClientFileReceiveDialog(QString const& sender, qulonglong transferID, QString const& basename, qulonglong size, OrgOpenslxPvsInterface* ifaceDBus, QWidget* parent = 0);
     ~ClientFileReceiveDialog();
 
 private Q_SLOTS:
@@ -33,6 +36,13 @@ private Q_SLOTS:
     void close();
     void error(QAbstractSocket::SocketError error);
 
+    // multicast:
+    void mcastTransferStarted(qulonglong transferID);
+    void mcastTransferProgress(qulonglong transferID, qulonglong bytes, qulonglong of);
+    void mcastTransferFinished(qulonglong transferID);
+    void mcastTransferFailed(qulonglong transferID, QString reason);
+    void cancelTransfer();
+
 private:
     void sendAck(bool b);
     QString formatSize(qint64 size);
@@ -42,6 +52,10 @@ private:
     qint64 _bytesToRead;
     int div;
 
+    // multicast:
+    OrgOpenslxPvsInterface* _ifaceDBus;
+    QString _filename;
+    qulonglong _transferID;
 };
 
 #endif /* CLIENTFILERECEIVEDIALOG_H_ */