Skip to content
Permalink
Browse files

Standardize map canvas decorations items dialog

Modify "Location" label by "Placement" in scale Bar Decoration
Reorder options of Scale Bar and Copyright decorations dialog in order to set "Placement" options after item's design properties
  • Loading branch information
DelazJ authored and nyalldawson committed Jan 30, 2016
1 parent 6854902 commit 4ab56116edc79a7ddd887f21aa3a3760b1417c88
Showing with 194 additions and 191 deletions.
  1. +133 −131 src/ui/qgsdecorationcopyrightdialog.ui
  2. +61 −60 src/ui/qgsdecorationscalebardialog.ui
@@ -15,9 +15,20 @@
</property>
<property name="windowIcon">
<iconset>
<normaloff>.</normaloff>.</iconset>
<normaloff/>
</iconset>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="1" column="0" colspan="2">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
<item row="0" column="0" colspan="2">
<widget class="QGroupBox" name="grpEnable">
<property name="minimumSize">
@@ -46,68 +57,129 @@
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="lblMargin">
<property name="minimumSize">
<size>
<width>155</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>Margin from edge</string>
</property>
</widget>
</item>
<item row="5" column="1" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item row="6" column="1" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QComboBox" name="cboOrientation">
<widget class="QLabel" name="textLabel1_4">
<property name="text">
<string>Horizontal</string>
</property>
</widget>
</item>
<item>
<widget class="QgsSpinBox" name="spnHorizontal">
<property name="minimumSize">
<size>
<width>150</width>
<width>90</width>
<height>0</height>
</size>
</property>
<item>
<property name="text">
<string>Horizontal</string>
</property>
</item>
<item>
<property name="text">
<string>Vertical</string>
</property>
</item>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="minimum">
<number>0</number>
</property>
<property name="maximum">
<number>100</number>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<widget class="QLabel" name="textLabel1_5">
<property name="text">
<string>Vertical</string>
</property>
<property name="sizeHint" stdset="0">
</widget>
</item>
<item>
<widget class="QgsSpinBox" name="spnVertical">
<property name="minimumSize">
<size>
<width>40</width>
<height>20</height>
<width>90</width>
<height>0</height>
</size>
</property>
</spacer>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="maximum">
<number>100</number>
</property>
</widget>
</item>
<item>
<widget class="QgsUnitSelectionWidget" name="wgtUnitSelection" native="true">
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
</widget>
</item>
</layout>
</item>
<item row="5" column="1" colspan="2">
<widget class="QComboBox" name="cboPlacement"/>
</item>
<item row="1" column="0" colspan="3">
<widget class="QTextEdit" name="txtCopyrightText">
<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:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Verdana'; font-size:10pt;&quot;&gt;© QGIS 2013&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Verdana'; font-size:10pt;&quot;&gt;© QGIS 2016&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="textLabel16">
<property name="maximumSize">
<size>
<width>100</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>&amp;Placement</string>
</property>
<property name="buddy">
<cstring>cboPlacement</cstring>
</property>
</widget>
</item>
<item row="6" column="0">
<widget class="QLabel" name="lblMargin">
<property name="minimumSize">
<size>
<width>155</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>Margin from edge</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label">
<property name="maximumSize">
<size>
<width>100</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>Color</string>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="textLabel15">
<property name="maximumSize">
<size>
@@ -123,7 +195,7 @@ p, li { white-space: pre-wrap; }
</property>
</widget>
</item>
<item row="4" column="1" colspan="2">
<item row="3" column="1" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QgsColorButtonV2" name="pbnColorChooser">
@@ -159,117 +231,46 @@ p, li { white-space: pre-wrap; }
</item>
</layout>
</item>
<item row="3" column="1" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QLabel" name="textLabel1_4">
<property name="text">
<string>Horizontal</string>
</property>
</widget>
</item>
<item row="4" column="1" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<widget class="QgsSpinBox" name="spnHorizontal">
<widget class="QComboBox" name="cboOrientation">
<property name="minimumSize">
<size>
<width>90</width>
<width>150</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="minimum">
<number>0</number>
</property>
<property name="maximum">
<number>100</number>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="textLabel1_5">
<property name="text">
<string>Vertical</string>
</property>
<item>
<property name="text">
<string>Horizontal</string>
</property>
</item>
<item>
<property name="text">
<string>Vertical</string>
</property>
</item>
</widget>
</item>
<item>
<widget class="QgsSpinBox" name="spnVertical">
<property name="minimumSize">
<size>
<width>90</width>
<height>0</height>
</size>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="maximumSize">
<property name="sizeHint" stdset="0">
<size>
<width>16777215</width>
<height>16777215</height>
<width>40</width>
<height>20</height>
</size>
</property>
<property name="maximum">
<number>100</number>
</property>
</widget>
</item>
<item>
<widget class="QgsUnitSelectionWidget" name="wgtUnitSelection" native="true">
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
</widget>
</spacer>
</item>
</layout>
</item>
<item row="2" column="1" colspan="2">
<widget class="QComboBox" name="cboPlacement"/>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label">
<property name="maximumSize">
<size>
<width>100</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>Color</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="textLabel16">
<property name="maximumSize">
<size>
<width>100</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>&amp;Placement</string>
</property>
<property name="buddy">
<cstring>cboPlacement</cstring>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="1" column="0" colspan="2">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
</layout>
</widget>
<layoutdefault spacing="6" margin="11"/>
@@ -295,12 +296,13 @@ p, li { white-space: pre-wrap; }
<tabstops>
<tabstop>grpEnable</tabstop>
<tabstop>txtCopyrightText</tabstop>
<tabstop>pbnColorChooser</tabstop>
<tabstop>cboOrientation</tabstop>
<tabstop>cboPlacement</tabstop>
<tabstop>spnHorizontal</tabstop>
<tabstop>spnVertical</tabstop>
<tabstop>wgtUnitSelection</tabstop>
<tabstop>pbnColorChooser</tabstop>
<tabstop>cboOrientation</tabstop>
<tabstop>buttonBox</tabstop>
</tabstops>
<resources/>
<connections/>

0 comments on commit 4ab5611

Please sign in to comment.
You can’t perform that action at this time.