Skip to content

Commit 86a9414

Browse files
committed
dwg import:
* allow entering new gpkg filenames (fixes #20305) * move messagebar to dialog (cherry picked from commit 8400a8b)
1 parent e96e41d commit 86a9414

File tree

2 files changed

+17
-6
lines changed

2 files changed

+17
-6
lines changed

src/app/dwg/qgsdwgimportdialog.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ QgsDwgImportDialog::QgsDwgImportDialog( QWidget *parent, Qt::WindowFlags f )
5454
: QDialog( parent, f )
5555
{
5656
setupUi( this );
57+
mDatabaseFileWidget->setStorageMode( QgsFileWidget::SaveFile );
58+
5759
connect( buttonBox, &QDialogButtonBox::accepted, this, &QgsDwgImportDialog::buttonBox_accepted );
5860
connect( mDatabaseFileWidget, &QgsFileWidget::fileChanged, this, &QgsDwgImportDialog::mDatabaseFileWidget_textChanged );
5961
connect( pbBrowseDrawing, &QPushButton::clicked, this, &QgsDwgImportDialog::pbBrowseDrawing_clicked );
@@ -222,7 +224,7 @@ void QgsDwgImportDialog::pbLoadDatabase_clicked()
222224
}
223225
else
224226
{
225-
QgisApp::instance()->messageBar()->pushMessage( tr( "Could not open layer list" ), Qgis::Critical, 4 );
227+
bar->pushMessage( tr( "Could not open layer list" ), Qgis::Critical, 4 );
226228
}
227229
}
228230

@@ -247,11 +249,11 @@ void QgsDwgImportDialog::pbImportDrawing_clicked()
247249
QString error;
248250
if ( importer.import( leDrawing->text(), error, cbExpandInserts->isChecked(), cbUseCurves->isChecked() ) )
249251
{
250-
QgisApp::instance()->messageBar()->pushMessage( tr( "Drawing import completed." ), Qgis::Info, 4 );
252+
bar->pushMessage( tr( "Drawing import completed." ), Qgis::Info, 4 );
251253
}
252254
else
253255
{
254-
QgisApp::instance()->messageBar()->pushMessage( tr( "Drawing import failed (%1)" ).arg( error ), Qgis::Critical, 4 );
256+
bar->pushMessage( tr( "Drawing import failed (%1)" ).arg( error ), Qgis::Critical, 4 );
255257
}
256258

257259
pbLoadDatabase_clicked();

src/ui/qgsdwgimportbase.ui

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<string>DWG/DXF Import</string>
1515
</property>
1616
<layout class="QGridLayout" name="gridLayout">
17-
<item row="7" column="0" colspan="2">
17+
<item row="8" column="0" colspan="2">
1818
<widget class="QDialogButtonBox" name="buttonBox">
1919
<property name="orientation">
2020
<enum>Qt::Horizontal</enum>
@@ -24,7 +24,7 @@
2424
</property>
2525
</widget>
2626
</item>
27-
<item row="2" column="0" colspan="2">
27+
<item row="3" column="0" colspan="2">
2828
<widget class="QGroupBox" name="mGroupBox">
2929
<property name="title">
3030
<string>Layers to Import into Project</string>
@@ -107,7 +107,7 @@
107107
</layout>
108108
</widget>
109109
</item>
110-
<item row="0" column="0" colspan="2">
110+
<item row="1" column="0" colspan="2">
111111
<widget class="QGroupBox" name="groupBox">
112112
<property name="title">
113113
<string>Import Drawing into GeoPackage</string>
@@ -221,6 +221,9 @@
221221
</layout>
222222
</widget>
223223
</item>
224+
<item row="0" column="0" colspan="2">
225+
<widget class="QgsMessageBar" name="bar" native="true"/>
226+
</item>
224227
</layout>
225228
</widget>
226229
<customwidgets>
@@ -235,6 +238,12 @@
235238
<header>qgsprojectionselectionwidget.h</header>
236239
<container>1</container>
237240
</customwidget>
241+
<customwidget>
242+
<class>QgsMessageBar</class>
243+
<extends>QWidget</extends>
244+
<header>qgsmessagebar.h</header>
245+
<container>1</container>
246+
</customwidget>
238247
</customwidgets>
239248
<tabstops>
240249
<tabstop>pbLoadDatabase</tabstop>

0 commit comments

Comments
 (0)