-
-
Notifications
You must be signed in to change notification settings - Fork 3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Further ui cleanups for map composer
git-svn-id: http://svn.osgeo.org/qgis/trunk@11974 c8812cc2-4d05-0410-92ff-de0c093fc19c
- ltr-3_40
- ltr-3_34
- ltr-3_28
- ltr-3_22
- ltr-3_16
- ltr-3_10
- ltr-3_4
- ltr-2_18
- ltr-2_14
- ltr-2_8
- final-3_40_2
- final-3_40_1
- final-3_40_0
- final-3_38_3
- final-3_38_2
- final-3_38_1
- final-3_38_0
- final-3_36_3
- final-3_36_2
- final-3_36_1
- final-3_36_0
- final-3_34_14
- final-3_34_13
- final-3_34_12
- final-3_34_11
- final-3_34_10
- final-3_34_9
- final-3_34_8
- final-3_34_7
- final-3_34_6
- final-3_34_5
- final-3_34_4
- final-3_34_3
- final-3_34_2
- final-3_34_1
- final-3_34_0
- final-3_32_3
- final-3_32_2
- final-3_32_1
- final-3_32_0
- final-3_30_3
- final-3_30_2
- final-3_30_1
- final-3_30_0
- final-3_28_15
- final-3_28_14
- final-3_28_13
- final-3_28_12
- final-3_28_11
- final-3_28_10
- final-3_28_9
- final-3_28_8
- final-3_28_7
- final-3_28_6
- final-3_28_5
- final-3_28_4
- final-3_28_3
- final-3_28_2
- final-3_28_1
- final-3_28_0
- final-3_26_3
- final-3_26_2
- final-3_26_1
- final-3_26_0
- final-3_24_3
- final-3_24_2
- final-3_24_1
- final-3_24_0
- final-3_22_16
- final-3_22_15
- final-3_22_14
- final-3_22_13
- final-3_22_12
- final-3_22_11
- final-3_22_10
- final-3_22_9
- final-3_22_8
- final-3_22_7
- final-3_22_6
- final-3_22_5
- final-3_22_4
- final-3_22_3
- final-3_22_2
- final-3_22_1
- final-3_22_0
- final-3_20_3
- final-3_20_2
- final-3_20_1
- final-3_20_0
- final-3_18_3
- final-3_18_2
- final-3_18_1
- final-3_18_0
- final-3_16_16
- final-3_16_15
- final-3_16_14
- final-3_16_13
- final-3_16_12
- final-3_16_11
- final-3_16_10
- final-3_16_9
- final-3_16_8
- final-3_16_7
- final-3_16_6
- final-3_16_5
- final-3_16_4
- final-3_16_3
- final-3_16_2
- final-3_16_1
- final-3_16_0
- final-3_14_16
- final-3_14_15
- final-3_14_1
- final-3_14_0
- final-3_12_3
- final-3_12_2
- final-3_12_1
- final-3_12_0
- final-3_10_14
- final-3_10_13
- final-3_10_12
- final-3_10_11
- final-3_10_10
- final-3_10_9
- final-3_10_8
- final-3_10_7
- final-3_10_6
- final-3_10_5
- final-3_10_4
- final-3_10_3
- final-3_10_2
- final-3_10_1
- final-3_10_0
- final-3_8_3
- final-3_8_2
- final-3_8_1
- final-3_8_0
- final-3_6_3
- final-3_6_2
- final-3_6_1
- final-3_6_0
- final-3_4_15
- final-3_4_14
- final-3_4_13
- final-3_4_12
- final-3_4_11
- final-3_4_10
- final-3_4_9
- final-3_4_8
- final-3_4_7
- final-3_4_6
- final-3_4_5
- final-3_4_4
- final-3_4_3
- final-3_4_2
- final-3_4_1
- final-3_4_0
- final-3_2_3
- final-3_2_2
- final-3_2_1
- final-3_2_0
- final-3_0_3
- final-3_0_2
- final-3_0_1
- final-3_0_0
- final-2_18_28
- final-2_18_27
- final-2_18_26
- final-2_18_25
- final-2_18_24
- final-2_18_23
- final-2_18_22
- final-2_18_21
- final-2_18_20
- final-2_18_19
- final-2_18_18
- final-2_18_17
- final-2_18_16
- final-2_18_15
- final-2_18_14
- final-2_18_13
- final-2_18_12
- final-2_18_11
- final-2_18_10
- final-2_18_9
- final-2_18_8
- final-2_18_7
- final-2_18_6
- final-2_18_5
- final-2_18_4
- final-2_18_3
- final-2_18_2
- final-2_18_1
- final-2_18_0
- final-2_16_3
- final-2_16_2
- final-2_16_1
- final-2_16_0
- final-2_14_22
- final-2_14_21
- final-2_14_20
- final-2_14_19
- final-2_14_18
- final-2_14_17
- final-2_14_16
- final-2_14_15
- final-2_14_14
- final-2_14_13
- final-2_14_12
- final-2_14_11
- final-2_14_10
- final-2_14_9
- final-2_14_8
- final-2_14_7
- final-2_14_6
- final-2_14_5
- final-2_14_4
- final-2_14_3
- final-2_14_2
- final-2_14_1
- final-2_14_0
- final-2_12_3
- final-2_12_2
- final-2_12_1
- final-2_12_0
- final-2_10_1
- final-2_10_0
- final-2_8_9
- final-2_8_8
- final-2_8_7
- final-2_8_6
- final-2_8_5
- final-2_8_4
- final-2_8_3
- final-2_8_2
- final-2_8_1
- final-2_8_0
- final-2_6_1
- final-2_6_0
- final-2_4_0
- final-2_2_0
- final-2_0_1
- final-2_0_0
- final-1_8_0
- archive/master_2
- Before-merge-new_vector_api
timlinux
committed
Nov 7, 2009
1 parent
9da6b3d
commit 04807f9
Showing
5 changed files
with
500 additions
and
425 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,213 +1,199 @@ | ||
<ui version="4.0" > | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<ui version="4.0"> | ||
<class>QgsCompositionBase</class> | ||
<widget class="QWidget" name="QgsCompositionBase" > | ||
<property name="geometry" > | ||
<widget class="QWidget" name="QgsCompositionBase"> | ||
<property name="geometry"> | ||
<rect> | ||
<x>0</x> | ||
<y>0</y> | ||
<width>243</width> | ||
<height>422</height> | ||
<height>354</height> | ||
</rect> | ||
</property> | ||
<property name="sizePolicy" > | ||
<sizepolicy vsizetype="Expanding" hsizetype="Expanding" > | ||
<property name="sizePolicy"> | ||
<sizepolicy hsizetype="Expanding" vsizetype="Expanding"> | ||
<horstretch>0</horstretch> | ||
<verstretch>0</verstretch> | ||
</sizepolicy> | ||
</property> | ||
<property name="windowTitle" > | ||
<property name="windowTitle"> | ||
<string>Composition</string> | ||
</property> | ||
<layout class="QGridLayout" > | ||
<property name="leftMargin" > | ||
<number>9</number> | ||
<layout class="QGridLayout"> | ||
<property name="margin"> | ||
<number>0</number> | ||
</property> | ||
<property name="topMargin" > | ||
<number>9</number> | ||
</property> | ||
<property name="rightMargin" > | ||
<number>9</number> | ||
</property> | ||
<property name="bottomMargin" > | ||
<number>9</number> | ||
</property> | ||
<property name="horizontalSpacing" > | ||
<number>6</number> | ||
</property> | ||
<property name="verticalSpacing" > | ||
<property name="spacing"> | ||
<number>6</number> | ||
</property> | ||
<item row="0" column="0" colspan="2" > | ||
<widget class="QGroupBox" name="groupBox" > | ||
<property name="title" > | ||
<item row="0" column="0" colspan="2"> | ||
<widget class="QGroupBox" name="groupBox"> | ||
<property name="title"> | ||
<string>Paper</string> | ||
</property> | ||
<layout class="QGridLayout" > | ||
<property name="leftMargin" > | ||
<number>9</number> | ||
</property> | ||
<property name="topMargin" > | ||
<number>9</number> | ||
</property> | ||
<property name="rightMargin" > | ||
<number>9</number> | ||
</property> | ||
<property name="bottomMargin" > | ||
<number>9</number> | ||
</property> | ||
<property name="horizontalSpacing" > | ||
<number>6</number> | ||
<layout class="QGridLayout" name="gridLayout"> | ||
<property name="margin"> | ||
<number>0</number> | ||
</property> | ||
<property name="verticalSpacing" > | ||
<number>6</number> | ||
</property> | ||
<item row="4" column="1" > | ||
<widget class="QComboBox" name="mPaperOrientationComboBox" > | ||
<property name="enabled" > | ||
<bool>true</bool> | ||
</property> | ||
<property name="sizePolicy" > | ||
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" > | ||
<item row="0" column="0"> | ||
<widget class="QLabel" name="textLabel3"> | ||
<property name="sizePolicy"> | ||
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> | ||
<horstretch>0</horstretch> | ||
<verstretch>0</verstretch> | ||
</sizepolicy> | ||
</property> | ||
</widget> | ||
</item> | ||
<item row="3" column="1" > | ||
<widget class="QLineEdit" name="mPaperHeightLineEdit" /> | ||
</item> | ||
<item row="2" column="1" > | ||
<widget class="QLineEdit" name="mPaperWidthLineEdit" /> | ||
</item> | ||
<item row="1" column="1" > | ||
<widget class="QComboBox" name="mPaperUnitsComboBox" > | ||
<property name="enabled" > | ||
<bool>false</bool> | ||
<property name="text"> | ||
<string>Size</string> | ||
</property> | ||
<property name="sizePolicy" > | ||
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" > | ||
<horstretch>0</horstretch> | ||
<verstretch>0</verstretch> | ||
</sizepolicy> | ||
<property name="wordWrap"> | ||
<bool>true</bool> | ||
</property> | ||
<property name="buddy"> | ||
<cstring>mPaperSizeComboBox</cstring> | ||
</property> | ||
</widget> | ||
</item> | ||
<item row="0" column="1" > | ||
<widget class="QComboBox" name="mPaperSizeComboBox" > | ||
<property name="enabled" > | ||
<item row="1" column="0" colspan="2"> | ||
<widget class="QComboBox" name="mPaperSizeComboBox"> | ||
<property name="enabled"> | ||
<bool>true</bool> | ||
</property> | ||
<property name="sizePolicy" > | ||
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" > | ||
<property name="sizePolicy"> | ||
<sizepolicy hsizetype="Expanding" vsizetype="Fixed"> | ||
<horstretch>0</horstretch> | ||
<verstretch>0</verstretch> | ||
</sizepolicy> | ||
</property> | ||
</widget> | ||
</item> | ||
<item row="4" column="0" > | ||
<widget class="QLabel" name="textLabel7" > | ||
<property name="sizePolicy" > | ||
<sizepolicy vsizetype="Preferred" hsizetype="Preferred" > | ||
<item row="2" column="0"> | ||
<widget class="QLabel" name="textLabel5"> | ||
<property name="sizePolicy"> | ||
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> | ||
<horstretch>0</horstretch> | ||
<verstretch>0</verstretch> | ||
</sizepolicy> | ||
</property> | ||
<property name="text" > | ||
<string>Orientation</string> | ||
<property name="text"> | ||
<string>Units</string> | ||
</property> | ||
<property name="buddy" > | ||
<cstring>mPaperOrientationComboBox</cstring> | ||
<property name="wordWrap"> | ||
<bool>true</bool> | ||
</property> | ||
<property name="buddy"> | ||
<cstring>mPaperUnitsComboBox</cstring> | ||
</property> | ||
</widget> | ||
</item> | ||
<item row="3" column="0" > | ||
<widget class="QLabel" name="textLabel6" > | ||
<property name="sizePolicy" > | ||
<sizepolicy vsizetype="Preferred" hsizetype="Preferred" > | ||
<item row="3" column="0" colspan="2"> | ||
<widget class="QComboBox" name="mPaperUnitsComboBox"> | ||
<property name="enabled"> | ||
<bool>false</bool> | ||
</property> | ||
<property name="sizePolicy"> | ||
<sizepolicy hsizetype="Expanding" vsizetype="Fixed"> | ||
<horstretch>0</horstretch> | ||
<verstretch>0</verstretch> | ||
</sizepolicy> | ||
</property> | ||
<property name="text" > | ||
<string>Height</string> | ||
</property> | ||
<property name="buddy" > | ||
<cstring>mPaperHeightLineEdit</cstring> | ||
</property> | ||
</widget> | ||
</item> | ||
<item row="2" column="0" > | ||
<widget class="QLabel" name="textLabel4" > | ||
<property name="sizePolicy" > | ||
<sizepolicy vsizetype="Preferred" hsizetype="Preferred" > | ||
<item row="4" column="0"> | ||
<widget class="QLabel" name="textLabel4"> | ||
<property name="sizePolicy"> | ||
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> | ||
<horstretch>0</horstretch> | ||
<verstretch>0</verstretch> | ||
</sizepolicy> | ||
</property> | ||
<property name="text" > | ||
<property name="text"> | ||
<string>Width</string> | ||
</property> | ||
<property name="buddy" > | ||
<property name="wordWrap"> | ||
<bool>true</bool> | ||
</property> | ||
<property name="buddy"> | ||
<cstring>mPaperWidthLineEdit</cstring> | ||
</property> | ||
</widget> | ||
</item> | ||
<item row="1" column="0" > | ||
<widget class="QLabel" name="textLabel5" > | ||
<property name="sizePolicy" > | ||
<sizepolicy vsizetype="Preferred" hsizetype="Preferred" > | ||
<item row="5" column="0" colspan="2"> | ||
<widget class="QLineEdit" name="mPaperWidthLineEdit"/> | ||
</item> | ||
<item row="6" column="0" colspan="2"> | ||
<widget class="QLabel" name="textLabel6"> | ||
<property name="sizePolicy"> | ||
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> | ||
<horstretch>0</horstretch> | ||
<verstretch>0</verstretch> | ||
</sizepolicy> | ||
</property> | ||
<property name="text" > | ||
<string>Units</string> | ||
<property name="text"> | ||
<string>Height</string> | ||
</property> | ||
<property name="buddy" > | ||
<cstring>mPaperUnitsComboBox</cstring> | ||
<property name="wordWrap"> | ||
<bool>true</bool> | ||
</property> | ||
<property name="buddy"> | ||
<cstring>mPaperHeightLineEdit</cstring> | ||
</property> | ||
</widget> | ||
</item> | ||
<item row="0" column="0" > | ||
<widget class="QLabel" name="textLabel3" > | ||
<property name="sizePolicy" > | ||
<sizepolicy vsizetype="Preferred" hsizetype="Preferred" > | ||
<item row="7" column="0" colspan="2"> | ||
<widget class="QLineEdit" name="mPaperHeightLineEdit"/> | ||
</item> | ||
<item row="8" column="0" colspan="2"> | ||
<widget class="QLabel" name="textLabel7"> | ||
<property name="sizePolicy"> | ||
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> | ||
<horstretch>0</horstretch> | ||
<verstretch>0</verstretch> | ||
</sizepolicy> | ||
</property> | ||
<property name="text" > | ||
<string>Size</string> | ||
<property name="text"> | ||
<string>Orientation</string> | ||
</property> | ||
<property name="buddy" > | ||
<cstring>mPaperSizeComboBox</cstring> | ||
<property name="wordWrap"> | ||
<bool>true</bool> | ||
</property> | ||
<property name="buddy"> | ||
<cstring>mPaperOrientationComboBox</cstring> | ||
</property> | ||
</widget> | ||
</item> | ||
<item row="9" column="0" colspan="2"> | ||
<widget class="QComboBox" name="mPaperOrientationComboBox"> | ||
<property name="enabled"> | ||
<bool>true</bool> | ||
</property> | ||
<property name="sizePolicy"> | ||
<sizepolicy hsizetype="Expanding" vsizetype="Fixed"> | ||
<horstretch>0</horstretch> | ||
<verstretch>0</verstretch> | ||
</sizepolicy> | ||
</property> | ||
</widget> | ||
</item> | ||
<item row="10" column="1"> | ||
<spacer name="verticalSpacer"> | ||
<property name="orientation"> | ||
<enum>Qt::Vertical</enum> | ||
</property> | ||
<property name="sizeHint" stdset="0"> | ||
<size> | ||
<width>20</width> | ||
<height>50</height> | ||
</size> | ||
</property> | ||
</spacer> | ||
</item> | ||
</layout> | ||
</widget> | ||
</item> | ||
<item rowspan="2" row="1" column="0" colspan="2" > | ||
<spacer> | ||
<property name="orientation" > | ||
<enum>Qt::Vertical</enum> | ||
</property> | ||
<property name="sizeType" > | ||
<enum>QSizePolicy::Expanding</enum> | ||
</property> | ||
<property name="sizeHint" > | ||
<size> | ||
<width>223</width> | ||
<height>41</height> | ||
</size> | ||
</property> | ||
</spacer> | ||
</item> | ||
</layout> | ||
</widget> | ||
<layoutdefault spacing="6" margin="11" /> | ||
<layoutdefault spacing="6" margin="11"/> | ||
<resources/> | ||
<connections/> | ||
</ui> |
Large diffs are not rendered by default.
Oops, something went wrong.