Commit 735d0e93 authored by Ralf Habacker's avatar Ralf Habacker

Fix '404 on help for settings in Umbrello

In KDE4, the help button is managed by the dialog,
so the corresponding code in slotHelpClicked() is
superfluous.

BUG:410906
FIXED-IN:2.30.3 (KDE Applications 19.12.3)
parent f6bf8c89
......@@ -35,7 +35,6 @@
// qt includes
#include <QApplication>
#include <QDesktopServices>
#include <QDockWidget>
#include <QFrame>
#include <QHBoxLayout>
......@@ -107,7 +106,7 @@ MultiPageDialogBase::MultiPageDialogBase(QWidget *parent, bool withDefaultButton
m_pageDialog->showButtonSeparator(true);
m_pageDialog->setFaceType(KPageDialog::List);
m_pageDialog->setModal(true);
m_pageDialog->setHelp(QString::fromLatin1("umbrello/index.html"), QString());
m_pageDialog->setHelp(QString(), QString::fromLatin1("umbrello"));
connect(m_pageDialog, SIGNAL(okClicked()), this, SLOT(slotOkClicked()));
connect(m_pageDialog, SIGNAL(applyClicked()), this, SLOT(slotApplyClicked()));
connect(m_pageDialog, SIGNAL(defaultClicked()), this, SLOT(slotDefaultClicked()));
......@@ -264,21 +263,16 @@ void MultiPageDialogBase::slotDefaultClicked()
emit defaultClicked();
}
#if QT_VERSION >= 0x050000
/**
* Launch khelpcenter.
*/
void MultiPageDialogBase::slotHelpClicked()
{
DEBUG(DBG_SRC) << "HELP clicked...directly handled";
#if QT_VERSION >= 0x050000
KHelpClient::invokeHelp(QLatin1String("help:/umbrello/index.html"), QLatin1String("umbrello"));
#else
QUrl url = QUrl(QLatin1String("help:/umbrello/index.html"));
QDesktopServices::openUrl(url);
#endif
}
#if QT_VERSION >= 0x050000
/**
* Button clicked event handler for the dialog button box.
* @param button the button which was clicked
......
......@@ -93,8 +93,8 @@ private slots:
void slotOkClicked();
void slotApplyClicked();
void slotDefaultClicked();
void slotHelpClicked();
#if QT_VERSION >= 0x050000
void slotHelpClicked();
void slotButtonClicked(QAbstractButton *button);
#endif
protected:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment