sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-06 00:05:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #30308 from DelazJ/composerHelpButtons

Browse Source 
Add help button and link user manual to some print layout dialogs
This commit is contained in:
Matthias Kuhn 2019-06-21 16:14:33 +02:00 committed by GitHub
commit 0509d7d954
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
19 changed files with 64 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/layout/qgslayoutaddpagesdialog.cpp
View File

@ -19,6 +19,7 @@
#include "qgslayout.h"
#include "qgslayoutmeasurementconverter.h"
#include "qgslayoutpagecollection.h"
#include "qgshelp.h"
QgsLayoutAddPagesDialog::QgsLayoutAddPagesDialog( QWidget *parent, Qt::WindowFlags flags )
: QDialog( parent, flags )
@ -53,6 +54,8 @@ QgsLayoutAddPagesDialog::QgsLayoutAddPagesDialog( QWidget *parent, Qt::WindowFla
connect( mWidthSpin, static_cast< void ( QDoubleSpinBox::* )( double )>( &QDoubleSpinBox::valueChanged ), this, &QgsLayoutAddPagesDialog::setToCustomSize );
connect( mHeightSpin, static_cast< void ( QDoubleSpinBox::* )( double )>( &QDoubleSpinBox::valueChanged ), this, &QgsLayoutAddPagesDialog::setToCustomSize );
connect( buttonBox, &QDialogButtonBox::helpRequested, this, &QgsLayoutAddPagesDialog::showHelp );
}
void QgsLayoutAddPagesDialog::setLayout( QgsLayout *layout )
@ -158,3 +161,8 @@ void QgsLayoutAddPagesDialog::setToCustomSize()
mLockAspectRatio->setEnabled( true );
mSizeUnitsComboBox->setEnabled( true );
}
void QgsLayoutAddPagesDialog::showHelp()
{
QgsHelp::openHelp( QStringLiteral( "print_composer/overview_composer.html#working-with-the-page-properties" ) );
}

1
src/app/layout/qgslayoutaddpagesdialog.h
View File

@ -79,6 +79,7 @@ class QgsLayoutAddPagesDialog : public QDialog, private Ui::QgsLayoutNewPageDial
void pageSizeChanged( int index );
void orientationChanged( int index );
void setToCustomSize();
void showHelp();
private:

7
src/app/layout/qgslayoutattributeselectiondialog.cpp
View File

