summaryrefslogtreecommitdiffstats
path: root/src/server/connectionframe/connectionframe.cpp
diff options
context:
space:
mode:
authorSimon Rettberg2018-07-19 17:20:30 +0200
committerSimon Rettberg2018-07-19 17:20:30 +0200
commit87eaae3e4e2f6d542956df870609b798b9fa9d26 (patch)
tree9cc85ec51589e1e7b14dae7e05a059b15a8cf8d2 /src/server/connectionframe/connectionframe.cpp
parent[server] SessionNameWindow: Set focus to text box on open (diff)
downloadpvs2-87eaae3e4e2f6d542956df870609b798b9fa9d26.tar.gz
pvs2-87eaae3e4e2f6d542956df870609b798b9fa9d26.tar.xz
pvs2-87eaae3e4e2f6d542956df870609b798b9fa9d26.zip
[server] Offer deleting temp. clients on session name change
If the user changes the session name, we now ask whether to disconnect and delete all clients that just connected via session name and don't belong to the currently loaded room layout.
Diffstat (limited to 'src/server/connectionframe/connectionframe.cpp')
-rw-r--r--src/server/connectionframe/connectionframe.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/server/connectionframe/connectionframe.cpp b/src/server/connectionframe/connectionframe.cpp
index 85d2e32..fb2c96a 100644
--- a/src/server/connectionframe/connectionframe.cpp
+++ b/src/server/connectionframe/connectionframe.cpp
@@ -68,9 +68,9 @@ bool ConnectionFrame::paintDisabled = false;
* @param width
* @param height
*/
-ConnectionFrame::ConnectionFrame(MainWindow* main, QWidget *parent) :
+ConnectionFrame::ConnectionFrame(MainWindow* main, QWidget *parent, bool fromRoomplan) :
QGroupBox(parent), _client(NULL), _timerId(0), _timerCounter(0), _isSelected(false), _isTutor(false),
- _mainWindow(main)
+ _isFromRoomplan(fromRoomplan), _mainWindow(main)
{
//defines the ui-stuff
@@ -82,8 +82,6 @@ ConnectionFrame::ConnectionFrame(MainWindow* main, QWidget *parent) :
lock = new QIcon(":cf_lock");
}
- //this->setAttribute(Qt::WA_OpaquePaintEvent);
-
_mainLayout = new QBoxLayout(QBoxLayout::TopToBottom, this);
_mainLayout->setSpacing(1);
_mainLayout->setMargin(3);