Skip to content

Commit dd9f397

Browse files
committedMar 14, 2020
Change titles on file dialogs too
1 parent 368c297 commit dd9f397

File tree

3 files changed

+15
-22
lines changed

3 files changed

+15
-22
lines changed
 

‎src/gui/qgsexpressionbuilderwidget.cpp

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1415,7 +1415,7 @@ void QgsExpressionBuilderWidget::exportUserExpressions_pressed()
14151415
QString lastSaveDir = settings.value( QStringLiteral( "lastExportExpressionsDir" ), QDir::homePath(), QgsSettings::App ).toString();
14161416
QString saveFileName = QFileDialog::getSaveFileName(
14171417
this,
1418-
tr( "Save user expressions" ),
1418+
tr( "Export User Expressions" ),
14191419
lastSaveDir,
14201420
tr( "User expressions" ) + " (*.json)" );
14211421

@@ -1432,7 +1432,7 @@ void QgsExpressionBuilderWidget::exportUserExpressions_pressed()
14321432

14331433
settings.setValue( QStringLiteral( "lastExportExpressionsDir" ), saveFileInfo.absolutePath(), QgsSettings::App );
14341434

1435-
QJsonDocument *exportJson = exportUserExpressions();
1435+
std::unique_ptr< QJsonDocument > exportJson = exportUserExpressions();
14361436
QFile jsonFile( saveFileName );
14371437

14381438
if ( !jsonFile.open( QFile::WriteOnly | QIODevice::Truncate ) )
@@ -1442,12 +1442,10 @@ void QgsExpressionBuilderWidget::exportUserExpressions_pressed()
14421442
QMessageBox::warning( this, tr( "Export user expressions" ), tr( "Error while creating the expressions file." ) );
14431443
else
14441444
jsonFile.close();
1445-
1446-
delete exportJson;
14471445
}
14481446

14491447

1450-
QJsonDocument *QgsExpressionBuilderWidget::exportUserExpressions()
1448+
std::unique_ptr< QJsonDocument > QgsExpressionBuilderWidget::exportUserExpressions()
14511449
{
14521450
const QString group = QStringLiteral( "user" );
14531451
QgsSettings settings;
@@ -1484,7 +1482,7 @@ QJsonDocument *QgsExpressionBuilderWidget::exportUserExpressions()
14841482
}
14851483

14861484
exportObject["expressions"] = exportList;
1487-
QJsonDocument *exportJson = new QJsonDocument( exportObject );
1485+
std::unique_ptr< QJsonDocument > exportJson = qgis::make_unique< QJsonDocument >( exportObject );
14881486

14891487
return exportJson;
14901488
}
@@ -1495,21 +1493,21 @@ void QgsExpressionBuilderWidget::importUserExpressions_pressed()
14951493
QString lastSaveDir = settings.value( QStringLiteral( "lastImportExpressionsDir" ), QDir::homePath(), QgsSettings::App ).toString();
14961494
QString loadFileName = QFileDialog::getOpenFileName(
14971495
this,
1498-
tr( "Save user expressions" ),
1496+
tr( "Import User Expressions" ),
14991497
lastSaveDir,
15001498
tr( "User expressions" ) + " (*.json)" );
15011499

15021500
if ( loadFileName.isEmpty() )
15031501
return;
15041502

1505-
QFileInfo saveFileInfo( loadFileName );
1503+
QFileInfo loadFileInfo( loadFileName );
15061504

1507-
settings.setValue( QStringLiteral( "lastImportExpressionsDir" ), saveFileInfo.absolutePath(), QgsSettings::App );
1505+
settings.setValue( QStringLiteral( "lastImportExpressionsDir" ), loadFileInfo.absolutePath(), QgsSettings::App );
15081506

15091507
QFile jsonFile( loadFileName );
15101508

15111509
if ( !jsonFile.open( QFile::ReadOnly ) )
1512-
QMessageBox::warning( this, tr( "Import user expressions" ), tr( "Error while reading the expressions file." ) );
1510+
QMessageBox::warning( this, tr( "Import User Expressions" ), tr( "Error while reading the expressions file." ) );
15131511

