[PVSMGRTOUCH] New GUI

TODO: Zoom, Refresh, Quality, Info

7 files changed, 388 insertions, 555 deletions

diff --git a/icons/dozent.png b/icons/dozent.png
index 847d63e..13e6e2f 100644
--- a/icons/dozent.png
+++ b/icons/dozent.png
diff --git a/icons/image.png b/icons/image.png
new file mode 100644
index 0000000..b0c9a3c
--- /dev/null
+++ b/icons/image.png
diff --git a/icons/info.png b/icons/info.png
new file mode 100644
index 0000000..209f1d2
--- /dev/null
+++ b/icons/info.png
diff --git a/icons/save.png b/icons/save.png
new file mode 100644
index 0000000..7fa489c
--- /dev/null
+++ b/icons/save.png
diff --git a/pvsmgr.qrc b/pvsmgr.qrc
index b4de3bc..7e90df1 100644
--- a/pvsmgr.qrc
+++ b/pvsmgr.qrc
@@ -4,6 +4,9 @@
     <file>icons/gears.png</file>
     <file>icons/projection.png</file>
     <file>icons/reset.png</file>
+    <file>icons/info.png</file>
+    <file>icons/image.png</file>
+    <file>icons/save.png</file>
     <file alias="finder">icons/finder.png</file>
     <file alias="exit">icons/exit.png</file>
     <file alias="terminal">icons/terminal.png</file>
diff --git a/src/gui/mainWindow.cpp b/src/gui/mainWindow.cpp
index 260da89..1e60ab9 100644
--- a/src/gui/mainWindow.cpp
+++ b/src/gui/mainWindow.cpp
@@ -52,17 +52,18 @@ MainWindow::MainWindow(QWidget *parent) :
         QDir::root().mkpath(QFileInfo(_settings.fileName()).path());
         QFile::copy("/etc/openslx/pvsmgr.conf", _settings.fileName());
     }
+    myself = this;
 
+#ifdef MAINWINDOW_USE_NORMALGUI
 	ui->horizontalSlider->setValue(100);
 	ui->label_2->setText("100");
-
 	ui->separator->setVisible(false);
+    conList = new ConnectionList(ui->ClWidget);
+    ui->ClientGLayout->addWidget(conList);
+#endif
 
-	myself = this;
 	conWin = new ConnectionWindow(ui->widget);
 	ui->VconWinLayout->addWidget(conWin);
-	conList = new ConnectionList(ui->ClWidget);
-	ui->ClientGLayout->addWidget(conList);
 
 	bgimage = false;
 
@@ -73,10 +74,11 @@ MainWindow::MainWindow(QWidget *parent) :
 	PVSConnectionManager::getManager();
 
 	//set the maximum width for list content
+#ifdef MAINWINDOW_USE_NORMALGUI
 	ui->ClWidget->setMaximumWidth(160);
-
 	ui->pvsLog->setReadOnly(true);
 	ui->pvsLog->hide();
+#endif
 
 	onToggleLog(false);
 	// add ourself to the log listeners, so we can output them too
@@ -97,32 +99,41 @@ MainWindow::MainWindow(QWidget *parent) :
 	_pwdCon = PVSConnectionManager::getManager()->setNeedPassword(false);
 	_sessionName = PVSConnectionManager::getManager()->getSessionName();
 
+	_profileDialog = new profileDialog(this);
+
+	// TODO: implement passwd!!!
+#ifdef MAINWINDOW_USE_NORMALGUI
 	ui->setPassword->setCheckState(Qt::Checked);
+#endif
 
 #ifdef MAINWINDOW_USE_TOUCHGUI //only used for the touchgui
 	// define the slots we want to use
-	connect(ui->comboBox_touch1, SIGNAL(currentIndexChanged(int)), this, SLOT(combobox1(int))); // Combobox 1 verkn��pfen mit IndexChangend Signal
-	connect(ui->comboBox_touch1, SIGNAL(currentIndexChanged(int)), this, SLOT(setindexback()));
-
-	connect(ui->pushButton, SIGNAL(clicked()), this, SLOT(createProfile())); // profile button
-	connect(ui->pushButton_2, SIGNAL(clicked()), this, SLOT(clientlisthide())); // clienlist button
+	connect(ui->action_Manage_Profiles, SIGNAL(triggered()), this, SLOT(createProfile()));
+	connect(ui->action_Reset, SIGNAL(triggered()), this, SLOT(resetall()));
+	connect(ui->action_Lock, SIGNAL(triggered()), this, SLOT(locksingle()));
+	connect(ui->action_Unlock, SIGNAL(triggered()), this, SLOT(unlocksingle()));
+	connect(ui->action_Project, SIGNAL(triggered()), this, SLOT(projecttoolbar()));
+	connect(ui->action_Unproject, SIGNAL(triggered()), this, SLOT(unprojecttoolbar()));
+	connect(ui->action_Set_as_Tutor_PC, SIGNAL(triggered()), this, SLOT(setdozenttoolbar()));
+	connect(ui->action_Maximize, SIGNAL(triggered()), this, SLOT(closeUp()));
+    connect(ui->action_Screenshot, SIGNAL(triggered()), this, SLOT(foto()));
+    connect(ui->action_Lock_All, SIGNAL(triggered()), this, SLOT(lockalltoolbar()));
+    connect(ui->action_Manage_Profiles, SIGNAL(triggered()), this, SLOT(createProfile()));
+    connect(ui->action_Config_Network, SIGNAL(triggered()), this, SLOT(configureNetwork()));
+    connect(ui->action_Show_Processes, SIGNAL(triggered()), this, SLOT(showProcesses()));
+    connect(ui->action_Start_Processes, SIGNAL(triggered()), this, SLOT(startProcess()));
+    connect(ui->action_About, SIGNAL(triggered()), _aboutDialog, SLOT(open()));
+    connect(ui->action_Save_Profile, SIGNAL(triggered()), _profileDialog, SLOT(save()));
+    connect(ui->action_Backgroundimage, SIGNAL(triggered()), this, SLOT(backgroundpicture()));
+
+    // TODO: change to actions!!!
+//    connect(ui->horizontalSlider, SIGNAL(valueChanged (int)), this, SLOT(changeRatio(int)));
+//    connect(ui->vncQuality, SIGNAL(currentIndexChanged (int)), this, SLOT(setVNCQuality(int)));
+//    connect(ui->thumbStatus, SIGNAL(currentIndexChanged(int)), this, SLOT(changeStatus(int)));
 
