Skip to content

Commit

Permalink
UI cleanups
Browse files Browse the repository at this point in the history 
git-svn-id: http://svn.osgeo.org/qgis/trunk@12069 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
timlinux committed Nov 10, 2009
1 parent cd9d372 commit abaf4fb
Show file tree
Hide file tree
Showing 3 changed files with 106 additions and 102 deletions.
29 changes: 2 additions & 27 deletions src/ui/qgscomposerbase.ui
View file
Expand Up @@ -21,7 +21,7 @@
<bool>true</bool>
</property>
<layout class="QGridLayout">
<item row="0" column="0">
<item row="1" column="0">
<widget class="QSplitter" name="mSplitter">
<property name="mouseTracking">
<bool>true</bool>
Expand Down Expand Up @@ -133,13 +133,6 @@
</widget>
</widget>
</item>
<item row="1" column="0">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons">
<set>QDialogButtonBox::Help</set>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QToolBar" name="toolBar">
Expand Down Expand Up @@ -445,27 +438,9 @@
</action>
</widget>
<tabstops>
<tabstop>buttonBox</tabstop>
<tabstop>mCompositionNameComboBox</tabstop>
<tabstop>mOptionsTabWidget</tabstop>
</tabstops>
<resources/>
<connections>
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>QgsComposerBase</receiver>
<slot>close()</slot>
<hints>
<hint type="sourcelabel">
<x>612</x>
<y>583</y>
</hint>
<hint type="destinationlabel">
<x>735</x>
<y>567</y>
</hint>
</hints>
</connection>
</connections>
<connections/>
</ui>
55 changes: 51 additions & 4 deletions src/ui/qgscomposermapwidgetbase.ui
View file
Expand Up @@ -26,13 +26,13 @@
<item row="0" column="0">
<widget class="QToolBox" name="toolBox">
<property name="currentIndex">
<number>0</number>
<number>1</number>
</property>
<widget class="QWidget" name="page">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<y>-68</y>
<width>386</width>
<height>419</height>
</rect>
Expand Down Expand Up @@ -172,6 +172,19 @@
</item>
</layout>
</item>
<item row="10" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
Expand All @@ -182,8 +195,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>404</width>
<height>351</height>
<width>386</width>
<height>352</height>
</rect>
</property>
<attribute name="label">
Expand Down Expand Up @@ -279,9 +292,30 @@
</layout>
</widget>
</item>
<item row="1" column="0">
<spacer name="verticalSpacer_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<widget class="QWidget" name="page_3">
<property name="geometry">
<rect>
<x>0</x>
<y>-448</y>
<width>386</width>
<height>805</height>
</rect>
</property>
<attribute name="label">
<string>Grid</string>
</attribute>
Expand Down Expand Up @@ -556,6 +590,19 @@
</property>
</widget>
</item>
<item row="37" column="0">
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
Expand Down
124 changes: 53 additions & 71 deletions src/ui/qgscomposerscalebarwidgetbase.ui
View file
Expand Up @@ -34,7 +34,7 @@
<x>0</x>
<y>0</y>
<width>307</width>
<height>714</height>
<height>616</height>
</rect>
</property>
<attribute name="label">
Expand Down Expand Up @@ -85,35 +85,20 @@
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="mNumbereOfSegmentsLabel">
<property name="text">
<string>Number of segments</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="buddy">
<cstring>mNumberOfSegmentsSpinBox</cstring>
<widget class="QSpinBox" name="mNumberOfSegmentsSpinBox">
<property name="suffix">
<string> Right segments</string>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QSpinBox" name="mNumberOfSegmentsSpinBox"/>
</item>
<item row="6" column="0">
<widget class="QLabel" name="mSegmentsLeftLabel">
<property name="text">
<string>Segments left</string>
</property>
<property name="buddy">
<cstring>mSegmentsLeftSpinBox</cstring>
<widget class="QSpinBox" name="mSegmentsLeftSpinBox">
<property name="suffix">
<string> Left segments</string>
</property>
</widget>
</item>
<item row="7" column="0">
<widget class="QSpinBox" name="mSegmentsLeftSpinBox"/>
</item>
<item row="8" column="0">
<item row="6" column="0">
<widget class="QLabel" name="mStyleLabel">
<property name="text">
<string>Style</string>
Expand All @@ -123,10 +108,10 @@
</property>
</widget>
</item>
<item row="9" column="0">
<item row="7" column="0">
<widget class="QComboBox" name="mStyleComboBox"/>
</item>
<item row="10" column="0">
<item row="8" column="0">
<widget class="QLabel" name="mMapLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
Expand All @@ -145,7 +130,7 @@
</property>
</widget>
</item>
<item row="11" column="0">
<item row="9" column="0">
<widget class="QComboBox" name="mMapComboBox">
<property name="enabled">
<bool>true</bool>
Expand All @@ -158,40 +143,30 @@
</property>
</widget>
</item>
<item row="12" column="0">
<widget class="QLabel" name="mHeightLabel">
<property name="text">
<string>Height (mm)</string>
</property>
<property name="buddy">
<cstring>mHeightSpinBox</cstring>
</property>
</widget>
</item>
<item row="13" column="0">
<widget class="QSpinBox" name="mHeightSpinBox"/>
</item>
<item row="14" column="0">
<widget class="QLabel" name="mLineWidthLabel">
<property name="text">
<string>Line width</string>
</property>
<property name="wordWrap">
<bool>true</bool>
<item row="10" column="0">
<widget class="QSpinBox" name="mHeightSpinBox">
<property name="suffix">
<string> mm</string>
</property>
<property name="buddy">
<cstring>mLineWidthSpinBox</cstring>
<property name="prefix">
<string>Height </string>
</property>
</widget>
</item>
<item row="15" column="0">
<item row="11" column="0">
<widget class="QDoubleSpinBox" name="mLineWidthSpinBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="prefix">
<string>Line width </string>
</property>
<property name="suffix">
<string> mm</string>
</property>
<property name="minimum">
<double>0.010000000000000</double>
</property>
Expand All @@ -203,33 +178,27 @@
</property>
</widget>
</item>
<item row="16" column="0">
<widget class="QLabel" name="mLabelBarSpaceLabel">
<property name="text">
<string>Label space</string>
<item row="12" column="0">
<widget class="QDoubleSpinBox" name="mLabelBarSpaceSpinBox">
<property name="prefix">
<string>Label space </string>
</property>
<property name="buddy">
<cstring>mLabelBarSpaceSpinBox</cstring>
<property name="suffix">
<string> mm</string>
</property>
</widget>
</item>
<item row="17" column="0">
<widget class="QDoubleSpinBox" name="mLabelBarSpaceSpinBox"/>
</item>
<item row="18" column="0">
<widget class="QLabel" name="mBoxSpaceLabel">
<property name="text">
<string>Box space</string>
<item row="13" column="0">
<widget class="QDoubleSpinBox" name="mBoxSizeSpinBox">
<property name="prefix">
<string>Box space </string>
</property>
<property name="buddy">
<cstring>mBoxSizeSpinBox</cstring>
<property name="suffix">
<string> mm</string>
</property>
</widget>
</item>
<item row="19" column="0">
<widget class="QDoubleSpinBox" name="mBoxSizeSpinBox"/>
</item>
<item row="20" column="0">
<item row="14" column="0">
<widget class="QLabel" name="mUnitLabelLabel">
<property name="text">
<string>Unit label</string>
Expand All @@ -242,10 +211,10 @@
</property>
</widget>
</item>
<item row="21" column="0">
<item row="15" column="0">
<widget class="QLineEdit" name="mUnitLabelLineEdit"/>
</item>
<item row="22" column="0">
<item row="16" column="0">
<widget class="QPushButton" name="mFontButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
Expand All @@ -258,13 +227,26 @@
</property>
</widget>
</item>
<item row="23" column="0">
<item row="17" column="0">
<widget class="QPushButton" name="mColorPushButton">
<property name="text">
<string>Color...</string>
</property>
</widget>
</item>
<item row="18" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</widget>
Expand Down

0 comments on commit abaf4fb

Please sign in to comment.