GUI: Add release notes to Help menu

8 files changed, 22 insertions, 1 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dbc38545f9..f0f7e2305c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2106,6 +2106,7 @@ if (ASCIIDOCTOR_FOUND)
 		${CMAKE_BINARY_DIR}/doc/tshark.html
 		${CMAKE_BINARY_DIR}/doc/wireshark.html
 		${CMAKE_BINARY_DIR}/doc/wireshark-filter.html
+		${CMAKE_BINARY_DIR}/docbook/release-notes.html
 	)
 	if(MAXMINDDB_FOUND)
 		list(APPEND DOC_FILES ${CMAKE_BINARY_DIR}/doc/mmdbresolve.html)
diff --git a/docbook/CMakeLists.txt b/docbook/CMakeLists.txt
index 46ba8a50f2..4624bb6709 100644
--- a/docbook/CMakeLists.txt
+++ b/docbook/CMakeLists.txt
@@ -474,7 +474,7 @@ set_docbook_target_properties(release_notes_txt)
 # trip on each other
 # add_dependencies ( release_notes_txt release_notes_html )
 
-add_custom_target( release_notes )
+add_custom_target( release_notes ALL )
 set_docbook_target_properties(release_notes)
 add_dependencies ( release_notes release_notes_txt release_notes_html )
 
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi
index 0a3ce0fd4c..62c46ac76d 100644
--- a/packaging/nsis/wireshark.nsi
+++ b/packaging/nsis/wireshark.nsi
@@ -550,6 +550,7 @@ File "${STAGING_DIR}\dumpcap.exe"
 File "${STAGING_DIR}\dumpcap.html"
 File "${STAGING_DIR}\extcap.html"
 File "${STAGING_DIR}\ipmap.html"
+File "${STAGING_DIR}\release-notes.html"
 
 !ifdef USE_VCREDIST
 ; C-runtime redistributable
@@ -1445,6 +1446,7 @@ Delete "$INSTDIR\browser_sslkeylog.lua"
 Delete "$INSTDIR\console.lua"
 Delete "$INSTDIR\dtd_gen.lua"
 Delete "$INSTDIR\init.lua"
+Delete "$INSTDIR\release-notes.html"
 
 RMDir "$INSTDIR\accessible"
 RMDir "$INSTDIR\audio"
diff --git a/packaging/wix/ComponentGroups.wxi b/packaging/wix/ComponentGroups.wxi
index fe129a3190..bffd3dd4cc 100644
--- a/packaging/wix/ComponentGroups.wxi
+++ b/packaging/wix/ComponentGroups.wxi
@@ -65,6 +65,8 @@
         </Component>
         <Component Id="cmpIpmap_html" Guid="*">
           <File Id="filIpmap_html" KeyPath="yes" Source="$(var.Staging.Dir)\ipmap.html" />
+        <Component Id="cmpReleaseNotes_html" Guid="*">
+          <File Id="filReleaseNotes_html" KeyPath="yes" Source="$(var.Staging.Dir)\release-notes.html" />
         </Component>
       </DirectoryRef>
     </Fragment>
@@ -86,6 +88,7 @@
         <ComponentRef Id="cmpDumpcap_html" />
         <ComponentRef Id="cmpExtcap_html" />
         <ComponentRef Id="cmpIpmap_html" />
+        <ComponentRef Id="cmpReleaseNotes_html" />
       </ComponentGroup>
     </Fragment>
 
diff --git a/ui/help_url.c b/ui/help_url.c
index e2f599ccd4..ec016ddb43 100644
--- a/ui/help_url.c
+++ b/ui/help_url.c
@@ -140,6 +140,11 @@ topic_action_url(topic_action_e action)
         url = doc_file_url("tshark.html");
         break;
 
+    /* Release Notes */
+    case(LOCALPAGE_RELEASE_NOTES):
+        url = doc_file_url("release-notes.html");
+        break;
+
     /* local help pages (User's Guide) */
     case(HELP_CONTENT):
         url = user_guide_url( "index.html");
diff --git a/ui/help_url.h b/ui/help_url.h
index 5cabf10791..c48b9f9ae4 100644
--- a/ui/help_url.h
+++ b/ui/help_url.h
@@ -50,6 +50,9 @@ typedef enum {
     LOCALPAGE_MAN_TEXT2PCAP,
     LOCALPAGE_MAN_TSHARK,
 
+    /* Release Notes */
+    LOCALPAGE_RELEASE_NOTES,
+
     /* help pages (textfiles or local HTML User's Guide) */
     HELP_CONTENT = 200,
     HELP_GETTING_STARTED,           /* currently unused */
diff --git a/ui/qt/wireshark_main_window.ui b/ui/qt/wireshark_main_window.ui
index d57a57b495..8c24288548 100644
--- a/ui/qt/wireshark_main_window.ui
+++ b/ui/qt/wireshark_main_window.ui
@@ -249,6 +249,7 @@
     <addaction name="separator"/>
     <addaction name="actionHelpWiki"/>
     <addaction name="actionHelpSampleCaptures"/>
+    <addaction name="actionHelpReleaseNotes"/>
     <addaction name="separator"/>
     <addaction name="actionHelpAbout"/>
    </widget>
@@ -3025,6 +3026,11 @@
     <string>Browser (SSL Keylog)</string>
    </property>
   </action>
+  <action name="actionHelpReleaseNotes">
+   <property name="text">
+    <string>Release Notes</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
diff --git a/ui/qt/wireshark_main_window_slots.cpp b/ui/qt/wireshark_main_window_slots.cpp
index 356a2bdb66..e5d24853ce 100644
--- a/ui/qt/wireshark_main_window_slots.cpp
+++ b/ui/qt/wireshark_main_window_slots.cpp
@@ -3814,6 +3814,7 @@ void WiresharkMainWindow::connectHelpMenuActions()
     connect(main_ui_->actionHelpDownloads, &QAction::triggered, this, [=]() { mainApp->helpTopicAction(ONLINEPAGE_DOWNLOAD); });
     connect(main_ui_->actionHelpWiki, &QAction::triggered, this, [=]() { mainApp->helpTopicAction(ONLINEPAGE_WIKI); });
     connect(main_ui_->actionHelpSampleCaptures, &QAction::triggered, this, [=]() { mainApp->helpTopicAction(ONLINEPAGE_SAMPLE_FILES); });
+    connect(main_ui_->actionHelpReleaseNotes, &QAction::triggered, this, [=]() { mainApp->helpTopicAction(LOCALPAGE_RELEASE_NOTES); });
 }
 
 #ifdef HAVE_SOFTWARE_UPDATE