Merge branch 'master' of openslx.org:pvs

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

1 files changed, 26 insertions, 18 deletions

diff --git a/src/pvsgui.cpp b/src/pvsgui.cpp
index 8617587..1520c81 100644
--- a/src/pvsgui.cpp
+++ b/src/pvsgui.cpp
@@ -119,6 +119,7 @@ PVSGUI::PVSGUI(QWidget *parent) :
     connect(_ifaceDBus, SIGNAL(disconnected()), this, SLOT(disconnected()));
     connect(_ifaceDBus, SIGNAL(addHost(QString)), this, SLOT(addHost(QString)));
     connect(_ifaceDBus, SIGNAL(delHost(QString)), this, SLOT(delHost(QString)));
+    connect(_ifaceDBus, SIGNAL(incomingMulticastTransferNew(qulonglong, QString, QString, qulonglong)), SLOT(incomingMulticastFile(qulonglong, QString, QString, qulonglong)));
 
     // show toolbar
     setWindowFlags(Qt::WindowStaysOnTopHint | Qt::X11BypassWindowManagerHint | Qt::FramelessWindowHint);
@@ -412,6 +413,12 @@ void PVSGUI::receiveFile()
     d->open();
 }
 
+void PVSGUI::incomingMulticastFile(qulonglong transferID, QString sender, QString basename, qulonglong size)
+{
+    ClientFileReceiveDialog *d = new ClientFileReceiveDialog(sender, transferID, basename, size, _ifaceDBus, this);
+    d->open();
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////
@@ -443,24 +450,6 @@ void printVersion()
 
 int main(int argc, char *argv[])
 {
-    QtSingleApplication app(argc, argv);
-    app.setQuitOnLastWindowClosed(false);
-    app.setOrganizationName("openslx");
-    app.setOrganizationDomain("openslx.org");
-    app.setApplicationName("pvsgui");
-
-    // only one instance should be allowed
-    if (app.sendMessage(""))
-    {
-        qDebug("[PVSGUI] ERROR: Already running. Exiting");
-        return 0;
-    }
-
-    // use system locale as language to translate gui
-    QTranslator translator;
-    translator.load(":pvsgui");
-    app.installTranslator(&translator);
-
     bool visible = false;
     int position = -1;
 
@@ -499,6 +488,25 @@ int main(int argc, char *argv[])
 		opt = getopt_long( argc, argv, optString, longOpts, &longIndex );
 	}
 
+
+    QtSingleApplication app(argc, argv);
+    app.setQuitOnLastWindowClosed(false);
+    app.setOrganizationName("openslx");
+    app.setOrganizationDomain("openslx.org");
+    app.setApplicationName("pvsgui");
+
+    // only one instance should be allowed
+    if (app.sendMessage(""))
+    {
+        qDebug("[PVSGUI] ERROR: Already running. Exiting");
+        return 0;
+    }
+
+    // use system locale as language to translate gui
+    QTranslator translator;
+    translator.load(":pvsgui");
+    app.installTranslator(&translator);
+
     PVSGUI pvsgui;
     pvsgui.setPosition(position);
     pvsgui.setVisible(visible);