Improved releasenotes manual can also be opened from a databasewindow now.

pglab/About.cpp

@@ -1,7 +1,9 @@
 #include "About.h"
 #include <QCoreApplication>
+#include <QDesktopServices>
 #include <QMessageBox>
 #include <QString>
+#include <QUrl>
 
 void ShowAboutDialog(QWidget *parent)
 {
@@ -21,3 +23,8 @@ void ShowAboutDialog(QWidget *parent)
               "attribution 3.0 license.</p>"
               ).arg(year).arg(releaseNotesUrl).arg(pgLabVersionString));
 }
+
+void OpenManual()
+{
+    QDesktopServices::openUrl(QString("https://eelke.gitlab.io/pgLab/#pglab-user-manual"));
+}

pglab/About.h

@@ -3,3 +3,4 @@
 #include <QWidget>
 
 void ShowAboutDialog(QWidget *parent);
+void OpenManual();

pglab/ConnectionManagerWindow.cpp

@@ -4,7 +4,6 @@
 #include "MasterController.h"
 #include "ConnectionController.h"
 #include "ConnectionListModel.h"
-#include <QDesktopServices>
 #include <QDir>
 #include <QMessageBox>
 #include <QStandardItemModel>
@@ -112,7 +111,7 @@ void ConnectionManagerWindow::on_actionAbout_triggered()
 
 void ConnectionManagerWindow::on_actionManual_triggered()
 {
-    QDesktopServices::openUrl(QString("https://eelke.gitlab.io/pgLab/#pglab-user-manual"));
+    OpenManual();
 }
 
 

pglab/DatabaseWindow.cpp

@@ -442,3 +442,9 @@ void DatabaseWindow::on_actionShow_connection_manager_triggered()
 {
     m_masterController->connectionController()->showConnectionManager();
 }
+
+void DatabaseWindow::on_actionManual_triggered()
+{
+    OpenManual();
+}
+

pglab/DatabaseWindow.h

@@ -106,6 +106,8 @@ private slots:
     void on_actionSave_copy_of_query_as_triggered();
     void on_actionShow_connection_manager_triggered();
 
+    void on_actionManual_triggered();
+
 public:
 	virtual void setTitleForWidget(QWidget *widget, QString title, QString hint) override;
 	virtual void setIconForWidget(QWidget *widget, QIcon icon) override;

pglab/DatabaseWindow.ui

@@ -94,6 +94,7 @@
     <property name="title">
      <string>Help</string>
     </property>
+    <addaction name="actionManual"/>
     <addaction name="actionAbout"/>
    </widget>
    <addaction name="menuFile"/>
@@ -325,6 +326,11 @@
     <string>Show connection manager</string>
    </property>
   </action>
+  <action name="actionManual">
+   <property name="text">
+    <string>Manual</string>
+   </property>
+  </action>
  </widget>
  <resources>
   <include location="resources.qrc"/>

releasenotes/notes/about-7eeb6e282f8e2ef1.yaml

@@ -1,6 +1,6 @@
 ---
 other:
-  - The connection window now has an About item in the file menu.
+  - The connection window now has an :menuselection:`Help --> About` menuitem.
   - The about dialog now uses html for enhanced formatting and hyperlinks.
   - |
     The about dialog now declares the usage of Icons8 icons and provides a

releasenotes/notes/help-usermanual-1ff757b8969fc8e9.yaml

@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    The user manual can now be accessed from the menu :menuselection:`Help --> Manual`.

releasenotes/notes/reset-master-password-6a8f5ccf5a052344.yaml

@@ -1,5 +1,6 @@
 ---
 features:
   - |
-    Added menu option to reset the password managers master password.
+    Added :menuselection:`File --> Reset password manager` menu option to reset
-    This will ofcourse also clear all saved passwords.
+    the password managers master password. This will ofcourse also clear all
+    saved passwords.