-	// toolbar slots
-	connect(ui->actionresetall, SIGNAL(triggered()), this, SLOT(resetall()));
-	connect(ui->actionLocksingle, SIGNAL(triggered()), this, SLOT(locksingle()));
-	connect(ui->actionUnlocksingle, SIGNAL(triggered()), this, SLOT(unlocksingle()));
-	connect(ui->actionProjection, SIGNAL(triggered()), this, SLOT(projecttoolbar()));
-	connect(ui->actionUnprojection, SIGNAL(triggered()), this, SLOT(unprojecttoolbar()));
-	connect(ui->actionDozent, SIGNAL(triggered()), this, SLOT(setdozenttoolbar()));
 
-	// Ui specific settings
-
-	ui->ClWidget->hide();
-	ui->progressBar->hide();
-	ui->pvsLog->hide();
-
-#endif
 
+#else
 	// toolbar and actions in pvsmgr
 	connect(ui->action_Exit, SIGNAL(triggered()), this, SLOT(close()));
 	ui->action_Exit->setStatusTip(tr("Exit"));
@@ -142,7 +153,6 @@ MainWindow::MainWindow(QWidget *parent) :
 	ui->actionShowProcesses->setStatusTip(tr("Show Processes of the selected Client"));
 	connect(ui->actionStartProcess, SIGNAL(triggered()), this, SLOT(startProcess()));
 	ui->actionStartProcess->setStatusTip(tr("Starts Process on the selected Client(s)"));
-
 	connect(ui->actionShow_Username, SIGNAL(triggered()), this, SLOT(showusername()));
 	connect(ui->actionShow_Hostname_IP, SIGNAL(triggered()), this, SLOT(showip()));
 	connect(ui->actionShow_Fullname, SIGNAL(triggered()), this, SLOT(showname()));
@@ -157,24 +167,22 @@ MainWindow::MainWindow(QWidget *parent) :
 	connect(ui->actionShow_Normal, SIGNAL(toggled(bool)), this, SLOT(onToggleLog(bool)));
 	connect(ui->actionShow_Error, SIGNAL(toggled(bool)), this, SLOT(onToggleLog(bool)));
 	connect(ui->actionAbout_pvs, SIGNAL(triggered()), _aboutDialog, SLOT(open()));
+	connect(ui->actionSave_Profile, SIGNAL(triggered()), _profileDialog, SLOT(save()));
+#endif
 
 	loadSettings(); //we load the appliocation settings
 
 	setUnifiedTitleAndToolBarOnMac(true);
+#ifdef MAINWINDOW_USE_NORMALGUI
 	statusBar()->showMessage(tr("The pvs manager"));
+#endif
 	this->showMaximized(); // show the Mainwindow maximized
 
 	// listen on port 29481 for incoming file transfers
 	_serverSocket = new QTcpServer();
 	_serverSocket->listen(QHostAddress::Any, 29481);
 	connect(_serverSocket, SIGNAL(newConnection()), this, SLOT(incomingFile()));
-	_profileDialog = new profileDialog(this);
 
-#ifdef MAINWINDOW_USE_TOUCHGUI
-	connect(ui->saveProfileButton, SIGNAL(clicked()), _profileDialog, SLOT(save()));
-#else
-	connect(ui->actionSave_Profile, SIGNAL(triggered()), _profileDialog, SLOT(save()));
-#endif
 }
 
 MainWindow::~MainWindow()
