From 1630ef0a7aec4869281257efc1735a555f581774 Mon Sep 17 00:00:00 2001
From: Christian Klinger
Date: Wed, 1 Jun 2016 13:00:00 +0200
Subject: small UI improvement.
---
gui/server_normal/mainwindow.ui | 27 ++++++++++++++++----------
src/server/connectionframe/connectionframe.cpp | 1 -
src/server/mainwindow/mainwindow.cpp | 3 ---
3 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/gui/server_normal/mainwindow.ui b/gui/server_normal/mainwindow.ui
index 5b4b70b..18685b7 100644
--- a/gui/server_normal/mainwindow.ui
+++ b/gui/server_normal/mainwindow.ui
@@ -7,34 +7,41 @@
0
0
846
- 760
+ 801
PVS2 Manager
- QToolButton {
- border: 1px solid #555;
+ QToolButton {
border-radius: 8px;
- padding: 2px;
+ padding: 4px;
margin: 5px;
-
+ border: 1px solid #777;
}
QToolButton:enabled {
-background-color: rgb(241, 241, 241)
+background-color: #f8f8f8;
+border: 1px solid #555;
}
QToolButton:enabled:hover {
- background-color: white;
- border-style: outset;
+ background: qradialgradient(cx: 0.4, cy: -0.1,
+fx: 0.4, fy: -0.1,
+radius: 1.35, stop: 0 #fff, stop: 1 #ddd);
+}
+
+QToolButton:enabled:checked,
+QToolButton:enabled:pressed {
+background: qradialgradient(cx: 0.4, cy: -0.1,
+fx: 0.4, fy: -0.1,
+radius: 1.35, stop: 0 #888, stop: 1 #aaa);
}
QLabel#examModeLabel {
width: 71px;
margin: 5px;
border-radius: 8px;
background-color: rgb(170, 170, 170);
-}
-
+}
diff --git a/src/server/connectionframe/connectionframe.cpp b/src/server/connectionframe/connectionframe.cpp
index e274bd5..e962e39 100644
--- a/src/server/connectionframe/connectionframe.cpp
+++ b/src/server/connectionframe/connectionframe.cpp
@@ -188,7 +188,6 @@ void ConnectionFrame::mouseReleaseEvent(QMouseEvent* event)
// Only recognize a move if the distance is larger than _startDragDistance
if ((this->pos() - _previousPosition).manhattanLength() > _startDragDistance )
{
- qDebug("Moved");
emit frameMoved(true, this);
}
else
diff --git a/src/server/mainwindow/mainwindow.cpp b/src/server/mainwindow/mainwindow.cpp
index 28bf268..9a3bd76 100644
--- a/src/server/mainwindow/mainwindow.cpp
+++ b/src/server/mainwindow/mainwindow.cpp
@@ -315,7 +315,6 @@ ConnectionFrame* MainWindow::createFrame(QString computerId, QPoint pxCoord, QPo
{
// Allocate and resize
const Room* room = Global::getCurrentRoom();
- qDebug() << "createFrame, access room: " << room;
int width = getTileWidthPx() * (room == NULL ? 1 : room->clientSize.width());
int height = getTileHeightPx() * (room == NULL ? 1 : room->clientSize.height());
@@ -647,14 +646,12 @@ void MainWindow::resizeEvent(QResizeEvent* e)
void MainWindow::lockContextButtons() {
- qDebug() << "LOCK";
for (auto it = _contextButtons.begin(); it != _contextButtons.end(); ++it) {
(*it)->setEnabled(false);
}
}
void MainWindow::unlockContextButtons() {
- qDebug() << "UNLOCK";
for (auto it = _contextButtons.begin(); it != _contextButtons.end(); ++it) {
(*it)->setEnabled(true);
}
--
cgit v1.2.3-55-g7522