Add Help button and connect it to user manual

This commit is contained in:
Harrissou Sant-anna 2017-09-01 15:46:09 +02:00 committed by Matthias Kuhn
parent 8e12757ce6
commit f51244c98b
51 changed files with 250 additions and 62 deletions

View File

@ -8,7 +8,6 @@
class QgsSymbolLevelsDialog : QDialog
{

View File

@ -36,6 +36,7 @@ QgsOSMExportDialog::QgsOSMExportDialog( QWidget *parent )
connect( btnBrowseDb, &QAbstractButton::clicked, this, &QgsOSMExportDialog::onBrowse );
connect( buttonBox, &QDialogButtonBox::accepted, this, &QgsOSMExportDialog::onOK );
connect( buttonBox, &QDialogButtonBox::rejected, this, &QgsOSMExportDialog::onClose );
connect( buttonBox, &QDialogButtonBox::helpRequested, this, &QgsOSMExportDialog::showHelp );
connect( editDbFileName, &QLineEdit::textChanged, this, &QgsOSMExportDialog::updateLayerName );
connect( radPoints, &QAbstractButton::clicked, this, &QgsOSMExportDialog::updateLayerName );
connect( radPolylines, &QAbstractButton::clicked, this, &QgsOSMExportDialog::updateLayerName );
@ -212,3 +213,8 @@ void QgsOSMExportDialog::onDeselectAll()
mTagsModel->item( i, 0 )->setCheckState( Qt::Unchecked );
}
}
void QgsOSMExportDialog::showHelp()
{
QgsHelp::openHelp( QStringLiteral( "managing_data_source/opening_data.html#importing-openstreetmap-vectors" ) );
}

View File

@ -19,6 +19,7 @@
#include <QDialog>
#include "ui_qgsosmexportdialog.h"
#include "qgshelp.h"
class QgsOSMDatabase;
@ -43,6 +44,7 @@ class QgsOSMExportDialog : public QDialog, private Ui::QgsOSMExportDialog
void onOK();
void onClose();
void showHelp();
private:
QgsOSMDatabase *mDatabase = nullptr;

View File

@ -34,6 +34,7 @@ QgsOSMImportDialog::QgsOSMImportDialog( QWidget *parent )
connect( editDbFileName, &QLineEdit::textChanged, this, &QgsOSMImportDialog::dbFileNameChanged );
connect( buttonBox, &QDialogButtonBox::accepted, this, &QgsOSMImportDialog::onOK );
connect( buttonBox, &QDialogButtonBox::rejected, this, &QgsOSMImportDialog::onClose );
connect( buttonBox, &QDialogButtonBox::helpRequested, this, &QgsOSMImportDialog::showHelp );
connect( mImport, &QgsOSMXmlImport::progress, this, &QgsOSMImportDialog::onProgress );
}
@ -130,3 +131,8 @@ void QgsOSMImportDialog::onProgress( int percent )
progressBar->setValue( percent );
qApp->processEvents( QEventLoop::ExcludeSocketNotifiers );
}
void QgsOSMImportDialog::showHelp()
{
QgsHelp::openHelp( QStringLiteral( "managing_data_source/opening_data.html#importing-openstreetmap-vectors" ) );
}

View File

@ -19,6 +19,7 @@
#include <QDialog>
#include "ui_qgsosmimportdialog.h"
#include "qgshelp.h"
class QgsOSMXmlImport;
@ -38,6 +39,7 @@ class QgsOSMImportDialog : public QDialog, private Ui::QgsOSMImportDialog
void onOK();
void onClose();
void showHelp();
void onProgress( int percent );

View File