@ -23,6 +23,7 @@
#include "qgssettings.h"
#include "qgsgui.h"
#include "qgslayouttablecolumn.h"
#include "qgshelp.h"
#include <QCheckBox>
#include <QDialogButtonBox>
@ -898,6 +899,7 @@ QgsLayoutAttributeSelectionDialog::QgsLayoutAttributeSelectionDialog( QgsLayoutI
connect( mRemoveSortColumnPushButton, &QPushButton::clicked, this, &QgsLayoutAttributeSelectionDialog::mRemoveSortColumnPushButton_clicked );
connect( mSortColumnUpPushButton, &QPushButton::clicked, this, &QgsLayoutAttributeSelectionDialog::mSortColumnUpPushButton_clicked );
connect( mSortColumnDownPushButton, &QPushButton::clicked, this, &QgsLayoutAttributeSelectionDialog::mSortColumnDownPushButton_clicked );
connect( buttonBox, &QDialogButtonBox::helpRequested, this, &QgsLayoutAttributeSelectionDialog::showHelp );
if ( mTable )
{
@ -1026,6 +1028,11 @@ void QgsLayoutAttributeSelectionDialog::mRemoveSortColumnPushButton_clicked()
mSortColumnTableView->selectRow( rowToRemove );
}
void QgsLayoutAttributeSelectionDialog::showHelp()
{
QgsHelp::openHelp( QStringLiteral( "print_composer/composer_items/composer_attribute_table.html" ) );
}
void QgsLayoutAttributeSelectionDialog::mSortColumnUpPushButton_clicked()
{
//find selected row

1
src/app/layout/qgslayoutattributeselectiondialog.h
View File

@ -297,6 +297,7 @@ class QgsLayoutAttributeSelectionDialog: public QDialog, private Ui::QgsLayoutAt
void mRemoveSortColumnPushButton_clicked();
void mSortColumnUpPushButton_clicked();
void mSortColumnDownPushButton_clicked();
void showHelp();
private:
QgsLayoutItemAttributeTable *mTable = nullptr;

13
src/app/layout/qgslayoutdesignerdialog.cpp
View File

@ -42,6 +42,7 @@
#include "qgsrendercontext.h"
#include "qgsmessagebar.h"
#include "qgsmessageviewer.h"
#include "qgshelp.h"
#include "qgsgui.h"
#include "qgsfeedback.h"
#include "qgslayoutitemguiregistry.h"
@ -4093,6 +4094,12 @@ bool QgsLayoutDesignerDialog::getSvgExportSettings( QgsLayoutExporter::SvgExport
Ui::QgsSvgExportOptionsDialog options;
options.setupUi( &dialog );
connect( options.buttonBox, &QDialogButtonBox::helpRequested, this, [ & ]
{
QgsHelp::openHelp( QStringLiteral( "print_composer/create_output.html" ) );
}
);
options.mTextRenderFormatComboBox->addItem( tr( "Always Export Text as Paths (Recommended)" ), QgsRenderContext::TextFormatAlwaysOutlines );
options.mTextRenderFormatComboBox->addItem( tr( "Always Export Text as Text Objects" ), QgsRenderContext::TextFormatAlwaysText );
@ -4176,6 +4183,12 @@ bool QgsLayoutDesignerDialog::getPdfExportSettings( QgsLayoutExporter::PdfExport
Ui::QgsPdfExportOptionsDialog options;
options.setupUi( &dialog );
connect( options.buttonBox, &QDialogButtonBox::helpRequested, this, [ & ]
{
QgsHelp::openHelp( QStringLiteral( "print_composer/create_output.html" ) );
}
);
options.mTextRenderFormatComboBox->addItem( tr( "Always Export Text as Paths (Recommended)" ), QgsRenderContext::TextFormatAlwaysOutlines );
options.mTextRenderFormatComboBox->addItem( tr( "Always Export Text as Text Objects" ), QgsRenderContext::TextFormatAlwaysText );

8
src/app/layout/qgslayoutimageexportoptionsdialog.cpp
View File

@ -19,6 +19,7 @@
#include "qgis.h"
#include "qgssettings.h"
#include "qgsgui.h"
#include "qgshelp.h"
#include <QCheckBox>
#include <QPushButton>
@ -32,7 +33,7 @@ QgsLayoutImageExportOptionsDialog::QgsLayoutImageExportOptionsDialog( QWidget *p
connect( mResolutionSpinBox, static_cast < void ( QSpinBox::* )( int ) > ( &QSpinBox::valueChanged ), this, &QgsLayoutImageExportOptionsDialog::mResolutionSpinBox_valueChanged );
connect( mClipToContentGroupBox, &QGroupBox::toggled, this, &QgsLayoutImageExportOptionsDialog::clipToContentsToggled );
connect( buttonBox, &QDialogButtonBox::helpRequested, this, &QgsLayoutImageExportOptionsDialog::showHelp );
QgsGui::enableAutoGeometryRestore( this );
}
@ -185,3 +186,8 @@ void QgsLayoutImageExportOptionsDialog::clipToContentsToggled( bool state )
whileBlocking( mHeightSpinBox )->setValue( mImageSize.height() * mResolutionSpinBox->value() / 25.4 );
}
}
void QgsLayoutImageExportOptionsDialog::showHelp()
{
QgsHelp::openHelp( QStringLiteral( "print_composer/create_output.html" ) );
}

1
src/app/layout/qgslayoutimageexportoptionsdialog.h
View File

@ -133,6 +133,7 @@ class QgsLayoutImageExportOptionsDialog: public QDialog, private Ui::QgsLayoutIm
void mHeightSpinBox_valueChanged( int value );
void mResolutionSpinBox_valueChanged( int value );
void clipToContentsToggled( bool state );
void showHelp();
private:

7
src/app/layout/qgslayouttablebackgroundcolorsdialog.cpp
View File

@ -19,6 +19,7 @@
#include "qgslayouttable.h"
#include "qgslayout.h"
#include "qgssettings.h"
#include "qgshelp.h"
#include "qgsgui.h"
#include <QCheckBox>
@ -33,6 +34,7 @@ QgsLayoutTableBackgroundColorsDialog::QgsLayoutTableBackgroundColorsDialog( QgsL
connect( buttonBox, &QDialogButtonBox::accepted, this, &QgsLayoutTableBackgroundColorsDialog::buttonBox_accepted );
connect( buttonBox, &QDialogButtonBox::rejected, this, &QgsLayoutTableBackgroundColorsDialog::buttonBox_rejected );
connect( buttonBox, &QDialogButtonBox::helpRequested, this, &QgsLayoutTableBackgroundColorsDialog::showHelp );
mCheckBoxMap.insert( QgsLayoutTable::OddColumns, mOddColumnsCheckBox );
mCheckBoxMap.insert( QgsLayoutTable::EvenColumns, mEvenColumnsCheckBox );
@ -91,6 +93,11 @@ void QgsLayoutTableBackgroundColorsDialog::buttonBox_rejected()
reject();
}
void QgsLayoutTableBackgroundColorsDialog::showHelp()
{
QgsHelp::openHelp( QStringLiteral( "print_composer/composer_items/composer_attribute_table.html#appearance" ) );
}
void QgsLayoutTableBackgroundColorsDialog::setGuiElementValues()
{
if ( !mTable )

1
src/app/layout/qgslayouttablebackgroundcolorsdialog.h
View File

@ -48,6 +48,7 @@ class QgsLayoutTableBackgroundColorsDialog: public QDialog, private Ui::QgsLayou
void buttonBox_accepted();
void buttonBox_rejected();
void showHelp();
private:

8
src/gui/layout/qgslayoutnewitempropertiesdialog.cpp
View File

@ -17,6 +17,7 @@
#include "qgssettings.h"
#include "qgslayout.h"
#include "qgslayoutpagecollection.h"
#include "qgshelp.h"
#include "qgsgui.h"
#include <QButtonGroup>
@ -54,6 +55,8 @@ QgsLayoutItemPropertiesDialog::QgsLayoutItemPropertiesDialog( QWidget *parent, Q
mLockAspectRatio->setWidthSpinBox( mWidthSpin );
mLockAspectRatio->setHeightSpinBox( mHeightSpin );
connect( buttonBox, &QDialogButtonBox::helpRequested, this, &QgsLayoutItemPropertiesDialog::showHelp );
}
void QgsLayoutItemPropertiesDialog::setItemPosition( QgsLayoutPoint position )
@ -182,3 +185,8 @@ void QgsLayoutItemPropertiesDialog::setLayout( QgsLayout *layout )
mPosUnitsComboBox->setConverter( &layout->renderContext().measurementConverter() );
mLayout = layout;
}
void QgsLayoutItemPropertiesDialog::showHelp()
{
QgsHelp::openHelp( QStringLiteral( "print_composer/composer_items/composer_items_options.html#creating-a-layout-item" ) );
}

3
src/gui/layout/qgslayoutnewitempropertiesdialog.h
View File

@ -96,6 +96,9 @@ class GUI_EXPORT QgsLayoutItemPropertiesDialog : public QDialog, private Ui::Qgs
QgsLayout *mLayout = nullptr;
private slots:
void showHelp();
};
#endif // QGSLAYOUTNEWITEMPROPERTIESDIALOG_H

28
src/ui/layout/qgslayoutattributeselectiondialogbase.ui
View File

@ -254,7 +254,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>
@ -278,32 +278,6 @@
</tabstops>
<resources>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
</resources>
<connections>
<connection>

28
src/ui/layout/qgslayoutattributetablewidgetbase.ui
View File

@ -896,34 +896,6 @@
</tabstops>
<resources>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
<include location="../../../images/images.qrc"/>
</resources>
<connections/>
</ui>

2
src/ui/layout/qgslayoutimageexportoptions.ui
View File

@ -273,7 +273,7 @@
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Save</set>
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Save</set>
</property>
</widget>
</item>

2
src/ui/layout/qgslayoutnewitemproperties.ui
View File

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

2
src/ui/layout/qgslayoutnewpagedialog.ui
View File

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

2
src/ui/layout/qgslayouttablebackgroundstyles.ui
View File

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

2
src/ui/layout/qgspdfexportoptions.ui
View File

@ -94,7 +94,7 @@
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Save</set>
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Save</set>
</property>
</widget>
</item>

2
src/ui/layout/qgssvgexportoptions.ui
View File

@ -209,7 +209,7 @@
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Save</set>
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Save</set>
</property>
</widget>
</item>