Remove method and fix widget hiding

qgis · Jul 6, 2021 · dfc5648 · dfc5648
1 parent 27eb574
commit dfc5648
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 45 deletions.
diff --git a/python/gui/auto_generated/qgsqueryresultwidget.sip.in b/python/gui/auto_generated/qgsqueryresultwidget.sip.in
@@ -49,15 +49,6 @@ Sets the connection to ``connection``, ownership is transferred to the widget.
 Convenience method to set the SQL editor text to ``sql``.
 %End
 
-    void setSqlVectorLayerOptions( const QgsAbstractDatabaseProviderConnection::SqlVectorLayerOptions &options );
-%Docstring
-Sets the SQL layer ``options``. This method automatically populates and shows the "Load as new layer" panel.
-%End
-
-    QgsAbstractDatabaseProviderConnection::SqlVectorLayerOptions sqlVectorLayerOptions() const;
-%Docstring
-Returns the sqlVectorLayerOptions
-%End
 
   public slots:
 

diff --git a/src/gui/qgsqueryresultwidget.cpp b/src/gui/qgsqueryresultwidget.cpp
@@ -31,8 +31,6 @@ QgsQueryResultWidget::QgsQueryResultWidget( QWidget *parent, QgsAbstractDatabase
   // Unsure :/
   // mSqlEditor->setLineNumbersVisible( true );
 
-  mSqlEditor->
-
   connect( mExecuteButton, &QPushButton::pressed, this, &QgsQueryResultWidget::executeQuery );
   connect( mClearButton, &QPushButton::pressed, this, [ = ]
   {
@@ -70,6 +68,27 @@ QgsQueryResultWidget::QgsQueryResultWidget( QWidget *parent, QgsAbstractDatabase
   mSqlErrorText->hide();
 
   mLoadAsNewLayerGroupBox->setCollapsed( true );
+
+  connect( mLoadAsNewLayerGroupBox, &QgsCollapsibleGroupBox::collapsedStateChanged, this, [ = ]( bool collapsed )
+  {
+    if ( ! collapsed )
+    {
+      // Configure the load layer interface
+      const bool showPkConfig { connection &&connection->sqlLayerDefinitionCapabilities().testFlag( QgsAbstractDatabaseProviderConnection::SqlLayerDefinitionCapability::PrimaryKeys )};
+      mPkColumnsCheckBox->setVisible( showPkConfig );
+      mPkColumnsComboBox->setVisible( showPkConfig );
+
+      const bool showGeometryColumnConfig {connection &&connection->sqlLayerDefinitionCapabilities().testFlag( QgsAbstractDatabaseProviderConnection::SqlLayerDefinitionCapability::GeometryColumn )};
+      mGeometryColumnCheckBox->setVisible( showGeometryColumnConfig );
+      mGeometryColumnComboBox->setVisible( showGeometryColumnConfig );
+
+      const bool showFilterConfig { connection &&connection->sqlLayerDefinitionCapabilities().testFlag( QgsAbstractDatabaseProviderConnection::SqlLayerDefinitionCapability::Filters ) };
+      mFilterLabel->setVisible( showFilterConfig );
+      mFilterToolButton->setVisible( showFilterConfig );
+      mFilterLineEdit->setVisible( showFilterConfig );
+    }
+  } );
+
   setConnection( connection );
 }
 
@@ -305,26 +324,6 @@ void QgsQueryResultWidget::setConnection( QgsAbstractDatabaseProviderConnection
   if ( connection )
   {
 
-    // Configure the load layer interface
-    if ( ! connection->sqlLayerDefinitionCapabilities().testFlag( QgsAbstractDatabaseProviderConnection::SqlLayerDefinitionCapability::PrimaryKeys ) )
-    {
-      mPkColumnsCheckBox->hide();
-      mPkColumnsComboBox->hide();
-    }
-
-    if ( ! connection->sqlLayerDefinitionCapabilities().testFlag( QgsAbstractDatabaseProviderConnection::SqlLayerDefinitionCapability::GeometryColumn ) )
-    {
-      mGeometryColumnCheckBox->hide();
-      mGeometryColumnComboBox->hide();
-    }
-
-    if ( ! connection->sqlLayerDefinitionCapabilities().testFlag( QgsAbstractDatabaseProviderConnection::SqlLayerDefinitionCapability::Filters ) )
-    {
-      mFilterLabel->hide();
-      mFilterToolButton->hide();
-      mFilterLineEdit->hide();
-    }
-
     // Add provider specific APIs
     const auto keywordsDict { connection->sqlDictionary() };
     QStringList keywords;
@@ -359,11 +358,6 @@ void QgsQueryResultWidget::setQuery( const QString &sql )
   mSqlEditor->setText( sql );
 }
 
-void QgsQueryResultWidget::setSqlVectorLayerOptions( const QgsAbstractDatabaseProviderConnection::SqlVectorLayerOptions &options )
-{
-  mSqlVectorLayerOptions = options;
-// TODO: check items
-}
 
 ///@cond private
 

diff --git a/src/gui/qgsqueryresultwidget.h b/src/gui/qgsqueryresultwidget.h
@@ -104,15 +104,6 @@ class GUI_EXPORT QgsQueryResultWidget: public QWidget, private Ui::QgsQueryResul
      */
     void setQuery( const QString &sql );
 
-    /**
-     * Sets the SQL layer \a options. This method automatically populates and shows the "Load as new layer" panel.
-     */
-    void setSqlVectorLayerOptions( const QgsAbstractDatabaseProviderConnection::SqlVectorLayerOptions &options );
-
-    /**
-     * Returns the sqlVectorLayerOptions
-     */
-    QgsAbstractDatabaseProviderConnection::SqlVectorLayerOptions sqlVectorLayerOptions() const;
 
   public slots:
 
@@ -187,6 +178,12 @@ class GUI_EXPORT QgsQueryResultWidget: public QWidget, private Ui::QgsQueryResul
      */
     void startFetching();
 
+    /**
+     * Returns the sqlVectorLayerOptions
+     */
+    QgsAbstractDatabaseProviderConnection::SqlVectorLayerOptions sqlVectorLayerOptions() const;
+
+
     friend class TestQgsQueryResultWidget;
 
 };