From 7d3a333d144033f80a7c5ecdd43996b691945436 Mon Sep 17 00:00:00 2001
From: Johann Latocha
Date: Tue, 8 Mar 2011 00:34:52 +0100
Subject: [PVSMGRTOUCH] * CloseUp fixed * Buttons removed

---
 src/gui/frame.cpp      | 25 +++++++++++++------------
 src/gui/mainWindow.cpp | 10 ++--------
 2 files changed, 15 insertions(+), 20 deletions(-)

(limited to 'src')

diff --git a/src/gui/frame.cpp b/src/gui/frame.cpp
index aa6b0cb..960c502 100644
--- a/src/gui/frame.cpp
+++ b/src/gui/frame.cpp
@@ -51,12 +51,13 @@ Frame::Frame(const QString & text, QWidget * parent) :
 
 	//QIcon icon;
 	//icon.addFile(QString::fromUtf8(), QSize(), QIcon::Normal, QIcon::Off);
-	button_closeUp   = createToolButton(tr("View"), QIcon(":/restore"),SLOT(closeUp()));
-	button_closeUp->setCheckable(true);
-	button_foto      = createToolButton(tr("Foto"), QIcon(":/photos"),SLOT(foto()));
-	button_lock      = createToolButton(tr("Lock this client"), QIcon(":/lock"),SLOT(setLock()));
+//	button_closeUp   = createToolButton(tr("View"), QIcon(":/restore"),SLOT(closeUp()));
+//	button_closeUp->setCheckable(true);
+//	button_foto      = createToolButton(tr("Foto"), QIcon(":/photos"),SLOT(foto()));
+//	button_lock      = createToolButton(tr("Lock this client"), QIcon(":/lock"),SLOT(setLock()));
 	//button_unlock    = createToolButton(tr("Unlock this client"), QIcon(":/lock"),SLOT(setLock()));
-	button_dozent    = createToolButton(tr("Set as Superclient"), QIcon(":/dozent2"),SLOT(setDozent()));
+//	button_dozent    = createToolButton(tr("Set as Superclient"), QIcon(":/dozent2"),SLOT(setDozent()));
+//	button_dozent->setCheckable(true);
 	button_control   = createToolButton(tr("Enable Remote Control"), QIcon(":/remotecontrol"), SLOT(remoteControlClicked()));
 	button_control->setCheckable(true);
 	button_control_all = createToolButton(tr("Remote Control All Clients"), QIcon(":/remotecontrolall"), SLOT(remoteControlAllClicked()));
@@ -311,8 +312,8 @@ void Frame::setToolButtonListVisible(bool visible)
 {
 	foreach (QToolButton* tb, toolButtonList)
 		tb->setVisible(visible);
-	if (visible && MainWindow::getConnectionWindow()->hasDozent && !_dozent)
-		button_dozent->setVisible(false);//At this time this button should only be visible on the dozent machine (the superclient).
+//	if (visible && MainWindow::getConnectionWindow()->hasDozent && !_dozent)
+//		button_dozent->setVisible(false);//At this time this button should only be visible on the dozent machine (the superclient).
 
 }
 
@@ -320,12 +321,12 @@ void Frame::setLockStatus(bool lock)
 {
 	if (lock)
 	{
-		button_lock->setToolTip(tr("Unlock this client"));
+		//button_lock->setToolTip(tr("Unlock this client"));
 		//button_lock->setIcon() TODO
 	}
 	else
 	{
-		button_lock->setToolTip(tr("Lock this client"));
+		//button_lock->setToolTip(tr("Lock this client"));
 		//button_lock->setIcon() TODO
 	}
 	_isLocked = lock;
@@ -373,14 +374,14 @@ void Frame::setDozent()
 {
 	if (_dozent)
 	{
-		button_dozent->setToolTip(tr("Set client as Superclient"));
+		//button_dozent->setToolTip(tr("Set client as Superclient"));
 		_dozent = false;
 		MainWindow::getConnectionWindow()->hasDozent = false;
 		getConFrame()->setDozent(false);
 	}
 	else
 	{
-		button_dozent->setToolTip(tr("Unset client as Superclient"));
+		//button_dozent->setToolTip(tr("Unset client as Superclient"));
 		_dozent = true;
 		MainWindow::getConnectionWindow()->hasDozent = true;
 		getConFrame()->setDozent(true);
@@ -390,7 +391,7 @@ void Frame::setDozent()
 void Frame::setCloseUp(bool value)
 {
 	_isCloseUp = value;
-	button_closeUp->setChecked(value);
+	//button_closeUp->setChecked(value);
 }
 
 void Frame::remoteControlClicked()
diff --git a/src/gui/mainWindow.cpp b/src/gui/mainWindow.cpp
index 7cd0b02..b4dd17c 100644
--- a/src/gui/mainWindow.cpp
+++ b/src/gui/mainWindow.cpp
@@ -800,16 +800,10 @@ void MainWindow::closeUp(ConnectionFrame* connFrame, PVSClient* pvsClient)
 
 	// Do we already have a closeUp Frame?
 	ConnectionFrame* closeupFrame = conWin->getCloseupFrame();
-
 	if(closeupFrame)
 	{
-		// Is it the same as the sender one?
-		if(connFrame == closeupFrame)
-			// Then it already is close up.
-			return;
-		else
-			// We need to un-closeUp the currently selected closeUp-Frame.
-			unCloseUp(closeupFrame);
+	    unCloseUp(closeupFrame);
+	    return;
 	}
 
 	_framePosOnCloseUp = connFrame->pos();//get the actualy position before run closeup
-- 
cgit v1.2.3-55-g7522