1
0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-03-23 19:57:21 +01:00

interface dialog layout correction for font 14pt

This commit is contained in:
Vadim Kurland 2008-08-30 16:46:42 +00:00
parent aa2c87c8d5
commit 2ad0e94f57
4 changed files with 58 additions and 33 deletions

View File

@ -1 +1 @@
#define BUILD_NUM 491
#define BUILD_NUM 498

View File

@ -1,3 +1,10 @@
2008-08-30 Vadim Kurland <vadim@vk.crocodile.org>
* InterfaceDialog: layout adjustment for bug #2078671: "fwbuilder
3.0.0 build 487 - add/edit interface". Layout did not work quite
right with QT4 themes Plastique and Oxygen with default font size
14.
2008-08-29 Vadim Kurland <vadim@vk.crocodile.org>
* ObjectEditor.cpp: more missing #include for FreeBSD

View File

@ -37,8 +37,8 @@ unix {
INCLUDEPATH += .. ../.. $$(INCLUDEPATH) /home/vadim/src/fwb3-branch-v3/install_root/include/ /home/vadim/src/fwb3-branch-v3/install_root/include/fwb-3 /usr/include/libxml2
LIBS_FWCOMPILER = -L/home/vadim/src/fwb3-branch-v3/install_root/lib -pthread -lfwcompiler -lfwbuilder -lxslt -lxml2 -lnetsnmp -lm -lwrap
LIBS_FWBUILDER = -L/home/vadim/src/fwb3-branch-v3/install_root/lib -pthread -lfwbuilder -lxslt -lxml2 -lnetsnmp -lm -lwrap
LIBS_FWCOMPILER = -L/home/vadim/src/fwb3-branch-v3/install_root/lib -pthread -lfwcompiler -lfwbuilder -lxslt -lxml2 -lz -lm -lcrypto -lsensors -lnetsnmp
LIBS_FWBUILDER = -L/home/vadim/src/fwb3-branch-v3/install_root/lib -pthread -lfwbuilder -lxslt -lxml2 -lz -lm -lcrypto -lsensors -lnetsnmp
target.path = $$PREFIX/bin
dtd.path = @TEMPLATE_DIR@/

View File

@ -8,8 +8,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>905</width>
<height>342</height>
<width>857</width>
<height>267</height>
</rect>
</property>
<property name="sizePolicy" >
@ -110,10 +110,22 @@
<enum>QFrame::Sunken</enum>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<property name="leftMargin" >
<number>2</number>
</property>
<property name="spacing" >
<property name="topMargin" >
<number>2</number>
</property>
<property name="rightMargin" >
<number>2</number>
</property>
<property name="bottomMargin" >
<number>2</number>
</property>
<property name="horizontalSpacing" >
<number>2</number>
</property>
<property name="verticalSpacing" >
<number>2</number>
</property>
<item row="0" column="2" >
@ -150,7 +162,7 @@
<string/>
</property>
<property name="pixmap" >
<pixmap>:/Icons/Interface/icon</pixmap>
<pixmap/>
</property>
</widget>
</item>
@ -160,7 +172,7 @@
<item row="1" column="0" >
<widget class="QFrame" name="frame7" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
<sizepolicy vsizetype="MinimumExpanding" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@ -172,12 +184,6 @@
<enum>QFrame::Sunken</enum>
</property>
<layout class="QGridLayout" >
<property name="sizeConstraint" >
<enum>QLayout::SetDefaultConstraint</enum>
</property>
<property name="spacing" >
<number>8</number>
</property>
<item rowspan="2" row="0" column="0" >
<widget class="QFrame" name="frame26" >
<property name="sizePolicy" >
@ -188,8 +194,8 @@
</property>
<property name="minimumSize" >
<size>
<width>0</width>
<height>16</height>
<width>170</width>
<height>107</height>
</size>
</property>
<property name="frameShape" >
@ -202,10 +208,22 @@
<property name="sizeConstraint" >
<enum>QLayout::SetMinAndMaxSize</enum>
</property>
<property name="margin" >
<property name="leftMargin" >
<number>8</number>
</property>
<property name="spacing" >
<property name="topMargin" >
<number>8</number>
</property>
<property name="rightMargin" >
<number>8</number>
</property>
<property name="bottomMargin" >
<number>8</number>
</property>
<property name="horizontalSpacing" >
<number>8</number>
</property>
<property name="verticalSpacing" >
<number>8</number>
</property>
<item row="0" column="0" >
@ -456,6 +474,19 @@ Security level can be any number between 0 and 100, 0 being least secure and 100
</widget>
</item>
<item row="2" column="0" >
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<size>
<width>20</width>
<height>21</height>
</size>
</property>
</spacer>
</item>
<item row="3" column="0" >
<widget class="QLabel" name="netzoneLabel" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
@ -471,7 +502,7 @@ Security level can be any number between 0 and 100, 0 being least secure and 100
</property>
</widget>
</item>
<item row="3" column="0" >
<item row="4" column="0" >
<widget class="QComboBox" name="netzone" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
@ -497,19 +528,6 @@ If network zone for this interface consists of only one subnet, you can simply c
</property>
</widget>
</item>
<item row="4" column="0" >
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0" >
<size>
<width>20</width>
<height>21</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>