@ -51,6 +51,7 @@ QgsAddTabOrGroup::QgsAddTabOrGroup( QgsVectorLayer *lyr, const QList < TabPair >
connect( mTabButton, &QAbstractButton::toggled, this, &QgsAddTabOrGroup::on_mTabButton_toggled );
connect( mGroupButton, &QAbstractButton::toggled, this, &QgsAddTabOrGroup::on_mGroupButton_toggled );
connect( buttonBox, &QDialogButtonBox::helpRequested, this, &QgsAddTabOrGroup::showHelp );
mColumnCountSpinBox->setValue( QgsSettings().value( QStringLiteral( "/qgis/attributeForm/defaultTabColumnCount" ), 1 ).toInt() );
@ -115,3 +116,8 @@ void QgsAddTabOrGroup::on_mTabButton_toggled( bool checked )
if ( checked )
mColumnCountSpinBox->setValue( QgsSettings().value( QStringLiteral( "/qgis/attributeForm/defaultTabColumnCount" ), 1 ).toInt() );
}
void QgsAddTabOrGroup::showHelp()
{
QgsHelp::openHelp( QStringLiteral( "working_with_vector/vector_properties.html#customize-a-form-for-your-data" ) );
}

View File

@ -22,6 +22,7 @@
#include "ui_qgsaddtaborgroupbase.h"
#include "qgsguiutils.h"
#include "qgis_app.h"
#include "qgshelp.h"
class QTreeWidgetItem;
class QgsVectorLayer;
@ -50,6 +51,7 @@ class APP_EXPORT QgsAddTabOrGroup : public QDialog, private Ui::QgsAddTabOrGroup
private slots:
void on_mGroupButton_toggled( bool checked );
void on_mTabButton_toggled( bool checked );
void showHelp();
protected:
QgsVectorLayer *mLayer = nullptr;

View File

@ -950,9 +950,15 @@ void QgsDiagramProperties::showSizeLegendDialog()
dlg.setLayout( new QVBoxLayout() );
dlg.setWindowTitle( panel->panelTitle() );
dlg.layout()->addWidget( panel );
QDialogButtonBox *buttonBox = new QDialogButtonBox( QDialogButtonBox::Ok );
QDialogButtonBox *buttonBox = new QDialogButtonBox( QDialogButtonBox::Help | QDialogButtonBox::Ok );
connect( buttonBox, &QDialogButtonBox::accepted, &dlg, &QDialog::accept );
connect( buttonBox, &QDialogButtonBox::helpRequested, this, &QgsDiagramProperties::showHelp );
dlg.layout()->addWidget( buttonBox );
if ( dlg.exec() )
mSizeLegend.reset( panel->dataDefinedSizeLegend() );
}
void QgsDiagramProperties::showHelp()
{
QgsHelp::openHelp( QStringLiteral( "working_with_vector/vector_properties.html#legend" ) );
}

View File

@ -90,6 +90,7 @@ class APP_EXPORT QgsDiagramProperties : public QWidget, private Ui::QgsDiagramPr
private slots:
void updateProperty();
void showHelp();
};
class EditBlockerDelegate: public QStyledItemDelegate

View File

@ -34,6 +34,8 @@ QgsSaveStyleToDbDialog::QgsSaveStyleToDbDialog( QWidget *parent )
QgsSettings settings;
restoreGeometry( settings.value( QStringLiteral( "Windows/saveStyleToDb/geometry" ) ).toByteArray() );
connect( buttonBox, &QDialogButtonBox::helpRequested, this, &QgsSaveStyleToDbDialog::showHelp );
}
QgsSaveStyleToDbDialog::~QgsSaveStyleToDbDialog()
@ -103,3 +105,8 @@ void QgsSaveStyleToDbDialog::on_mFilePickButton_clicked()
mFileNameLabel->setText( myFI.fileName() );
}
}
void QgsSaveStyleToDbDialog::showHelp()
{
QgsHelp::openHelp( QStringLiteral( "introduction/general_tools.html#save-and-share-layer-properties" ) );
}

View File

@ -19,6 +19,7 @@
#include "ui_qgssavetodbdialog.h"
#include "qgsguiutils.h"
#include "qgis_app.h"
#include "qgshelp.h"
class APP_EXPORT QgsSaveStyleToDbDialog : public QDialog, private Ui::QgsSaveToDBDialog
{
@ -38,6 +39,10 @@ class APP_EXPORT QgsSaveStyleToDbDialog : public QDialog, private Ui::QgsSaveToD
bool isDefault();
void on_mFilePickButton_clicked();
void accept() override;
private slots:
void showHelp();
};
#endif // QGSSAVESTYLETODBDIALOG_H

View File

