Skip to content

Commit

Permalink
[composer] More GUI label alignment fixes for Windows
Browse files Browse the repository at this point in the history
  • Loading branch information
@nyalldawson
nyalldawson committed Jun 17, 2014
1 parent 3f62330 commit 95f88ae
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 8 deletions.
3 changes: 3 additions & 0 deletions src/ui/qgscomposerhtmlwidgetbase.ui
View file
Expand Up @@ -72,6 +72,9 @@
<bool>false</bool>
</property>
<layout class="QFormLayout" name="formLayout">
<property name="labelAlignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
<item row="0" column="0">
<widget class="QLabel" name="mUrlLabel">
<property name="text">
Expand Down
5 changes: 4 additions & 1 deletion src/ui/qgscomposerscalebarwidgetbase.ui
View file
Expand Up @@ -60,7 +60,7 @@
<property name="geometry">
<rect>
<x>0</x>
<y>-187</y>
<y>-86</y>
<width>339</width>
<height>665</height>
</rect>
Expand Down Expand Up @@ -302,6 +302,9 @@
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<property name="labelAlignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
<item row="0" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
Expand Down
19 changes: 17 additions & 2 deletions src/ui/qgscomposershapewidgetbase.ui 100644 → 100755
View file
Expand Up @@ -56,7 +56,7 @@
<x>0</x>
<y>0</y>
<width>283</width>
<height>404</height>
<height>408</height>
</rect>
</property>
<layout class="QVBoxLayout" name="mainLayout">
Expand All @@ -72,6 +72,9 @@
<bool>false</bool>
</property>
<layout class="QFormLayout" name="formLayout">
<property name="labelAlignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
<item row="1" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
Expand All @@ -81,6 +84,12 @@
</item>
<item row="1" column="1">
<widget class="QDoubleSpinBox" name="mCornerRadiusSpinBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="suffix">
<string> mm</string>
</property>
Expand All @@ -98,6 +107,12 @@
</item>
<item row="2" column="1">
<widget class="QPushButton" name="mShapeStyleButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Change...</string>
</property>
Expand All @@ -119,7 +134,7 @@
<customwidget>
<class>QgsCollapsibleGroupBoxBasic</class>
<extends>QGroupBox</extends>
<header location="global">qgscollapsiblegroupbox.h</header>
<header>qgscollapsiblegroupbox.h</header>
<container>1</container>
</customwidget>
</customwidgets>
Expand Down
13 changes: 8 additions & 5 deletions src/ui/qgscomposertablewidgetbase.ui
View file
Expand Up @@ -75,6 +75,9 @@
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<property name="labelAlignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
<item row="0" column="0">
<widget class="QLabel" name="mLayerLabel">
<property name="text">
Expand Down Expand Up @@ -330,16 +333,16 @@
<header>qgscollapsiblegroupbox.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsMapLayerComboBox</class>
<extends>QComboBox</extends>
<header location="global">qgsmaplayercombobox.h</header>
</customwidget>
<customwidget>
<class>QgsColorButton</class>
<extends>QPushButton</extends>
<header>qgscolorbutton.h</header>
</customwidget>
<customwidget>
<class>QgsMapLayerComboBox</class>
<extends>QComboBox</extends>
<header location="global">qgsmaplayercombobox.h</header>
</customwidget>
</customwidgets>
<resources>
<include location="../../images/images.qrc"/>
Expand Down

0 comments on commit 95f88ae

Please sign in to comment.