Skip to content

Commit

Permalink
Standardise margins on vector layer properties dialog
Browse files Browse the repository at this point in the history
  • Loading branch information
@nyalldawson
nyalldawson committed Apr 13, 2017
1 parent f23d381 commit 7f065c7
Show file tree
Hide file tree
Showing 3 changed files with 163 additions and 43 deletions.
1 change: 1 addition & 0 deletions src/app/qgsvectorlayerproperties.cpp
View file
Expand Up @@ -293,6 +293,7 @@ QgsVectorLayerProperties::QgsVectorLayerProperties(
);

QString myStyle = QgsApplication::reportStyleSheet();
myStyle.append( QStringLiteral( "body { margin: 10px; }\n " ) );
teMetadataViewer->clear();
teMetadataViewer->document()->setDefaultStyleSheet( myStyle );
teMetadataViewer->setHtml( htmlMetadata() );
Expand Down
52 changes: 26 additions & 26 deletions src/ui/qgsdiagrampropertiesbase.ui
View file
Expand Up @@ -12,16 +12,16 @@
</property>
<layout class="QVBoxLayout" name="verticalLayout_8" stretch="0,1">
<property name="leftMargin">
<number>6</number>
<number>0</number>
</property>
<property name="topMargin">
<number>6</number>
<number>0</number>
</property>
<property name="rightMargin">
<number>6</number>
<number>0</number>
</property>
<property name="bottomMargin">
<number>6</number>
<number>0</number>
</property>
<item>
<widget class="QFrame" name="frameShowDiagrams">
Expand Down Expand Up @@ -303,8 +303,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>632</width>
<height>405</height>
<width>644</width>
<height>417</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_6">
Expand Down Expand Up @@ -539,7 +539,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>618</width>
<width>340</width>
<height>484</height>
</rect>
</property>
Expand Down Expand Up @@ -1130,8 +1130,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>632</width>
<height>405</height>
<width>511</width>
<height>294</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_11">
Expand Down Expand Up @@ -1446,8 +1446,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>632</width>
<height>405</height>
<width>280</width>
<height>288</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_12">
Expand Down Expand Up @@ -1872,8 +1872,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>632</width>
<height>405</height>
<width>100</width>
<height>180</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
Expand Down Expand Up @@ -2091,8 +2091,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>632</width>
<height>405</height>
<width>324</width>
<height>131</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_12">
Expand Down Expand Up @@ -2175,12 +2175,6 @@
<header>qgsscrollarea.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsColorButton</class>
<extends>QToolButton</extends>
<header>qgscolorbutton.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsCollapsibleGroupBox</class>
<extends>QGroupBox</extends>
Expand All @@ -2193,6 +2187,17 @@
<header>qgsfieldexpressionwidget.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsScaleRangeWidget</class>
<extends>QWidget</extends>
<header>qgsscalerangewidget.h</header>
</customwidget>
<customwidget>
<class>QgsColorButton</class>
<extends>QToolButton</extends>
<header>qgscolorbutton.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsDoubleSpinBox</class>
<extends>QDoubleSpinBox</extends>
Expand All @@ -2214,11 +2219,6 @@
<header>qgsunitselectionwidget.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsScaleRangeWidget</class>
<extends>QWidget</extends>
<header>qgsscalerangewidget.h</header>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>mDiagramTypeComboBox</tabstop>
Expand Down
153 changes: 136 additions & 17 deletions src/ui/qgsvectorlayerpropertiesbase.ui
View file
Expand Up @@ -298,11 +298,47 @@
</property>
<widget class="QWidget" name="mOptsPage_Information">
<layout class="QVBoxLayout" name="verticalLayout_5">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QTextBrowser" name="teMetadataViewer">
<widget class="QFrame" name="frame">
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QVBoxLayout" name="verticalLayout_7">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QTextBrowser" name="teMetadataViewer">
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
Expand Down Expand Up @@ -334,11 +370,23 @@
<rect>
<x>0</x>
<y>0</y>
<width>629</width>
<height>572</height>
<width>639</width>
<height>592</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_13">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QgsCollapsibleGroupBox" name="mMetaDescriptionGrpBx">
<property name="title">
Expand Down Expand Up @@ -773,11 +821,23 @@ border-radius: 2px;</string>
<rect>
<x>0</x>
<y>0</y>
<width>644</width>
<height>522</height>
<width>653</width>
<height>536</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_9">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QgsCollapsibleGroupBox" name="groupBox_6">
<property name="title">
Expand Down Expand Up @@ -870,7 +930,6 @@ border-radius: 2px;</string>
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
<zorder>label_5</zorder>
</widget>
</item>
<item>
Expand Down Expand Up @@ -1000,8 +1059,8 @@ border-radius: 2px;</string>
<rect>
<x>0</x>
<y>0</y>
<width>644</width>
<height>522</height>
<width>653</width>
<height>536</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_18">
Expand Down Expand Up @@ -1101,8 +1160,8 @@ border-radius: 2px;</string>
<rect>
<x>0</x>
<y>0</y>
<width>644</width>
<height>522</height>
<width>653</width>
<height>536</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_20">
Expand Down Expand Up @@ -1161,11 +1220,23 @@ border-radius: 2px;</string>
<rect>
<x>0</x>
<y>0</y>
<width>686</width>
<height>507</height>
<width>671</width>
<height>522</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_32">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QgsCollapsibleGroupBox" name="mScaleVisibilityGroupBox">
<property name="title">
Expand Down Expand Up @@ -1394,6 +1465,18 @@ border-radius: 2px;</string>
<bool>true</bool>
</property>
<layout class="QGridLayout" name="gridLayout_10">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
Expand Down Expand Up @@ -1497,8 +1580,8 @@ border-radius: 2px;</string>
<rect>
<x>0</x>
<y>0</y>
<width>100</width>
<height>30</height>
<width>653</width>
<height>536</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_21">
Expand Down Expand Up @@ -1563,8 +1646,8 @@ border-radius: 2px;</string>
<rect>
<x>0</x>
<y>0</y>
<width>199</width>
<height>123</height>
<width>653</width>
<height>536</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_23">
Expand Down Expand Up @@ -1707,6 +1790,18 @@ border-radius: 2px;</string>
</widget>
<widget class="QWidget" name="page">
<layout class="QVBoxLayout" name="verticalLayout_4">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QGroupBox" name="groupBox_4">
<property name="title">
Expand All @@ -1727,6 +1822,18 @@ border-radius: 2px;</string>
</widget>
<widget class="QWidget" name="mOptsPage_Legend">
<layout class="QVBoxLayout" name="verticalLayout_8">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QGroupBox" name="groupBox_3">
<property name="title">
Expand All @@ -1743,6 +1850,18 @@ border-radius: 2px;</string>
</widget>
<widget class="QWidget" name="mOptsPage_DataDependencies">
<layout class="QVBoxLayout" name="verticalLayout_29">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QGroupBox" name="groupBox_5">
<property name="title">
Expand Down

0 comments on commit 7f065c7

Please sign in to comment.