From 6cb55b01dcd5306d5d17ff007085770ba5918ef4 Mon Sep 17 00:00:00 2001 From: Johann Latocha Date: Sun, 29 Aug 2010 00:59:36 +0200 Subject: Feature #633 --- CMakeLists.txt | 20 +++++++++++--------- i18n/pvs_ar_JO.ts | 8 ++++---- i18n/pvs_de_DE.ts | 8 ++++---- i18n/pvs_es_MX.ts | 8 ++++---- i18n/pvs_fr_FR.ts | 8 ++++---- i18n/pvs_pl_PL.ts | 8 ++++---- i18n/pvsgui_ar_JO.ts | 40 ++++++++++++++++++++-------------------- i18n/pvsgui_de_DE.ts | 40 ++++++++++++++++++++-------------------- i18n/pvsgui_es_MX.ts | 40 ++++++++++++++++++++-------------------- i18n/pvsgui_fr_FR.ts | 40 ++++++++++++++++++++-------------------- i18n/pvsgui_pl_PL.ts | 40 ++++++++++++++++++++-------------------- i18n/pvsmgr_ar_JO.ts | 26 +++++++++++++------------- i18n/pvsmgr_de_DE.ts | 26 +++++++++++++------------- i18n/pvsmgr_es_MX.ts | 26 +++++++++++++------------- i18n/pvsmgr_fr_FR.ts | 26 +++++++++++++------------- i18n/pvsmgr_pl_PL.ts | 26 +++++++++++++------------- misc/pvs.conf | 14 +++++--------- misc/pvsgui.conf | 3 +++ misc/pvsmgr.conf | 12 ------------ src/gui/mainWindow.cpp | 4 +++- src/gui/mainWindow.h | 2 ++ src/pvs.cpp | 3 +++ src/pvsgui.cpp | 3 +++ 23 files changed, 215 insertions(+), 216 deletions(-) create mode 100644 misc/pvsgui.conf diff --git a/CMakeLists.txt b/CMakeLists.txt index 4c85954..f829f33 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -366,23 +366,25 @@ SET_PROPERTY(TARGET pvsmgr PROPERTY COMPILE_DEFINITIONS MAINWINDOW_USE_NORMALGUI ENDIF(UNIX) # add install target to our makefile -CONFIGURE_FILE( org.openslx.pvs.service ${CMAKE_BINARY_DIR}/org.openslx.pvs.service ) IF(WIN32) INSTALL( TARGETS pvs pvsgui RUNTIME DESTINATION bin ) ELSEIF(UNIX) + CONFIGURE_FILE( org.openslx.pvs.service ${CMAKE_BINARY_DIR}/org.openslx.pvs.service ) INSTALL( TARGETS pvsmgr pvs pvsgui pvsmgrtouch RUNTIME DESTINATION bin ) + INSTALL( PROGRAMS misc/pvs-vncsrv DESTINATION bin) + INSTALL( FILES ${CMAKE_BINARY_DIR}/org.openslx.pvs.service DESTINATION share/dbus-1/services ) + INSTALL( FILES misc/pvs.conf misc/pvsgui.conf misc/pvsmgr.conf DESTINATION /etc/openslx ) ENDIF(WIN32) -INSTALL( PROGRAMS misc/pvs-vncsrv DESTINATION bin) -INSTALL( FILES ${CMAKE_BINARY_DIR}/org.openslx.pvs.service DESTINATION share/dbus-1/services ) # add uninstall target to our makefile CONFIGURE_FILE( - "${CMAKE_CURRENT_SOURCE_DIR}/Uninstall.cmake" - "${CMAKE_CURRENT_BINARY_DIR}/Uninstall.cmake" - IMMEDIATE @ONLY) - -ADD_CUSTOM_TARGET(uninstall - "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/Uninstall.cmake") + "${CMAKE_CURRENT_SOURCE_DIR}/Uninstall.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/Uninstall.cmake" + IMMEDIATE @ONLY +) +ADD_CUSTOM_TARGET( uninstall + "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/Uninstall.cmake" +) # add package target to our makefile SET( CPACK_GENERATOR "DEB;RPM" ) diff --git a/i18n/pvs_ar_JO.ts b/i18n/pvs_ar_JO.ts index a57e4bd..02f343b 100644 --- a/i18n/pvs_ar_JO.ts +++ b/i18n/pvs_ar_JO.ts @@ -4,22 +4,22 @@ PVS - + Message - + VNC connection - + The host - + requested your screen! diff --git a/i18n/pvs_de_DE.ts b/i18n/pvs_de_DE.ts index a58199c..7b41dff 100644 --- a/i18n/pvs_de_DE.ts +++ b/i18n/pvs_de_DE.ts @@ -4,22 +4,22 @@ PVS - + Message - + VNC connection - + The host - + requested your screen! diff --git a/i18n/pvs_es_MX.ts b/i18n/pvs_es_MX.ts index a57e4bd..02f343b 100644 --- a/i18n/pvs_es_MX.ts +++ b/i18n/pvs_es_MX.ts @@ -4,22 +4,22 @@ PVS - + Message - + VNC connection - + The host - + requested your screen! diff --git a/i18n/pvs_fr_FR.ts b/i18n/pvs_fr_FR.ts index a57e4bd..02f343b 100644 --- a/i18n/pvs_fr_FR.ts +++ b/i18n/pvs_fr_FR.ts @@ -4,22 +4,22 @@ PVS - + Message - + VNC connection - + The host - + requested your screen! diff --git a/i18n/pvs_pl_PL.ts b/i18n/pvs_pl_PL.ts index a57e4bd..02f343b 100644 --- a/i18n/pvs_pl_PL.ts +++ b/i18n/pvs_pl_PL.ts @@ -4,22 +4,22 @@ PVS - + Message - + VNC connection - + The host - + requested your screen! diff --git a/i18n/pvsgui_ar_JO.ts b/i18n/pvsgui_ar_JO.ts index 83560ba..1c15454 100644 --- a/i18n/pvsgui_ar_JO.ts +++ b/i18n/pvsgui_ar_JO.ts @@ -394,82 +394,82 @@ p, li { white-space: pre-wrap; } PVSGUI - + Connect - + &Disconnect - + C&hat - + &Send File - + &Config - + &Information - + &About - + &Quit - - - + + + PVS Connection - + Please enter password (If not needed leave blank): - + Are you sure you want to disconnect? - - + + PVS connection - - + + Connected to - - + + Disconnected - + New host available: diff --git a/i18n/pvsgui_de_DE.ts b/i18n/pvsgui_de_DE.ts index d49306a..c92de3f 100644 --- a/i18n/pvsgui_de_DE.ts +++ b/i18n/pvsgui_de_DE.ts @@ -402,82 +402,82 @@ p, li { white-space: pre-wrap; } PVSGUI - + Connect Verbinden - + &Disconnect &Trennen - + C&hat - + &Send File Datei &Senden - + &Config &Konfiguration - + &Information &Information - + &About &Über - + &Quit &Beenden - - - + + + PVS Connection PVS Verbindung - + Please enter password (If not needed leave blank): Bitte geben sie ein Passwor ein (Falls nicht erforderlich einfach leer lassen): - + Are you sure you want to disconnect? Sind sie sicher dass sie die Verbindung trennen möchten? - - + + PVS connection PVS Verbindung - - + + Connected to Verbunden mit - - + + Disconnected Getrennt - + New host available: Neuer Host verfügbar: diff --git a/i18n/pvsgui_es_MX.ts b/i18n/pvsgui_es_MX.ts index 92db9d7..7dab7d2 100644 --- a/i18n/pvsgui_es_MX.ts +++ b/i18n/pvsgui_es_MX.ts @@ -414,82 +414,82 @@ p, li { white-space: pre-wrap; } PVSGUI - + Connect Conectar - + &Disconnect &Desconectar - + C&hat ??? - + &Send File &Enviar archivo - + &Config &Configuración - + &Information &Información - + &About &Acerca de - + &Quit &Cerrar - - - + + + PVS Connection PVS Connección - + Please enter password (If not needed leave blank): Porfavor ingrese una contraseña (Deje la seccion vacia si no lo necesita): - + Are you sure you want to disconnect? Realmente desea desconectarse? - - + + PVS connection PVS Connección - - + + Connected to Connectar a - - + + Disconnected Desconectado - + New host available: Nuevo Host disponible: diff --git a/i18n/pvsgui_fr_FR.ts b/i18n/pvsgui_fr_FR.ts index 83560ba..1c15454 100644 --- a/i18n/pvsgui_fr_FR.ts +++ b/i18n/pvsgui_fr_FR.ts @@ -394,82 +394,82 @@ p, li { white-space: pre-wrap; } PVSGUI - + Connect - + &Disconnect - + C&hat - + &Send File - + &Config - + &Information - + &About - + &Quit - - - + + + PVS Connection - + Please enter password (If not needed leave blank): - + Are you sure you want to disconnect? - - + + PVS connection - - + + Connected to - - + + Disconnected - + New host available: diff --git a/i18n/pvsgui_pl_PL.ts b/i18n/pvsgui_pl_PL.ts index 83560ba..1c15454 100644 --- a/i18n/pvsgui_pl_PL.ts +++ b/i18n/pvsgui_pl_PL.ts @@ -394,82 +394,82 @@ p, li { white-space: pre-wrap; } PVSGUI - + Connect - + &Disconnect - + C&hat - + &Send File - + &Config - + &Information - + &About - + &Quit - - - + + + PVS Connection - + Please enter password (If not needed leave blank): - + Are you sure you want to disconnect? - - + + PVS connection - - + + Connected to - - + + Disconnected - + New host available: diff --git a/i18n/pvsmgr_ar_JO.ts b/i18n/pvsmgr_ar_JO.ts index ba391d2..3371586 100644 --- a/i18n/pvsmgr_ar_JO.ts +++ b/i18n/pvsmgr_ar_JO.ts @@ -315,63 +315,63 @@ Perform an unprojection or remove remote help to get a target. MainWindow - + Exit - + Remove the vnc-Connection for the selected client(s) - + Show the selected client in the whole window - + Make a screenshot for the selected client(s) - + Lock or Unlock all Clients - + The pvs manager - + This operation can only be performed for one selected Client! - + This operation can only be performed if you have selected a Client! - + This operation can only be performed for at least one selected Client! - + You have to set a Superclient-machine before performing this action. - + Open Image - + Image Files (*.png *.jpg *.svg) @@ -593,7 +593,7 @@ Perform an unprojection or remove remote help to get a target. - + Show Processes of the selected Client diff --git a/i18n/pvsmgr_de_DE.ts b/i18n/pvsmgr_de_DE.ts index e8d7001..00db421 100644 --- a/i18n/pvsmgr_de_DE.ts +++ b/i18n/pvsmgr_de_DE.ts @@ -315,63 +315,63 @@ Perform an unprojection or remove remote help to get a target. MainWindow - + Exit - + Remove the vnc-Connection for the selected client(s) - + Show the selected client in the whole window - + Make a screenshot for the selected client(s) - + Lock or Unlock all Clients - + The pvs manager - + This operation can only be performed for one selected Client! - + This operation can only be performed if you have selected a Client! - + This operation can only be performed for at least one selected Client! - + You have to set a Superclient-machine before performing this action. - + Open Image - + Image Files (*.png *.jpg *.svg) @@ -593,7 +593,7 @@ Perform an unprojection or remove remote help to get a target. - + Show Processes of the selected Client diff --git a/i18n/pvsmgr_es_MX.ts b/i18n/pvsmgr_es_MX.ts index 484d600..491b1b8 100644 --- a/i18n/pvsmgr_es_MX.ts +++ b/i18n/pvsmgr_es_MX.ts @@ -315,63 +315,63 @@ Perform an unprojection or remove remote help to get a target. MainWindow - + Exit Salir - + Remove the vnc-Connection for the selected client(s) Remover la conexión VNC de los clientes seleccionados - + Show the selected client in the whole window Mostrar el cliente seleccionado en toda la ventana - + Make a screenshot for the selected client(s) Capturar la pantalla de los clientes seleccionados - + Lock or Unlock all Clients Bloquear o desbloquear todos los clientes - + The pvs manager PVS Manager - + This operation can only be performed for one selected Client! Esta operación solamente puede ser realizada para un cliente! - + This operation can only be performed if you have selected a Client! - + This operation can only be performed for at least one selected Client! Esta operación solamente puede ser realizada para el ultimo cliente seleccionado! - + You have to set a Superclient-machine before performing this action. Usted debe asignar un super cliente antes de realizar esta acción. - + Open Image Abrir imagen - + Image Files (*.png *.jpg *.svg) Extensión de imagenes (*.png *.jpg *.svg) @@ -593,7 +593,7 @@ Perform an unprojection or remove remote help to get a target. - + Show Processes of the selected Client diff --git a/i18n/pvsmgr_fr_FR.ts b/i18n/pvsmgr_fr_FR.ts index ba391d2..3371586 100644 --- a/i18n/pvsmgr_fr_FR.ts +++ b/i18n/pvsmgr_fr_FR.ts @@ -315,63 +315,63 @@ Perform an unprojection or remove remote help to get a target. MainWindow - + Exit - + Remove the vnc-Connection for the selected client(s) - + Show the selected client in the whole window - + Make a screenshot for the selected client(s) - + Lock or Unlock all Clients - + The pvs manager - + This operation can only be performed for one selected Client! - + This operation can only be performed if you have selected a Client! - + This operation can only be performed for at least one selected Client! - + You have to set a Superclient-machine before performing this action. - + Open Image - + Image Files (*.png *.jpg *.svg) @@ -593,7 +593,7 @@ Perform an unprojection or remove remote help to get a target. - + Show Processes of the selected Client diff --git a/i18n/pvsmgr_pl_PL.ts b/i18n/pvsmgr_pl_PL.ts index ba391d2..3371586 100644 --- a/i18n/pvsmgr_pl_PL.ts +++ b/i18n/pvsmgr_pl_PL.ts @@ -315,63 +315,63 @@ Perform an unprojection or remove remote help to get a target. MainWindow - + Exit - + Remove the vnc-Connection for the selected client(s) - + Show the selected client in the whole window - + Make a screenshot for the selected client(s) - + Lock or Unlock all Clients - + The pvs manager - + This operation can only be performed for one selected Client! - + This operation can only be performed if you have selected a Client! - + This operation can only be performed for at least one selected Client! - + You have to set a Superclient-machine before performing this action. - + Open Image - + Image Files (*.png *.jpg *.svg) @@ -593,7 +593,7 @@ Perform an unprojection or remove remote help to get a target. - + Show Processes of the selected Client diff --git a/misc/pvs.conf b/misc/pvs.conf index a6fe1f0..f91a63c 100644 --- a/misc/pvs.conf +++ b/misc/pvs.conf @@ -1,10 +1,6 @@ -[General] -chatstate=on -chatmode=community -VNCPermit= +[Permissions] +vnc_lecturer=ro +vnc_other=no +allow_chat=T +allow_filetransfer=T -[room] -room=2 -background= -clientorder= -tag= diff --git a/misc/pvsgui.conf b/misc/pvsgui.conf new file mode 100644 index 0000000..9725bf5 --- /dev/null +++ b/misc/pvsgui.conf @@ -0,0 +1,3 @@ +[Display] +location=1 + diff --git a/misc/pvsmgr.conf b/misc/pvsmgr.conf index 3ff7b40..e69de29 100644 --- a/misc/pvsmgr.conf +++ b/misc/pvsmgr.conf @@ -1,12 +0,0 @@ -[Chat] -chatstate=on -chatmode=bossmode - -[Room] -roomId=123 - -[VNC] -quality=high - -[General] -chatmode=private diff --git a/src/gui/mainWindow.cpp b/src/gui/mainWindow.cpp index 473c85b..9eeb719 100644 --- a/src/gui/mainWindow.cpp +++ b/src/gui/mainWindow.cpp @@ -40,9 +40,11 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow) { - ui->setupUi(this); + if (!QFile::exists(_settings.fileName())) + QFile::copy("/etc/openslx/pvsmgr.conf", _settings.fileName()); + ui->horizontalSlider->setValue(100); ui->label_2->setText("100"); diff --git a/src/gui/mainWindow.h b/src/gui/mainWindow.h index 1e4a18f..574be7e 100644 --- a/src/gui/mainWindow.h +++ b/src/gui/mainWindow.h @@ -159,6 +159,8 @@ private: QMenu* _profileMenuList; QMap _mapProfileToAction; + QSettings _settings; + public slots: void loadProfile(QAction* actiontriggered); void setindexback(); diff --git a/src/pvs.cpp b/src/pvs.cpp index 21b7bdf..bcd2a48 100755 --- a/src/pvs.cpp +++ b/src/pvs.cpp @@ -30,6 +30,9 @@ extern PVS *mainClient; PVS::PVS() : QObject() { + if (!QFile::exists(_settings.fileName())) + QFile::copy("/etc/openslx/pvs.conf", _settings.fileName()); + _pvsServerConnection = new PVSServerConnection(this); _locked = false; _vncAllowed = false; diff --git a/src/pvsgui.cpp b/src/pvsgui.cpp index 0d89027..41a79b9 100644 --- a/src/pvsgui.cpp +++ b/src/pvsgui.cpp @@ -24,6 +24,9 @@ PVSGUI::PVSGUI(QWidget *parent) : { setupUi(this); + if (!QFile::exists(_settings.fileName())) + QFile::copy("/etc/openslx/pvsgui.conf", _settings.fileName()); + _menu = new QMenu(this); _hostMenu = new QMenu(tr("Connect"), this); _hosts = new QHash (); -- cgit v1.2.3-55-g7522