diff options
author | Johann Latocha | 2011-03-02 19:10:03 +0100 |
---|---|---|
committer | Johann Latocha | 2011-03-02 19:10:03 +0100 |
commit | 99bcde9a9b27a9901ecf40b8ce23943f6899d62b (patch) | |
tree | 6b1b301dea746523b777122c40680d011c24f0b0 | |
parent | * dbus interface removed (diff) | |
parent | .. (diff) | |
download | vmchooser-99bcde9a9b27a9901ecf40b8ce23943f6899d62b.tar.gz vmchooser-99bcde9a9b27a9901ecf40b8ce23943f6899d62b.tar.xz vmchooser-99bcde9a9b27a9901ecf40b8ce23943f6899d62b.zip |
Merge branch 'master' of openslx.org:openslx/tools/vmchooser
Conflicts:
src/main.cpp
-rw-r--r-- | src/img/title_r.png | bin | 4108 -> 4113 bytes | |||
-rw-r--r-- | src/main.cpp | 1 | ||||
-rw-r--r-- | src/ui/dialog.ui | 23 |
3 files changed, 16 insertions, 8 deletions
diff --git a/src/img/title_r.png b/src/img/title_r.png Binary files differindex 2d0e2cb..3edbcb0 100644 --- a/src/img/title_r.png +++ b/src/img/title_r.png diff --git a/src/main.cpp b/src/main.cpp index ff054fc..4d86369 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -166,6 +166,7 @@ int main(int argc, char *argv[]) { QList<Session*> vsessions(VSession::readXmlDir(vSessionPath)); Dialog w; + w.setWindowFlags(Qt::FramelessWindowHint); if (cmdOptions.contains("pvs")) w.showSettingsPVS(); diff --git a/src/ui/dialog.ui b/src/ui/dialog.ui index 9a49987..e1c93c2 100644 --- a/src/ui/dialog.ui +++ b/src/ui/dialog.ui @@ -13,6 +13,11 @@ <property name="windowTitle"> <string>vmchooser</string> </property> + <property name="styleSheet"> + <string notr="true">#Dialog { + border:1px solid #999; +}</string> + </property> <layout class="QVBoxLayout" name="verticalLayout"> <property name="spacing"> <number>0</number> @@ -43,9 +48,10 @@ </size> </property> <property name="styleSheet"> - <string notr="true">background-color:#003592; -margin-top:0px; -margin-bottom:0px;</string> + <string notr="true">#label_l {background-color:#003592; +margin-left:1px; +margin-top:1px; +margin-bottom:0px;}</string> </property> <property name="frameShadow"> <enum>QFrame::Plain</enum> @@ -73,9 +79,10 @@ margin-bottom:0px;</string> </size> </property> <property name="styleSheet"> - <string notr="true">background-color:#003592; -margin-top:0px; -margin-bottom:0px;</string> + <string notr="true">#label_r {background-color:#003592; +margin-top:1px; +margin-right:1px; +margin-bottom:0px;}</string> </property> <property name="frameShadow"> <enum>QFrame::Plain</enum> @@ -102,8 +109,8 @@ margin-bottom:0px;</string> </size> </property> <property name="styleSheet"> - <string notr="true">border-top:1px solid #ccc; -border-bottom:1px solid #ccc; + <string notr="true">#treeView {border-top:1px solid #999; +border-bottom:1px solid #999;} </string> </property> <property name="frameShape"> |