@ -57,6 +57,7 @@ QgsColorDialog::QgsColorDialog( QWidget *parent, Qt::WindowFlags fl, const QColo
connect( mColorWidget, &QgsCompoundColorWidget::currentColorChanged, this, &QgsColorDialog::currentColorChanged );
connect( this, &QDialog::rejected, this, &QgsColorDialog::discardColor );
connect( mButtonBox, &QDialogButtonBox::helpRequested, this, &QgsColorDialog::showHelp );
}
QColor QgsColorDialog::color() const
@ -205,3 +206,8 @@ void QgsColorDialog::closeEvent( QCloseEvent *e )
saveSettings();
QDialog::closeEvent( e );
}
void QgsColorDialog::showHelp()
{
QgsHelp::openHelp( QStringLiteral( "introduction/general_tools.html#color-selector" ) );
}

View File

@ -21,6 +21,7 @@
#include "ui_qgscolordialog.h"
#include "qgis_gui.h"
#include "qgis.h"
#include "qgshelp.h"
class QColor;
@ -113,6 +114,7 @@ class GUI_EXPORT QgsColorDialog : public QDialog, private Ui::QgsColorDialogBase
void on_mButtonBox_rejected();
void on_mButtonBox_clicked( QAbstractButton *button );
void discardColor();
void showHelp();
private:

View File

@ -33,6 +33,8 @@ QgsExpressionBuilderDialog::QgsExpressionBuilderDialog( QgsVectorLayer *layer, c
QgsSettings settings;
restoreGeometry( settings.value( QStringLiteral( "Windows/ExpressionBuilderDialog/geometry" ) ).toByteArray() );
connect( buttonBox, &QDialogButtonBox::helpRequested, this, &QgsExpressionBuilderDialog::showHelp );
}
QgsExpressionBuilderWidget *QgsExpressionBuilderDialog::expressionBuilder()
@ -79,3 +81,8 @@ void QgsExpressionBuilderDialog::setGeomCalculator( const QgsDistanceArea &da )
// Store in child widget only.
builder->setGeomCalculator( da );
}
void QgsExpressionBuilderDialog::showHelp()
{
QgsHelp::openHelp( QStringLiteral( "working_with_vector/expression.html" ) );
}

View File

@ -18,6 +18,7 @@
#include <QDialog>
#include "ui_qgsexpressionbuilderdialogbase.h"
#include "qgshelp.h"
#include "qgis_gui.h"
@ -75,6 +76,10 @@ class GUI_EXPORT QgsExpressionBuilderDialog : public QDialog, private Ui::QgsExp
private:
QString mRecentKey;
private slots:
void showHelp();
};
#endif

View File

@ -57,6 +57,8 @@ QgsExpressionSelectionDialog::QgsExpressionSelectionDialog( QgsVectorLayer *laye
QgsSettings settings;
restoreGeometry( settings.value( QStringLiteral( "Windows/ExpressionSelectionDialog/geometry" ) ).toByteArray() );
connect( buttonBox, &QDialogButtonBox::helpRequested, this, &QgsExpressionSelectionDialog::showHelp );
}
QgsExpressionBuilderWidget *QgsExpressionSelectionDialog::expressionBuilder()
@ -194,3 +196,8 @@ void QgsExpressionSelectionDialog::saveRecent()
{
mExpressionBuilder->saveToRecent( QStringLiteral( "Selection" ) );
}
void QgsExpressionSelectionDialog::showHelp()
{
QgsHelp::openHelp( QStringLiteral( "introduction/general_tools.html#automatic-selection" ) );
}

View File

@ -21,6 +21,7 @@
#include "qgsmapcanvas.h"
#include "qgsmessagebar.h"
#include "qgshelp.h"
#include <QDialog>
#include "qgis_gui.h"
@ -88,6 +89,7 @@ class GUI_EXPORT QgsExpressionSelectionDialog : public QDialog, private Ui::QgsE
void on_mActionSelectIntersect_triggered();
void on_mButtonZoomToFeatures_clicked();
void on_mPbnClose_clicked();
void showHelp();
protected:

View File

