sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-06 00:07:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #62696 from qgis/backport-62688-to-release-3_44

Browse Source 
[Backport release-3_44] Move splitter in Execute SQL dialog to include error label
This commit is contained in:
Alexander Bruy 2025-07-29 06:43:59 +01:00 committed by GitHub
commit 63a5ac51f1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/qgsqueryresultwidget.cpp
View File

@ -73,6 +73,7 @@ QgsQueryResultPanelWidget::QgsQueryResultPanelWidget( QWidget *parent, QgsAbstra
mainLayout->setSpacing( 6 ); mainLayout->setSpacing( 6 );
progressLayout->setSpacing( 6 ); progressLayout->setSpacing( 6 );
mResultsContainer->hide();
mQueryResultsTableView->hide(); mQueryResultsTableView->hide();
mQueryResultsTableView->setItemDelegate( new QgsQueryResultItemDelegate( mQueryResultsTableView ) ); mQueryResultsTableView->setItemDelegate( new QgsQueryResultItemDelegate( mQueryResultsTableView ) );
mQueryResultsTableView->setContextMenuPolicy( Qt::CustomContextMenu ); mQueryResultsTableView->setContextMenuPolicy( Qt::CustomContextMenu );
@ -233,6 +234,7 @@ void QgsQueryResultPanelWidget::executeQuery()
{ {
mQueryResultsTableView->hide(); mQueryResultsTableView->hide();
mSqlErrorText->hide(); mSqlErrorText->hide();
mResultsContainer->hide();
mFirstRowFetched = false; mFirstRowFetched = false;
cancelRunningQuery(); cancelRunningQuery();
@ -440,6 +442,7 @@ void QgsQueryResultPanelWidget::startFetching()
emit firstResultBatchFetched(); emit firstResultBatchFetched();
mFirstRowFetched = true; mFirstRowFetched = true;
mQueryResultsTableView->show(); mQueryResultsTableView->show();
mResultsContainer->show();
updateButtons(); updateButtons();
updateSqlLayerColumns(); updateSqlLayerColumns();
mActualRowCount = mModel->queryResult().rowCount(); mActualRowCount = mModel->queryResult().rowCount();
@ -452,6 +455,7 @@ void QgsQueryResultPanelWidget::startFetching()
mQueryResultsTableView->setModel( mModel.get() ); mQueryResultsTableView->setModel( mModel.get() );
mQueryResultsTableView->show(); mQueryResultsTableView->show();
mResultsContainer->show();
connect( mModel.get(), &QgsQueryResultModel::fetchingComplete, mStopButton, [=] { connect( mModel.get(), &QgsQueryResultModel::fetchingComplete, mStopButton, [=] {
bool ok = false; bool ok = false;
@ -483,10 +487,12 @@ void QgsQueryResultPanelWidget::showError( const QString &title, const QString &
{ {
mSqlErrorText->show(); mSqlErrorText->show();
mSqlErrorText->setText( message ); mSqlErrorText->setText( message );
mResultsContainer->show();
} }
else else
{ {
mMessageBar->pushCritical( title, message ); mMessageBar->pushCritical( title, message );
mResultsContainer->hide();
} }
} }

30
src/ui/qgsqueryresultpanelwidgetbase.ui
View File

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>662</width> <width>662</width>
<height>471</height> <height>485</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -43,7 +43,7 @@
</layout> </layout>
</item> </item>
<item> <item>
<layout class="QVBoxLayout" name="mainLayout"> <layout class="QVBoxLayout" name="mainLayout" stretch="1,0">
<property name="leftMargin"> <property name="leftMargin">
<number>6</number> <number>6</number>
</property> </property>
@ -140,15 +140,33 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QTableView" name="mQueryResultsTableView"/> <widget class="QWidget" name="mResultsContainer" native="true">
<layout class="QVBoxLayout" name="verticalLayout_5">
<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>
<widget class="QgsCodeEditorSQL" name="mSqlErrorText" native="true"/>
</item>
<item>
<widget class="QTableView" name="mQueryResultsTableView"/>
</item>
</layout>
</widget>
</widget> </widget>
</item> </item>
</layout> </layout>
</widget> </widget>
</item> </item>
<item>
<widget class="QgsCodeEditorSQL" name="mSqlErrorText" native="true"/>
</item>
<item> <item>
<widget class="QgsCollapsibleGroupBox" name="mLoadAsNewLayerGroupBox"> <widget class="QgsCollapsibleGroupBox" name="mLoadAsNewLayerGroupBox">
<property name="title"> <property name="title">