Merge pull request #41119 from mrylov/hana_fixui

Fix UI issues in HANA provider
qgis · Feb 2, 2021 · 334408e · 334408e
2 parents e299a49 + 8c07b3e
commit 334408e
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 6 deletions.
diff --git a/src/providers/hana/qgshananewconnection.cpp b/src/providers/hana/qgshananewconnection.cpp
@@ -15,6 +15,7 @@
  *
  ***************************************************************************/
 #include "qgsauthmanager.h"
+#include "qgsgui.h"
 #include "qgshanadriver.h"
 #include "qgshanaconnection.h"
 #include "qgshananewconnection.h"
@@ -43,6 +44,7 @@ QgsHanaNewConnection::QgsHanaNewConnection(
   , mOriginalConnName( connName )
 {
   setupUi( this );
+  QgsGui::instance()->enableAutoGeometryRestore( this );
 
   cmbIdentifierType_changed( cmbIdentifierType->currentIndex() );
 

diff --git a/src/providers/hana/qgshanasourceselect.cpp b/src/providers/hana/qgshanasourceselect.cpp
@@ -16,6 +16,7 @@
  ***************************************************************************/
 #include "qgsapplication.h"
 #include "qgsdatasourceuri.h"
+#include "qgsgui.h"
 #include "qgshanasourceselect.h"
 #include "qgshanaconnection.h"
 #include "qgshananewconnection.h"
@@ -199,6 +200,8 @@ QgsHanaSourceSelect::QgsHanaSourceSelect(
   : QgsAbstractDataSourceWidget( parent, fl, theWidgetMode )
 {
   setupUi( this );
+  QgsGui::instance()->enableAutoGeometryRestore( this );
+
   connect( btnConnect, &QPushButton::clicked, this, &QgsHanaSourceSelect::btnConnect_clicked );
   connect( cbxAllowGeometrylessTables, &QCheckBox::stateChanged, this, &QgsHanaSourceSelect::cbxAllowGeometrylessTables_stateChanged );
   connect( btnNew, &QPushButton::clicked, this, &QgsHanaSourceSelect::btnNew_clicked );

diff --git a/src/ui/qgshananewconnectionbase.ui b/src/ui/qgshananewconnectionbase.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>464</width>
-    <height>725</height>
+    <height>729</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -99,13 +99,13 @@
           <property name="minimumSize">
            <size>
             <width>0</width>
-            <height>100</height>
+            <height>124</height>
            </size>
           </property>
           <property name="maximumSize">
            <size>
             <width>16777215</width>
-            <height>16777215</height>
+            <height>124</height>
            </size>
           </property>
           <property name="frameShape">
@@ -361,7 +361,13 @@
           <property name="minimumSize">
            <size>
             <width>0</width>
-            <height>22</height>
+            <height>25</height>
+           </size>
+          </property>
+          <property name="maximumSize">
+           <size>
+            <width>16777215</width>
+            <height>25</height>
            </size>
           </property>
           <property name="frameShadow">
@@ -373,7 +379,7 @@
              <x>0</x>
              <y>0</y>
              <width>151</width>
-             <height>20</height>
+             <height>25</height>
             </rect>
            </property>
            <item>
@@ -393,9 +399,21 @@
              <x>160</x>
              <y>0</y>
              <width>51</width>
-             <height>20</height>
+             <height>25</height>
             </rect>
            </property>
+           <property name="minimumSize">
+            <size>
+             <width>0</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="maximumSize">
+            <size>
+             <width>16777215</width>
+             <height>16777215</height>
+            </size>
+           </property>
            <property name="text">
             <string>00</string>
            </property>