summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Rettberg2016-10-28 18:07:15 +0200
committerSimon Rettberg2016-10-28 18:07:15 +0200
commitb37b57855eb0a117cd87a7e8aafbee3ff0c8de0a (patch)
tree080af291595fc702b5b313085eab7f34536161cf
parent[server] Initialize _wantsAttention to false in client.cpp (diff)
downloadpvs2-b37b57855eb0a117cd87a7e8aafbee3ff0c8de0a.tar.gz
pvs2-b37b57855eb0a117cd87a7e8aafbee3ff0c8de0a.tar.xz
pvs2-b37b57855eb0a117cd87a7e8aafbee3ff0c8de0a.zip
[client] Disable "quit on last window closed" as it triggers in exam mode
Apparently, invisible windows are treated as closed...
-rw-r--r--src/client/clientapp/clientapp.cpp1
-rw-r--r--src/client/toolbar/toolbar.cpp6
2 files changed, 6 insertions, 1 deletions
diff --git a/src/client/clientapp/clientapp.cpp b/src/client/clientapp/clientapp.cpp
index 7711556..d3f0eb4 100644
--- a/src/client/clientapp/clientapp.cpp
+++ b/src/client/clientapp/clientapp.cpp
@@ -11,6 +11,7 @@ ClientApp::ClientApp(int& argc, char** argv)
setOrganizationName("openslx");
setOrganizationDomain("openslx.org");
setApplicationName("pvsclient");
+ setQuitOnLastWindowClosed(false);
/* configuration */
QSettings::setPath(QSettings::IniFormat, QSettings::SystemScope, "/opt/");
diff --git a/src/client/toolbar/toolbar.cpp b/src/client/toolbar/toolbar.cpp
index 8af15f4..19c44cc 100644
--- a/src/client/toolbar/toolbar.cpp
+++ b/src/client/toolbar/toolbar.cpp
@@ -78,12 +78,14 @@ Toolbar::Toolbar(QWidget *parent)
{
init();
}
+
void Toolbar::exit()
{
this->close();
this->deleteLater();
qApp->quit();
}
+
void Toolbar::init()
{
_ui = new Ui::Toolbar;
@@ -93,7 +95,9 @@ void Toolbar::init()
/* Set window properties */
setWindowFlags(Qt::WindowStaysOnTopHint | Qt::X11BypassWindowManagerHint | Qt::FramelessWindowHint);
setAttribute(Qt::WA_AlwaysShowToolTips);
- setAttribute(Qt::WA_QuitOnClose);
+ setAttribute(Qt::WA_QuitOnClose, false);
+ setAttribute(Qt::WA_DeleteOnClose, false);
+
/* Create the VNC Window */
_vnc = new VncWindow(NULL);