125 changes: 65 additions & 60 deletions src/ui/qgscomposerlabelwidgetbase.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>443</width>
<height>712</height>
<width>304</width>
<height>705</height>
</rect>
</property>
<property name="sizePolicy">
Expand Down Expand Up @@ -52,8 +52,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>441</width>
<height>690</height>
<width>302</width>
<height>683</height>
</rect>
</property>
<layout class="QVBoxLayout" name="mainLayout">
Expand All @@ -80,46 +80,38 @@
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<widget class="QCheckBox" name="mHtmlCheckBox">
<property name="text">
<string>Render as HTML</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="mInsertExpressionButton">
<property name="text">
<string>Insert an expression</string>
</property>
</widget>
</item>
</layout>
<widget class="QCheckBox" name="mHtmlCheckBox">
<property name="text">
<string>Render as HTML</string>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
<widget class="QPushButton" name="mFontButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Font</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="mFontColorButton">
<property name="text">
<string>Font color...</string>
</property>
</widget>
</item>
</layout>
<widget class="QPushButton" name="mInsertExpressionButton">
<property name="text">
<string>Insert an expression</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="mFontButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Font</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="mFontColorButton">
<property name="text">
<string>Font color...</string>
</property>
</widget>
</item>
</layout>
</widget>
Expand All @@ -138,21 +130,34 @@
<property name="collapsed" stdset="0">
<bool>false</bool>
</property>
<layout class="QFormLayout" name="formLayout_4">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<property name="labelAlignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
<layout class="QGridLayout" name="gridLayout">
<property name="verticalSpacing">
<number>3</number>
</property>
<item row="0" column="0">
<item row="1" column="0">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>4</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="0" colspan="2">
<widget class="QLabel" name="mVerticalAlignementLabel">
<property name="text">
<string>Vertical</string>
</property>
</widget>
</item>
<item row="0" column="1">
<item row="3" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_6">
<item>
<widget class="QRadioButton" name="mTopRadioButton">
Expand Down Expand Up @@ -182,21 +187,14 @@
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<width>0</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item row="1" column="0">
<widget class="QLabel" name="mHorizontalAlignementLabel">
<property name="text">
<string>Horizontal</string>
</property>
</widget>
</item>
<item row="1" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_5">
<item>
Expand Down Expand Up @@ -227,14 +225,21 @@
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<width>0</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item row="0" column="0" colspan="2">
<widget class="QLabel" name="mHorizontalAlignementLabel">
<property name="text">
<string>Horizontal</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
Expand All @@ -250,7 +255,7 @@
<string notr="true">composeritem</string>
</property>
<property name="collapsed" stdset="0">
<bool>false</bool>
<bool>true</bool>
</property>
<layout class="QFormLayout" name="formLayout_2">
<property name="fieldGrowthPolicy">
Expand Down
122 changes: 67 additions & 55 deletions src/ui/qgscomposerlegendwidgetbase.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<y>-150</y>
<width>376</width>
<height>990</height>
<height>1186</height>
</rect>
</property>
<layout class="QVBoxLayout" name="mainLayout">
Expand All @@ -83,6 +83,9 @@
<property name="text">
<string>&amp;Title</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="buddy">
<cstring>mTitleLineEdit</cstring>
</property>
Expand All @@ -96,6 +99,9 @@
<property name="text">
<string>Map</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="1">
Expand All @@ -106,6 +112,9 @@
<property name="text">
<string>Wrap text on</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item row="2" column="1">
Expand Down Expand Up @@ -166,38 +175,16 @@
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<width>0</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QCheckBox" name="mCheckBoxAutoUpdate">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Auto Update</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QTreeView" name="mItemTreeView">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="selectionMode">
<enum>QAbstractItemView::ContiguousSelection</enum>
</property>
Expand Down Expand Up @@ -234,8 +221,8 @@
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
<width>20</width>
<height>20</height>
</size>
</property>
</widget>
Expand All @@ -251,8 +238,8 @@
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
<width>20</width>
<height>20</height>
</size>
</property>
</widget>
Expand All @@ -268,8 +255,8 @@
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
<width>20</width>
<height>20</height>
</size>
</property>
</widget>
Expand All @@ -285,8 +272,8 @@
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
<width>20</width>
<height>20</height>
</size>
</property>
</widget>
Expand All @@ -302,8 +289,8 @@
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
<width>20</width>
<height>20</height>
</size>
</property>
</widget>
Expand All @@ -325,8 +312,8 @@
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
<width>20</width>
<height>20</height>
</size>
</property>
<property name="checkable">
Expand All @@ -341,36 +328,40 @@
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<width>0</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<widget class="QCheckBox" name="mCheckBoxAutoUpdate">
<property name="text">
<string>Auto Update</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QgsCollapsibleGroupBoxBasic" name="mFontsColGroupBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title">
<string>Fonts</string>
</property>
<property name="syncGroup" stdset="0">
<string notr="true">composeritem</string>
</property>
<property name="collapsed" stdset="0">
<bool>false</bool>
<bool>true</bool>
</property>
<layout class="QGridLayout" name="gridLayout_4">
<item row="0" column="0">
<layout class="QVBoxLayout" name="verticalLayout_4">
<item>
<widget class="QPushButton" name="mTitleFontButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
Expand All @@ -383,28 +374,28 @@
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QPushButton" name="mGroupFontButton">
<item>
<widget class="QPushButton" name="mLayerFontButton">
<property name="text">
<string>Group Font...</string>
<string>Layer Font...</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QPushButton" name="mLayerFontButton">
<item>
<widget class="QPushButton" name="mGroupFontButton">
<property name="text">
<string>Layer Font...</string>
<string>Group Font...</string>
</property>
</widget>
</item>
<item row="1" column="1">
<item>
<widget class="QPushButton" name="mItemFontButton">
<property name="text">
<string>Item Font...</string>
</property>
</widget>
</item>
<item row="2" column="0" colspan="2">
<item>
<widget class="QPushButton" name="mFontColorPushButton">
<property name="text">
<string>Font color...</string>
Expand Down Expand Up @@ -512,6 +503,9 @@
<property name="text">
<string>Symbol width</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item row="0" column="1">
Expand All @@ -529,6 +523,9 @@
<property name="text">
<string>Symbol height</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="1">
Expand Down Expand Up @@ -567,6 +564,9 @@
<property name="text">
<string>Group Space</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item row="0" column="1">
Expand All @@ -584,6 +584,9 @@
<property name="text">
<string>Layer space</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="1">
Expand All @@ -601,6 +604,9 @@
<property name="text">
<string>Symbol space</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item row="2" column="1">
Expand All @@ -618,6 +624,9 @@
<property name="text">
<string>Icon label space</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item row="3" column="1">
Expand All @@ -635,6 +644,9 @@
<property name="text">
<string>Box space</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item row="4" column="1">
Expand Down
235 changes: 100 additions & 135 deletions src/ui/qgscomposermapwidgetbase.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</sizepolicy>
</property>
<property name="windowTitle">
<string>Map options</string>
<string>Map Options</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<property name="spacing">
Expand Down Expand Up @@ -54,9 +54,9 @@
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>455</width>
<height>1051</height>
<y>-215</y>
<width>440</width>
<height>1303</height>
</rect>
</property>
<property name="sizePolicy">
Expand All @@ -68,12 +68,6 @@
<layout class="QVBoxLayout" name="mainLayout">
<item>
<widget class="QgsCollapsibleGroupBoxBasic" name="groupBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title">
<string>Main properties</string>
</property>
Expand Down Expand Up @@ -146,46 +140,30 @@
</widget>
</item>
<item row="3" column="0" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
<widget class="QCheckBox" name="mDrawCanvasItemsCheckBox">
<property name="text">
<string>Draw map canvas items</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="mKeepLayerListCheckBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>Lock layers for map item</string>
</property>
</widget>
</item>
</layout>
<widget class="QCheckBox" name="mDrawCanvasItemsCheckBox">
<property name="text">
<string>Draw map canvas items</string>
</property>
</widget>
</item>
<item row="4" column="0" colspan="2">
<widget class="QCheckBox" name="mKeepLayerListCheckBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Lock layers for map item</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QgsCollapsibleGroupBoxBasic" name="mExtentsCheckBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title">
<string>Extents</string>
</property>
Expand All @@ -196,7 +174,26 @@
<bool>false</bool>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="2">
<item row="3" column="1">
<widget class="QLineEdit" name="mYMaxLineEdit"/>
</item>
<item row="2" column="1">
<widget class="QLineEdit" name="mXMaxLineEdit"/>
</item>
<item row="2" column="0">
<widget class="QLabel" name="mXMaxLabel">
<property name="text">
<string>X max</string>
</property>
<property name="wordWrap">
<bool>false</bool>
</property>
<property name="buddy">
<cstring>mXMaxLineEdit</cstring>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="mYMinLabel">
<property name="text">
<string>Y min</string>
Expand All @@ -209,13 +206,7 @@
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="mXMinLineEdit"/>
</item>
<item row="0" column="3">
<widget class="QLineEdit" name="mYMinLineEdit"/>
</item>
<item row="1" column="2">
<item row="3" column="0">
<widget class="QLabel" name="mYMaxLabel">
<property name="text">
<string>Y max</string>
Expand All @@ -228,6 +219,19 @@
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="mXMinLineEdit"/>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="mYMinLineEdit"/>
</item>
<item row="4" column="0" colspan="4">
<widget class="QPushButton" name="mSetToMapCanvasExtentButton">
<property name="text">
<string>Set to map canvas extent</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="mXMinLabel">
<property name="enabled">
Expand All @@ -244,32 +248,6 @@
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="mXMaxLabel">
<property name="text">
<string>X max</string>
</property>
<property name="wordWrap">
<bool>false</bool>
</property>
<property name="buddy">
<cstring>mXMaxLineEdit</cstring>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="mXMaxLineEdit"/>
</item>
<item row="1" column="3">
<widget class="QLineEdit" name="mYMaxLineEdit"/>
</item>
<item row="2" column="0" colspan="4">
<widget class="QPushButton" name="mSetToMapCanvasExtentButton">
<property name="text">
<string>Set to map canvas extent</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
Expand All @@ -288,7 +266,7 @@
<string notr="true">composeritem</string>
</property>
<property name="collapsed" stdset="0">
<bool>false</bool>
<bool>true</bool>
</property>
<layout class="QFormLayout">
<property name="fieldGrowthPolicy">
Expand Down Expand Up @@ -330,7 +308,7 @@
</widget>
</item>
<item row="1" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_3">
<layout class="QVBoxLayout" name="verticalLayout_7">
<item>
<widget class="QDoubleSpinBox" name="mIntervalYSpinBox">
<property name="prefix">
Expand Down Expand Up @@ -373,7 +351,7 @@
</widget>
</item>
<item row="2" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_5">
<layout class="QVBoxLayout" name="verticalLayout_8">
<item>
<widget class="QDoubleSpinBox" name="mOffsetXSpinBox">
<property name="prefix">
Expand Down Expand Up @@ -473,6 +451,9 @@
<property name="title">
<string>Draw coordinates</string>
</property>
<property name="flat">
<bool>false</bool>
</property>
<property name="checkable">
<bool>true</bool>
</property>
Expand All @@ -489,6 +470,12 @@
<property name="labelAlignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
<property name="leftMargin">
<number>6</number>
</property>
<property name="rightMargin">
<number>6</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="mAnnotationFormatLabel">
<property name="text">
Expand All @@ -513,16 +500,12 @@
</widget>
</item>
<item row="1" column="1">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QComboBox" name="mAnnotationDirectionComboBoxLeft"/>
</item>
<item>
<widget class="QComboBox" name="mAnnotationPositionLeftComboBox"/>
</item>
</layout>
<widget class="QComboBox" name="mAnnotationPositionLeftComboBox"/>
</item>
<item row="2" column="0">
<item row="2" column="1">
<widget class="QComboBox" name="mAnnotationDirectionComboBoxLeft"/>
</item>
<item row="3" column="0">
<widget class="QLabel" name="mAnnotationPositionLabelRight">
<property name="text">
<string>Right</string>
Expand All @@ -535,17 +518,13 @@
</property>
</widget>
</item>
<item row="2" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_6">
<item>
<widget class="QComboBox" name="mAnnotationDirectionComboBoxRight"/>
</item>
<item>
<widget class="QComboBox" name="mAnnotationPositionRightComboBox"/>
</item>
</layout>
<item row="3" column="1">
<widget class="QComboBox" name="mAnnotationPositionRightComboBox"/>
</item>
<item row="3" column="0">
<item row="4" column="1">
<widget class="QComboBox" name="mAnnotationDirectionComboBoxRight"/>
</item>
<item row="5" column="0">
<widget class="QLabel" name="mAnnotationPositionLabelTop">
<property name="text">
<string>Top</string>
Expand All @@ -558,17 +537,13 @@
</property>
</widget>
</item>
<item row="3" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_7">
<item>
<widget class="QComboBox" name="mAnnotationDirectionComboBoxTop"/>
</item>
<item>
<widget class="QComboBox" name="mAnnotationPositionTopComboBox"/>
</item>
</layout>
<item row="5" column="1">
<widget class="QComboBox" name="mAnnotationPositionTopComboBox"/>
</item>
<item row="6" column="1">
<widget class="QComboBox" name="mAnnotationDirectionComboBoxTop"/>
</item>
<item row="4" column="0">
<item row="7" column="0">
<widget class="QLabel" name="mAnnotationPositionLabelBottom">
<property name="text">
<string>Bottom</string>
Expand All @@ -581,31 +556,27 @@
</property>
</widget>
</item>
<item row="4" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_8">
<item>
<widget class="QComboBox" name="mAnnotationDirectionComboBoxBottom"/>
</item>
<item>
<widget class="QComboBox" name="mAnnotationPositionBottomComboBox"/>
</item>
</layout>
<item row="7" column="1">
<widget class="QComboBox" name="mAnnotationPositionBottomComboBox"/>
</item>
<item row="5" column="1">
<widget class="QPushButton" name="mAnnotationFontButton">
<item row="8" column="1">
<widget class="QComboBox" name="mAnnotationDirectionComboBoxBottom"/>
</item>
<item row="9" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Font...</string>
<string>Font</string>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="label">
<item row="9" column="1">
<widget class="QPushButton" name="mAnnotationFontButton">
<property name="text">
<string>Font</string>
<string>Font...</string>
</property>
</widget>
</item>
<item row="6" column="0">
<item row="10" column="0">
<widget class="QLabel" name="mDistanceToFrameLabel">
<property name="text">
<string>Distance to map frame</string>
Expand All @@ -618,10 +589,10 @@
</property>
</widget>
</item>
<item row="6" column="1">
<item row="10" column="1">
<widget class="QDoubleSpinBox" name="mDistanceToMapFrameSpinBox"/>
</item>
<item row="7" column="0">
<item row="11" column="0">
<widget class="QLabel" name="mCoordinatePrecisionLabel">
<property name="text">
<string>Coordinate precision</string>
Expand All @@ -634,7 +605,7 @@
</property>
</widget>
</item>
<item row="7" column="1">
<item row="11" column="1">
<widget class="QSpinBox" name="mCoordinatePrecisionSpinBox"/>
</item>
</layout>
Expand All @@ -645,12 +616,6 @@
</item>
<item>
<widget class="QgsCollapsibleGroupBoxBasic" name="groupBox_2">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title">
<string>Overview</string>
</property>
Expand Down
86 changes: 39 additions & 47 deletions src/ui/qgscomposerscalebarwidgetbase.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>436</width>
<height>761</height>
<width>337</width>
<height>757</height>
</rect>
</property>
<property name="sizePolicy">
Expand Down Expand Up @@ -52,8 +52,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>434</width>
<height>739</height>
<width>320</width>
<height>792</height>
</rect>
</property>
<layout class="QVBoxLayout" name="mainLayout">
Expand Down Expand Up @@ -141,6 +141,9 @@
<property name="labelAlignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
<item row="0" column="0" colspan="2">
<widget class="QComboBox" name="mUnitsComboBox"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="mUnitLabelLabel">
<property name="text">
Expand Down Expand Up @@ -177,9 +180,6 @@
</property>
</widget>
</item>
<item row="0" column="0" colspan="2">
<widget class="QComboBox" name="mUnitsComboBox"/>
</item>
</layout>
</widget>
</item>
Expand Down Expand Up @@ -287,7 +287,7 @@
<string notr="true">composeritem</string>
</property>
<property name="collapsed" stdset="0">
<bool>false</bool>
<bool>true</bool>
</property>
<layout class="QFormLayout" name="formLayout_4">
<property name="fieldGrowthPolicy">
Expand Down Expand Up @@ -384,50 +384,42 @@
<string notr="true">composeritem</string>
</property>
<property name="collapsed" stdset="0">
<bool>false</bool>
<bool>true</bool>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<layout class="QHBoxLayout" name="horizontalLayout2">
<item>
<widget class="QPushButton" name="mFontButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Font...</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="mFontColorPushButton">
<property name="text">
<string>Font color...</string>
</property>
</widget>
</item>
</layout>
<widget class="QPushButton" name="mFontButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Font...</string>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout3">
<item>
<widget class="QPushButton" name="mColorPushButton">
<property name="text">
<string>Fill color...</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="mStrokeColorPushButton">
<property name="text">
<string>Stroke color...</string>
</property>
</widget>
</item>
</layout>
<widget class="QPushButton" name="mFontColorPushButton">
<property name="text">
<string>Font color...</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="mColorPushButton">
<property name="text">
<string>Fill color...</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="mStrokeColorPushButton">
<property name="text">
<string>Stroke color...</string>
</property>
</widget>
</item>
</layout>
</widget>
Expand Down
47 changes: 27 additions & 20 deletions src/ui/qgscomposertablewidgetbase.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
<string>Attribute Table</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
Expand Down Expand Up @@ -92,13 +92,6 @@
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QCheckBox" name="mShowOnlyVisibleFeaturesCheckBox">
<property name="text">
<string>Show only visible features</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="mComposerMapLabel">
<property name="text">
Expand Down Expand Up @@ -147,6 +140,13 @@
<item row="5" column="1">
<widget class="QDoubleSpinBox" name="mMarginSpinBox"/>
</item>
<item row="2" column="0" colspan="2">
<widget class="QCheckBox" name="mShowOnlyVisibleFeaturesCheckBox">
<property name="text">
<string>Show only visible features</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
Expand Down Expand Up @@ -233,20 +233,27 @@
<property name="collapsed" stdset="0">
<bool>false</bool>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QPushButton" name="mHeaderFontPushButton">
<property name="text">
<string>Header Font...</string>
<layout class="QVBoxLayout" name="verticalLayout_3">
<property name="spacing">
<number>6</number>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="mContentFontPushButton">
<property name="text">
<string>Content Font...</string>
</property>
</widget>
<item>
<widget class="QPushButton" name="mHeaderFontPushButton">
<property name="text">
<string>Header Font...</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="mContentFontPushButton">
<property name="text">
<string>Content Font...</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
Expand Down
45 changes: 25 additions & 20 deletions src/ui/qgscompositionwidgetbase.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,9 @@
<property name="text">
<string>Width</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="1">
Expand All @@ -144,6 +147,9 @@
<property name="text">
<string>Height</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item row="2" column="1">
Expand All @@ -170,6 +176,9 @@
<property name="text">
<string>Units</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item row="3" column="1">
Expand All @@ -190,6 +199,9 @@
<property name="text">
<string>Number of pages</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item row="4" column="1">
Expand Down Expand Up @@ -263,12 +275,6 @@
</item>
<item row="0" column="1">
<widget class="QSpinBox" name="mResolutionSpinBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="suffix">
<string> dpi</string>
</property>
Expand Down Expand Up @@ -309,12 +315,6 @@
</property>
<item row="0" column="1">
<widget class="QDoubleSpinBox" name="mGridResolutionSpinBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="prefix">
<string/>
</property>
Expand All @@ -334,10 +334,13 @@
<property name="text">
<string>Grid offset</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="1">
<layout class="QHBoxLayout" name="horizontalLayout">
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="QDoubleSpinBox" name="mOffsetXSpinBox">
<property name="prefix">
Expand Down Expand Up @@ -365,16 +368,13 @@
<property name="text">
<string>Pen width</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QDoubleSpinBox" name="mPenWidthSpinBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="prefix">
<string/>
</property>
Expand Down Expand Up @@ -442,6 +442,9 @@
<property name="text">
<string>Selection tolerance</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item row="5" column="1">
Expand All @@ -459,6 +462,9 @@
<property name="text">
<string>Spacing</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
Expand Down Expand Up @@ -540,7 +546,6 @@
</customwidgets>
<tabstops>
<tabstop>scrollArea</tabstop>
<tabstop>mOffsetXSpinBox</tabstop>
</tabstops>
<resources/>
<connections/>
Expand Down