From d1a9406bff80773ed9273353af2c48e90ee5a701 Mon Sep 17 00:00:00 2001
From: Nikhil Mohite <nikhil.mohite@enterprisedb.com>
Date: Mon, 2 Jan 2023 12:57:09 +0530
Subject: [PATCH] Removed 'About pgAdmin 4' default menu option from macOS
 native menus.

---
 runtime/src/js/pgadmin.js                     |   1 +
 .../browser/register_browser_preferences.py   | 115 +++++++++---------
 2 files changed, 59 insertions(+), 57 deletions(-)

diff --git a/runtime/src/js/pgadmin.js b/runtime/src/js/pgadmin.js
index 5246da23b..3d9e36082 100644
--- a/runtime/src/js/pgadmin.js
+++ b/runtime/src/js/pgadmin.js
@@ -287,6 +287,7 @@ function launchPgAdminWindow() {
       // Create Mac Builtin Menu
       if (platform() === 'darwin') {
         nativeMenu.createMacBuiltin('pgAdmin 4');
+        nativeMenu?.items[0].submenu.removeAt(0)
         pgAdminMainScreen.menu = nativeMenu;
       }
 
diff --git a/web/pgadmin/browser/register_browser_preferences.py b/web/pgadmin/browser/register_browser_preferences.py
index 32b482132..6bbb11ab7 100644
--- a/web/pgadmin/browser/register_browser_preferences.py
+++ b/web/pgadmin/browser/register_browser_preferences.py
@@ -11,7 +11,7 @@ from flask_babel import gettext
 from pgadmin.utils.constants import PREF_LABEL_DISPLAY,\
     PREF_LABEL_KEYBOARD_SHORTCUTS, PREF_LABEL_TABS_SETTINGS, \
     PREF_LABEL_OPTIONS, QT_DEFAULT_PLACEHOLDER, VW_EDT_DEFAULT_PLACEHOLDER
-from flask_security import current_user
+from flask import current_app
 import config
 
 LOCK_LAYOUT_LEVEL = {
@@ -181,65 +181,66 @@ def register_browser_preferences(self):
         fields=fields
     )
 
-    self.preference.register(
-        'keyboard_shortcuts',
-        'main_menu_file',
-        gettext('File main menu'),
-        'keyboardshortcut',
-        {
-            'alt': True,
-            'shift': True,
-            'control': False,
-            'key': {'key_code': 70, 'char': 'f'}
-        },
-        category_label=PREF_LABEL_KEYBOARD_SHORTCUTS,
-        fields=fields
-    )
+    if not current_app.PGADMIN_RUNTIME:
+        self.preference.register(
+            'keyboard_shortcuts',
+            'main_menu_file',
+            gettext('File main menu'),
+            'keyboardshortcut',
+            {
+                'alt': True,
+                'shift': True,
+                'control': False,
+                'key': {'key_code': 70, 'char': 'f'}
+            },
+            category_label=PREF_LABEL_KEYBOARD_SHORTCUTS,
+            fields=fields
+        )
 
-    self.preference.register(
-        'keyboard_shortcuts',
-        'main_menu_object',
-        gettext('Object main menu'),
-        'keyboardshortcut',
-        {
-            'alt': True,
-            'shift': True,
-            'control': False,
-            'key': {'key_code': 79, 'char': 'o'}
-        },
-        category_label=PREF_LABEL_KEYBOARD_SHORTCUTS,
-        fields=fields
-    )
+        self.preference.register(
+            'keyboard_shortcuts',
+            'main_menu_object',
+            gettext('Object main menu'),
+            'keyboardshortcut',
+            {
+                'alt': True,
+                'shift': True,
+                'control': False,
+                'key': {'key_code': 79, 'char': 'o'}
+            },
+            category_label=PREF_LABEL_KEYBOARD_SHORTCUTS,
+            fields=fields
+        )
 
-    self.preference.register(
-        'keyboard_shortcuts',
-        'main_menu_tools',
-        gettext('Tools main menu'),
-        'keyboardshortcut',
-        {
-            'alt': True,
-            'shift': True,
-            'control': False,
-            'key': {'key_code': 76, 'char': 'l'}
-        },
-        category_label=PREF_LABEL_KEYBOARD_SHORTCUTS,
-        fields=fields
-    )
+        self.preference.register(
+            'keyboard_shortcuts',
+            'main_menu_tools',
+            gettext('Tools main menu'),
+            'keyboardshortcut',
+            {
+                'alt': True,
+                'shift': True,
+                'control': False,
+                'key': {'key_code': 76, 'char': 'l'}
+            },
+            category_label=PREF_LABEL_KEYBOARD_SHORTCUTS,
+            fields=fields
+        )
 
-    self.preference.register(
-        'keyboard_shortcuts',
-        'main_menu_help',
-        gettext('Help main menu'),
-        'keyboardshortcut',
-        {
-            'alt': True,
-            'shift': True,
-            'control': False,
-            'key': {'key_code': 72, 'char': 'h'}
-        },
-        category_label=PREF_LABEL_KEYBOARD_SHORTCUTS,
-        fields=fields
-    )
+        self.preference.register(
+            'keyboard_shortcuts',
+            'main_menu_help',
+            gettext('Help main menu'),
+            'keyboardshortcut',
+            {
+                'alt': True,
+                'shift': True,
+                'control': False,
+                'key': {'key_code': 72, 'char': 'h'}
+            },
+            category_label=PREF_LABEL_KEYBOARD_SHORTCUTS,
+            fields=fields
+        )
 
     self.preference.register(
         'keyboard_shortcuts',