Skip to content

Commit

Permalink
Add help button to mesh calculator dialog
Browse files Browse the repository at this point in the history
and fix title case on mesh/raster calculator file selector dialog
  • Loading branch information
DelazJ authored and nyalldawson committed Oct 4, 2021
1 parent 5bc837c commit 21e7b8c
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 3 deletions.
7 changes: 6 additions & 1 deletion src/app/mesh/qgsmeshcalculatordialog.cpp
Expand Up @@ -28,6 +28,7 @@
#include "qgswkbtypes.h"
#include "qgsfeatureiterator.h"
#include "qgsmeshdatasetgrouptreeview.h"
#include "qgshelp.h"

#include "cpl_string.h"
#include "gdal.h"
Expand Down Expand Up @@ -103,10 +104,14 @@ QgsMeshCalculatorDialog::QgsMeshCalculatorDialog( QgsMeshLayer *meshLayer, QWidg
useFullLayerExtent();
repopulateTimeCombos();
mButtonBox->button( QDialogButtonBox::Ok )->setEnabled( false );
connect( mButtonBox, &QDialogButtonBox::helpRequested, this, [ = ]
{
QgsHelp::openHelp( QStringLiteral( "working_with_mesh/mesh_properties.html#mesh-calculator" ) );
} );

const QgsSettings settings;
mOutputDatasetFileWidget->setStorageMode( QgsFileWidget::SaveFile );
mOutputDatasetFileWidget->setDialogTitle( tr( "Enter mesh dataset file" ) );
mOutputDatasetFileWidget->setDialogTitle( tr( "Enter Mesh Dataset File" ) );
mOutputDatasetFileWidget->setDefaultRoot( settings.value( QStringLiteral( "/MeshCalculator/lastOutputDir" ), QDir::homePath() ).toString() );
onOutputFormatChange();
connect( mOutputDatasetFileWidget, &QgsFileWidget::fileChanged, this, &QgsMeshCalculatorDialog::updateInfoMessage );
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgsrastercalcdialog.cpp
Expand Up @@ -93,7 +93,7 @@ QgsRasterCalcDialog::QgsRasterCalcDialog( QgsRasterLayer *rasterLayer, QWidget *

QgsSettings settings;
mOutputLayer->setStorageMode( QgsFileWidget::SaveFile );
mOutputLayer->setDialogTitle( tr( "Enter result file" ) );
mOutputLayer->setDialogTitle( tr( "Enter Result File" ) );
mOutputLayer->setDefaultRoot( settings.value( QStringLiteral( "/RasterCalculator/lastOutputDir" ), QDir::homePath() ).toString() );
connect( mOutputLayer, &QgsFileWidget::fileChanged, this, [ = ]() { setAcceptButtonState(); } );

Expand Down
2 changes: 1 addition & 1 deletion src/ui/mesh/qgsmeshcalculatordialogbase.ui
Expand Up @@ -650,7 +650,7 @@
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
Expand Down

0 comments on commit 21e7b8c

Please sign in to comment.