Skip to content

Commit

Permalink
Fix more alignment, spacing and stretching issues
Browse files Browse the repository at this point in the history
  • Loading branch information
@DelazJ @nyalldawson
DelazJ authored and nyalldawson committed May 4, 2020
1 parent 6d87c11 commit a86413d
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 44 deletions.
1 change: 1 addition & 0 deletions src/gui/qgsfeaturepickerwidget.cpp
View file
Expand Up @@ -42,6 +42,7 @@ QgsFeaturePickerWidget::QgsFeaturePickerWidget( QWidget *parent )
mNextButton->setEnabled( false );
mNextButton->setVisible( mShowBrowserButtons );
layout->addWidget( mNextButton );
layout->setContentsMargins( 0, 0, 0, 0 );

setLayout( layout );

Expand Down
43 changes: 5 additions & 38 deletions src/ui/qgsexpressionbuilder.ui
View file
Expand Up @@ -99,7 +99,7 @@
<height>0</height>
</size>
</property>
<layout class="QVBoxLayout" name="verticalLayout_6" stretch="0,1,0,1">
<layout class="QVBoxLayout" name="verticalLayout_6" stretch="0,1,0,0">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_10" stretch="0">
<item>
Expand Down Expand Up @@ -412,21 +412,12 @@
</item>
<item>
<layout class="QGridLayout" name="gridLayout">
<property name="sizeConstraint">
<enum>QLayout::SetMinAndMaxSize</enum>
</property>
<property name="topMargin">
<number>0</number>
<number>3</number>
</property>
<item row="0" column="0">
<widget class="QFrame" name="mExpectedOutputFrame">
<layout class="QHBoxLayout" name="horizontalLayout_7">
<property name="spacing">
<number>3</number>
</property>
<property name="sizeConstraint">
<enum>QLayout::SetMinAndMaxSize</enum>
</property>
<property name="leftMargin">
<number>0</number>
</property>
Expand All @@ -442,7 +433,7 @@
<item>
<widget class="QLabel" name="label_3">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
Expand All @@ -451,41 +442,17 @@
<string>Output preview is generated &lt;br&gt; using the first feature from the layer.</string>
</property>
<property name="text">
<string>Expected Format:</string>
<string>Expected format:</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="lblExpected">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Output preview is generated &lt;br&gt; using the first feature from the layer.</string>
</property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Sunken</enum>
</property>
<property name="lineWidth">
<number>0</number>
</property>
<property name="midLineWidth">
<number>0</number>
</property>
<property name="text">
<string>string [r,g,b,a] as int 0-255 or #RRGGBBAA as hex or color as color's name</string>
</property>
<property name="textFormat">
<enum>Qt::RichText</enum>
</property>
<property name="scaledContents">
<bool>false</bool>
<string>Help text</string>
</property>
<property name="wordWrap">
<bool>true</bool>
Expand Down
24 changes: 18 additions & 6 deletions src/ui/qgsexpressionpreviewbase.ui
View file
Expand Up @@ -7,17 +7,29 @@
<x>0</x>
<y>0</y>
<width>400</width>
<height>300</height>
<height>67</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<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="1" column="0">
<widget class="QLabel" name="label">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
Expand All @@ -26,14 +38,14 @@
<string>Preview:</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLabel" name="mPreviewLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
Expand All @@ -42,7 +54,7 @@
<string>TextLabel</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
<property name="wordWrap">
<bool>true</bool>
Expand All @@ -57,7 +69,7 @@
<item>
<widget class="QLabel" name="label_2">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
Expand Down

0 comments on commit a86413d

Please sign in to comment.