Merge pull request #4250 from ismailsunni/XYZ_connection_dialog

nyalldawson · web-flow · commit 0798faadaa7a · 2017-03-12T18:22:59.000+10:00
Update UI for XYZ Connection Dialog
diff --git a/src/providers/wms/qgsxyzconnectiondialog.cpp b/src/providers/wms/qgsxyzconnectiondialog.cpp
@@ -21,6 +21,10 @@ QgsXyzConnectionDialog::QgsXyzConnectionDialog( QWidget *parent )
   : QDialog( parent )
 {
   setupUi( this );
+
+  // Behavior for min and max zoom check box
+  connect( mCheckBoxZMin, &QCheckBox::toggled, mSpinZMin, &QSpinBox::setEnabled );
+  connect( mCheckBoxZMax, &QCheckBox::toggled, mSpinZMax, &QSpinBox::setEnabled );
 }
 
 void QgsXyzConnectionDialog::setConnection( const QgsXyzConnection &conn )
diff --git a/src/ui/qgsxyzconnectiondialog.ui b/src/ui/qgsxyzconnectiondialog.ui
@@ -15,57 +15,89 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <layout class="QFormLayout" name="formLayout">
-     <item row="0" column="0">
-      <widget class="QLabel" name="label">
-       <property name="text">
-        <string>Name</string>
+    <layout class="QGridLayout" name="gridLayout">
+     <item row="1" column="1">
+      <widget class="QLineEdit" name="mEditUrl">
+       <property name="placeholderText">
+        <string>http://example.com/{z}/{x}/{y}.png</string>
        </property>
       </widget>
      </item>
-     <item row="0" column="1">
-      <widget class="QLineEdit" name="mEditName"/>
-     </item>
      <item row="1" column="0">
       <widget class="QLabel" name="label_2">
        <property name="text">
         <string>URL</string>
        </property>
       </widget>
      </item>
-     <item row="1" column="1">
-      <widget class="QLineEdit" name="mEditUrl">
-       <property name="placeholderText">
-        <string>http://example.com/{z}/{x}/{y}.png</string>
-       </property>
-      </widget>
-     </item>
      <item row="2" column="0">
       <widget class="QCheckBox" name="mCheckBoxZMin">
        <property name="text">
         <string>Min. Zoom Level</string>
        </property>
+       <property name="checked">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="0">
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>Name</string>
+       </property>
       </widget>
      </item>
      <item row="2" column="1">
-      <widget class="QSpinBox" name="mSpinZMin"/>
+      <widget class="QSpinBox" name="mSpinZMin">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+      </widget>
      </item>
      <item row="3" column="0">
       <widget class="QCheckBox" name="mCheckBoxZMax">
        <property name="text">
         <string>Max. Zoom Level</string>
        </property>
+       <property name="checked">
+        <bool>true</bool>
+       </property>
       </widget>
      </item>
      <item row="3" column="1">
       <widget class="QSpinBox" name="mSpinZMax">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
        <property name="value">
         <number>18</number>
        </property>
       </widget>
      </item>
+     <item row="0" column="1">
+      <widget class="QLineEdit" name="mEditName"/>
+     </item>
     </layout>
    </item>
+   <item>
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
    <item>
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="orientation">

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,10 @@ QgsXyzConnectionDialog::QgsXyzConnectionDialog( QWidget *parent )`
`21`	`21`	`: QDialog( parent )`
`22`	`22`	`{`
`23`	`23`	`setupUi( this );`
	`24`	`+`
	`25`	`+ // Behavior for min and max zoom check box`
	`26`	`+ connect( mCheckBoxZMin, &QCheckBox::toggled, mSpinZMin, &QSpinBox::setEnabled );`
	`27`	`+ connect( mCheckBoxZMax, &QCheckBox::toggled, mSpinZMax, &QSpinBox::setEnabled );`
`24`	`28`	`}`
`25`	`29`
`26`	`30`	`void QgsXyzConnectionDialog::setConnection( const QgsXyzConnection &conn )`