@ -146,6 +146,8 @@ QgsGradientColorRampDialog::QgsGradientColorRampDialog( const QgsGradientColorRa
connect( mStopEditor, &QgsGradientStopEditor::selectedStopChanged, this, &QgsGradientColorRampDialog::selectedStopChanged );
mStopEditor->selectStop( 0 );
connect( buttonBox, &QDialogButtonBox::helpRequested, this, &QgsGradientColorRampDialog::showHelp );
}
QgsGradientColorRampDialog::~QgsGradientColorRampDialog()
@ -563,6 +565,11 @@ void QgsGradientColorRampDialog::setColor2( const QColor &color )
updateColorButtons();
}
void QgsGradientColorRampDialog::showHelp()
{
QgsHelp::openHelp( QStringLiteral( "working_with_vector/style_library.html#color-ramp" ) );
}
/// @cond PRIVATE

View File

@ -20,6 +20,7 @@
#include "qgis.h"
#include "ui_qgsgradientcolorrampdialogbase.h"
#include "qgshelp.h"
#include "qgis_gui.h"
class QgsGradientColorRamp;
@ -91,6 +92,7 @@ class GUI_EXPORT QgsGradientColorRampDialog : public QDialog, private Ui::QgsGra
void plotMousePress( QPointF point );
void plotMouseRelease( QPointF point );
void plotMouseMove( QPointF point );
void showHelp();
private:

View File

@ -56,6 +56,8 @@ QgsNewMemoryLayerDialog::QgsNewMemoryLayerDialog( QWidget *parent, Qt::WindowFla
mPointRadioButton->setChecked( true );
mNameLineEdit->setText( tr( "New scratch layer" ) );
connect( mButtonBox, &QDialogButtonBox::helpRequested, this, &QgsNewMemoryLayerDialog::showHelp );
}
QgsNewMemoryLayerDialog::~QgsNewMemoryLayerDialog()
@ -116,3 +118,8 @@ QString QgsNewMemoryLayerDialog::layerName() const
{
return mNameLineEdit->text();
}
void QgsNewMemoryLayerDialog::showHelp()
{
QgsHelp::openHelp( QStringLiteral( "managing_data_source/create_layers.html#creating-a-new-temporary-scratch-layer" ) );
}

View File

@ -20,6 +20,7 @@
#include "ui_qgsnewmemorylayerdialogbase.h"
#include "qgsguiutils.h"
#include "qgis.h"
#include "qgshelp.h"
#include "qgis_gui.h"
class QgsVectorLayer;
@ -65,6 +66,10 @@ class GUI_EXPORT QgsNewMemoryLayerDialog: public QDialog, private Ui::QgsNewMemo
private:
QString mCrsId;
private slots:
void showHelp();
};
#endif //QGSNEWMEMORYLAYERDIALOG_H

View File

@ -34,6 +34,8 @@ QgsOrderByDialog::QgsOrderByDialog( QgsVectorLayer *layer, QWidget *parent )
mOrderByTableWidget->horizontalHeader()->setResizeMode( 2, QHeaderView::ResizeToContents );
mOrderByTableWidget->installEventFilter( this );
connect( buttonBox, &QDialogButtonBox::helpRequested, this, &QgsOrderByDialog::showHelp );
}
void QgsOrderByDialog::setOrderBy( const QgsFeatureRequest::OrderBy &orderBy )
@ -150,3 +152,7 @@ bool QgsOrderByDialog::eventFilter( QObject *obj, QEvent *e )
return false;
}
void QgsOrderByDialog::showHelp()
{
QgsHelp::openHelp( QStringLiteral( "working_with_vector/vector_properties.html#layer-rendering" ) );
}

View File

@ -22,6 +22,7 @@
#include "ui_qgsorderbydialogbase.h"
#include "qgsfeaturerequest.h"
#include "qgshelp.h"
#include "qgis_gui.h"
class QgsVectorLayer;
@ -62,6 +63,7 @@ class GUI_EXPORT QgsOrderByDialog : public QDialog, private Ui::OrderByDialogBas
private slots:
void onExpressionChanged( const QString &expression );
void showHelp();
private:

View File

