Simplify cinnamon-menu-editor

cinnamon-menu-editor:
   Remove item cut/copy/paste from menu editor and add menu category selection to desktop editor instead so that instead of the menu editor adding <Include> and <Exclude> rules to the .menu file when launchers are added to/remove from categories, the desktop editor adds/removes categories to the Categories= field in the .desktop file.
   Remove code related to separators and menu layout/ordering as these are not used in cinnamon applets.
   Add "Restore Item" button and remove "Close" button.
   Handle flatpak apps properly.
   Use atomic save for .menu file
   Update some deprecated code.

cinnamon-desktop editor:
   Add menu category selection for launcher editor.
   Add "Hide (NoDisplay)" toggle for launcher editor and directory editor.
   Remove unnecessary <Include> and <Exclude> rules from the .menu file added in previous versions of menu-editor when a .desktop file is updated.
   Show a warning infobar when editing a local file when no "restore" to system is available.
   Don't create a new .desktop file in ~/.local/share/applications if original is in a subdirectory of ~/.local/share/applications as it would be overriden anyway and edit original instead
   Add command line option --show-categories so that unnecessary complexity can be avoided when launched from the app menu.
   Add error dialog for write errors

config.py:
   delete unused constants

cinnamon-applications.menu:
   simplify logic in "Administration" menu
   remove unused "System" menu

Author: fredcw

files/etc/xdg/menus/cinnamon-applications.menu

@@ -1,6 +1,7 @@
 <!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
  "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
 
+<!-- Category selection logic in this file should be kept in sync with same in cinnamon-desktop-editor.py -->
 <Menu>
 
   <Name>Applications</Name>
@@ -20,10 +21,10 @@
     <Include>
       <And>
         <Category>Utility</Category>
-	<!-- Accessibility spec must have either the Utility or Settings
-	     category, and we display an accessibility submenu already for
-	     the ones that do not have Settings, so don't display accessibility
-	     applications here -->
+    <!-- Accessibility spec must have either the Utility or Settings
+         category, and we display an accessibility submenu already for
+         the ones that do not have Settings, so don't display accessibility
+         applications here -->
         <Not><Category>Accessibility</Category></Not>
         <Not><Category>System</Category></Not>
       </And>
@@ -129,12 +130,6 @@
       </Include>
   </Menu>
 
-  <!-- System Tools-->
-  <Menu>
-    <Name>System</Name>
-    <Directory>cinnamon-system-tools.directory</Directory>    
-  </Menu>   <!-- End System Tools -->
-
   <!-- Other -->
   <Menu>
     <Name>Other</Name>
@@ -176,36 +171,27 @@
     <Name>Administration</Name>
     <Directory>cinnamon-settings-system.directory</Directory>
     <Include>
-      <And>
-        <Category>Settings</Category>
-        <Category>System</Category>
-      </And>
-    </Include>
-    <Include>
-      <And>
-        <Category>System</Category>
-        <Not><Category>Settings</Category></Not>
-      </And>
+      <Category>System</Category>
     </Include>
   </Menu>     <!-- End System Settings -->
 
   <Layout>
-	<Merge type="menus"/>
-	<Menuname>Accessories</Menuname>
-	<Menuname>Education</Menuname>
-	<Menuname>Games</Menuname>
-	<Menuname>Graphics</Menuname>
-	<Menuname>Internet</Menuname>
-	<Menuname>Office</Menuname>
-	<Menuname>Other</Menuname>
-	<Menuname>Development</Menuname>
-	<Menuname>Multimedia</Menuname>
-	<Menuname>System</Menuname>
-	<Menuname>Universal Access</Menuname>
-	<Menuname>wine-wine</Menuname>
-	<Menuname>Preferences</Menuname>
-	<Menuname>Administration</Menuname>
-	<Merge type="files"/>
+    <Merge type="menus"/>
+    <Menuname>Accessories</Menuname>
+    <Menuname>Education</Menuname>
+    <Menuname>Games</Menuname>
+    <Menuname>Graphics</Menuname>
+    <Menuname>Internet</Menuname>
+    <Menuname>Office</Menuname>
+    <Menuname>Other</Menuname>
+    <Menuname>Development</Menuname>
+  <Menuname>Science</Menuname>
+    <Menuname>Multimedia</Menuname>
+    <Menuname>Universal Access</Menuname>
+    <Menuname>wine-wine</Menuname>
+    <Menuname>Preferences</Menuname>
+    <Menuname>Administration</Menuname>
+    <Merge type="files"/>
   </Layout>
 
 </Menu>  <!-- End Applications -->

files/usr/bin/cinnamon-menu-editor

@@ -13,14 +13,7 @@ from cme import MainWindow
 
 
 def main():
-    try:
-        from MenuEditor import config
-        datadir = config.pkgdatadir
-        version = config.VERSION
-    except Exception:
-        datadir = '.'
-        version = '0.9'
-    app = MainWindow.MainWindow(datadir, version)
+    app = MainWindow.MainWindow()
     app.run()