diff options
| author | Dirk von Suchodoletz | 2011-03-25 02:29:55 +0100 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2011-03-25 02:29:55 +0100 |
| commit | 2da95e2716a5e912089562f0c43aa7bdae07a70e (patch) | |
| tree | 9f2e1df13f7c7a1d98faf6df687586b3ff82f958 /src/gui/connectionFrame.h | |
| parent | ... (diff) | |
| parent | revert username generator (diff) | |
| download | pvs-2da95e2716a5e912089562f0c43aa7bdae07a70e.tar.gz pvs-2da95e2716a5e912089562f0c43aa7bdae07a70e.tar.xz pvs-2da95e2716a5e912089562f0c43aa7bdae07a70e.zip | |
Merge branch 'master' of openslx.org:pvs
Diffstat (limited to 'src/gui/connectionFrame.h')
| -rw-r--r-- | src/gui/connectionFrame.h | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/gui/connectionFrame.h b/src/gui/connectionFrame.h index 235d0fc..fe6dc95 100644 --- a/src/gui/connectionFrame.h +++ b/src/gui/connectionFrame.h @@ -16,8 +16,8 @@ extern "C" } #define PROFILE -#define STYLE_DEFAULT "QGroupBox{background-color: rgb(150, 150, 150); margin: 2px; border: 1px solid black; border-radius: 8px; padding: 2px; padding-top: 1.5em;}" -#define STYLE_SELECTED "QGroupBox{background-color: rgb(150, 150, 150); margin: 2px; border: 1px solid red; border-radius: 8px; padding: 2px; padding-top: 1.5em;}" +#define STYLE_DEFAULT "QGroupBox{background-color: #DCDCDC; margin: 2px; border: 1px solid black; border-radius: 8px; padding: 2px; padding-top: 1.5em;}" +#define STYLE_SELECTED "QGroupBox{background-color: #DCDCDC; margin: 2px; border: 1px solid red; border-radius: 8px; padding: 2px; padding-top: 1.5em;}" #include <src/util/timeUtil.h> @@ -118,7 +118,6 @@ public: void setFrameRate(int newRate); bool isClientOnline; void paintCloseUp(int w, int h); - void resizeComponent(int w, int h); void setSource(); void setTarget(); void setUnproject(); @@ -145,8 +144,8 @@ public Q_SLOTS: protected: //virtual void paintEvent(QPaintEvent *event); void mouseReleaseEvent ( QMouseEvent * e ); - virtual void enterEvent ( QEvent * event ); - virtual void leaveEvent ( QEvent * event ); + virtual void enterEvent ( QEvent * event ); + virtual void leaveEvent ( QEvent * event ); void mousePressEvent(QMouseEvent *event); void mouseMoveEvent(QMouseEvent *event); //void mouseReleaseEvent ( QMouseEvent * event ); @@ -154,15 +153,12 @@ protected: private: Frame *_frame; - //clickableLabel *frame; - QSplitter *_split; - QGridLayout* _gL; + QVBoxLayout *_layoutTop; + QHBoxLayout *_layoutBottom; QLabel* _ip; QLabel* _status; QLabel* _dozentContaimner; QWidget* _conFrameTaskbar; - QGridLayout* _gLayout; - QHBoxLayout* _hLayoutInCfTaskbar; PVSClient* _myConnection; QPixmap _clientPix; |