[composer] More GUI label alignment fixes for Windows

This commit is contained in:
Nyall Dawson 2014-06-17 21:40:59 +10:00
parent 3f6233079b
commit 95f88aeea9
4 changed files with 32 additions and 8 deletions

View File

@ -72,6 +72,9 @@
<bool>false</bool> <bool>false</bool>
</property> </property>
<layout class="QFormLayout" name="formLayout"> <layout class="QFormLayout" name="formLayout">
<property name="labelAlignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="mUrlLabel"> <widget class="QLabel" name="mUrlLabel">
<property name="text"> <property name="text">

View File

@ -60,7 +60,7 @@
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>-187</y> <y>-86</y>
<width>339</width> <width>339</width>
<height>665</height> <height>665</height>
</rect> </rect>
@ -302,6 +302,9 @@
<property name="fieldGrowthPolicy"> <property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum> <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property> </property>
<property name="labelAlignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label_4"> <widget class="QLabel" name="label_4">
<property name="text"> <property name="text">

19
src/ui/qgscomposershapewidgetbase.ui Normal file → Executable file
View File

@ -56,7 +56,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>283</width> <width>283</width>
<height>404</height> <height>408</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="mainLayout"> <layout class="QVBoxLayout" name="mainLayout">
@ -72,6 +72,9 @@
<bool>false</bool> <bool>false</bool>
</property> </property>
<layout class="QFormLayout" name="formLayout"> <layout class="QFormLayout" name="formLayout">
<property name="labelAlignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLabel" name="label_3"> <widget class="QLabel" name="label_3">
<property name="text"> <property name="text">
@ -81,6 +84,12 @@
</item> </item>
<item row="1" column="1"> <item row="1" column="1">
<widget class="QDoubleSpinBox" name="mCornerRadiusSpinBox"> <widget class="QDoubleSpinBox" name="mCornerRadiusSpinBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="suffix"> <property name="suffix">
<string> mm</string> <string> mm</string>
</property> </property>
@ -98,6 +107,12 @@
</item> </item>
<item row="2" column="1"> <item row="2" column="1">
<widget class="QPushButton" name="mShapeStyleButton"> <widget class="QPushButton" name="mShapeStyleButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text"> <property name="text">
<string>Change...</string> <string>Change...</string>
</property> </property>
@ -119,7 +134,7 @@
<customwidget> <customwidget>
<class>QgsCollapsibleGroupBoxBasic</class> <class>QgsCollapsibleGroupBoxBasic</class>
<extends>QGroupBox</extends> <extends>QGroupBox</extends>
<header location="global">qgscollapsiblegroupbox.h</header> <header>qgscollapsiblegroupbox.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
</customwidgets> </customwidgets>

View File

@ -75,6 +75,9 @@
<property name="fieldGrowthPolicy"> <property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum> <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property> </property>
<property name="labelAlignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="mLayerLabel"> <widget class="QLabel" name="mLayerLabel">
<property name="text"> <property name="text">
@ -330,16 +333,16 @@
<header>qgscollapsiblegroupbox.h</header> <header>qgscollapsiblegroupbox.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget>
<class>QgsMapLayerComboBox</class>
<extends>QComboBox</extends>
<header location="global">qgsmaplayercombobox.h</header>
</customwidget>
<customwidget> <customwidget>
<class>QgsColorButton</class> <class>QgsColorButton</class>
<extends>QPushButton</extends> <extends>QPushButton</extends>
<header>qgscolorbutton.h</header> <header>qgscolorbutton.h</header>
</customwidget> </customwidget>
<customwidget>
<class>QgsMapLayerComboBox</class>
<extends>QComboBox</extends>
<header location="global">qgsmaplayercombobox.h</header>
</customwidget>
</customwidgets> </customwidgets>
<resources> <resources>
<include location="../../images/images.qrc"/> <include location="../../images/images.qrc"/>