From 732c3221815077e3674d40fe736fdc3398ad64f4 Mon Sep 17 00:00:00 2001
From: mgrojo <mgrojo@gmail.com>
Date: Mon, 6 Aug 2018 19:54:21 +0200
Subject: [PATCH] Menu bar restructured so it follows a more standard layout

- Some actions not directly related to file operations over databases or
projects have been moved from "File" to a new "Tools" top-level menu entry.
Future tools can be added here.
- Preferences moved from "View" to "Edit" (MacOS is supposed to still have
it in the application menu).

See issue #1434
---
 src/MainWindow.ui | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/MainWindow.ui b/src/MainWindow.ui
index d6ea7d32..4445a175 100644
--- a/src/MainWindow.ui
+++ b/src/MainWindow.ui
@@ -916,12 +916,8 @@ You can drag SQL statements from an object row and drop them into other applicat
     <addaction name="fileAttachAction"/>
     <addaction name="fileCloseAction"/>
     <addaction name="separator"/>
-    <addaction name="separator"/>
     <addaction name="fileSaveAction"/>
     <addaction name="fileRevertAction"/>
-    <addaction name="fileCompactAction"/>
-    <addaction name="actionEncryption"/>
-    <addaction name="actionLoadExtension"/>
     <addaction name="separator"/>
     <addaction name="menuImport"/>
     <addaction name="menuExport"/>
@@ -940,6 +936,8 @@ You can drag SQL statements from an object row and drop them into other applicat
     <addaction name="editDeleteObjectAction"/>
     <addaction name="separator"/>
     <addaction name="editCreateIndexAction"/>
+    <addaction name="separator"/>
+    <addaction name="viewPreferencesAction"/>
    </widget>
    <widget class="QMenu" name="viewMenu">
     <property name="title">
@@ -948,8 +946,6 @@ You can drag SQL statements from an object row and drop them into other applicat
     <addaction name="viewDBToolbarAction"/>
     <addaction name="viewExtraDBToolbarAction"/>
     <addaction name="viewProjectToolbarAction"/>
-    <addaction name="separator"/>
-    <addaction name="viewPreferencesAction"/>
    </widget>
    <widget class="QMenu" name="helpMenu">
     <property name="title">
@@ -962,9 +958,19 @@ You can drag SQL statements from an object row and drop them into other applicat
     <addaction name="actionBug_report"/>
     <addaction name="helpAboutAction"/>
    </widget>
+   <widget class="QMenu" name="menuTools">
+    <property name="title">
+     <string>Tools</string>
+    </property>
+    <addaction name="fileCompactAction"/>
+    <addaction name="actionEncryption"/>
+    <addaction name="separator"/>
+    <addaction name="actionLoadExtension"/>
+   </widget>
    <addaction name="fileMenu"/>
    <addaction name="editMenu"/>
    <addaction name="viewMenu"/>
+   <addaction name="menuTools"/>
    <addaction name="helpMenu"/>
   </widget>
   <widget class="QStatusBar" name="statusbar"/>