@ -137,6 +137,8 @@ QgsRasterLayerSaveAsDialog::QgsRasterLayerSaveAsDialog( QgsRasterLayer *rasterLa
okButton->setEnabled( false );
}
connect( mButtonBox, &QDialogButtonBox::helpRequested, this, &QgsRasterLayerSaveAsDialog::showHelp );
mExtentGroupBox->setOutputCrs( outputCrs() );
mExtentGroupBox->setOriginalExtent( mDataProvider->extent(), mLayerCrs );
mExtentGroupBox->setCurrentExtent( mCurrentExtent, mCurrentCrs );
@ -737,3 +739,7 @@ bool QgsRasterLayerSaveAsDialog::validate() const
return true;
}
void QgsRasterLayerSaveAsDialog::showHelp()
{
QgsHelp::openHelp( QStringLiteral( "managing_data_source/create_layers.html#save-layer-from-an-existing-file" ) );
}

View File

@ -20,6 +20,7 @@
#include "qgscoordinatereferencesystem.h"
#include "qgsrasterrange.h"
#include "qgis_gui.h"
#include "qgshelp.h"
class QgsRasterLayer;
class QgsRasterDataProvider;
@ -108,6 +109,8 @@ class GUI_EXPORT QgsRasterLayerSaveAsDialog: public QDialog, private Ui::QgsRast
void on_mPyramidsGroupBox_toggled( bool toggled );
void populatePyramidsLevels();
void extentChanged();
void crsChanged();
void showHelp();
private:
QgsRasterLayer *mRasterLayer = nullptr;
@ -135,8 +138,6 @@ class GUI_EXPORT QgsRasterLayerSaveAsDialog: public QDialog, private Ui::QgsRast
void adjustNoDataCellWidth( int row, int column );
bool validate() const;
private slots:
void crsChanged();
};

View File

@ -113,6 +113,8 @@ QgsStyleExportImportDialog::QgsStyleExportImportDialog( QgsStyle *style, QWidget
disconnect( buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept );
connect( buttonBox, &QDialogButtonBox::accepted, this, &QgsStyleExportImportDialog::doExportImport );
buttonBox->button( QDialogButtonBox::Ok )->setEnabled( false );
connect( buttonBox, &QDialogButtonBox::helpRequested, this, &QgsStyleExportImportDialog::showHelp );
}
void QgsStyleExportImportDialog::doExportImport()
@ -585,3 +587,8 @@ void QgsStyleExportImportDialog::selectionChanged( const QItemSelection &selecte
bool nothingSelected = listItems->selectionModel()->selectedIndexes().empty();
buttonBox->button( QDialogButtonBox::Ok )->setDisabled( nothingSelected );
}
void QgsStyleExportImportDialog::showHelp()
{
QgsHelp::openHelp( QStringLiteral( "working_with_vector/style_library.html#share-symbols" ) );
}

View File

@ -28,6 +28,7 @@
#include "ui_qgsstyleexportimportdialogbase.h"
#include "qgis_gui.h"
#include "qgis_sip.h"
#include "qgshelp.h"
class QgsStyle;
class QgsStyleGroupSelectionDialog;
@ -114,6 +115,7 @@ class GUI_EXPORT QgsStyleExportImportDialog : public QDialog, private Ui::QgsSty
void updateProgress( qint64, qint64 );
void downloadCanceled();
void selectionChanged( const QItemSelection &selected, const QItemSelection &deselected );
void showHelp();
private:
void downloadStyleXml( const QUrl &url );

View File

@ -43,6 +43,7 @@ QgsSymbolLevelsDialog::QgsSymbolLevelsDialog( const QgsLegendSymbolList &list, b
chkEnable->setChecked( usingSymbolLevels );
connect( chkEnable, &QAbstractButton::clicked, this, &QgsSymbolLevelsDialog::updateUi );
connect( buttonBox, &QDialogButtonBox::helpRequested, this, &QgsSymbolLevelsDialog::showHelp );
// only consider entries with symbols
Q_FOREACH ( const QgsLegendSymbolItem &item, list )
@ -167,6 +168,11 @@ void QgsSymbolLevelsDialog::setForceOrderingEnabled( bool enabled )
chkEnable->show();
}
void QgsSymbolLevelsDialog::showHelp()
{
QgsHelp::openHelp( QStringLiteral( "working_with_vector/vector_properties.html#symbols-levels" ) );
}
/// @cond PRIVATE

View File

