Skip to content

Commit

Permalink
Update composer ui files
Browse files Browse the repository at this point in the history
- Add section headers (should be moved to app stylesheet, and custom label or container class made)
- Enable map grid group box (was disabled)
- Reformat all form layouts to look like rest of app (more grid layout-like, with labels left-aligned and growing entry fields)
- Re-layout map extents group box
- Expand more group boxes by default (increases discovery)
  • Loading branch information
dakcarto committed Feb 19, 2013
1 parent 77afb16 commit 0f0c981
Show file tree
Hide file tree
Showing 11 changed files with 632 additions and 478 deletions.
55 changes: 37 additions & 18 deletions src/ui/qgscomposerarrowwidgetbase.ui
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,36 @@
<rect>
<x>0</x>
<y>0</y>
<width>469</width>
<height>689</height>
<width>334</width>
<height>632</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_5">
<layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
<number>0</number>
</property>
<property name="margin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="label_3">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="styleSheet">
<string notr="true">padding: 2px; font-weight: bold; background-color: rgb(200, 200, 200);</string>
</property>
<property name="text">
<string>Arrow</string>
</property>
</widget>
</item>
<item>
<widget class="QScrollArea" name="scrollArea">
<property name="widgetResizable">
Expand All @@ -27,19 +46,13 @@
<rect>
<x>0</x>
<y>0</y>
<width>467</width>
<height>687</height>
<width>332</width>
<height>610</height>
</rect>
</property>
<layout class="QVBoxLayout" name="mainLayout">
<item>
<widget class="QgsCollapsibleGroupBoxBasic" name="groupBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title">
<string>Main properties</string>
</property>
Expand All @@ -53,6 +66,9 @@
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<property name="labelAlignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
<item row="1" column="0">
<widget class="QLabel" name="label">
<property name="text">
Expand Down Expand Up @@ -89,6 +105,12 @@
</item>
<item row="0" column="0" colspan="2">
<widget class="QPushButton" name="mArrowColorButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Arrow color...</string>
</property>
Expand All @@ -99,25 +121,22 @@
</item>
<item>
<widget class="QgsCollapsibleGroupBoxBasic" name="mArrowMarkersGroupBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title">
<string>Arrow markers</string>
</property>
<property name="syncGroup" stdset="0">
<string notr="true">composeritem</string>
</property>
<property name="collapsed" stdset="0">
<bool>true</bool>
<bool>false</bool>
</property>
<layout class="QFormLayout" name="formLayout">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<property name="labelAlignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
<item row="0" column="0" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
Expand Down
55 changes: 37 additions & 18 deletions src/ui/qgscomposerhtmlwidgetbase.ui
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,30 @@
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
<number>0</number>
</property>
<property name="margin">
<number>0</number>
</property>
<item row="0" column="0">
<item>
<widget class="QLabel" name="label">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="styleSheet">
<string notr="true">padding: 2px; font-weight: bold; background-color: rgb(200, 200, 200);</string>
</property>
<property name="text">
<string>HTML frame</string>
</property>
</widget>
</item>
<item>
<widget class="QScrollArea" name="scrollArea">
<property name="widgetResizable">
<bool>true</bool>
Expand All @@ -28,18 +47,12 @@
<x>0</x>
<y>0</y>
<width>407</width>
<height>368</height>
<height>348</height>
</rect>
</property>
<layout class="QVBoxLayout" name="mainLayout">
<item>
<widget class="QgsCollapsibleGroupBoxBasic" name="groupBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title">
<string>Main properties</string>
</property>
Expand All @@ -50,16 +63,19 @@
<bool>false</bool>
</property>
<layout class="QFormLayout" name="formLayout">
<item row="2" column="0">
<widget class="QLabel" name="mResizeModeLabel">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<property name="labelAlignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
<item row="0" column="0">
<widget class="QLabel" name="mUrlLabel">
<property name="text">
<string>Resize mode</string>
<string>URL</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QComboBox" name="mResizeModeComboBox"/>
</item>
<item row="0" column="1">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
Expand All @@ -74,13 +90,16 @@
</item>
</layout>
</item>
<item row="0" column="0">
<widget class="QLabel" name="mUrlLabel">
<item row="2" column="0">
<widget class="QLabel" name="mResizeModeLabel">
<property name="text">
<string>URL</string>
<string>Resize mode</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QComboBox" name="mResizeModeComboBox"/>
</item>
</layout>
</widget>
</item>
Expand Down
Loading

0 comments on commit 0f0c981

Please sign in to comment.