Add command line option to desktop editor...

... --show-categories so that categories are shown when opened from the menu editor and not from the app menu.

Author: fredcw

files/usr/share/cinnamon/cinnamon-desktop-editor/cinnamon-desktop-editor.py

@@ -323,14 +323,23 @@ def save(self):
 class LauncherEditor(ItemEditor):
     ui_file = '/usr/share/cinnamon/cinnamon-desktop-editor/launcher-editor.ui'
 
+    def __init__(self, item_path=None, callback=None, destdir=None, icon_size=24, show_categories=False):
+        self.show_categories = show_categories
+        super(LauncherEditor, self).__init__(item_path, callback, destdir, icon_size)
+
     def build_ui(self):
         self.builder.get_object('exec-browse').connect('clicked', self.pick_exec)
         self.builder.get_object('name-entry').connect('changed', self.resync_validity)
         self.builder.get_object('exec-entry').connect('changed', self.resync_validity)
 
-        self.category_widgets = {} # Map ID -> CheckButton
-        self._setup_categories_list()
-        self.fdo_categories = []
+        if self.show_categories:
+            self.category_widgets = {} # Map ID -> CheckButton
+            self._setup_categories_list()
+            self.fdo_categories = []
+        else:
+            cat_section = self.builder.get_object('category-section')
+            cat_section.set_visible(False)
+            cat_section.set_no_show_all(True)
 
     def resync_validity(self, *args):
         name_text = self.builder.get_object('name-entry').get_text().strip()
@@ -371,22 +380,31 @@ def load(self):
         self.set_check('nodisplay-check', "NoDisplay")
         self.set_icon("Icon")
 
-        # Preselect existing categories
-        try:
-            flowbox = self.builder.get_object('category-flowbox')
-            self.fdo_categories = self.keyfile.get_string_list(DESKTOP_GROUP, "Categories")
-            cinnamon_categories = self._fdo_to_cinnamon(self.fdo_categories)
-            for cat_id in cinnamon_categories:
-                if cat_id in self.category_widgets:
-                    self.category_widgets[cat_id].set_active(True)
-        except GLib.GError:
-            pass
+        if self.show_categories:
+            # Preselect existing categories
+            try:
+                flowbox = self.builder.get_object('category-flowbox')
+                self.fdo_categories = self.keyfile.get_string_list(DESKTOP_GROUP, "Categories")
+                cinnamon_categories = self._fdo_to_cinnamon(self.fdo_categories)
+                for cat_id in cinnamon_categories:
+                    if cat_id in self.category_widgets:
+                        self.category_widgets[cat_id].set_active(True)
+            except GLib.GError:
+                pass
+        else:
+            try:
+                self.old_categories = self.keyfile.get_locale_string(DESKTOP_GROUP, "Categories", None)
+            except GLib.GError:
+                self.old_categories = ""
 
     def get_keyfile_edits(self):
-        self.fdo_categories = self._cinnamon_to_fdo(self.fdo_categories)
-        categories_val = ";".join(self.fdo_categories)
-        if categories_val:
-            categories_val += ";"
+        if self.show_categories:
+            self.fdo_categories = self._cinnamon_to_fdo(self.fdo_categories)
+            categories_val = ";".join(self.fdo_categories)
+            if categories_val:
+                categories_val += ";"
+        else:
+            categories_val = self.old_categories
 
         return dict(Name=self.builder.get_object('name-entry').get_text(),
                     Exec=self.builder.get_object('exec-entry').get_text(),
@@ -548,7 +566,7 @@ def check_custom_path(self):
         else:
             # If directory appears to be from a user installed app (e.g. wine) rather
             # than a user created custom launcher, we show a warning that 'restore' is not available.
-            if not file_name.startswith(("custom-", "alacarte-")):
+            if not file_name.startswith("alacarte-"):
                 self.builder.get_object('restore-info-bar').show()
 
 class CinnamonLauncherEditor(ItemEditor):
@@ -639,6 +657,7 @@ def __init__(self):
         parser.add_option("-f", "--file", dest="desktop_file", help="Name of desktop file (i.e. gnome-terminal.desktop)", metavar="DESKTOP_NAME")
         parser.add_option("-m", "--mode", dest="mode", default=None, help="Mode to run in: launcher, directory, panel-launcher or nemo-launcher")
         parser.add_option("-i", "--icon-size", dest="icon_size", type=int, default=24, help="Size to set the icon picker for (panel-launcher only)")
+        parser.add_option("--show-categories", action="store_true", dest="show_categories", default=False, help="Show the category selection section (launcher mode only)")
         (options, args) = parser.parse_args()
 
         if not options.mode:
@@ -659,6 +678,7 @@ def __init__(self):
         self.orig_file = options.original_desktop_file
         self.desktop_file = options.desktop_file
         self.dest_dir = options.destination_directory
+        self.show_categories = options.show_categories
 
         if options.mode == "cinnamon-launcher":
             self.json_path = args[0]
@@ -671,7 +691,7 @@ def __init__(self):
             editor = DirectoryEditor(self.orig_file, self.directory_cb)
             editor.dialog.show_all()
         elif self.mode == "launcher":
-            editor = LauncherEditor(self.orig_file, self.launcher_cb)
+            editor = LauncherEditor(self.orig_file, self.launcher_cb, show_categories=self.show_categories)
             editor.dialog.show_all()
         elif self.mode == "cinnamon-launcher":
             editor = CinnamonLauncherEditor(self.orig_file, self.panel_launcher_cb, icon_size=self.icon_size)

files/usr/share/cinnamon/cinnamon-menu-editor/cme/MainWindow.py

@@ -252,7 +252,7 @@ def on_new_menu_button_clicked(self, button):
 
     def on_new_launcher_button_clicked(self, button):
         file_path = Path(util.getUserItemDir()) / util.getUniqueFileId('alacarte', '.desktop')
-        process = subprocess.Popen(['cinnamon-desktop-editor', '-mlauncher', '-o' + str(file_path)], env=os.environ)
+        process = subprocess.Popen(['cinnamon-desktop-editor', '-mlauncher', '-o' + str(file_path), "--show-categories"], env=os.environ)
         GLib.child_watch_add(GLib.PRIORITY_DEFAULT, process.pid, self._on_launcher_editor_exited)
 
     def _on_edit_delete_restore_activate(self, menu):
@@ -344,7 +344,8 @@ def _on_edit_properties_activate(self, menu):
         file_type = 'launcher' if isinstance(item, CMenu.TreeEntry) else 'directory'
         file_path = item.get_desktop_file_path()
 
-        process = subprocess.Popen(['cinnamon-desktop-editor', '-m' + file_type, '-o' + file_path], env=os.environ)
+        print()
+        process = subprocess.Popen(['cinnamon-desktop-editor', '-m' + file_type, '-o' + file_path, "--show-categories"], env=os.environ)
         GLib.child_watch_add(GLib.PRIORITY_DEFAULT, process.pid, self._on_launcher_editor_exited)
 
     def on_menu_tree_cursor_changed(self, treeview):