Skip to content

Commit 9956864

Browse files
committed
Enable help button and title in color dialogs
1 parent 297138f commit 9956864

8 files changed

+41
-4
lines changed

src/gui/qgscolorbrewercolorrampdialog.cpp

+8-1
Original file line numberDiff line numberDiff line change
@@ -124,10 +124,17 @@ QgsColorBrewerColorRampDialog::QgsColorBrewerColorRampDialog( const QgsColorBrew
124124
QVBoxLayout *vLayout = new QVBoxLayout();
125125
mWidget = new QgsColorBrewerColorRampWidget( ramp );
126126
vLayout->addWidget( mWidget );
127-
QDialogButtonBox *bbox = new QDialogButtonBox( QDialogButtonBox::Ok | QDialogButtonBox::Cancel, Qt::Horizontal );
127+
QDialogButtonBox *bbox = new QDialogButtonBox( QDialogButtonBox::Cancel | QDialogButtonBox::Help | QDialogButtonBox::Ok, Qt::Horizontal );
128128
connect( bbox, &QDialogButtonBox::accepted, this, &QDialog::accept );
129129
connect( bbox, &QDialogButtonBox::rejected, this, &QDialog::reject );
130+
connect( bbox, &QDialogButtonBox::helpRequested, this, &QgsColorBrewerColorRampDialog::showHelp );
130131
vLayout->addWidget( bbox );
131132
setLayout( vLayout );
133+
setWindowTitle( tr( "ColorBrewer Ramp" ) );
132134
connect( mWidget, &QgsColorBrewerColorRampWidget::changed, this, &QgsColorBrewerColorRampDialog::changed );
133135
}
136+
137+
void QgsColorBrewerColorRampDialog::showHelp()
138+
{
139+
QgsHelp::openHelp( QStringLiteral( "working_with_vector/style_library.html#color-ramp" ) );
140+
}

src/gui/qgscolorbrewercolorrampdialog.h

+5
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#include <QDialog>
2020
#include "qgspanelwidget.h"
2121
#include "qgscolorramp.h"
22+
#include "qgshelp.h"
2223
#include "ui_qgscolorbrewercolorrampwidgetbase.h"
2324
#include "qgis_gui.h"
2425
#include "qgis.h"
@@ -118,6 +119,10 @@ class GUI_EXPORT QgsColorBrewerColorRampDialog : public QDialog
118119

119120
QgsColorBrewerColorRampWidget *mWidget = nullptr;
120121

122+
private slots:
123+
124+
void showHelp();
125+
121126
};
122127

123128
#endif

src/gui/qgslimitedrandomcolorrampdialog.cpp

+8-1
Original file line numberDiff line numberDiff line change
@@ -121,10 +121,17 @@ QgsLimitedRandomColorRampDialog::QgsLimitedRandomColorRampDialog( const QgsLimit
121121
QVBoxLayout *vLayout = new QVBoxLayout();
122122
mWidget = new QgsLimitedRandomColorRampWidget( ramp );
123123
vLayout->addWidget( mWidget );
124-
QDialogButtonBox *bbox = new QDialogButtonBox( QDialogButtonBox::Ok | QDialogButtonBox::Cancel, Qt::Horizontal );
124+
QDialogButtonBox *bbox = new QDialogButtonBox( QDialogButtonBox::Cancel | QDialogButtonBox::Help | QDialogButtonBox::Ok, Qt::Horizontal );
125125
connect( bbox, &QDialogButtonBox::accepted, this, &QDialog::accept );
126126
connect( bbox, &QDialogButtonBox::rejected, this, &QDialog::reject );
127+
connect( bbox, &QDialogButtonBox::helpRequested, this, &QgsLimitedRandomColorRampDialog::showHelp );
127128
vLayout->addWidget( bbox );
128129
setLayout( vLayout );
130+
setWindowTitle( tr( "Random Color Ramp" ) );
129131
connect( mWidget, &QgsLimitedRandomColorRampWidget::changed, this, &QgsLimitedRandomColorRampDialog::changed );
130132
}
133+
134+
void QgsLimitedRandomColorRampDialog::showHelp()
135+
{
136+
QgsHelp::openHelp( QStringLiteral( "working_with_vector/style_library.html#color-ramp" ) );
137+
}

