Skip to content

Commit

Permalink
Print composer gui cleanups from Milena
Browse files Browse the repository at this point in the history 
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@13049 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
borysiasty committed Mar 11, 2010
1 parent 1142e94 commit 3f77549
Show file tree
Hide file tree
Showing 3 changed files with 48 additions and 41 deletions.
2 changes: 1 addition & 1 deletion src/ui/qgscomposerarrowwidgetbase.ui
View file
Expand Up @@ -42,7 +42,7 @@
<item row="1" column="0">
<widget class="QDoubleSpinBox" name="mOutlineWidthSpinBox">
<property name="prefix">
<string>Outline width </string>
<string>Line width </string>
</property>
</widget>
</item>
Expand Down
3 changes: 2 additions & 1 deletion src/ui/qgscomposerbase.ui
View file
Expand Up @@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>799</width>
<width>1145</width>
<height>609</height>
</rect>
</property>
Expand Down Expand Up @@ -172,6 +172,7 @@
<addaction name="mActionAddBasicShape"/>
<addaction name="mActionAddArrow"/>
<addaction name="mActionAddTable"/>
<addaction name="separator"/>
<addaction name="mActionSelectMoveItem"/>
<addaction name="mActionMoveItemContent"/>
<addaction name="mActionGroupItems"/>
Expand Down
84 changes: 45 additions & 39 deletions src/ui/qgscomposermapwidgetbase.ui
View file
Expand Up @@ -155,6 +155,12 @@
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QCheckBox" name="mKeepLayerListCheckBox">
<property name="maximumSize">
<size>
<width>20</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string/>
</property>
Expand Down Expand Up @@ -311,7 +317,7 @@
<property name="geometry">
<rect>
<x>0</x>
<y>-54</y>
<y>0</y>
<width>377</width>
<height>789</height>
</rect>
Expand Down Expand Up @@ -417,14 +423,14 @@
</property>
</widget>
</item>
<item row="19" column="0">
<item row="21" column="0">
<widget class="QCheckBox" name="mDrawAnnotationCheckBox">
<property name="text">
<string>Draw annotation</string>
</property>
</widget>
</item>
<item row="20" column="0">
<item row="22" column="0">
<widget class="QLabel" name="mAnnotationPositionLabel">
<property name="text">
<string>Annotation position</string>
Expand All @@ -437,10 +443,10 @@
</property>
</widget>
</item>
<item row="21" column="0">
<item row="23" column="0">
<widget class="QComboBox" name="mAnnotationPositionComboBox"/>
</item>
<item row="22" column="0">
<item row="24" column="0">
<widget class="QLabel" name="mAnnotationDirectionLabel">
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
Expand All @@ -456,43 +462,17 @@
</property>
</widget>
</item>
<item row="23" column="0">
<item row="25" column="0">
<widget class="QComboBox" name="mAnnotationDirectionComboBox"/>
</item>
<item row="30" column="0">
<widget class="QLabel" name="mLineColorLabel">
<property name="text">
<string>Line color</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="buddy">
<cstring>mLineColorButton</cstring>
</property>
</widget>
</item>
<item row="31" column="0">
<widget class="QgsColorButton" name="mLineColorButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="32" column="0">
<item row="34" column="0">
<widget class="QPushButton" name="mAnnotationFontButton">
<property name="text">
<string>Font...</string>
</property>
</widget>
</item>
<item row="33" column="0">
<item row="35" column="0">
<widget class="QLabel" name="mDistanceToFrameLabel">
<property name="text">
<string>Distance to map frame</string>
Expand All @@ -505,10 +485,10 @@
</property>
</widget>
</item>
<item row="34" column="0">
<item row="36" column="0">
<widget class="QDoubleSpinBox" name="mDistanceToMapFrameSpinBox"/>
</item>
<item row="35" column="0">
<item row="37" column="0">
<widget class="QLabel" name="mCoordinatePrecisionLabel">
<property name="text">
<string>Coordinate precision</string>
Expand All @@ -521,7 +501,7 @@
</property>
</widget>
</item>
<item row="36" column="0">
<item row="38" column="0">
<widget class="QSpinBox" name="mCoordinatePrecisionSpinBox"/>
</item>
<item row="15" column="0">
Expand Down Expand Up @@ -590,7 +570,7 @@
</property>
</widget>
</item>
<item row="37" column="0">
<item row="39" column="0">
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
Expand All @@ -603,6 +583,32 @@
</property>
</spacer>
</item>
<item row="19" column="0">
<widget class="QLabel" name="mLineColorLabel">
<property name="text">
<string>Line color</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="buddy">
<cstring>mLineColorButton</cstring>
</property>
</widget>
</item>
<item row="20" column="0">
<widget class="QgsColorButton" name="mLineColorButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</widget>
</item>
Expand Down Expand Up @@ -641,10 +647,10 @@
<tabstop>mOffsetYSpinBox</tabstop>
<tabstop>mCrossWidthSpinBox</tabstop>
<tabstop>mLineWidthSpinBox</tabstop>
<tabstop>mLineColorButton</tabstop>
<tabstop>mDrawAnnotationCheckBox</tabstop>
<tabstop>mAnnotationPositionComboBox</tabstop>
<tabstop>mAnnotationDirectionComboBox</tabstop>
<tabstop>mLineColorButton</tabstop>
<tabstop>mAnnotationFontButton</tabstop>
<tabstop>mDistanceToMapFrameSpinBox</tabstop>
<tabstop>mCoordinatePrecisionSpinBox</tabstop>
Expand Down

0 comments on commit 3f77549

Please sign in to comment.