aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorubbo <ubbo@34ebc366-c3a9-4b3c-9f84-69acf7962910>2012-01-15 23:01:49 +0000
committerubbo <ubbo@34ebc366-c3a9-4b3c-9f84-69acf7962910>2012-01-15 23:01:49 +0000
commita97aeb29b7ab72774aec93058305d23d22450ca9 (patch)
treec0fd85d98447b3cd109d272bd82ae5710d5e230d
parentchoose helppage keygen.html from wizard (diff)
downloadgpg4usb-a97aeb29b7ab72774aec93058305d23d22450ca9.tar.gz
gpg4usb-a97aeb29b7ab72774aec93058305d23d22450ca9.zip
scroll to #content in keygen help
git-svn-id: http://cpunk.de/svn/src/gpg4usb/trunk@746 34ebc366-c3a9-4b3c-9f84-69acf7962910
-rw-r--r--helppage.cpp3
-rw-r--r--mainwindow.cpp2
-rw-r--r--wizard.cpp2
3 files changed, 4 insertions, 3 deletions
diff --git a/helppage.cpp b/helppage.cpp
index 5c23dd8..40152cb 100644
--- a/helppage.cpp
+++ b/helppage.cpp
@@ -32,7 +32,8 @@ HelpPage::HelpPage(const QString path, QWidget *parent) :
mainLayout->setContentsMargins(0,0,0,0);
setLayout(mainLayout);
//setAttribute(Qt::WA_DeleteOnClose);
- browser->setSource(QUrl::fromLocalFile(path));
+ //browser->setSource(QUrl::fromLocalFile(path));
+ browser->setSource(QUrl(path));
browser->setFocus();
}
diff --git a/mainwindow.cpp b/mainwindow.cpp
index d1dd330..d951454 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -635,7 +635,7 @@ void MainWindow::openHelp() {
void MainWindow::openHelp(const QString page)
{
- edit->newHelpTab("help", qApp->applicationDirPath() + "/help/" + page);
+ edit->newHelpTab("help", "file://" + qApp->applicationDirPath() + "/help/" + page);
}
void MainWindow::setStatusBarText(QString text)
diff --git a/wizard.cpp b/wizard.cpp
index cc4184f..fe28bf9 100644
--- a/wizard.cpp
+++ b/wizard.cpp
@@ -105,7 +105,7 @@ KeyGenPage::KeyGenPage(GpgME::GpgContext *ctx, QWidget *parent)
"and verify texts signed by you.<br/>"
"You can use the private key to decrypt and sign texts.<br/>"
"For more information have a look in the online tutorial:"));
- QLabel *linkLabel = new QLabel("<a href=""docu_keygen.html"">"+tr("Online tutorial")+"</a>");
+ QLabel *linkLabel = new QLabel("<a href=""docu_keygen.html#content"">"+tr("Online tutorial")+"</a>");
//linkLabel->setOpenExternalLinks(true);
connect(linkLabel, SIGNAL(linkActivated(const QString&)), parentWidget()->parentWidget(), SLOT(openHelp(const QString&)));