@@ -244,14 +252,14 @@ int MainWindow::getConnectionWindowHeight() // returns the height of the Coonect
 
 QStringList MainWindow::getProfilList() // loads the profile list
 {
-	QSettings settings("openslx", "pvsmgr");
+	QSettings settings("openslx", "profiles");
 	profilList = settings.childGroups();
 	return profilList;
 }
 
 void MainWindow::loadSettings()
 {
-	QSettings settings("openslx", "pvsmgr");
+	QSettings settings("openslx", "profiles");
 	QString current = settings.value("current", "default").toString();
 	currentProfi = current;
 	_profilName = current;
@@ -322,7 +330,7 @@ void MainWindow::loadSettings(QString profilname) // loads the current profile
 	{
 		_profilName = profilname;
 		MainWindow::getConnectionWindow()->ClientLocationList.clear();
-		QSettings settings("openslx", "pvsmgr");
+		QSettings settings("openslx", "profiles");
 		settings.setValue("current", _profilName);
 		ConnectionFrame* cFrame;
 		foreach (cFrame, AllFrameOnWindow)
@@ -374,7 +382,7 @@ void MainWindow::saveSettings(QString profilname)
 {
 	QList<ConnectionFrame*> AllFrameOnWindow =
 			MainWindow::getConnectionWindow()->getAllFrameOnWindow();
-	QSettings settings("openslx", "pvsmgr");
+	QSettings settings("openslx", "profiles");
 	settings.setValue("current", profilname);
 	settings.setValue("size", QString("%1").arg(AllFrameOnWindow.size()));
 
@@ -393,7 +401,7 @@ void MainWindow::saveSettings(QString profilname)
 
 void MainWindow::removeProfil(QString profilname)
 {
-	QSettings settings("openslx", "pvsmgr");
+	QSettings settings("openslx", "profiles");
 	settings.remove(profilname);
 }
 
@@ -635,7 +643,9 @@ void MainWindow::on_log_line(LogEntry consoleEntry)
 	if (level == ConsoleLogger::LOG_CHAT && !showChat)
 		return;
 
+#ifdef MAINWINDOW_USE_NORMALGUI
 	ui->pvsLog->insertPlainText(consoleEntry.getLine());
+#endif
 
 }
 
@@ -643,11 +653,13 @@ void MainWindow::onToggleLog(bool showtime)
 {
 	if (showtime)
 		;//to kill the system warning due "unused variable"
+#ifdef MAINWINDOW_USE_NORMALGUI
 	showError = ui->actionShow_Error->isChecked();
 	showTerminal = ui->actionShow_Terminal->isChecked();
 	showNetwork = ui->actionShow_Network->isChecked();
 	showChat = ui->actionShow_Chat->isChecked();
 	showNormal = ui->actionShow_Normal->isChecked();
+#endif
 	//showAtAll = ui->logAtAllAction->get_active();
 
 
@@ -656,10 +668,12 @@ void MainWindow::onToggleLog(bool showtime)
 
 void MainWindow::setLogConsoleDisabled(bool visible)
 {
+#ifdef MAINWINDOW_USE_NORMALGUI
 	if (!visible)
 		ui->pvsLog->hide();
 	else
 		ui->pvsLog->show();
+#endif
 }
 
 /*void MainWindow::close()
@@ -905,7 +919,9 @@ void MainWindow::changeRatio(int ratio) // needed the change the size of the vnc
 	{
 		QString str;
 		str.append(QString("%1").arg(ratio));
+#ifdef MAINWINDOW_USE_NORMALGUI
 		ui->label_2->setText(str);
+#endif
 
 		std::list<QString>* selClients =
 				getConnectionList()->getSelectedClients();
@@ -946,7 +962,9 @@ else
 	int updatefreq = (ratio*500)/100;
 	QString str;
 	str.append(QString("%1").arg(updatefreq));
+#ifdef MAINWINDOW_USE_NORMALGUI
 	ui->label_2->setText(str);
+#endif
 	std::list<QString>* selClients = getConnectionList()->getSelectedClients();
 	if (selClients->size() > 0)
 	{
@@ -984,6 +1002,7 @@ else
  */
 void MainWindow::changeStatus(int index)
 {
+#ifdef MAINWINDOW_USE_NORMALGUI
 	QString status = ui->thumbStatus->currentText();
 
 	if (status == "Thumbnailratio")
@@ -998,11 +1017,13 @@ void MainWindow::changeStatus(int index)
 					PVSConnectionManager::getManager()->getClientFromIp(
 							selClients->front().toStdString().c_str());
 			int ratio = pvsClient->getConnectionFrame()->getRatio();
+
 			ui->label_2->setText(QString::number(ratio));
 			ui->horizontalSlider->setValue(ratio);
 		}
 		else
 		{
+
 			ui->label_2->setText("100");
 			ui->horizontalSlider->setValue(100);
 		}
@@ -1021,9 +1042,7 @@ void MainWindow::changeStatus(int index)
 							selClients->front().toStdString().c_str());
 			if (pvsClient->getVNCConnection())
 			{
-				int
-						updatefreq =
-								pvsClient->getConnectionFrame()->getFrame()->getVNCClientThread()->getUpdatefreq();
+				int updatefreq = pvsClient->getConnectionFrame()->getFrame()->getVNCClientThread()->getUpdatefreq();
 				int showfreq = (updatefreq * 100) / 500;
 				ui->label_2->setText(QString::number(updatefreq));
 				ui->horizontalSlider->setValue(showfreq);
@@ -1035,6 +1054,7 @@ void MainWindow::changeStatus(int index)
 			ui->horizontalSlider->setValue(100);
 		}
 	}
+#endif
 }
 
 /*
@@ -1096,13 +1116,12 @@ void MainWindow::setPasswordForConnection(int enabled)
 
 void MainWindow::setindexback() //sets the index of the combobox back
 {
-#ifdef MAINWINDOW_USE_TOUCHGUI
-	ui->comboBox_touch1->setCurrentIndex(0);
-#endif
+    // TODO: delete this
 }
 
 void MainWindow::clientlisthide() // hide or show the clientlist
 {
+#ifdef MAINWINDOW_USE_NORMALGUI
 
 	if (locked1 == false)
 	{
@@ -1115,7 +1134,7 @@ void MainWindow::clientlisthide() // hide or show the clientlist
 		ui->ClWidget->hide();
 		locked1 = false;
 	}
-
+#endif
 }
 
 void MainWindow::lockalltoolbar() // locks all if a dozent is set
diff --git a/src/gui/ui/mainwindowtouch.ui b/src/gui/ui/mainwindowtouch.ui
index 1f329d6..26a2742 100644
--- a/src/gui/ui/mainwindowtouch.ui
+++ b/src/gui/ui/mainwindowtouch.ui
@@ -6,677 +6,488 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1349</width>
-    <height>768</height>
+    <width>842</width>
+    <height>600</height>
    </rect>
   </property>
   <property name="windowTitle">
-   <string>PVSmgr</string>
+   <string>MainWindow</string>
   </property>
-  <widget class="QWidget" name="centralWidget">
+  <widget class="QWidget" name="widget">
+   <property name="styleSheet">
+    <string notr="true">background-color: rgb(150, 150, 150);</string>
+   </property>
    <layout class="QGridLayout" name="gridLayout">
+    <property name="margin">
+     <number>0</number>
+    </property>
     <item row="0" column="0">
-     <widget class="QScrollArea" name="scrollArea">
-      <property name="styleSheet">
-       <string>border-color: rgb(0, 0, 0);</string>
-      </property>
-      <property name="widgetResizable">
-       <bool>true</bool>
-      </property>
-      <widget class="QWidget" name="scrollAreaWidgetContents">
-       <property name="geometry">
-        <rect>
-         <x>0</x>
-         <y>0</y>
-         <width>1431</width>
-         <height>655</height>
-        </rect>
-       </property>
-       <layout class="QGridLayout" name="gridLayout_3">
-        <item row="0" column="0">
-         <layout class="QHBoxLayout" name="horizontalLayout">
-          <item>
-           <widget class="QComboBox" name="comboBox_touch1">
-            <property name="font">
-             <font>
-              <pointsize>15</pointsize>
-             </font>
-            </property>
-            <item>
-             <property name="text">
-              <string>All</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Lock</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Unlock</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Unproject</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Backgroundimage</string>
-             </property>
-            </item>
-           </widget>
-          </item>
-          <item>
-           <widget class="Line" name="line_5">
-            <property name="orientation">
-             <enum>Qt::Vertical</enum>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QLabel" name="label">
-            <property name="text">
-             <string>VNC-Quality</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QComboBox" name="vncQuality">
-            <property name="font">
-             <font>
-              <pointsize>15</pointsize>
-             </font>
-            </property>
-            <item>
-             <property name="text">
-              <string>HIGH</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>MEDIUM</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>LOW</string>
-             </property>
-            </item>
-           </widget>
-          </item>
-          <item>
-           <widget class="Line" name="line_3">
-            <property name="orientation">
-             <enum>Qt::Vertical</enum>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QPushButton" name="pushButton_2">
-            <property name="font">
-             <font>
-              <pointsize>15</pointsize>
-             </font>
-            </property>
-            <property name="text">
-             <string>ClientList</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="Line" name="line_2">
-            <property name="orientation">
-             <enum>Qt::Vertical</enum>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QPushButton" name="saveProfileButton">
-            <property name="font">
-             <font>
-              <pointsize>15</pointsize>
-             </font>
-            </property>
-            <property name="text">
-             <string>Save Profile</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QPushButton" name="pushButton">
-            <property name="font">
-             <font>
-              <pointsize>15</pointsize>
-             </font>
-            </property>
-            <property name="text">
-             <string>Manage Profiles</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="Line" name="line_4">
-            <property name="orientation">
-             <enum>Qt::Vertical</enum>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QProgressBar" name="progressBar">
-            <property name="styleSheet">
-             <string>border-color: rgb(0, 0, 0);</string>
-            </property>
-            <property name="value">
-             <number>0</number>
-            </property>
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="Line" name="separator">
-            <property name="orientation">
-             <enum>Qt::Vertical</enum>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QCheckBox" name="setPassword">
-            <property name="font">
-             <font>
-              <pointsize>15</pointsize>
-             </font>
-            </property>
-            <property name="text">
-             <string>setPassword</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="Line" name="line">
-            <property name="orientation">
-             <enum>Qt::Vertical</enum>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QComboBox" name="thumbStatus">
-            <property name="font">
-             <font>
-              <pointsize>15</pointsize>
-             </font>
-            </property>
-            <item>
-             <property name="text">
-              <string>Thumbnailratio</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Thumbnailrate</string>
-             </property>
-            </item>
-           </widget>
-          </item>
-          <item>
-           <widget class="QSlider" name="horizontalSlider">
-            <property name="minimum">
-             <number>25</number>
-            </property>
-            <property name="maximum">
-             <number>200</number>
-            </property>
-            <property name="singleStep">
-             <number>25</number>
-            </property>
-            <property name="pageStep">
-             <number>25</number>
-            </property>
-            <property name="value">
-             <number>25</number>
-            </property>
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="tickPosition">
-             <enum>QSlider::TicksBothSides</enum>
-            </property>
-            <property name="tickInterval">
-             <number>0</number>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QLabel" name="label_2">
-            <property name="text">
-             <string>   0</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QLabel" name="label_3">
-            <property name="text">
-             <string>%</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </item>
-        <item row="1" column="0">
-         <widget class="QSplitter" name="splitter_2">
-          <property name="orientation">
-           <enum>Qt::Vertical</enum>
-          </property>
-          <widget class="QSplitter" name="splitter">
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
-           </property>
-           <widget class="QWidget" name="ClWidget" native="true">
-            <property name="minimumSize">
-             <size>
-              <width>150</width>
-              <height>240</height>
-             </size>
-            </property>
-            <property name="styleSheet">
-             <string>background-color: rgb(255, 255, 255);</string>
-            </property>
-            <layout class="QGridLayout" name="gridLayout_5">
-             <item row="0" column="0">
-              <layout class="QGridLayout" name="ClientGLayout"/>
-             </item>
-            </layout>
-           </widget>
-           <widget class="QWidget" name="widget" native="true">
-            <property name="styleSheet">
-             <string>background-color: rgb(150, 150, 150);</string>
-            </property>
-            <layout class="QGridLayout" name="gridLayout_4">
-             <item row="0" column="0">
-              <layout class="QVBoxLayout" name="VconWinLayout"/>
-             </item>
-            </layout>
-           </widget>
-          </widget>
-          <widget class="QTextEdit" name="pvsLog"/>
-         </widget>
-        </item>
-       </layout>
-      </widget>
-     </widget>
+     <layout class="QVBoxLayout" name="VconWinLayout"/>
     </item>
    </layout>
   </widget>
-  <widget class="QStatusBar" name="statusBar"/>
+  <widget class="QMenuBar" name="menubar">
+   <property name="geometry">
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>842</width>
+     <height>21</height>
+    </rect>
+   </property>
+   <widget class="QMenu" name="menu_File">
+    <property name="title">
+     <string>&amp;File</string>
+    </property>
+    <addaction name="action_Info"/>
+    <addaction name="separator"/>
+    <addaction name="action_Save_Profile"/>
+    <addaction name="action_Manage_Profiles"/>
+    <addaction name="separator"/>
+    <addaction name="action_Quit"/>
+   </widget>
+   <widget class="QMenu" name="menu_Tools">
+    <property name="title">
+     <string>&amp;Tools</string>
+    </property>
+    <addaction name="action_Screenshot"/>
+    <addaction name="separator"/>
+    <addaction name="action_Project"/>
+    <addaction name="action_Unproject"/>
+    <addaction name="action_Lock"/>
+    <addaction name="action_Unlock"/>
+    <addaction name="action_Lock_All"/>
+    <addaction name="action_Reset"/>
+    <addaction name="separator"/>
+    <addaction name="action_Show_Processes"/>
+    <addaction name="action_Start_Processes"/>
+   </widget>
+   <widget class="QMenu" name="menu_Config">
+    <property name="title">
+     <string>&amp;Config</string>
+    </property>
+    <addaction name="action_Set_as_Tutor_PC"/>
+    <addaction name="action_Config_Network"/>
+   </widget>
+   <widget class="QMenu" name="menu_Help">
+    <property name="title">
+     <string>&amp;Help</string>
+    </property>
+    <addaction name="action_About"/>
+   </widget>
+   <widget class="QMenu" name="menu_View">
+    <property name="title">
+     <string>&amp;View</string>
+    </property>
+    <widget class="QMenu" name="menu_Refresh">
+     <property name="title">
+      <string>&amp;Refresh</string>
+     </property>
+     <addaction name="action_refresh_100"/>
+     <addaction name="action_refresh_200"/>
+     <addaction name="action_refresh_300"/>
+     <addaction name="action_refresh_400"/>
+     <addaction name="action_refresh_500"/>
+     <addaction name="action_refresh_600"/>
+     <addaction name="action_refresh_700"/>
+     <addaction name="action_refresh_800"/>
+     <addaction name="action_refresh_900"/>
+     <addaction name="action_refresh_1000"/>
+    </widget>
+    <widget class="QMenu" name="menu_Quality">
+     <property name="title">
+      <string>&amp;Quality</string>
+     </property>
+     <addaction name="action_quality_High"/>
+     <addaction name="action_quality_Medium"/>
+     <addaction name="action_quality_Low"/>
+    </widget>
+    <widget class="QMenu" name="menu_Zoom">
+     <property name="title">
+      <string>&amp;Zoom</string>
+     </property>
+     <addaction name="action_zoom_25"/>
+     <addaction name="action_zoom_50"/>
+     <addaction name="action_zoom_75"/>
+     <addaction name="action_zoom_100"/>
+     <addaction name="action_zoom_125"/>
+     <addaction name="action_zoom_150"/>
+     <addaction name="action_zoom_175"/>
+     <addaction name="action_zoom_200"/>
+    </widget>
+    <addaction name="action_Maximize"/>
+    <addaction name="menu_Zoom"/>
+    <addaction name="menu_Refresh"/>
+    <addaction name="menu_Quality"/>
+    <addaction name="action_Backgroundimage"/>
+   </widget>
+   <addaction name="menu_File"/>
+   <addaction name="menu_View"/>
+   <addaction name="menu_Tools"/>
+   <addaction name="menu_Config"/>
+   <addaction name="menu_Help"/>
+  </widget>
   <widget class="QToolBar" name="toolBar">
-   <property name="enabled">
-    <bool>true</bool>
-   </property>
-   <property name="maximumSize">
-    <size>
-     <width>129000</width>
-     <height>12900</height>
-    </size>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>15</pointsize>
-     <kerning>true</kerning>
-    </font>
-   </property>
    <property name="windowTitle">
     <string>toolBar</string>
    </property>
-   <property name="layoutDirection">
-    <enum>Qt::LeftToRight</enum>
-   </property>
-   <property name="autoFillBackground">
-    <bool>true</bool>
-   </property>
-   <property name="movable">
-    <bool>false</bool>
-   </property>
    <property name="iconSize">
     <size>
-     <width>50</width>
-     <height>50</height>
+     <width>32</width>
+     <height>32</height>
     </size>
    </property>
-   <property name="toolButtonStyle">
-    <enum>Qt::ToolButtonIconOnly</enum>
-   </property>
-   <property name="floatable">
-    <bool>false</bool>
-   </property>
    <attribute name="toolBarArea">
     <enum>TopToolBarArea</enum>
    </attribute>
    <attribute name="toolBarBreak">
     <bool>false</bool>
    </attribute>
-   <addaction name="action_Exit"/>
-   <addaction name="actionFoto"/>
-   <addaction name="actionView"/>
-   <addaction name="actionProjection"/>
-   <addaction name="actionUnprojection"/>
-   <addaction name="actionLocksingle"/>
-   <addaction name="actionUnlocksingle"/>
-   <addaction name="actionLock"/>
-   <addaction name="actionresetall"/>
-   <addaction name="actionDozent"/>
-   <addaction name="actionConfigure_Network"/>
-   <addaction name="actionShowProcesses"/>
-   <addaction name="actionStartProcess"/>
+   <addaction name="action_Info"/>
+   <addaction name="action_Save_Profile"/>
+   <addaction name="separator"/>
+   <addaction name="action_Maximize"/>
+   <addaction name="action_Backgroundimage"/>
+   <addaction name="separator"/>
+   <addaction name="action_Screenshot"/>
+   <addaction name="action_Project"/>
+   <addaction name="action_Unproject"/>
+   <addaction name="action_Lock"/>
+   <addaction name="action_Unlock"/>
+   <addaction name="action_Lock_All"/>
+   <addaction name="action_Reset"/>
+   <addaction name="action_Show_Processes"/>
+   <addaction name="action_Start_Processes"/>
+   <addaction name="separator"/>
+   <addaction name="action_Set_as_Tutor_PC"/>
   </widget>
-  <action name="actionShow_Username">
-   <property name="checkable">
-    <bool>false</bool>
-   </property>
+  <action name="action_About">
    <property name="text">
-    <string>Show Username</string>
+    <string>&amp;About</string>
    </property>
   </action>
-  <action name="actionShow_Hostname_IP">
-   <property name="checkable">
-    <bool>false</bool>
+  <action name="action_Info">
+   <property name="icon">
+    <iconset resource="../../../pvsmgr.qrc">
+     <normaloff>:/icons/info.png</normaloff>:/icons/info.png</iconset>
    </property>
    <property name="text">
-    <string>Show Hostname/IP</string>
+    <string>&amp;Info</string>
    </property>
   </action>
-  <action name="actionVNC_Placeholders">
-   <property name="checkable">
-    <bool>true</bool>
+  <action name="action_Save_Profile">
+   <property name="icon">
+    <iconset resource="../../../pvsmgr.qrc">
+     <normaloff>:/icons/save.png</normaloff>:/icons/save.png</iconset>
    </property>
    <property name="text">
-    <string>VNC-Placeholders</string>
+    <string>&amp;Save Profile</string>
    </property>
   </action>
-  <action name="actionShow_Log">
-   <property name="checkable">
-    <bool>true</bool>
-   </property>
-   <property name="checked">
-    <bool>false</bool>
-   </property>
+  <action name="action_Manage_Profiles">
    <property name="text">
-    <string>Show Log</string>
+    <string>&amp;Manage Profiles</string>
    </property>
   </action>
-  <action name="actionShow_Normal">
-   <property name="checkable">
-    <bool>true</bool>
-   </property>
+  <action name="action_Quit">
    <property name="text">
-    <string>Show Normal</string>
+    <string>&amp;Quit</string>
    </property>
   </action>
-  <action name="actionShow_Error">
-   <property name="checkable">
-    <bool>true</bool>
+  <action name="action_Backgroundimage">
+   <property name="icon">
+    <iconset resource="../../../pvsmgr.qrc">
+     <normaloff>:/icons/image.png</normaloff>:/icons/image.png</iconset>
    </property>
    <property name="text">
-    <string>Show Error</string>
+    <string>&amp;Backgroundimage</string>
    </property>
   </action>
-  <action name="actionShow_Network">
-   <property name="checkable">
-    <bool>true</bool>
+  <action name="action_Screenshot">
+   <property name="icon">
+    <iconset resource="../../../pvsmgr.qrc">
+     <normaloff>:/photos</normaloff>:/photos</iconset>
    </property>
    <property name="text">
-    <string>Show Network</string>
+    <string>&amp;Screenshot</string>
    </property>
   </action>
-  <action name="actionShow_Terminal">
-   <property name="checkable">
-    <bool>true</bool>
+  <action name="action_Project">
+   <property name="icon">
+    <iconset resource="../../../pvsmgr.qrc">
+     <normaloff>:/icons/projection.png</normaloff>:/icons/projection.png</iconset>
    </property>
    <property name="text">
-    <string>Show Terminal</string>
+    <string>&amp;Project</string>
    </property>
   </action>
-  <action name="actionShow_Chat">
-   <property name="checkable">
-    <bool>true</bool>
-   </property>
-   <property name="text">
-    <string>Show Chat</string>
+  <action name="action_Unproject">
+   <property name="icon">
+    <iconset resource="../../../pvsmgr.qrc">
+     <normaloff>:/icons/unprojection.png</normaloff>:/icons/unprojection.png</iconset>
    </property>
-  </action>
-  <action name="actionAbout_pvs">
    <property name="text">
-    <string>About pvs</string>
+    <string>&amp;Unproject</string>
    </property>
   </action>
-  <action name="action100_x_100">
-   <property name="checkable">
-    <bool>true</bool>
+  <action name="action_Lock">
+   <property name="icon">
+    <iconset resource="../../../pvsmgr.qrc">
+     <normaloff>:/icons/locksingle.png</normaloff>:/icons/locksingle.png</iconset>
    </property>
    <property name="text">
-    <string>100 x 100</string>
+    <string>&amp;Lock</string>
    </property>
   </action>
-  <action name="action200_x_200">
-   <property name="checkable">
-    <bool>true</bool>
+  <action name="action_Unlock">
+   <property name="icon">
+    <iconset resource="../../../pvsmgr.qrc">
+     <normaloff>:/icons/unlocksingle.png</normaloff>:/icons/unlocksingle.png</iconset>
    </property>
    <property name="text">
-    <string>200 x 200</string>
+    <string>U&amp;nlock</string>
    </property>
   </action>
-  <action name="action500_x_500">
-   <property name="checkable">
-    <bool>true</bool>
+  <action name="action_Lock_All">
+   <property name="icon">
+    <iconset resource="../../../pvsmgr.qrc">
+     <normaloff>:/lock</normaloff>:/lock</iconset>
    </property>
    <property name="text">
-    <string>500 x 500</string>
+    <string>Lock &amp;All</string>
    </property>
   </action>
-  <action name="action_Disconnect">
+  <action name="action_Reset">
    <property name="icon">
     <iconset resource="../../../pvsmgr.qrc">
-     <normaloff>:/logout</normaloff>:/logout</iconset>
+     <normaloff>:/icons/reset.png</normaloff>:/icons/reset.png</iconset>
    </property>
    <property name="text">
-    <string>&amp;Disconnect</string>
-   </property>
-   <property name="shortcut">
-    <string>Ctrl+W</string>
+    <string>&amp;Reset All</string>
    </property>
   </action>
-  <action name="action_Exit">
+  <action name="action_Show_Processes">
    <property name="icon">
     <iconset resource="../../../pvsmgr.qrc">
-     <normaloff>:/exit</normaloff>
-     <normalon>:/exit</normalon>:/exit</iconset>
+     <normaloff>:/icons/gears.png</normaloff>:/icons/gears.png</iconset>
    </property>
    <property name="text">
-    <string>&amp;Exit</string>
-   </property>
-   <property name="shortcut">
-    <string>Ctrl+Q</string>
+    <string>Show &amp;Processes</string>
    </property>
   </action>
-  <action name="actionFoto">
+  <action name="action_Start_Processes">
    <property name="icon">
     <iconset resource="../../../pvsmgr.qrc">
-     <normaloff>:/photos</normaloff>:/photos</iconset>
+     <normaloff>:/icons/gearsgo.png</normaloff>:/icons/gearsgo.png</iconset>
    </property>
    <property name="text">
-    <string>Foto</string>
-   </property>
-   <property name="toolTip">
-    <string>Foto</string>
+    <string>Start Pr&amp;ocess</string>
    </property>
   </action>
-  <action name="actionView">
+  <action name="action_Set_as_Tutor_PC">
    <property name="icon">
     <iconset resource="../../../pvsmgr.qrc">
-     <normaloff>:/restore</normaloff>:/restore</iconset>
+     <normaloff>:/dozent2</normaloff>:/dozent2</iconset>
    </property>
    <property name="text">
-    <string>view</string>
+    <string>Set as &amp;Tutor PC</string>
    </property>
-   <property name="toolTip">
-    <string>View</string>
+  </action>
+  <action name="action_Config_Network">
+   <property name="text">
+    <string>Config &amp;Network</string>
    </property>
   </action>
-  <action name="actionLock">
-   <property name="icon">
-    <iconset resource="../../../pvsmgr.qrc">
-     <normaloff>:/lock</normaloff>:/lock</iconset>
+  <action name="action_zoom_25">
+   <property name="checkable">
+    <bool>true</bool>
    </property>
    <property name="text">
-    <string>lock</string>
-   </property>
-   <property name="toolTip">
-    <string>Lock All Clients</string>
+    <string>25%</string>
    </property>
   </action>
-  <action name="actionCreate_profile">
-   <property name="icon">
-    <iconset resource="../../../pvsmgr.qrc">
-     <normaloff>:/profile</normaloff>:/profile</iconset>
+  <action name="action_zoom_50">
+   <property name="checkable">
+    <bool>true</bool>
    </property>
    <property name="text">
-    <string>Create profile</string>
+    <string>50%</string>
    </property>
   </action>
-  <action name="actionresetall">
-   <property name="icon">
-    <iconset>
-     <activeon>:/icons/reset.png</activeon>
-    </iconset>
+  <action name="action_zoom_75">
+   <property name="checkable">
+    <bool>true</bool>
    </property>
    <property name="text">
-    <string>resetall</string>
+    <string>75%</string>
+   </property>
+  </action>
+  <action name="action_zoom_100">
+   <property name="checkable">
+    <bool>true</bool>
    </property>
-   <property name="toolTip">
-    <string>Reset Projections and Locks</string>
+   <property name="checked">
+    <bool>true</bool>
    </property>
-   <property name="shortcut">
-    <string>Ctrl+R</string>
+   <property name="text">
+    <string>100%</string>
    </property>
   </action>
-  <action name="actionLocksingle">
-   <property name="icon">
-    <iconset resource="../../../pvsmgr.qrc">
-     <normaloff>:/icons/locksingle.png</normaloff>:/icons/locksingle.png</iconset>
+  <action name="action_zoom_125">
+   <property name="checkable">
+    <bool>true</bool>
    </property>
    <property name="text">
-    <string>locksingle</string>
+    <string>125%</string>
    </property>
-   <property name="toolTip">
-    <string>Locks a Single Target</string>
+  </action>
+  <action name="action_zoom_150">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>150%</string>
    </property>
   </action>
-  <action name="actionUnlocksingle">
-   <property name="icon">
-    <iconset resource="../../../pvsmgr.qrc">
-     <normaloff>:/icons/unlocksingle.png</normaloff>:/icons/unlocksingle.png</iconset>
+  <action name="action_zoom_175">
+   <property name="checkable">
+    <bool>true</bool>
    </property>
    <property name="text">
-    <string>unlocksingle</string>
+    <string>175%</string>
    </property>
-   <property name="toolTip">
-    <string>Unlocks a single target</string>
+  </action>
+  <action name="action_zoom_200">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>200%</string>
    </property>
   </action>
-  <action name="actionProjection">
+  <action name="action_Maximize">
    <property name="icon">
     <iconset resource="../../../pvsmgr.qrc">
-     <normaloff>:/icons/projection.png</normaloff>:/icons/projection.png</iconset>
+     <normaloff>:/restore</normaloff>:/restore</iconset>
    </property>
    <property name="text">
-    <string>projection</string>
+    <string>&amp;Maximize</string>
+   </property>
+  </action>
+  <action name="action_refresh_100">
+   <property name="checkable">
+    <bool>true</bool>
    </property>
-   <property name="toolTip">
-    <string>Projects a single target</string>
+   <property name="text">
+    <string>100ms</string>
    </property>
   </action>
-  <action name="actionUnprojection">
-   <property name="icon">
-    <iconset resource="../../../pvsmgr.qrc">
-     <normaloff>:/icons/unprojection.png</normaloff>:/icons/unprojection.png</iconset>
+  <action name="action_refresh_200">
+   <property name="checkable">
+    <bool>true</bool>
    </property>
    <property name="text">
-    <string>unprojection</string>
+    <string>200ms</string>
+   </property>
+  </action>
+  <action name="action_refresh_300">
+   <property name="checkable">
+    <bool>true</bool>
    </property>
-   <property name="toolTip">
-    <string>Unprojects a single target</string>
+   <property name="text">
+    <string>300ms</string>
    </property>
   </action>
-  <action name="actionDozent">
-   <property name="icon">
-    <iconset resource="../../../pvsmgr.qrc">
-     <normaloff>:/dozent2</normaloff>:/dozent2</iconset>
+  <action name="action_refresh_400">
+   <property name="checkable">
+    <bool>true</bool>
    </property>
    <property name="text">
-    <string>dozent</string>
+    <string>400ms</string>
    </property>
-   <property name="toolTip">
-    <string>Select Tutor PC</string>
+  </action>
+  <action name="action_refresh_500">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="checked">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>500ms</string>
    </property>
   </action>
-  <action name="actionShow_Fullname">
+  <action name="action_refresh_600">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
    <property name="text">
-    <string>Show Name</string>
+    <string>600ms</string>
    </property>
   </action>
-  <action name="actionChat">
-   <property name="icon">
-    <iconset resource="../../../pvsmgr.qrc">
-     <normaloff>:/chat</normaloff>:/chat</iconset>
+  <action name="action_refresh_700">
+   <property name="checkable">
+    <bool>true</bool>
    </property>
    <property name="text">
-    <string>Chat</string>
+    <string>700ms</string>
    </property>
-   <property name="toolTip">
-    <string>Start chat with client(s)</string>
+  </action>
+  <action name="action_refresh_800">
+   <property name="checkable">
+    <bool>true</bool>
    </property>
-   <property name="shortcut">
-    <string>Ctrl+D</string>
+   <property name="text">
+    <string>800ms</string>
    </property>
   </action>
-  <action name="actionConfigure_Network">
-   <property name="icon">
-    <iconset resource="../../../pvsmgr.qrc">
-     <normaloff>:/netconf</normaloff>:/netconf</iconset>
+  <action name="action_refresh_900">
+   <property name="checkable">
+    <bool>true</bool>
    </property>
    <property name="text">
-    <string>Configure Network...</string>
+    <string>900ms</string>
    </property>
   </action>
-  <action name="actionShowProcesses">
-   <property name="icon">
-    <iconset resource="../../../pvsmgr.qrc">
-     <normaloff>:/icons/gears.png</normaloff>:/icons/gears.png</iconset>
+  <action name="action_refresh_1000">
+   <property name="checkable">
+    <bool>true</bool>
    </property>
    <property name="text">
-    <string>showProcesses</string>
+    <string>1000ms</string>
+   </property>
+  </action>
+  <action name="action_quality_High">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="checked">
+    <bool>true</bool>
    </property>
-   <property name="toolTip">
-    <string>Show processes of all clients</string>
+   <property name="text">
+    <string>High</string>
    </property>
   </action>
-  <action name="actionStartProcess">
-   <property name="icon">
-    <iconset resource="../../../pvsmgr.qrc">
-     <normaloff>:/icons/gearsgo.png</normaloff>:/icons/gearsgo.png</iconset>
+  <action name="action_quality_Medium">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="checked">
+    <bool>false</bool>
    </property>
    <property name="text">
-    <string>Start Process</string>
+    <string>Medium</string>
+   </property>
+  </action>
+  <action name="action_quality_Low">
+   <property name="checkable">
+    <bool>true</bool>
    </property>
-   <property name="toolTip">
-    <string>Start process on the selected client(s)</string>
+   <property name="text">
+    <string>Low</string>
    </property>
   </action>
  </widget>
- <layoutdefault spacing="6" margin="11"/>
  <resources>
   <include location="../../../pvsmgr.qrc"/>
  </resources>