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, 38 insertions, 0 deletions

diff --git a/src/gui/multicastConfigDialog.h b/src/gui/multicastConfigDialog.h
new file mode 100644
index 0000000..6421813
--- /dev/null
+++ b/src/gui/multicastConfigDialog.h
@@ -0,0 +1,38 @@
+#ifndef MULTICASTCONFIGDIALOG_H
+#define MULTICASTCONFIGDIALOG_H
+
+#include <QtGui/QDialog>
+#include <QPointer>
+#include "ui_multicastConfigDialog.h"
+#include <pvsinterface.h>
+
+class McastConfiguration;
+
+class MulticastConfigDialog : public QDialog
+{
+    Q_OBJECT
+
+public:
+    MulticastConfigDialog(QWidget* parent = 0);
+    MulticastConfigDialog(McastConfiguration* dbusIface, QWidget *parent = 0);
+    ~MulticastConfigDialog();
+
+private:
+    Ui::MulticastConfigDialogClass _ui;
+    McastConfiguration* _config;
+    bool _isAddressValid;
+    bool _isPortValid;
+
+    void setupUi();
+
+    void setError(QWidget* input, QLabel* messageLabel, QString text);
+    void setOK(QWidget* input, QLabel* messageLabel);
+    void revalidateButtons();
+
+private slots:
+	void dialogAccepted();
+	void validateGroupAddress(QString const&);
+	void validateDataPort(QString const&);
+};
+
+#endif // MULTICASTCONFIGDIALOG_H