@ -21,7 +21,7 @@
#include <QItemDelegate>
#include "qgsrenderer.h"
#include "qgshelp.h"
#include "ui_qgssymbollevelsdialogbase.h"
#include "qgis_gui.h"
@ -47,6 +47,9 @@ class GUI_EXPORT QgsSymbolLevelsDialog : public QDialog, private Ui::QgsSymbolLe
void renderingPassChanged( int row, int column );
private slots:
void showHelp();
protected:
//! \note not available in Python bindings
void populateTable() SIP_SKIP;

View File

@ -680,10 +680,11 @@ QgsSymbolSelectorDialog::QgsSymbolSelectorDialog( QgsSymbol *symbol, QgsStyle *s
{
setLayout( new QVBoxLayout() );
mSelectorWidget = new QgsSymbolSelectorWidget( symbol, style, vl, this );
mButtonBox = new QDialogButtonBox( QDialogButtonBox::Ok | QDialogButtonBox::Cancel );
mButtonBox = new QDialogButtonBox( QDialogButtonBox::Cancel | QDialogButtonBox::Help | QDialogButtonBox::Ok );
connect( mButtonBox, &QDialogButtonBox::accepted, this, &QDialog::accept );
connect( mButtonBox, &QDialogButtonBox::rejected, this, &QDialog::reject );
connect( mButtonBox, &QDialogButtonBox::helpRequested, this, &QgsSymbolSelectorDialog::showHelp );
layout()->addWidget( mSelectorWidget );
layout()->addWidget( mButtonBox );
@ -697,6 +698,10 @@ QgsSymbolSelectorDialog::QgsSymbolSelectorDialog( QgsSymbol *symbol, QgsStyle *s
mButtonBox->hide();
layout()->setContentsMargins( 0, 0, 0, 0 );
}
else
{
setWindowTitle( tr( "Symbol Selector" ) );
}
mSelectorWidget->setDockMode( embedded );
}
@ -833,3 +838,8 @@ void QgsSymbolSelectorDialog::changeLayer( QgsSymbolLayer *layer )
{
mSelectorWidget->changeLayer( layer );
}
void QgsSymbolSelectorDialog::showHelp()
{
QgsHelp::openHelp( QStringLiteral( "working_with_vector/style_library.html#the-symbol-selector" ) );
}

View File

@ -25,6 +25,7 @@
#include "qgspanelwidget.h"
#include "qgssymbolwidgetcontext.h"
#include "qgsproperty.h"
#include "qgshelp.h"
#include <QStandardItemModel>
#include <QDialogButtonBox>
@ -328,6 +329,9 @@ class GUI_EXPORT QgsSymbolSelectorDialog : public QDialog
QgsSymbolSelectorWidget *mSelectorWidget = nullptr;
QDialogButtonBox *mButtonBox = nullptr;
QgsSymbolWidgetContext mContext;
private slots:
void showHelp();
};
#endif

View File

@ -35,7 +35,7 @@ QgsGeometryCheckerDialog::QgsGeometryCheckerDialog( QgisInterface *iface, QWidge
restoreGeometry( s.value( QStringLiteral( "/Plugin-GeometryChecker/Window/geometry" ) ).toByteArray() );
mTabWidget = new QTabWidget();
mButtonBox = new QDialogButtonBox( QDialogButtonBox::Close, Qt::Horizontal );
mButtonBox = new QDialogButtonBox( QDialogButtonBox::Close | QDialogButtonBox::Help, Qt::Horizontal );
QVBoxLayout *layout = new QVBoxLayout( this );
layout->addWidget( mTabWidget );
@ -46,6 +46,7 @@ QgsGeometryCheckerDialog::QgsGeometryCheckerDialog( QgisInterface *iface, QWidge
mTabWidget->setTabEnabled( 1, false );
connect( mButtonBox, &QDialogButtonBox::rejected, this, &QDialog::reject );
connect( mButtonBox, &QDialogButtonBox::helpRequested, this, &QgsGeometryCheckerDialog::showHelp );
connect( dynamic_cast< QgsGeometryCheckerSetupTab * >( mTabWidget->widget( 0 ) ), &QgsGeometryCheckerSetupTab::checkerStarted, this, &QgsGeometryCheckerDialog::onCheckerStarted );
connect( dynamic_cast< QgsGeometryCheckerSetupTab * >( mTabWidget->widget( 0 ) ), &QgsGeometryCheckerSetupTab::checkerFinished, this, &QgsGeometryCheckerDialog::onCheckerFinished );
}
@ -97,3 +98,8 @@ void QgsGeometryCheckerDialog::closeEvent( QCloseEvent *ev )
QDialog::closeEvent( ev );
}
}
void QgsGeometryCheckerDialog::showHelp()
{
QgsHelp::openHelp( QStringLiteral( "plugins/plugins_geometry_checker.html" ) );
}

