From f18150d68204f2a23f4874e45363df1112fd1620 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com>
Date: Web, 17 Apr 2024 22:58:24 -0400
Subject: [PATCH] layout: Move menu items around to be more logical

Fixes: https://gitlab.gnome.org/GNOME/gnome-menus/issues/15
---
 layout/gnome-applications.menu | 6 +++---

diff --git a/layout/gnome-applications.menu b/layout/gnome-applications.menu
index f8d3d48..03855c5 100644
--- a/layout/gnome-applications.menu
+++ b/layout/gnome-applications.menu
@@ -28,6 +28,7 @@
         <Not><Category>System</Category></Not>
         <Not><Category>X-GNOME-Utilities</Category></Not>
       </And>
+      <Filename>org.gnome.Tour.desktop</Filename>
     </Include>
     <Exclude>
       <!-- Exclude everything we put in the X-GNOME-Utilities whitelist.
@@ -40,6 +41,7 @@
       <Filename>org.gnome.DiskUtility.desktop</Filename>
       <Filename>org.gnome.eog.desktop</Filename>
       <Filename>org.gnome.Evince.desktop</Filename>
+      <Filename>org.gnome.Extensions.desktop</Filename>
       <Filename>org.gnome.FileRoller.desktop</Filename>
       <Filename>org.gnome.font-viewer.desktop</Filename>
       <Filename>org.gnome.Screenshot.desktop</Filename>
@@ -178,16 +180,18 @@
         <Not><Category>Settings</Category></Not>
         <Not><Category>X-GNOME-Utilities</Category></Not>
       </And>
+      <Filename>gnome-system-monitor.desktop</Filename>
+      <Filename>org.gnome.baobab.desktop</Filename>
+      <Filename>org.gnome.DiskUtility.desktop</Filename>
+      <Filename>org.gnome.Software.desktop</Filename>
+      <Filename>org.gnome.Usage.desktop</Filename>
     </Include>
 
     <Exclude>
       <!-- Utilities exclusions -->
       <Filename>gnome-abrt.desktop</Filename>
       <Filename>gnome-system-log.desktop</Filename>
-      <Filename>gnome-system-monitor.desktop</Filename>
-      <Filename>org.gnome.baobab.desktop</Filename>
       <Filename>org.gnome.Terminal.desktop</Filename>
-      <Filename>org.gnome.Usage.desktop</Filename>
     </Exclude>
   </Menu>   <!-- End System Tools -->
 
@@ -207,28 +211,31 @@
     <Include>
       <Category>X-GNOME-Utilities</Category>
       <Filename>gnome-abrt.desktop</Filename>
+      <Filename>gnome-control-center.desktop</Filename>
       <Filename>gnome-system-log.desktop</Filename>
-      <Filename>gnome-system-monitor.desktop</Filename>
       <Filename>gucharmap.desktop</Filename>
       <Filename>nm-connection-editor.desktop</Filename>
-      <Filename>org.gnome.baobab.desktop</Filename>
       <Filename>org.gnome.Calculator.desktop</Filename>
       <Filename>org.gnome.DejaDup.desktop</Filename>
       <Filename>org.gnome.Dictionary.desktop</Filename>
-      <Filename>org.gnome.DiskUtility.desktop</Filename>
       <Filename>org.gnome.eog.desktop</Filename>
       <Filename>org.gnome.Evince.desktop</Filename>
+      <Filename>org.gnome.Extensions.desktop</Filename>
       <Filename>org.gnome.FileRoller.desktop</Filename>
       <Filename>org.gnome.fonts.desktop</Filename>
       <Filename>org.gnome.Screenshot.desktop</Filename>
       <Filename>org.gnome.seahorse.Application.desktop</Filename>
       <Filename>org.gnome.Terminal.desktop</Filename>
       <Filename>org.gnome.tweaks.desktop</Filename>
-      <Filename>org.gnome.Usage.desktop</Filename>
       <Filename>simple-scan.desktop</Filename>
       <Filename>vinagre.desktop</Filename>
       <Filename>yelp.desktop</Filename>
     </Include>
+    <Exclude>
+      <Filename>org.gnome.baobab.desktop</Filename>
+      <Filename>org.gnome.DiskUtility.desktop</Filename>
+      <Filename>org.gnome.Usage.desktop</Filename>
+    </Exclude>
   </Menu>
 
   <!-- Other -->