Skip to content

Commit

Permalink
Merge pull request #5323 from DelazJ/networkspacing
Browse files Browse the repository at this point in the history
Align items and reduce spacing in Options -> Network dialog
  • Loading branch information
m-kuhn authored Oct 8, 2017
2 parents b9dd238 + edda367 commit 5d0f8cd
Showing 1 changed file with 84 additions and 106 deletions.
190 changes: 84 additions & 106 deletions src/ui/qgsoptionsbase.ui
Original file line number Diff line number Diff line change
Expand Up @@ -5082,6 +5082,41 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
<bool>true</bool>
</property>
<layout class="QGridLayout" name="gridLayout_1">
<item row="1" column="0">
<widget class="QLabel" name="label_47">
<property name="text">
<string>Exclude URLs (starting with)</string>
</property>
</widget>
</item>
<item row="1" column="4">
<widget class="QToolButton" name="mRemoveUrlPushButton">
<property name="toolTip">
<string>Remove selected URL</string>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/symbologyRemove.svg</normaloff>:/images/themes/default/symbologyRemove.svg</iconset>
</property>
</widget>
</item>
<item row="1" column="3">
<widget class="QToolButton" name="mAddUrlPushButton">
<property name="toolTip">
<string>Add URL to exclude</string>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/symbologyAdd.svg</normaloff>:/images/themes/default/symbologyAdd.svg</iconset>
</property>
</widget>
</item>
<item row="0" column="0" colspan="5">
<layout class="QGridLayout" name="gridLayout_17">
<item row="0" column="1">
Expand Down Expand Up @@ -5119,43 +5154,39 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
<enum>QFrame::Raised</enum>
</property>
<layout class="QGridLayout" name="gridLayout_18">
<item row="1" column="2">
<widget class="QLabel" name="lblProxyHost">
<property name="text">
<string>Host</string>
</property>
</widget>
</item>
<item row="1" column="3">
<widget class="QLineEdit" name="leProxyHost"/>
</item>
<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="2" column="2">
<widget class="QLineEdit" name="leProxyPort"/>
</item>
<item row="2" column="1">
<widget class="QLabel" name="lblProxyPort">
<property name="text">
<string>Port</string>
</property>
</widget>
</item>
<item row="2" column="3">
<widget class="QLineEdit" name="leProxyPort"/>
<item row="1" column="2">
<widget class="QLineEdit" name="leProxyHost"/>
</item>
<item row="2" column="1">
<spacer name="horizontalSpacer_27">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>12</width>
<height>20</height>
</size>
<item row="1" column="1">
<widget class="QLabel" name="lblProxyHost">
<property name="text">
<string>Host</string>
</property>
</spacer>
</widget>
</item>
<item row="3" column="2" colspan="2">
<item row="3" column="1" colspan="2">
<widget class="QGroupBox" name="mAuthGroupBox">
<property name="title">
<string>Authentication</string>
Expand Down Expand Up @@ -5184,74 +5215,21 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
</item>
</layout>
</item>
<item row="7" column="0" rowspan="2" colspan="5">
<widget class="QGroupBox" name="grpUrlExclude">
<property name="title">
<string/>
<item row="1" column="1" colspan="2">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="flat">
<bool>true</bool>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
<layout class="QGridLayout" name="gridLayout_5">
<property name="leftMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<item row="2" column="3">
<widget class="QToolButton" name="mRemoveUrlPushButton">
<property name="toolTip">
<string>Remove selected URL</string>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/symbologyRemove.svg</normaloff>:/images/themes/default/symbologyRemove.svg</iconset>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="QToolButton" name="mAddUrlPushButton">
<property name="toolTip">
<string>Add URL to exclude</string>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/symbologyAdd.svg</normaloff>:/images/themes/default/symbologyAdd.svg</iconset>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_47">
<property name="text">
<string>Exclude URLs (starting with)</string>
</property>
</widget>
</item>
<item row="2" column="1">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="3" column="0" colspan="4">
<widget class="QListWidget" name="mExcludeUrlListWidget"/>
</item>
</layout>
</widget>
</spacer>
</item>
<item row="2" column="0" colspan="5">
<widget class="QListWidget" name="mExcludeUrlListWidget"/>
</item>
</layout>
</widget>
Expand All @@ -5263,8 +5241,8 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
<width>0</width>
<height>0</height>
</size>
</property>
</spacer>
Expand Down Expand Up @@ -5405,12 +5383,23 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
</widget>
<layoutdefault spacing="6" margin="11"/>
<customwidgets>
<customwidget>
<class>QgsColorButton</class>
<extends>QToolButton</extends>
<header>qgscolorbutton.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsScrollArea</class>
<extends>QScrollArea</extends>
<header>qgsscrollarea.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsSpinBox</class>
<extends>QSpinBox</extends>
<header>qgsspinbox.h</header>
</customwidget>
<customwidget>
<class>QgsCollapsibleGroupBox</class>
<extends>QGroupBox</extends>
Expand Down Expand Up @@ -5439,17 +5428,6 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
<extends>QLineEdit</extends>
<header>qgsfilterlineedit.h</header>
</customwidget>
<customwidget>
<class>QgsColorButton</class>
<extends>QToolButton</extends>
<header>qgscolorbutton.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsSpinBox</class>
<extends>QSpinBox</extends>
<header>qgsspinbox.h</header>
</customwidget>
<customwidget>
<class>QgsColorSchemeList</class>
<extends>QWidget</extends>
Expand Down

0 comments on commit 5d0f8cd

Please sign in to comment.