Started including button for reloading room configuration by choosing your own room first.

Is not working right now.

4 files changed, 73 insertions, 0 deletions

diff --git a/src/server/mainwindow/mainwindow.cpp b/src/server/mainwindow/mainwindow.cpp
index 48c29ac..7c9d210 100644
--- a/src/server/mainwindow/mainwindow.cpp
+++ b/src/server/mainwindow/mainwindow.cpp
@@ -98,6 +98,7 @@ MainWindow::MainWindow(QString ipListUrl, QWidget* parent) :
 	connect(ui->action_SetAsTutor, SIGNAL(triggered()), this, SLOT(onButtonStopProjection()));
 	connect(ui->action_Lock, SIGNAL(toggled(bool)), this, SLOT(onButtonLock(bool)));
 	connect(ui->action_Help, SIGNAL(triggered()), this, SLOT(onButtonHelp()));
+	connect(ui->actionReload_Room_Configuration, SIGNAL(triggered()), this, SLOT(onButtonReloadRoomConfig()));
 
 	/* Stuff for the button lock */
 	//Setup a timeout
@@ -311,6 +312,10 @@ void MainWindow::tryToUseRoomTemplate()
 
 	for (auto i : rooms)
 	{
+		if (!_rooms.contains(i)) {
+			QList<QPair<QString, QPoint>> posIpConfig;
+			_rooms.insert(i, posIpConfig);
+		}
 		conf.beginGroup(i);
 		if (!conf.contains("mgrIP")) {
 			qDebug() << "Invalid config file!";
@@ -338,6 +343,7 @@ void MainWindow::tryToUseRoomTemplate()
 					// Position is given in grid coordinates, createFrame take pixels
 					QString computerId = conf.value("ip").toString();
 					QPoint coord = conf.value("pos").toPoint();
+					_rooms[i].append(qMakePair(computerId, coord));
 					qDebug()  << computerId;
 					qDebug()  << coord;
 					qDebug()  << _tileWidth ;
@@ -677,6 +683,11 @@ void MainWindow::startVncServerIfNecessary(int from)
 	}
 }
 
+void MainWindow::onButtonReloadRoomConfig()
+{
+	_reloadWindow->show();
+}
+
 /***************************************************************************//**
  * Display popup which explains possible actions about the buttons.
  */
diff --git a/src/server/mainwindow/mainwindow.h b/src/server/mainwindow/mainwindow.h
index 924738c..5349903 100644
--- a/src/server/mainwindow/mainwindow.h
+++ b/src/server/mainwindow/mainwindow.h
@@ -11,6 +11,7 @@ class ConnectionFrame;
 class ListenServer;
 class DiscoveryListener;
 class HelpWindow;
+class ReloadWindow;
 
 namespace Ui{
 	class MainWindow;
@@ -35,6 +36,7 @@ private:
 	Ui::MainWindow    *ui;
 	SessionNameWindow *_sessionNameWindow;
 	HelpWindow        *_helpWindow;
+	ReloadWindow			*_reloadWindow;
 	QLabel            *_sessionNameLabel;
 	int               _tbIconSize;
 	Qt::ToolBarArea   _tbArea;
@@ -63,6 +65,7 @@ private:
 	DiscoveryListener       *_discoveryListener;
 	FileDownloader          _fileDownloader;
 	QStringList             _tutorList;
+	QMap<QString, QList<QPair<QString, QPoint> > > _rooms;
 
 	static const QString sStrTutorNdef;
 	static const QString sStrTutorOffline;
@@ -106,6 +109,7 @@ protected slots:
 	void onButtonStopProjection();
 
 	void onButtonSetAsTutor();
+	void onButtonReloadRoomConfig();
 
 	void onButtonExit();
 	void onButtonHelp();
diff --git a/src/server/reloadroomwindow/reloadroomwindow.cpp b/src/server/reloadroomwindow/reloadroomwindow.cpp
new file mode 100644
index 0000000..77219a7
--- /dev/null
+++ b/src/server/reloadroomwindow/reloadroomwindow.cpp
@@ -0,0 +1,29 @@
+#include "reloadroomwindow.h"
+#include "ui_reloadroom.h"
+
+ReloadRoomWindow::ReloadRoomWindow(QWidget *parent) :
+	QDialog(parent), ui(new Ui::ReloadRoom)
+{
+	ui->setupUi(this);
+	connect(ui->buttonBox, SIGNAL(accepted()), this, SLOT(onButtonOk()));
+	connect(ui->buttonBox, SIGNAL(rejected()), this, SLOT(onButtonCancel()));
+}
+
+ReloadRoomWindow::~ReloadRoomWindow()
+{
+	delete ui;
+}
+
+/*
+ * Slots
+ */
+
+void ReloadRoomWindow::onButtonOk()
+{
+
+}
+
+void ReloadRoomWindow::onButtonCancel()
+{
+	this->hide();
+}
diff --git a/src/server/reloadroomwindow/reloadroomwindow.h b/src/server/reloadroomwindow/reloadroomwindow.h
new file mode 100644
index 0000000..e918736
--- /dev/null
+++ b/src/server/reloadroomwindow/reloadroomwindow.h
@@ -0,0 +1,29 @@
+#ifndef RELOADROOMWINDOW_H
+#define RELOADROOMWINDOW_H
+
+#include <QDialog>
+
+namespace Ui {
+class ReloadRoom;
+}
+
+class ReloadRoomWindow : public QDialog
+{
+	Q_OBJECT
+
+public:
+	explicit ReloadRoomWindow(QWidget *parent = 0);
+	~ReloadRoomWindow();
+
+	// void show();
+
+private:
+	Ui::ReloadRoom *ui;
+
+
+private slots:
+	void onButtonCancel();
+	void onButtonOk();
+
+};
+#endif