View File

@ -17,6 +17,8 @@
#ifndef QGS_GEOMETRY_CHECKER_DIALOG_H
#define QGS_GEOMETRY_CHECKER_DIALOG_H
#include "qgshelp.h"
#include <QDialog>
#include <QDialogButtonBox>
#include <QTabWidget>
@ -44,6 +46,7 @@ class QgsGeometryCheckerDialog : public QDialog
private slots:
void onCheckerStarted( QgsGeometryChecker *checker, QgsFeaturePool *featurePool );
void onCheckerFinished( bool successful );
void showHelp();
};
#endif // QGS_GEOMETRY_CHECKER_DIALOG_H

View File

@ -782,6 +782,9 @@ void QgsSpatialQueryDialog::on_bbMain_clicked( QAbstractButton *button )
case QDialogButtonBox::RejectRole:
reject();
break;
case QDialogButtonBox::HelpRole:
showHelp();
break;
default:
return;
}
@ -1072,3 +1075,8 @@ void QgsSpatialQueryDialog::signal_layerReference_selectionFeaturesChanged()
{
evaluateCheckBoxLayer( false );
} // void QgsSpatialQueryDialog::signal_layerReference_selectionFeaturesChanged()
void QgsSpatialQueryDialog::showHelp()
{
QgsHelp::openHelp( QStringLiteral( "plugins/plugins_spatial_query.html" ) );
}

View File

