summaryrefslogtreecommitdiffstats
path: root/gui
diff options
context:
space:
mode:
authorBjörn Hagemeister2014-05-19 17:30:55 +0200
committerBjörn Hagemeister2014-05-19 17:30:55 +0200
commit4d2cb705ed01094061eb281dc0a1130ebb3872c9 (patch)
treef55586edb88bc4df60b2ef8385fc3d8e967b7675 /gui
parentHelp window (diff)
parentCommiting forgotten icon. (diff)
downloadpvs2-4d2cb705ed01094061eb281dc0a1130ebb3872c9.tar.gz
pvs2-4d2cb705ed01094061eb281dc0a1130ebb3872c9.tar.xz
pvs2-4d2cb705ed01094061eb281dc0a1130ebb3872c9.zip
Merge branch 'master' of git.openslx.org:pvs2
Diffstat (limited to 'gui')
-rw-r--r--gui/server_normal/mainwindow.ui16
1 files changed, 5 insertions, 11 deletions
diff --git a/gui/server_normal/mainwindow.ui b/gui/server_normal/mainwindow.ui
index 135544d..9bf32aa 100644
--- a/gui/server_normal/mainwindow.ui
+++ b/gui/server_normal/mainwindow.ui
@@ -53,12 +53,6 @@
</layout>
</widget>
<widget class="QToolBar" name="toolBar">
- <property name="maximumSize">
- <size>
- <width>129000</width>
- <height>12900</height>
- </size>
- </property>
<property name="windowTitle">
<string>toolBar</string>
</property>
@@ -71,11 +65,11 @@
<property name="movable">
<bool>false</bool>
</property>
- <property name="toolButtonStyle">
- <enum>Qt::ToolButtonIconOnly</enum>
- </property>
- <property name="floatable">
- <bool>false</bool>
+ <property name="iconSize">
+ <size>
+ <width>64</width>
+ <height>64</height>
+ </size>
</property>
<attribute name="toolBarArea">
<enum>LeftToolBarArea</enum>