diff options
| -rw-r--r-- | gui/server_normal/mainwindow.ui~ | 553 | ||||
| -rw-r--r-- | src/client/vnc/vncwindow.cpp | 7 | ||||
| -rw-r--r-- | src/client/vnc/vncwindow.h | 1 | ||||
| -rw-r--r-- | src/server/mainwindow/mainwindow.cpp | 9 |
4 files changed, 14 insertions, 556 deletions
diff --git a/gui/server_normal/mainwindow.ui~ b/gui/server_normal/mainwindow.ui~ deleted file mode 100644 index 6ea4d15..0000000 --- a/gui/server_normal/mainwindow.ui~ +++ /dev/null @@ -1,553 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ui version="4.0"> - <class>MainWindow</class> - <widget class="QMainWindow" name="MainWindow"> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>838</width> - <height>607</height> - </rect> - </property> - <property name="windowTitle"> - <string>PVSmgr</string> - </property> - <widget class="QWidget" name="centralWidget"> - <layout class="QGridLayout" name="gridLayout"> - <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>778</width> - <height>542</height> - </rect> - </property> - <layout class="QGridLayout" name="gridLayout_2"> - <item row="0" column="0"> - <layout class="QVBoxLayout" name="verticalLayout"> - <item> - <layout class="QHBoxLayout" name="horizontalLayout"> - <item> - <widget class="QLabel" name="label"> - <property name="text"> - <string>VNC quality</string> - </property> - </widget> - </item> - <item> - <widget class="QComboBox" name="vncQuality"> - <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="separator"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - </widget> - </item> - <item> - <widget class="QCheckBox" name="setPassword"> - <property name="text"> - <string>Set password</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"> - <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> - <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> - </item> - </layout> - </widget> - </widget> - </item> - </layout> - </widget> - <widget class="QMenuBar" name="menuBar"> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>838</width> - <height>23</height> - </rect> - </property> - <widget class="QMenu" name="menu_File"> - <property name="title"> - <string>&File</string> - </property> - <widget class="QMenu" name="menuLoad_profile"> - <property name="title"> - <string>Load profile </string> - </property> - </widget> - <addaction name="action_Disconnect"/> - <addaction name="separator"/> - <addaction name="actionCreate_profile"/> - <addaction name="separator"/> - <addaction name="menuLoad_profile"/> - <addaction name="separator"/> - <addaction name="action_Exit"/> - </widget> - <widget class="QMenu" name="menuClients"> - <property name="title"> - <string>&Clients</string> - </property> - <addaction name="actionShow_Fullname"/> - <addaction name="actionShow_Hostname_IP"/> - <addaction name="actionShow_Username"/> - <addaction name="separator"/> - <addaction name="actionVNC_Placeholders"/> - </widget> - <widget class="QMenu" name="menuLogging"> - <property name="title"> - <string>&Logging</string> - </property> - <addaction name="actionShow_Log"/> - <addaction name="separator"/> - <addaction name="actionShow_Normal"/> - <addaction name="actionShow_Error"/> - <addaction name="actionShow_Network"/> - <addaction name="actionShow_Terminal"/> - <addaction name="actionShow_Chat"/> - </widget> - <widget class="QMenu" name="menu_Help"> - <property name="title"> - <string>&Help</string> - </property> - <addaction name="actionAbout_pvs"/> - </widget> - <addaction name="menu_File"/> - <addaction name="menuClients"/> - <addaction name="menuLogging"/> - <addaction name="menu_Help"/> - </widget> - <widget class="QStatusBar" name="statusBar"/> - <widget class="QToolBar" name="toolBar"> - <property name="maximumSize"> - <size> - <width>129000</width> - <height>12900</height> - </size> - </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>true</bool> - </property> - <property name="toolButtonStyle"> - <enum>Qt::ToolButtonIconOnly</enum> - </property> - <property name="floatable"> - <bool>false</bool> - </property> - <attribute name="toolBarArea"> - <enum>LeftToolBarArea</enum> - </attribute> - <attribute name="toolBarBreak"> - <bool>false</bool> - </attribute> - <addaction name="action_Exit"/> - <addaction name="action_Disconnect"/> - <addaction name="actionFoto"/> - <addaction name="actionView"/> - <addaction name="actionLock"/> - <addaction name="actionChat"/> - <addaction name="actionShowProcesses"/> - </widget> - <action name="actionShow_Username"> - <property name="checkable"> - <bool>false</bool> - </property> - <property name="text"> - <string>Show Username</string> - </property> - <property name="shortcut"> - <string>Ctrl+3</string> - </property> - </action> - <action name="actionShow_Hostname_IP"> - <property name="checkable"> - <bool>false</bool> - </property> - <property name="text"> - <string>Show IP</string> - </property> - <property name="shortcut"> - <string>Ctrl+2</string> - </property> - </action> - <action name="actionVNC_Placeholders"> - <property name="checkable"> - <bool>true</bool> - </property> - <property name="text"> - <string>VNC-Placeholders</string> - </property> - </action> - <action name="actionShow_Log"> - <property name="checkable"> - <bool>true</bool> - </property> - <property name="checked"> - <bool>false</bool> - </property> - <property name="text"> - <string>Show Log</string> - </property> - <property name="shortcut"> - <string>Ctrl+L</string> - </property> - </action> - <action name="actionShow_Normal"> - <property name="checkable"> - <bool>true</bool> - </property> - <property name="text"> - <string>Show Normal</string> - </property> - <property name="shortcut"> - <string>Ctrl+O</string> - </property> - </action> - <action name="actionShow_Error"> - <property name="checkable"> - <bool>true</bool> - </property> - <property name="text"> - <string>Show Error</string> - </property> - <property name="shortcut"> - <string>Ctrl+E</string> - </property> - </action> - <action name="actionShow_Network"> - <property name="checkable"> - <bool>true</bool> - </property> - <property name="text"> - <string>Show Network</string> - </property> - <property name="shortcut"> - <string>Ctrl+N</string> - </property> - </action> - <action name="actionShow_Terminal"> - <property name="checkable"> - <bool>true</bool> - </property> - <property name="text"> - <string>Show Terminal</string> - </property> - <property name="shortcut"> - <string>Ctrl+T</string> - </property> - </action> - <action name="actionShow_Chat"> - <property name="checkable"> - <bool>true</bool> - </property> - <property name="text"> - <string>Show Chat</string> - </property> - <property name="shortcut"> - <string>Ctrl+G</string> - </property> - </action> - <action name="actionAbout_pvs"> - <property name="text"> - <string>About pvs</string> - </property> - <property name="shortcut"> - <string>Ctrl+P</string> - </property> - </action> - <action name="action100_x_100"> - <property name="checkable"> - <bool>true</bool> - </property> - <property name="text"> - <string>100 x 100</string> - </property> - </action> - <action name="action200_x_200"> - <property name="checkable"> - <bool>true</bool> - </property> - <property name="text"> - <string>200 x 200</string> - </property> - </action> - <action name="action500_x_500"> - <property name="checkable"> - <bool>true</bool> - </property> - <property name="text"> - <string>500 x 500</string> - </property> - </action> - <action name="action_Disconnect"> - <property name="icon"> - <iconset resource="../../../pvsmgr.qrc"> - <normaloff>:/logout</normaloff>:/logout</iconset> - </property> - <property name="text"> - <string>&Disconnect</string> - </property> - <property name="shortcut"> - <string>Ctrl+W</string> - </property> - </action> - <action name="action_Exit"> - <property name="icon"> - <iconset resource="../../../pvsmgr.qrc"> - <normaloff>:/exit</normaloff> - <normalon>:/exit</normalon>:/exit</iconset> - </property> - <property name="text"> - <string>&Exit</string> - </property> - <property name="toolTip"> - <string>Exit</string> - </property> - <property name="shortcut"> - <string>Ctrl+Q</string> - </property> - </action> - <action name="actionFoto"> - <property name="icon"> - <iconset resource="../../../pvsmgr.qrc"> - <normaloff>:/photos</normaloff>:/photos</iconset> - </property> - <property name="text"> - <string>Foto</string> - </property> - <property name="toolTip"> - <string>Foto</string> - </property> - <property name="shortcut"> - <string>Ctrl+F</string> - </property> - </action> - <action name="actionView"> - <property name="icon"> - <iconset resource="../../../pvsmgr.qrc"> - <normaloff>:/restore</normaloff>:/restore</iconset> - </property> - <property name="text"> - <string>view</string> - </property> - <property name="toolTip"> - <string>View</string> - </property> - <property name="shortcut"> - <string>Ctrl+V</string> - </property> - </action> - <action name="actionLock"> - <property name="icon"> - <iconset resource="../../../pvsmgr.qrc"> - <normaloff>:/lock</normaloff>:/lock</iconset> - </property> - <property name="text"> - <string>lock</string> - </property> - <property name="toolTip"> - <string>Lock or Unlock all Clients</string> - </property> - <property name="shortcut"> - <string>Ctrl+A</string> - </property> - </action> - <action name="actionCreate_profile"> - <property name="icon"> - <iconset resource="../../../pvsmgr.qrc"> - <normaloff>:/profile</normaloff>:/profile</iconset> - </property> - <property name="text"> - <string>Profile &manager</string> - </property> - <property name="shortcut"> - <string>Ctrl+M</string> - </property> - </action> - <action name="actionShow_Fullname"> - <property name="text"> - <string>Show Name</string> - </property> - <property name="shortcut"> - <string>Ctrl+1</string> - </property> - </action> - <action name="actionChat"> - <property name="icon"> - <iconset resource="../../../pvsmgr.qrc"> - <normaloff>:/chat</normaloff>:/chat</iconset> - </property> - <property name="text"> - <string>Chat</string> - </property> - <property name="toolTip"> - <string>Start Chat with client(s)</string> - </property> - <property name="shortcut"> - <string>Ctrl+D</string> - </property> - </action> - <action name="dummy"> - <property name="text"> - <string>-</string> - </property> - </action> - <action name="actionShowProcesses"> - <property name="icon"> - <iconset resource="../../../pvsmgr.qrc"> - <normaloff>:/gears</normaloff>:/gears</iconset> - </property> - <property name="text"> - <string>showProcesses</string> - </property> - <property name="toolTip"> - <string>Show Processes of the selected Client</string> - </property> - </action> - </widget> - <layoutdefault spacing="6" margin="11"/> - <resources> - <include location="../../../pvsmgr.qrc"/> - </resources> - <connections/> -</ui> diff --git a/src/client/vnc/vncwindow.cpp b/src/client/vnc/vncwindow.cpp index 34cbab7..2f2b427 100644 --- a/src/client/vnc/vncwindow.cpp +++ b/src/client/vnc/vncwindow.cpp @@ -115,7 +115,14 @@ void VncWindow::onProjectionStopped() //////////////////////////////////////////////////////////////////////////////// // Protected +void VncWindow::close() +{ + if (this->isVisible()) + QDialog::close(); + else + emit running(false, _clientId); +} void VncWindow::timerEvent(QTimerEvent *event) { if (event->timerId() == _redrawTimer) diff --git a/src/client/vnc/vncwindow.h b/src/client/vnc/vncwindow.h index 60e4835..a9c5910 100644 --- a/src/client/vnc/vncwindow.h +++ b/src/client/vnc/vncwindow.h @@ -52,6 +52,7 @@ protected: void resizeEvent(QResizeEvent* event); void closeEvent(QCloseEvent *e); void timerEvent(QTimerEvent *event); + void close(); //bool event(QEvent *event); //bool eventFilter(QObject *obj, QEvent *event); diff --git a/src/server/mainwindow/mainwindow.cpp b/src/server/mainwindow/mainwindow.cpp index 7543004..4909fb9 100644 --- a/src/server/mainwindow/mainwindow.cpp +++ b/src/server/mainwindow/mainwindow.cpp @@ -608,14 +608,17 @@ void MainWindow::onButtonStopProjection() c->setDesiredProjectionSource(0); c->setProjectionSource(false); } - NetworkMessage msg; - msg.setField(_ID, _VNCCLIENT); + NetworkMessage stopVncClientmsg; + NetworkMessage stopVncServermsg; + stopVncClientmsg.setField(_ID, _VNCCLIENT); + stopVncServermsg.setField(_ID, _VNCSERVER); for (QList<ConnectionFrame*>::iterator it(_clientFrames.begin()); it != _clientFrames.end(); ++it) { Client *c = (**it).client(); if (c == NULL) continue; - c->sendMessage(msg); + c->sendMessage(stopVncClientmsg); + c->sendMessage(stopVncServermsg); } } |