From 5acd0590258e9335cf4d3b1910a517efccd22a3e Mon Sep 17 00:00:00 2001 From: Fabian Schillinger Date: Fri, 9 Jul 2010 21:18:44 +0200 Subject: first commit to test git --- src/gui/connectionList.cpp | 23 +++++++++++++++++++++++ src/gui/connectionList.h | 1 + src/gui/connectionWindow.cpp | 2 -- src/gui/mainWindow.cpp | 35 +++++++++++++++++++++++++++++++++++ src/gui/mainWindow.h | 1 + src/gui/ui/mainwindow.ui | 19 ++++++++++++++++--- src/gui/ui/mainwindowtouch.ui | 17 +++++++++++++++-- 7 files changed, 91 insertions(+), 7 deletions(-) (limited to 'src/gui') diff --git a/src/gui/connectionList.cpp b/src/gui/connectionList.cpp index 2f9829e..61be876 100644 --- a/src/gui/connectionList.cpp +++ b/src/gui/connectionList.cpp @@ -432,6 +432,14 @@ void ConnectionList::on_remoteHelp() } } +/* + * + */ +void ConnectionList::showProcesses() +{ + MainWindow::getConnectionWindow()->messageStations("BROADCAST","SHOWPROCESSES"); +} + void ConnectionList::on_lock() { MainWindow::getConnectionWindow()->lockStations(); @@ -442,6 +450,21 @@ void ConnectionList::on_unlock() MainWindow::getConnectionWindow()->unlockStations(); } +/* Hier werden Nachrichten vom Server versendet: +* Type: PVSMESSAGE +* Ident: BROADCAST +* Msg: die Nachricht +* +* Wenn Ident: LOCKSTATION -> locke Client +* +* +* +* +* +* +* +*/ + void ConnectionList::on_message() { Dialog msgD; diff --git a/src/gui/connectionList.h b/src/gui/connectionList.h index 50d8924..29dd174 100644 --- a/src/gui/connectionList.h +++ b/src/gui/connectionList.h @@ -108,6 +108,7 @@ public slots: virtual void on_projection(); virtual void on_unprojection(); virtual void on_lock(); + virtual void showProcesses(); virtual void on_unlock(); virtual void on_message(); virtual void on_lock_with_message(); diff --git a/src/gui/connectionWindow.cpp b/src/gui/connectionWindow.cpp index cf51051..9e7b370 100644 --- a/src/gui/connectionWindow.cpp +++ b/src/gui/connectionWindow.cpp @@ -263,8 +263,6 @@ bool ConnectionWindow::remoteHelp(QString sname) { } - - bool ConnectionWindow::lockStations() { if (std::list* lockList = MainWindow::getConnectionList()->getSelectedClients()) { if (!lockList->empty()) { diff --git a/src/gui/mainWindow.cpp b/src/gui/mainWindow.cpp index eb15e82..4cd6997 100644 --- a/src/gui/mainWindow.cpp +++ b/src/gui/mainWindow.cpp @@ -116,6 +116,10 @@ MainWindow::MainWindow(QWidget *parent) : // toolbar and actions in pvsmgr + + //testweise chat starten beim klicken auf processlist + connect(ui->actionShowProcesses, SIGNAL(triggered()), this, SLOT(showProcesses())); + ui->actionShowProcesses->setStatusTip(tr("Shows list of processes of this client")); connect(ui->action_Exit, SIGNAL(triggered()), this, SLOT(close())); ui->action_Exit->setStatusTip(tr("Exit")); connect(ui->action_Disconnect, SIGNAL(triggered()), this, SLOT(disconnect())); @@ -130,6 +134,8 @@ MainWindow::MainWindow(QWidget *parent) : ui->actionLock->setStatusTip(tr("Lock or Unlock all Clients")); connect(ui->actionCreate_profile, SIGNAL(triggered()), this, SLOT(createProfile())); + + 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())); @@ -795,6 +801,35 @@ void MainWindow::foto() // makes a screenshot of the selected client } } +/* + * test if a client is selected and then make him tell his processlist + * + * + * + * + * + */ + +void MainWindow::showProcesses() +{ + std::list* selectedClients = + MainWindow::getConnectionList()->getSelectedClients(); + if (selectedClients->size() == 1) + { + // do stuff + } + else + { + QString + message = + QString( + tr( + "This operation can only be performed for one selected Client!")); + QMessageBox::information(this, "PVS", message); + } +} + + void MainWindow::createProfile() { profileDialog proDiag; diff --git a/src/gui/mainWindow.h b/src/gui/mainWindow.h index 00bd927..5e20af2 100644 --- a/src/gui/mainWindow.h +++ b/src/gui/mainWindow.h @@ -171,6 +171,7 @@ public slots: void projecttoolbar(); void unprojecttoolbar(); void closeUp(); + void showProcesses(); void foto(); void backgroundpicture(); void repaintbackgroundpicture(); diff --git a/src/gui/ui/mainwindow.ui b/src/gui/ui/mainwindow.ui index eb49d1b..b5ac0e3 100644 --- a/src/gui/ui/mainwindow.ui +++ b/src/gui/ui/mainwindow.ui @@ -28,8 +28,8 @@ 0 0 - 776 - 534 + 778 + 542 @@ -195,7 +195,7 @@ 0 0 838 - 28 + 23 @@ -286,6 +286,7 @@ + @@ -531,6 +532,18 @@ - + + + + :/finder:/finder + + + Show Processes + + + show processes of this client + + diff --git a/src/gui/ui/mainwindowtouch.ui b/src/gui/ui/mainwindowtouch.ui index 9030b17..f8e76c0 100644 --- a/src/gui/ui/mainwindowtouch.ui +++ b/src/gui/ui/mainwindowtouch.ui @@ -28,8 +28,8 @@ 0 0 - 1327 - 658 + 1329 + 660 @@ -365,6 +365,7 @@ + @@ -636,6 +637,18 @@ Ctrl+D + + + + :/finder:/finder + + + Show Processes + + + show processes of this client + + -- cgit v1.2.3-55-g7522