@ -24,6 +24,7 @@
#include "ui_qgsspatialquerydialogbase.h"
#include "qgisinterface.h"
#include "qgsvectorlayer.h"
#include "qgshelp.h"
/**
* \class QgsSpatialQueryDialog
@ -61,6 +62,7 @@ class QgsSpatialQueryDialog : public QDialog, private Ui::QgsSpatialQueryDialogB
void on_ckbUsingSelectedTarget_toggled();
void on_ckbLogProcessing_clicked( bool checked );
void on_ckbZoomItem_clicked( bool checked );
void showHelp();
//! Slots for signs of QGIS
void signal_qgis_layerWasAdded( QgsMapLayer *mapLayer );

View File

@ -404,7 +404,7 @@ p, li { white-space: pre-wrap; }
<string>Run query or close the window</string>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Apply|QDialogButtonBox::Close</set>
<set>QDialogButtonBox::Apply|QDialogButtonBox::Close|QDialogButtonBox::Help</set>
</property>
</widget>
</item>

View File

@ -40,6 +40,8 @@ QgsWCSSourceSelect::QgsWCSSourceSelect( QWidget *parent, Qt::WindowFlags fl, Qgs
mAddDefaultButton->hide();
mLayersTreeWidget->setSelectionMode( QAbstractItemView::SingleSelection );
connect( buttonBox, &QDialogButtonBox::helpRequested, this, &QgsWCSSourceSelect::showHelp );
}
QgsWCSSourceSelect::~QgsWCSSourceSelect()
@ -255,3 +257,9 @@ void QgsWCSSourceSelect::enableLayersForCrs( QTreeWidgetItem * )
{
// TODO: I am not convinced to disable layers according to selected CRS
}
void QgsWCSSourceSelect::showHelp()
{
QgsHelp::openHelp( QStringLiteral( "working_with_ogc/ogc_client_support.html" ) );
}

View File

@ -23,6 +23,8 @@
#include "qgsowssourceselect.h"
#include "qgsdatasourceuri.h"
#include "qgsguiutils.h"
#include "qgshelp.h"
#include "qgswcscapabilities.h"
#include "qgsproviderregistry.h"
#include "qgsdataprovider.h"
@ -78,6 +80,11 @@ class QgsWCSSourceSelect : public QgsOWSSourceSelect
QStringList selectedLayersFormats() override;
QStringList selectedLayersCrses() override;
QStringList selectedLayersTimes() override;
private slots:
//! Open help browser
void showHelp();
};
#endif // QGSWCSSOURCESELECT_H

View File

@ -81,16 +81,6 @@
</property>
</spacer>
</item>
<item row="4" column="1">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
@ -108,6 +98,16 @@
</property>
</widget>
</item>
<item row="4" column="0" colspan="2">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
</layout>
</widget>
<tabstops>

View File

@ -26,7 +26,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>
@ -89,14 +89,13 @@
</action>
</widget>
<customwidgets>
<customwidget>
<class>QgsCompoundColorWidget</class>
<extends>QWidget</extends>
<header>qgscompoundcolorwidget.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<customwidget>
<class>QgsCompoundColorWidget</class>
<extends>QWidget</extends>
<header>qgscompoundcolorwidget.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<resources/>
<connections/>
</ui>

View File

@ -33,7 +33,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>

View File

@ -14,9 +14,32 @@
<string>Select By Expression</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<property name="margin">
<property name="leftMargin">
<number>3</number>
</property>
<property name="topMargin">
<number>3</number>
</property>
<property name="rightMargin">
<number>3</number>
</property>
<property name="bottomMargin">
<number>3</number>
</property>
<item row="1" column="4">
<widget class="QPushButton" name="mPbnClose">
<property name="text">
<string>Close</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QToolButton" name="mButtonZoomToFeatures">
<property name="text">
<string>Zoom to features</string>
</property>
</widget>
</item>
<item row="1" column="0">
<spacer name="horizontalSpacer">
<property name="orientation">
@ -30,12 +53,8 @@
</property>
</spacer>
</item>
<item row="1" column="3">
<widget class="QPushButton" name="mPbnClose">
<property name="text">
<string>Close</string>
</property>
</widget>
<item row="0" column="0" colspan="5">
<widget class="QgsExpressionBuilderWidget" name="mExpressionBuilder" native="true"/>
</item>
<item row="1" column="2">
<widget class="QToolButton" name="mButtonSelect">
@ -50,16 +69,13 @@
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QToolButton" name="mButtonZoomToFeatures">
<property name="text">
<string>Zoom to features</string>
<item row="1" column="3">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons">
<set>QDialogButtonBox::Close|QDialogButtonBox::Help</set>
</property>
</widget>
</item>
<item row="0" column="0" colspan="4">
<widget class="QgsExpressionBuilderWidget" name="mExpressionBuilder" native="true"/>
</item>
</layout>
<action name="mActionSelect">
<property name="text">

View File

@ -321,7 +321,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>

View File

@ -141,7 +141,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>

View File

@ -20,7 +20,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>

View File

@ -157,7 +157,7 @@
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Close|QDialogButtonBox::Ok</set>
<set>QDialogButtonBox::Close|QDialogButtonBox::Help|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>

View File

@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>396</width>
<height>257</height>
<height>260</height>
</rect>
</property>
<property name="windowTitle">
@ -102,7 +102,7 @@
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Close|QDialogButtonBox::Ok</set>
<set>QDialogButtonBox::Close|QDialogButtonBox::Help|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>

View File

@ -674,7 +674,7 @@ datasets with maximum width and height specified below.</string>
<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>

View File

@ -50,16 +50,6 @@
<item row="0" column="1">
<widget class="QLineEdit" name="mNameEdit"/>
</item>
<item row="6" column="1">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
<property name="centerButtons">
<bool>false</bool>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QCheckBox" name="mUseAsDefault">
<property name="text">
@ -107,6 +97,16 @@
</property>
</widget>
</item>
<item row="6" column="0" colspan="2">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok</set>
</property>
<property name="centerButtons">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</widget>
<layoutdefault spacing="6" margin="11"/>

View File

@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>400</width>
<width>413</width>
<height>379</height>
</rect>
</property>
@ -144,7 +144,7 @@
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Close|QDialogButtonBox::Ok</set>
<set>QDialogButtonBox::Close|QDialogButtonBox::Help|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>

View File

@ -47,7 +47,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>