diff options
author | Björn Hagemeister | 2014-05-05 18:24:24 +0200 |
---|---|---|
committer | Björn Hagemeister | 2014-05-05 18:24:24 +0200 |
commit | 699744e0cf4433096d9a5ea2828c66c935e8a3fc (patch) | |
tree | 281793f11d8a15bd6a0a9cdc0fd7324d07d38743 /src | |
parent | Adding flashy Symbol for working connection of client to server. (diff) | |
parent | Resize thumbnail correctly (diff) | |
download | pvs2-699744e0cf4433096d9a5ea2828c66c935e8a3fc.tar.gz pvs2-699744e0cf4433096d9a5ea2828c66c935e8a3fc.tar.xz pvs2-699744e0cf4433096d9a5ea2828c66c935e8a3fc.zip |
Merge branch 'master' of git.openslx.org:pvs2
Diffstat (limited to 'src')
-rw-r--r-- | src/server/connectionframe/connectionframe.cpp | 2 | ||||
-rw-r--r-- | src/server/connectionframe/connectionframe.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/server/connectionframe/connectionframe.cpp b/src/server/connectionframe/connectionframe.cpp index 1c7eaff..4b3a7dd 100644 --- a/src/server/connectionframe/connectionframe.cpp +++ b/src/server/connectionframe/connectionframe.cpp @@ -125,6 +125,8 @@ QLabel* ConnectionFrame::addIcon(const QIcon* icon) void ConnectionFrame::setSize(int width, int height) { this->resize(width, height); + if (this->_client == NULL) + showDefaultThumb(); } /** diff --git a/src/server/connectionframe/connectionframe.h b/src/server/connectionframe/connectionframe.h index 1f39b79..3477721 100644 --- a/src/server/connectionframe/connectionframe.h +++ b/src/server/connectionframe/connectionframe.h @@ -41,6 +41,7 @@ private: void updateAppearance(); QLabel* addIcon(const QIcon* icon); + // Static stylesheets static const QString studentLblStyle, studentBgStyle; static const QString tutorLblStyle, tutorBgStyle; static const QString selectedBgStyle; |