Move About pgAdmin 4 menu option to top of application menu for macOS.#…

…7289
pgadmin-org · Sep 30, 2024 · 51d86ff · 51d86ff
1 parent 28eb2c0
commit 51d86ff
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 0 deletions.
diff --git a/runtime/src/js/menu.js b/runtime/src/js/menu.js
@@ -41,6 +41,25 @@ function buildMenu(pgadminMenus, pgAdminMainScreen, callbacks) {
   });
 
   let menuFile = pgadminMenus.shift();
+
+  if (isMac) {
+    // Add About pgAdmin 4 on top of menu.
+    const aboutIndex = menuFile.submenu.findIndex((item) => item.label === 'About pgAdmin 4');
+    if (aboutIndex !== -1) {
+      menuFile.submenu.splice(0, 0, menuFile.submenu.splice(aboutIndex, 1)[0]);
+      menuFile.submenu.splice(1, 0, { type: 'separator' });
+    }
+    // Remove About pgAdmin 4 from help menu.
+    const helpMenuIndex = pgadminMenus.findIndex((menu) => menu.label === 'Help');
+    if (helpMenuIndex !== -1) {
+      const helpMenu = pgadminMenus[helpMenuIndex];
+      const aboutIndexInHelpMenu = helpMenu.submenu.findIndex((item) => item.label === 'About pgAdmin 4');
+      if (aboutIndexInHelpMenu !== -1) {
+        helpMenu.submenu.splice(aboutIndexInHelpMenu, 1);
+      }
+    }
+  }
+
   template.push({
     ...menuFile,
     submenu: [

diff --git a/web/pgadmin/settings/__init__.py b/web/pgadmin/settings/__init__.py
@@ -11,6 +11,8 @@
 
 import traceback
 import json
+import config
+
 
 from flask import Response, request, render_template, url_for, current_app
 from flask_babel import gettext
@@ -30,6 +32,8 @@
 
 class SettingsModule(PgAdminModule):
     def get_own_menuitems(self):
+        appname = config.APP_NAME
+
         return {
             'file_items': [
                 MenuItem(
@@ -38,6 +42,14 @@ def get_own_menuitems(self):
                     module="pgAdmin.Settings",
                     callback='show',
                     label=gettext('Reset Layout')
+                ),
+                MenuItem(
+                    name='mnu_about',
+                    priority=999,
+                    module="pgAdmin.About",
+                    callback='about_show',
+                    icon='fa fa-info-circle',
+                    label=gettext('About %(appname)s', appname=appname)
                 )
             ]
         }