Skip to content

Commit 5d0f8cd

Browse files
m-kuhnm-kuhn
authoredOct 8, 2017
Merge pull request #5323 from DelazJ/networkspacing
Align items and reduce spacing in Options -> Network dialog
·
ltr-3_40final-3_0_0
2 parents b9dd238 + edda367 commit 5d0f8cd

File tree

1 file changed

+84
-106
lines changed

1 file changed

+84
-106
lines changed
 

‎src/ui/qgsoptionsbase.ui

Lines changed: 84 additions & 106 deletions
Original file line numberDiff line numberDiff line change
@@ -5082,6 +5082,41 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
50825082
<bool>true</bool>
50835083
</property>
50845084
<layout class="QGridLayout" name="gridLayout_1">
5085+
<item row="1" column="0">
5086+
<widget class="QLabel" name="label_47">
5087+
<property name="text">
5088+
<string>Exclude URLs (starting with)</string>
5089+
</property>
5090+
</widget>
5091+
</item>
5092+
<item row="1" column="4">
5093+
<widget class="QToolButton" name="mRemoveUrlPushButton">
5094+
<property name="toolTip">
5095+
<string>Remove selected URL</string>
5096+
</property>
5097+
<property name="text">
5098+
<string/>
5099+
</property>
5100+
<property name="icon">
5101+
<iconset resource="../../images/images.qrc">
5102+
<normaloff>:/images/themes/default/symbologyRemove.svg</normaloff>:/images/themes/default/symbologyRemove.svg</iconset>
5103+
</property>
5104+
</widget>
5105+
</item>
5106+
<item row="1" column="3">
5107+
<widget class="QToolButton" name="mAddUrlPushButton">
5108+
<property name="toolTip">
5109+
<string>Add URL to exclude</string>
5110+
</property>
5111+
<property name="text">
5112+
<string/>
5113+
</property>
5114+
<property name="icon">
5115+
<iconset resource="../../images/images.qrc">
5116+
<normaloff>:/images/themes/default/symbologyAdd.svg</normaloff>:/images/themes/default/symbologyAdd.svg</iconset>
5117+
</property>
5118+
</widget>
5119+
</item>
50855120
<item row="0" column="0" colspan="5">
50865121
<layout class="QGridLayout" name="gridLayout_17">
50875122
<item row="0" column="1">
@@ -5119,43 +5154,39 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
51195154
<enum>QFrame::Raised</enum>
51205155
</property>
51215156
<layout class="QGridLayout" name="gridLayout_18">
5122-
<item row="1" column="2">
5123-
<widget class="QLabel" name="lblProxyHost">
5124-
<property name="text">
5125-
<string>Host</string>
5126-
</property>
5127-
</widget>
5128-
</item>
5129-
<item row="1" column="3">
5130-
<widget class="QLineEdit" name="leProxyHost"/>
5131-
</item>
5157+
<property name="leftMargin">
5158+
<number>0</number>
5159+
</property>
5160+
<property name="topMargin">
5161+
<number>0</number>
5162+
</property>
5163+
<property name="rightMargin">
5164+
<number>0</number>
5165+
</property>
5166+
<property name="bottomMargin">
5167+
<number>0</number>
5168+
</property>
51325169
<item row="2" column="2">
5170+
<widget class="QLineEdit" name="leProxyPort"/>
5171+
</item>
5172+
<item row="2" column="1">
51335173
<widget class="QLabel" name="lblProxyPort">
51345174
<property name="text">
51355175
<string>Port</string>
51365176
</property>
51375177
</widget>
51385178
</item>
5139-
<item row="2" column="3">
5140-
<widget class="QLineEdit" name="leProxyPort"/>
5179+
<item row="1" column="2">
5180+
<widget class="QLineEdit" name="leProxyHost"/>
51415181
</item>
5142-
<item row="2" column="1">
5143-
<spacer name="horizontalSpacer_27">
5144-
<property name="orientation">
5145-
<enum>Qt::Horizontal</enum>
5146-
</property>
5147-
<property name="sizeType">
5148-
<enum>QSizePolicy::Fixed</enum>
5149-
</property>
5150-
<property name="sizeHint" stdset="0">
5151-
<size>
5152-
<width>12</width>
5153-
<height>20</height>
5154-
</size>
5182+
<item row="1" column="1">
5183+
<widget class="QLabel" name="lblProxyHost">
5184+
<property name="text">
5185+
<string>Host</string>
51555186
</property>
5156-
</spacer>
5187+
</widget>
51575188
</item>
5158-
<item row="3" column="2" colspan="2">
5189+
<item row="3" column="1" colspan="2">
51595190
<widget class="QGroupBox" name="mAuthGroupBox">
51605191
<property name="title">
51615192
<string>Authentication</string>
@@ -5184,74 +5215,21 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
51845215
</item>
51855216
</layout>
51865217
</item>
5187-
<item row="7" column="0" rowspan="2" colspan="5">
5188-
<widget class="QGroupBox" name="grpUrlExclude">
5189-
<property name="title">
5190-
<string/>
5218+
<item row="1" column="1" colspan="2">
5219+
<spacer name="horizontalSpacer">
5220+
<property name="orientation">
5221+
<enum>Qt::Horizontal</enum>
51915222
</property>
5192-
<property name="flat">
5193-
<bool>true</bool>
5223+
<property name="sizeHint" stdset="0">
5224+
<size>
5225+
<width>40</width>
5226+
<height>20</height>
5227+
</size>
51945228
</property>
5195-
<layout class="QGridLayout" name="gridLayout_5">
5196-
<property name="leftMargin">
5197-
<number>0</number>
5198-
</property>
5199-
<property name="rightMargin">
5200-
<number>0</number>
5201-
</property>
5202-
<item row="2" column="3">
5203-
<widget class="QToolButton" name="mRemoveUrlPushButton">
5204-
<property name="toolTip">
5205-
<string>Remove selected URL</string>
5206-
</property>
5207-
<property name="text">
5208-
<string/>
5209-
</property>
5210-
<property name="icon">
5211-
<iconset resource="../../images/images.qrc">
5212-
<normaloff>:/images/themes/default/symbologyRemove.svg</normaloff>:/images/themes/default/symbologyRemove.svg</iconset>
5213-
</property>
5214-
</widget>
5215-
</item>
5216-
<item row="2" column="2">
5217-
<widget class="QToolButton" name="mAddUrlPushButton">
5218-
<property name="toolTip">
5219-
<string>Add URL to exclude</string>
5220-
</property>
5221-
<property name="text">
5222-
<string/>
5223-
</property>
5224-
<property name="icon">
5225-
<iconset resource="../../images/images.qrc">
5226-
<normaloff>:/images/themes/default/symbologyAdd.svg</normaloff>:/images/themes/default/symbologyAdd.svg</iconset>
5227-
</property>
5228-
</widget>
5229-
</item>
5230-
<item row="2" column="0">
5231-
<widget class="QLabel" name="label_47">
5232-
<property name="text">
5233-
<string>Exclude URLs (starting with)</string>
5234-
</property>
5235-
</widget>
5236-
</item>
5237-
<item row="2" column="1">
5238-
<spacer name="horizontalSpacer">
5239-
<property name="orientation">
5240-
<enum>Qt::Horizontal</enum>
5241-
</property>
5242-
<property name="sizeHint" stdset="0">
5243-
<size>
5244-
<width>40</width>
5245-
<height>20</height>
5246-
</size>
5247-
</property>
5248-
</spacer>
5249-
</item>
5250-
<item row="3" column="0" colspan="4">
5251-
<widget class="QListWidget" name="mExcludeUrlListWidget"/>
5252-
</item>
5253-
</layout>
5254-
</widget>
5229+
</spacer>
5230+
</item>
5231+
<item row="2" column="0" colspan="5">
5232+
<widget class="QListWidget" name="mExcludeUrlListWidget"/>
52555233
</item>
52565234
</layout>
52575235
</widget>
@@ -5263,8 +5241,8 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
52635241
</property>
52645242
<property name="sizeHint" stdset="0">
52655243
<size>
5266-
<width>20</width>
5267-
<height>40</height>
5244+
<width>0</width>
5245+
<height>0</height>
52685246
</size>
52695247
</property>
52705248
</spacer>
@@ -5405,12 +5383,23 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
54055383
</widget>
54065384
<layoutdefault spacing="6" margin="11"/>
54075385
<customwidgets>
5386+
<customwidget>
5387+
<class>QgsColorButton</class>
5388+
<extends>QToolButton</extends>
5389+
<header>qgscolorbutton.h</header>
5390+
<container>1</container>
5391+
</customwidget>
54085392
<customwidget>
54095393
<class>QgsScrollArea</class>
54105394
<extends>QScrollArea</extends>
54115395
<header>qgsscrollarea.h</header>
54125396
<container>1</container>
54135397
</customwidget>
5398+
<customwidget>
5399+
<class>QgsSpinBox</class>
5400+
<extends>QSpinBox</extends>
5401+
<header>qgsspinbox.h</header>
5402+
</customwidget>
54145403
<customwidget>
54155404
<class>QgsCollapsibleGroupBox</class>
54165405
<extends>QGroupBox</extends>
@@ -5439,17 +5428,6 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
54395428
<extends>QLineEdit</extends>
54405429
<header>qgsfilterlineedit.h</header>
54415430
</customwidget>
5442-
<customwidget>
5443-
<class>QgsColorButton</class>
5444-
<extends>QToolButton</extends>
5445-
<header>qgscolorbutton.h</header>
5446-
<container>1</container>
5447-
</customwidget>
5448-
<customwidget>
5449-
<class>QgsSpinBox</class>
5450-
<extends>QSpinBox</extends>
5451-
<header>qgsspinbox.h</header>
5452-
</customwidget>
54535431
<customwidget>
54545432
<class>QgsColorSchemeList</class>
54555433
<extends>QWidget</extends>

0 commit comments

Comments
 (0)
Please sign in to comment.