189 changes: 119 additions & 70 deletions src/ui/qgscomposerlabelwidgetbase.ui
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>307</width>
<height>525</height>
<width>443</width>
<height>550</height>
</rect>
</property>
<property name="sizePolicy">
Expand All @@ -30,7 +30,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>276</width>
<width>400</width>
<height>503</height>
</rect>
</property>
Expand All @@ -43,47 +43,117 @@
<property name="lineWrapMode">
<enum>QTextEdit::WidgetWidth</enum>
</property>
<property name="html">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:7.8pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
<item row="3" column="0" colspan="2">
<widget class="QPushButton" name="mFontColorButton">
<item row="7" column="1">
<widget class="QDoubleSpinBox" name="mMarginDoubleSpinBox">
<property name="prefix">
<string/>
</property>
<property name="suffix">
<string> mm</string>
</property>
</widget>
</item>
<item row="8" column="0">
<widget class="QLabel" name="mRotationLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Font color...</string>
<string>Rotation</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="buddy">
<cstring>mRotationSpinBox</cstring>
</property>
</widget>
</item>
<item row="8" column="1">
<widget class="QDoubleSpinBox" name="mRotationSpinBox">
<property name="suffix">
<string> °</string>
</property>
<property name="maximum">
<double>360.000000000000000</double>
</property>
</widget>
</item>
<item row="1" column="0" colspan="2">
<widget class="QPushButton" name="mInsertExpressionButton">
<property name="text">
<string>Insert an expression</string>
</property>
</widget>
</item>
<item row="2" column="0" colspan="2">
<widget class="QCheckBox" name="mHtmlCheckBox">
<property name="text">
<string>Render as HTML</string>
</property>
</widget>
</item>
<item row="7" column="0">
<widget class="QLabel" name="mMarginLabel">
<property name="text">
<string>Margin</string>
</property>
</widget>
</item>
<item row="4" column="0" colspan="2">
<widget class="QGroupBox" name="buttonGroup1">
<item row="6" column="0" colspan="2">
<widget class="QGroupBox" name="mVerticalAlignementGroup">
<property name="title">
<string>Horizontal Alignment:</string>
<string>Vertical Alignment:</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="sizeConstraint">
<enum>QLayout::SetMinimumSize</enum>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QRadioButton" name="mLeftRadioButton">
<spacer name="horizontalSpacer_3">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QRadioButton" name="mTopRadioButton">
<property name="text">
<string>Left</string>
<string>Top</string>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="mCenterRadioButton">
<widget class="QRadioButton" name="mMiddleRadioButton">
<property name="text">
<string>Center</string>
<string>Middle</string>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="mRightRadioButton">
<widget class="QRadioButton" name="mBottomRadioButton">
<property name="text">
<string>Right</string>
<string>Bottom</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<spacer name="horizontalSpacer_4">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
Expand All @@ -99,29 +169,45 @@
</widget>
</item>
<item row="5" column="0" colspan="2">
<widget class="QGroupBox" name="buttonGroup2">
<widget class="QGroupBox" name="mHorizontalAlignementGroup">
<property name="title">
<string>Vertical Alignment:</string>
<string>Horizontal Alignment:</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="sizeConstraint">
<enum>QLayout::SetMinimumSize</enum>
</property>
<item>
<widget class="QRadioButton" name="mTopRadioButton">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QRadioButton" name="mLeftRadioButton">
<property name="text">
<string>Top</string>
<string>Left</string>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="mMiddleRadioButton">
<widget class="QRadioButton" name="mCenterRadioButton">
<property name="text">
<string>Middle</string>
<string>Center</string>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="mBottomRadioButton">
<widget class="QRadioButton" name="mRightRadioButton">
<property name="text">
<string>Bottom</string>
<string>Right</string>
</property>
</widget>
</item>
Expand All @@ -141,43 +227,14 @@
</layout>
</widget>
</item>
<item row="6" column="0" colspan="2">
<widget class="QDoubleSpinBox" name="mMarginDoubleSpinBox">
<property name="prefix">
<string>Margin </string>
</property>
<property name="suffix">
<string>mm</string>
</property>
</widget>
</item>
<item row="7" column="0">
<widget class="QLabel" name="mRotationLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<item row="3" column="1">
<widget class="QPushButton" name="mFontColorButton">
<property name="text">
<string>Rotation</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="buddy">
<cstring>mRotationSpinBox</cstring>
</property>
</widget>
</item>
<item row="7" column="1">
<widget class="QDoubleSpinBox" name="mRotationSpinBox">
<property name="maximum">
<double>360.000000000000000</double>
<string>Font color...</string>
</property>
</widget>
</item>
<item row="2" column="0" colspan="2">
<item row="3" column="0">
<widget class="QPushButton" name="mFontButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
Expand All @@ -190,13 +247,6 @@
</property>
</widget>
</item>
<item row="1" column="0" colspan="2">
<widget class="QPushButton" name="mInsertExpressionButton">
<property name="text">
<string>Insert an expression</string>
</property>
</widget>
</item>
</layout>
</widget>
</widget>
Expand All @@ -207,7 +257,6 @@
<tabstops>
<tabstop>mTextEdit</tabstop>
<tabstop>mFontButton</tabstop>
<tabstop>mFontColorButton</tabstop>
<tabstop>mMarginDoubleSpinBox</tabstop>
</tabstops>
<resources/>
Expand Down