From 2e410301bc2a0e4d48facca00ab4bf63cf20cd78 Mon Sep 17 00:00:00 2001
From: Jan Prochazka <jan.prochazka@gmail.com>
Date: Thu, 17 Feb 2022 10:19:44 +0100
Subject: [PATCH] main menu changes

---
 app/src/mainMenuDefinition.js                 | 20 ++++++++++++-------
 .../web/src/commands/CommandPalette.svelte    |  2 +-
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/app/src/mainMenuDefinition.js b/app/src/mainMenuDefinition.js
index 40bf94b1..54b44fe2 100644
--- a/app/src/mainMenuDefinition.js
+++ b/app/src/mainMenuDefinition.js
@@ -5,12 +5,16 @@ module.exports = [
       { command: 'new.connection', hideDisabled: true },
       { command: 'new.sqliteDatabase', hideDisabled: true },
       { divider: true },
+      { command: 'new.query', hideDisabled: true },
+      { command: 'new.freetable', hideDisabled: true },
+      { command: 'new.shell', hideDisabled: true },
+      { command: 'new.jsonl', hideDisabled: true },
+      { divider: true },
       { command: 'file.open', hideDisabled: true },
       { command: 'file.openArchive', hideDisabled: true },
       { divider: true },
       { command: 'group.save', hideDisabled: true },
       { command: 'group.saveAs', hideDisabled: true },
-      { command: 'database.search', hideDisabled: true },
       { divider: true },
       { command: 'file.exit', hideDisabled: true },
     ],
@@ -18,11 +22,6 @@ module.exports = [
   {
     label: 'Window',
     submenu: [
-      { command: 'new.query', hideDisabled: true },
-      { command: 'new.freetable', hideDisabled: true },
-      { command: 'new.shell', hideDisabled: true },
-      { command: 'new.jsonl', hideDisabled: true },
-      { divider: true },
       { command: 'tabs.closeTab', hideDisabled: true },
       { command: 'tabs.closeAll', hideDisabled: true },
     ],
@@ -53,7 +52,14 @@ module.exports = [
   },
   {
     label: 'Tools',
-    submenu: [{ command: 'sql.generator' }, { command: 'file.import' }, { command: 'new.modelCompare' }],
+    submenu: [
+      { command: 'database.search', hideDisabled: true },
+      { command: 'commandPalette.show', hideDisabled: true },
+      { divider: true },
+      { command: 'sql.generator', hideDisabled: true },
+      { command: 'file.import', hideDisabled: true },
+      { command: 'new.modelCompare', hideDisabled: true },
+    ],
   },
   {
     label: 'Help',
diff --git a/packages/web/src/commands/CommandPalette.svelte b/packages/web/src/commands/CommandPalette.svelte
index c906ebfb..b29b5c54 100644
--- a/packages/web/src/commands/CommandPalette.svelte
+++ b/packages/web/src/commands/CommandPalette.svelte
@@ -3,7 +3,7 @@
     id: 'commandPalette.show',
     category: 'Command palette',
     name: 'Show',
-    toolbarName: 'Search',
+    toolbarName: 'Command palette',
     toolbarOrder: 0,
     keyText: 'F1',
     toolbar: true,