Skip to content

Commit

Permalink
[composer] Neaten up some item widget panels
Browse files Browse the repository at this point in the history
  • Loading branch information
@nyalldawson
nyalldawson committed Jun 16, 2014
1 parent 39b3e5f commit 7ff4888
Show file tree
Hide file tree
Showing 7 changed files with 202 additions and 92 deletions.
48 changes: 33 additions & 15 deletions src/ui/qgsatlascompositionwidgetbase.ui 100644 → 100755
View file
Expand Up @@ -23,7 +23,16 @@
<property name="spacing">
<number>0</number>
</property>
<property name="margin">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
Expand All @@ -32,15 +41,24 @@
<enum>QFrame::StyledPanel</enum>
</property>
<layout class="QGridLayout" name="gridLayout">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<property name="horizontalSpacing">
<number>0</number>
</property>
<property name="verticalSpacing">
<number>3</number>
</property>
<property name="margin">
<number>0</number>
</property>
<item row="0" column="1">
<widget class="QCheckBox" name="mUseAtlasCheckBox">
<property name="text">
Expand Down Expand Up @@ -91,7 +109,7 @@
<x>0</x>
<y>0</y>
<width>431</width>
<height>567</height>
<height>569</height>
</rect>
</property>
<layout class="QVBoxLayout" name="mainLayout">
Expand Down Expand Up @@ -130,16 +148,6 @@
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QgsMapLayerComboBox" name="mAtlasCoverageLayerComboBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="0" column="1">
<spacer name="horizontalSpacer_3">
<property name="orientation">
Expand Down Expand Up @@ -177,6 +185,16 @@
</property>
</widget>
</item>
<item row="0" column="2" colspan="2">
<widget class="QgsMapLayerComboBox" name="mAtlasCoverageLayerComboBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
</layout>
</widget>
</item>
Expand Down
24 changes: 20 additions & 4 deletions src/ui/qgscomposerhtmlwidgetbase.ui 100644 → 100755
View file
Expand Up @@ -17,7 +17,16 @@
<property name="spacing">
<number>0</number>
</property>
<property name="margin">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
Expand Down Expand Up @@ -47,7 +56,7 @@
<x>0</x>
<y>0</y>
<width>407</width>
<height>360</height>
<height>364</height>
</rect>
</property>
<layout class="QVBoxLayout" name="mainLayout">
Expand Down Expand Up @@ -105,7 +114,14 @@
</widget>
</item>
<item row="2" column="1">
<widget class="QComboBox" name="mResizeModeComboBox"/>
<widget class="QComboBox" name="mResizeModeComboBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="3" column="0" colspan="2">
<widget class="QPushButton" name="mAddFramePushButton">
Expand Down Expand Up @@ -168,7 +184,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
51 changes: 43 additions & 8 deletions src/ui/qgscomposeritemwidgetbase.ui 100644 → 100755
View file
Expand Up @@ -261,6 +261,12 @@
</item>
<item row="0" column="1">
<widget class="QDoubleSpinBox" name="mItemRotationSpinBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="suffix">
<string> °</string>
</property>
Expand Down Expand Up @@ -289,6 +295,12 @@
<layout class="QFormLayout" name="formLayout_4">
<item row="0" column="0" colspan="2">
<widget class="QgsColorButton" name="mFrameColorButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Color...</string>
</property>
Expand All @@ -308,7 +320,17 @@
</widget>
</item>
<item row="1" column="1">
<widget class="QDoubleSpinBox" name="mOutlineWidthSpinBox"/>
<widget class="QDoubleSpinBox" name="mOutlineWidthSpinBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="suffix">
<string> mm</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_8">
Expand All @@ -318,7 +340,14 @@
</widget>
</item>
<item row="2" column="1">
<widget class="QgsPenJoinStyleComboBox" name="mFrameJoinStyleCombo"/>
<widget class="QgsPenJoinStyleComboBox" name="mFrameJoinStyleCombo">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
</layout>
</widget>
Expand All @@ -343,6 +372,12 @@
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QgsColorButton" name="mBackgroundColorButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Color...</string>
</property>
Expand Down Expand Up @@ -460,6 +495,12 @@
</layout>
</widget>
<customwidgets>
<customwidget>
<class>QgsCollapsibleGroupBoxBasic</class>
<extends>QGroupBox</extends>
<header>qgscollapsiblegroupbox.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsColorButton</class>
<extends>QPushButton</extends>
Expand All @@ -470,12 +511,6 @@
<extends>QComboBox</extends>
<header>qgsblendmodecombobox.h</header>
</customwidget>
<customwidget>
<class>QgsCollapsibleGroupBoxBasic</class>
<extends>QGroupBox</extends>
<header location="global">qgscollapsiblegroupbox.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsPenJoinStyleComboBox</class>
<extends>QComboBox</extends>
Expand Down
20 changes: 10 additions & 10 deletions src/ui/qgscomposerlegendwidgetbase.ui 100644 → 100755
View file
Expand Up @@ -63,9 +63,9 @@
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>375</width>
<height>1320</height>
<y>-169</y>
<width>374</width>
<height>1145</height>
</rect>
</property>
<layout class="QVBoxLayout" name="mainLayout">
Expand Down Expand Up @@ -802,7 +802,7 @@
<string>Space below title.</string>
</property>
<property name="suffix">
<string>mm</string>
<string> mm</string>
</property>
</widget>
</item>
Expand All @@ -817,17 +817,17 @@
</widget>
<layoutdefault spacing="6" margin="11"/>
<customwidgets>
<customwidget>
<class>QgsColorButton</class>
<extends>QPushButton</extends>
<header>qgscolorbutton.h</header>
</customwidget>
<customwidget>
<class>QgsCollapsibleGroupBoxBasic</class>
<extends>QGroupBox</extends>
<header location="global">qgscollapsiblegroupbox.h</header>
<header>qgscollapsiblegroupbox.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsColorButton</class>
<extends>QPushButton</extends>
<header>qgscolorbutton.h</header>
</customwidget>
</customwidgets>
<resources>
<include location="../../images/images.qrc"/>
Expand Down
50 changes: 37 additions & 13 deletions src/ui/qgscomposermapwidgetbase.ui 100644 → 100755
View file
Expand Up @@ -23,7 +23,16 @@
<property name="spacing">
<number>0</number>
</property>
<property name="margin">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
Expand Down Expand Up @@ -54,9 +63,9 @@
<property name="geometry">
<rect>
<x>0</x>
<y>-299</y>
<width>439</width>
<height>1699</height>
<y>-348</y>
<width>438</width>
<height>1415</height>
</rect>
</property>
<property name="sizePolicy">
Expand Down Expand Up @@ -464,6 +473,9 @@
</item>
<item row="3" column="1">
<widget class="QDoubleSpinBox" name="mCrossWidthSpinBox">
<property name="suffix">
<string> mm</string>
</property>
<property name="decimals">
<number>5</number>
</property>
Expand Down Expand Up @@ -550,7 +562,11 @@
</widget>
</item>
<item row="1" column="1" colspan="2">
<widget class="QDoubleSpinBox" name="mFrameWidthSpinBox"/>
<widget class="QDoubleSpinBox" name="mFrameWidthSpinBox">
<property name="suffix">
<string> mm</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="mFramePenLabel">
Expand All @@ -560,7 +576,11 @@
</widget>
</item>
<item row="2" column="1">
<widget class="QDoubleSpinBox" name="mGridFramePenSizeSpinBox"/>
<widget class="QDoubleSpinBox" name="mGridFramePenSizeSpinBox">
<property name="suffix">
<string> mm</string>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="QgsColorButton" name="mGridFramePenColorButton">
Expand Down Expand Up @@ -740,7 +760,11 @@
</widget>
</item>
<item row="11" column="1">
<widget class="QDoubleSpinBox" name="mDistanceToMapFrameSpinBox"/>
<widget class="QDoubleSpinBox" name="mDistanceToMapFrameSpinBox">
<property name="suffix">
<string> mm</string>
</property>
</widget>
</item>
<item row="12" column="0">
<widget class="QLabel" name="mCoordinatePrecisionLabel">
Expand Down Expand Up @@ -848,6 +872,12 @@
</widget>
<layoutdefault spacing="6" margin="11"/>
<customwidgets>
<customwidget>
<class>QgsCollapsibleGroupBoxBasic</class>
<extends>QGroupBox</extends>
<header>qgscollapsiblegroupbox.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsColorButton</class>
<extends>QPushButton</extends>
Expand All @@ -858,12 +888,6 @@
<extends>QComboBox</extends>
<header>qgsblendmodecombobox.h</header>
</customwidget>
<customwidget>
<class>QgsCollapsibleGroupBoxBasic</class>
<extends>QGroupBox</extends>
<header location="global">qgscollapsiblegroupbox.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<resources/>
<connections/>
Expand Down

0 comments on commit 7ff4888

Please sign in to comment.