15141512
QTextStream jsonStream( &jsonFile );
15151513
QString jsonString = jsonFile.readAll();
@@ -1519,7 +1517,7 @@ void QgsExpressionBuilderWidget::importUserExpressions_pressed()
15191517

15201518
if ( importJson.isNull() )
15211519
{
1522-
QMessageBox::warning( this, tr( "Import user expressions" ), tr( "Error while reading the expressions file." ) );
1520+
QMessageBox::warning( this, tr( "Import User Expressions" ), tr( "Error while reading the expressions file." ) );
15231521
return;
15241522
}
15251523

@@ -1554,7 +1552,7 @@ void QgsExpressionBuilderWidget::loadExpressionsFromJson( const QJsonDocument &e
15541552
tr( "QGIS Version Mismatch" ),
15551553
tr( "The imported expressions are from newer version of QGIS (%1) "
15561554
"and some of the expression might not work the current version (%2). "
1557-
"Do you want to continue?" ).arg( qgisJsonVersion.toString(), qgisVersion.toString() ), buttons ) )
1555+
"Are you sure you want to continue?" ).arg( qgisJsonVersion.toString(), qgisVersion.toString() ), buttons ) )
15581556
{
15591557
case QMessageBox::No:
15601558
return;
@@ -1655,16 +1653,14 @@ void QgsExpressionBuilderWidget::loadExpressionsFromJson( const QJsonDocument &e
16551653

16561654
loadUserExpressions( );
16571655

1658-
QgsLogger::warning( QString::number( skippedExpressionLabels.count() ) + QStringLiteral( __FILE__ ) + ": " + QString::number( __LINE__ ) );
1659-
16601656
if ( ! skippedExpressionLabels.isEmpty() )
16611657
{
16621658
QStringList skippedExpressionLabelsQuoted;
16631659
for ( const QString &skippedExpressionLabel : skippedExpressionLabels )
16641660
skippedExpressionLabelsQuoted.append( QString( "'%1'" ).arg( skippedExpressionLabel ) );
16651661

16661662
QMessageBox::information( this,
1667-
tr( "Skipped expressions" ),
1663+
tr( "Skipped Expression Imports" ),
16681664
QString( "%1\n%2" ).arg( tr( "The following expressions have been skipped:" ),
16691665
skippedExpressionLabelsQuoted.join( ", " ) ) );
16701666
}
@@ -1679,7 +1675,7 @@ void QgsExpressionBuilderWidget::showMessageBoxConfirmExpressionOverwrite(
16791675
{
16801676
QMessageBox::StandardButtons buttons = QMessageBox::Yes | QMessageBox::YesToAll | QMessageBox::No | QMessageBox::NoToAll;
16811677
switch ( QMessageBox::question( this,
1682-
tr( "Expression overwrite" ),
1678+
tr( "Expression Overwrite" ),
16831679
tr( "The expression with label '%1' was already defined."
16841680
"The old expression \"%2\" will be overwritten by \"%3\"."
16851681
"Are you sure you want to overwrite the expression?" ).arg( label, oldExpression, newExpression ), buttons ) )

‎src/gui/qgsexpressionbuilderwidget.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ class GUI_EXPORT QgsExpressionBuilderWidget : public QWidget, private Ui::QgsExp
399399
* \returns the created expressions JSON file
400400
* \since QGIS 3.14
401401
*/
402-
QJsonDocument *exportUserExpressions();
402+
std::unique_ptr< QJsonDocument > exportUserExpressions();
403403

404404
/**
405405
* Display a file dialog to choose where to load the expression JSON file from

‎src/ui/qgsexpressionbuilder.ui

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -963,15 +963,12 @@ Saved scripts are auto loaded on QGIS startup.</string>
963963
</layout>
964964
<action name="mActionImportUserExpressions">
965965
<property name="text">
966-
<string>Import user expressions</string>
966+
<string>Import User Expressions</string>
967967
</property>
968968
</action>
969969
<action name="mActionExportUserExpressions">
970970
<property name="text">
971-
<string>Export user expressions</string>
972-
</property>
973-
<property name="toolTip">
974-
<string>Export user expressions</string>
971+
<string>Export User Expressions</string>
975972
</property>
976973
</action>
977974
</widget>

0 commit comments

Comments
 (0)
Please sign in to comment.