reorganize help menu

git-svn-id: http://cpunk.de/svn/src/gpg4usb/trunk@685 34ebc366-c3a9-4b3c-9f84-69acf7962910

2 files changed, 21 insertions, 4 deletions

diff --git a/mainwindow.cpp b/mainwindow.cpp
index cbebe18..c1eb521 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -320,8 +320,12 @@ void MainWindow::createActions()
     aboutAct->setToolTip(tr("Show the application's About box"));
     connect(aboutAct, SIGNAL(triggered()), this, SLOT(about()));
 
-    openTutorialAct = new QAction(tr("Online &Tutorial"), this);
-    openTutorialAct->setToolTip(tr("Open Online Tutorial"));
+    openHelpAct = new QAction(tr("Integrated Help"), this);
+    openHelpAct->setToolTip(tr("Open integrated Help"));
+    connect(openHelpAct, SIGNAL(triggered()), this, SLOT(openHelp()));
+
+    openTutorialAct = new QAction(tr("Online &Tutorials"), this);
+    openTutorialAct->setToolTip(tr("Open Online Tutorials"));
     connect(openTutorialAct, SIGNAL(triggered()), this, SLOT(openTutorial()));
 
     openTranslateAct = new QAction(tr("Translate gpg4usb"), this);
@@ -423,9 +427,12 @@ void MainWindow::createMenus()
     viewMenu = menuBar()->addMenu(tr("&View"));
 
     helpMenu = menuBar()->addMenu(tr("&Help"));
+    helpMenu->addAction(openHelpAct);
+    helpMenu->addAction(startWizardAct);
+    helpMenu->addSeparator();
     helpMenu->addAction(openTutorialAct);
     helpMenu->addAction(openTranslateAct);
-    helpMenu->addAction(startWizardAct);
+    helpMenu->addSeparator();
     helpMenu->addAction(aboutAct);
 
 }
@@ -615,10 +622,14 @@ void MainWindow::openTranslate() {
 }
 
 void MainWindow::openTutorial() {
-    //QDesktopServices::openUrl(QUrl("http://gpg4usb.cpunk.de/docu.html"));
+    QDesktopServices::openUrl(QUrl("http://gpg4usb.cpunk.de/docu.html"));
+}
+
+void MainWindow::openHelp() {
     edit->newHelpTab("help", qApp->applicationDirPath() + "/help/docu.html");
 }
 
+
 void MainWindow::startWizard()
 {
     Wizard *wizard = new Wizard(mCtx,this);
diff --git a/mainwindow.h b/mainwindow.h
index 3106371..d7a7e1f 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -159,6 +159,11 @@ private slots:
     void openTutorial();
 
     /**
+     * @details Open integrated help in new tab.
+     */
+    void openHelp();
+
+    /**
      * @details Show a warn message in status bar, if there are files in attachment folder.
      */
     void checkAttachmentFolder();
@@ -284,6 +289,7 @@ private:
     QAction *openSettingsAct; /** Action to open settings dialog */
     QAction *openTranslateAct; /** Action to open translate doc*/
     QAction *openTutorialAct; /** Action to open tutorial */
+    QAction *openHelpAct; /** Action to open tutorial */
     QAction *showKeyDetailsAct; /** Action to open key-details dialog */
     QAction *startWizardAct; /** Action to open the wizard */