src/gui/qgslimitedrandomcolorrampdialog.h

+5
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include "qgis.h"
2121
#include "qgspanelwidget.h"
2222
#include "qgscolorramp.h"
23+
#include "qgshelp.h"
2324
#include "ui_qgslimitedrandomcolorrampwidgetbase.h"
2425
#include "qgis_gui.h"
2526

@@ -129,6 +130,10 @@ class GUI_EXPORT QgsLimitedRandomColorRampDialog : public QDialog
129130

130131
QgsLimitedRandomColorRampWidget *mWidget = nullptr;
131132

133+
private slots:
134+
135+
void showHelp();
136+
132137
};
133138

134139
#endif

src/gui/qgspresetcolorrampdialog.cpp

+8-1
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,17 @@ QgsPresetColorRampDialog::QgsPresetColorRampDialog( const QgsPresetSchemeColorRa
112112
QVBoxLayout *vLayout = new QVBoxLayout();
113113
mWidget = new QgsPresetColorRampWidget( ramp );
114114
vLayout->addWidget( mWidget );
115-
QDialogButtonBox *bbox = new QDialogButtonBox( QDialogButtonBox::Ok | QDialogButtonBox::Cancel, Qt::Horizontal );
115+
QDialogButtonBox *bbox = new QDialogButtonBox( QDialogButtonBox::Cancel | QDialogButtonBox::Help | QDialogButtonBox::Ok, Qt::Horizontal );
116116
connect( bbox, &QDialogButtonBox::accepted, this, &QDialog::accept );
117117
connect( bbox, &QDialogButtonBox::rejected, this, &QDialog::reject );
118+
connect( bbox, &QDialogButtonBox::helpRequested, this, &QgsPresetColorRampDialog::showHelp );
118119
vLayout->addWidget( bbox );
119120
setLayout( vLayout );
121+
setWindowTitle( tr( "Color Presets Ramp" ) );
120122
connect( mWidget, &QgsPresetColorRampWidget::changed, this, &QgsPresetColorRampDialog::changed );
121123
}
124+
125+
void QgsPresetColorRampDialog::showHelp()
126+
{
127+
QgsHelp::openHelp( QStringLiteral( "working_with_vector/style_library.html#color-ramp" ) );
128+
}

src/gui/qgspresetcolorrampdialog.h

+5
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include "qgis.h"
2121
#include "qgspanelwidget.h"
2222
#include "qgscolorramp.h"
23+
#include "qgshelp.h"
2324
#include "ui_qgspresetcolorrampwidgetbase.h"
2425
#include "qgis_gui.h"
2526

@@ -117,6 +118,10 @@ class GUI_EXPORT QgsPresetColorRampDialog : public QDialog
117118

118119
QgsPresetColorRampWidget *mWidget = nullptr;
119120

121+
private slots:
122+
123+
void showHelp();
124+
120125
};
121126

122127
#endif //QGSPRESETCOLORRAMPDIALOG_H

src/gui/symbology/qgscptcitycolorrampdialog.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -464,6 +464,7 @@ void QgsCptCityColorRampDialog::showHelp()
464464
"(you must enable Experimental plugins in the plugin manager).\n\n"
465465
);
466466
QMessageBox *msg = new QMessageBox( this );
467+
msg->setWindowTitle( tr( "Download more cpt-city Gradients" ) );
467468
msg->setText( helpText );
468469
msg->exec();
469470
}

src/ui/qgspresetcolorrampwidgetbase.ui

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
14-
<string>ColorBrewer Ramp</string>
14+
<string>Color Presets Ramp</string>
1515
</property>
1616
<layout class="QVBoxLayout" name="verticalLayout" stretch="1,0,0">
1717
<item>

0 commit comments

Comments
 (0)