From 20f449be908dbe974af547a035fbaa646e002aa1 Mon Sep 17 00:00:00 2001 From: ubbo Date: Sun, 15 Jan 2012 22:50:11 +0000 Subject: choose helppage keygen.html from wizard git-svn-id: http://cpunk.de/svn/src/gpg4usb/trunk@745 34ebc366-c3a9-4b3c-9f84-69acf7962910 --- mainwindow.cpp | 8 ++++++-- mainwindow.h | 1 + wizard.cpp | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/mainwindow.cpp b/mainwindow.cpp index 5449246..d1dd330 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -629,9 +629,13 @@ void MainWindow::openTutorial() QDesktopServices::openUrl(QUrl("http://gpg4usb.cpunk.de/docu.html")); } -void MainWindow::openHelp() +void MainWindow::openHelp() { + openHelp("docu.html"); +} + +void MainWindow::openHelp(const QString page) { - edit->newHelpTab("help", qApp->applicationDirPath() + "/help/docu.html"); + edit->newHelpTab("help", qApp->applicationDirPath() + "/help/" + page); } void MainWindow::setStatusBarText(QString text) diff --git a/mainwindow.h b/mainwindow.h index bd4ef5f..1921e08 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -164,6 +164,7 @@ private slots: * @details Open integrated help in new tab. */ void openHelp(); + void openHelp(const QString page); /** * @details Show a warn message in status bar, if there are files in attachment folder. diff --git a/wizard.cpp b/wizard.cpp index 77fc3d0..cc4184f 100644 --- a/wizard.cpp +++ b/wizard.cpp @@ -105,10 +105,10 @@ KeyGenPage::KeyGenPage(GpgME::GpgContext *ctx, QWidget *parent) "and verify texts signed by you.
" "You can use the private key to decrypt and sign texts.
" "For more information have a look in the online tutorial:")); - QLabel *linkLabel = new QLabel(""+tr("Online tutorial")+""); + QLabel *linkLabel = new QLabel(""+tr("Online tutorial")+""); //linkLabel->setOpenExternalLinks(true); - connect(linkLabel, SIGNAL(linkActivated(const QString&)), parentWidget()->parentWidget(), SLOT(openHelp())); + connect(linkLabel, SIGNAL(linkActivated(const QString&)), parentWidget()->parentWidget(), SLOT(openHelp(const QString&))); QWidget *createKeyButtonBox = new QWidget(this); QHBoxLayout *createKeyButtonBoxLayout = new QHBoxLayout(createKeyButtonBox); -- cgit v1.2.3