diff options
| author | Björn Hagemeister | 2014-05-06 15:42:33 +0200 |
|---|---|---|
| committer | Björn Hagemeister | 2014-05-06 15:42:33 +0200 |
| commit | 8e774982be169f33fe4f4c687885d96f1c4e5ab4 (patch) | |
| tree | f4d8042b531ef15024cd9e56a9569f3939950e96 /src/server/connectionframe | |
| parent | New Feature: Showing client toolbar while vnc server is running. (diff) | |
| parent | Merge branch 'master' of git.openslx.org:pvs2 (diff) | |
| download | pvs2-8e774982be169f33fe4f4c687885d96f1c4e5ab4.tar.gz pvs2-8e774982be169f33fe4f4c687885d96f1c4e5ab4.tar.xz pvs2-8e774982be169f33fe4f4c687885d96f1c4e5ab4.zip | |
Merge branch 'master' of git.openslx.org:pvs2
Conflicts:
src/client/connectwindow/connectwindow.h
Diffstat (limited to 'src/server/connectionframe')
| -rw-r--r-- | src/server/connectionframe/connectionframe.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/server/connectionframe/connectionframe.cpp b/src/server/connectionframe/connectionframe.cpp index 4b3a7dd..75d24a4 100644 --- a/src/server/connectionframe/connectionframe.cpp +++ b/src/server/connectionframe/connectionframe.cpp @@ -21,20 +21,20 @@ #include <cassert> static QString style_student( - "QLabel{ background-color: #919191; border-radius: 2px; color: black;} \ - QGroupBox { background-color: #919191; margin: 2px; border-radius: 4px}" + "QLabel{ background-color: #FFF; border-radius: 2px; color: black;} \ + QGroupBox { background-color: #AAA; margin: 2px; border-radius: 4px}" ); static QString style_tutor( - "QLabel{ background-color: #70C670; border-radius: 2px; color: black;} \ + "QLabel{ background-color: #FFF; border-radius: 2px; color: black;} \ QGroupBox { background-color: #70C670; margin: 2px; border-radius: 4px}" ); static QString style_selectedStudent( - "QLabel{ background-color: #6C8CD5; border-radius: 2px; color: black; } \ - QGroupBox { background-color: #919191; margin: 0px; border-radius: 4px; border: 2px dashed #6C8CD5;}" + "QLabel{ background-color: #FFF; border-radius: 2px; color: black; } \ + QGroupBox { background-color: #AAA; margin: 0px; border-radius: 4px; border: 2px solid #6C8CD5;}" ); static QString style_selectedTutor( - "QLabel{ background-color: #6C8CD5; border-radius: 2px; color: black;} \ - QGroupBox { background-color: #70C670; margin: 0px; border-radius: 4px; border: 2px dashed #6C8CD5;}" + "QLabel{ background-color: #FFF; border-radius: 2px; color: black;} \ + QGroupBox { background-color: #70C670; margin: 0px; border-radius: 4px; border: 2px solid #6C8CD5;}" ); static QString style_disconnected( "QLabel{ background-color: #919191; color: black; } \ |