rearrange buttons

Handle flatpak apps properly

Author: fredcw

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

@@ -44,7 +44,7 @@ def ask(msg):
         buttons=Gtk.ButtonsType.YES_NO,
     )
     dialog.set_markup(msg)
-    
+
     response = dialog.run()
     dialog.destroy()
     return response == Gtk.ResponseType.YES
@@ -90,7 +90,7 @@ def fillKeyFile(keyfile, items):
             keyfile.set_string(DESKTOP_GROUP, key, item)
             if key in LOCALIZABLE_KEYS and locale:
                 keyfile.set_locale_string(DESKTOP_GROUP, key, locale, item)
-        elif isinstance(item, Sequence):
+        elif isinstance(item, list):
             keyfile.set_string_list(DESKTOP_GROUP, key, item)
             if key in LOCALIZABLE_KEYS and locale:
                 keyfile.set_locale_string_list(DESKTOP_GROUP, key, locale, item)
@@ -99,13 +99,12 @@ def fillKeyFile(keyfile, items):
 class ItemEditor(object):
     ui_file = None
 
-    def __init__(self, item_path=None, callback=None, destdir=None, icon_size=24, is_nemo_launcher=False):
+    def __init__(self, item_path=None, callback=None, destdir=None, icon_size=24):
         self.builder = Gtk.Builder()
         self.builder.set_translation_domain('cinnamon') # let it translate!
         self.builder.add_from_file(self.ui_file)
         self.callback = callback
         self.destdir = destdir
-        self.is_nemo_launcher = is_nemo_launcher
         self.dialog = self.builder.get_object('editor')
 
         self.dialog.connect('response', self.on_response)
@@ -175,6 +174,22 @@ def validate_exec_line(self, string):
     def get_keyfile_edits(self):
         raise NotImplementedError()
 
+    def pick_exec(self, button):
+        chooser = Gtk.FileChooserDialog(
+            title=_("Choose a command"),
+            parent=self.dialog,
+            action=Gtk.FileChooserAction.OPEN
+        )
+        chooser.add_buttons(
+            Gtk.STOCK_CANCEL, Gtk.ResponseType.REJECT,
+            Gtk.STOCK_OK, Gtk.ResponseType.ACCEPT
+        )
+        response = chooser.run()
+
+        if response == Gtk.ResponseType.ACCEPT:
+            self.builder.get_object('exec-entry').set_text(escape_space(chooser.get_filename()))
+        chooser.destroy()
+
     def set_text(self, ctl, name):
         try:
             val = self.keyfile.get_locale_string(DESKTOP_GROUP, name, None)
@@ -208,6 +223,71 @@ def load(self):
         except GLib.GError:
             pass
 
+    def save(self):
+        fillKeyFile(self.keyfile, self.get_keyfile_edits())
+        contents, length = self.keyfile.to_data()
+        
+        try:
+            with open(self.item_path, 'w') as f:
+                f.write(contents)
+            
+        except IOError as e:
+            print("Error writing file:", e)
+
+    def run(self):
+        self.dialog.present()
+
+    def on_response(self, dialog, response):
+        if response == Gtk.ResponseType.OK:
+            self.save()
+            self.callback(True, self.item_path)
+        else:
+            self.callback(False, self.item_path)
+
+class NemoLauncherEditor(ItemEditor):
+    ui_file = '/usr/share/cinnamon/cinnamon-desktop-editor/launcher-editor.ui'
+
+    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)
+
+        # Hide LauncherEditor widgets not relevant to NemoLauncherEditor
+        self.builder.get_object('nodisplay-check').set_visible(False)
+        self.builder.get_object('nodisplay-check').set_no_show_all(True)
+        self.builder.get_object('category-section').set_visible(False)
+        self.builder.get_object('category-section').set_no_show_all(True)
+
+    def resync_validity(self, *args):
+        name_text = self.builder.get_object('name-entry').get_text().strip()
+        exec_text = self.builder.get_object('exec-entry').get_text().strip()
+        name_valid = name_text != ""
+        exec_valid = self.validate_exec_line(exec_text)
+        self.sync_widgets(name_valid, exec_valid)
+
+
+    def load(self):
+        super(NemoLauncherEditor, self).load()
+        self.set_text('name-entry', "Name")
+        self.set_text('exec-entry', "Exec")
+        self.set_text('comment-entry', "Comment")
+        self.set_check('terminal-check', "Terminal")
+        self.set_check('offload-gpu-check', "PrefersNonDefaultGPU")
+        self.set_icon("Icon")
+
+    def get_keyfile_edits(self):
+        return dict(Name=self.builder.get_object('name-entry').get_text(),
+                    Exec=self.builder.get_object('exec-entry').get_text(),
+                    Comment=self.builder.get_object('comment-entry').get_text(),
+                    Terminal=self.builder.get_object('terminal-check').get_active(),
+                    PrefersNonDefaultGPU=self.builder.get_object("offload-gpu-check").get_active(),
+                    Icon=self.icon_chooser.get_icon(),
+                    Type="Application")
+
+    def check_custom_path(self):
+        if self.item_path:
+            self.item_path = os.path.join(getUserItemPath(), os.path.split(self.item_path)[1])
+
     def save(self):
         fillKeyFile(self.keyfile, self.get_keyfile_edits())
         contents, length = self.keyfile.to_data()
@@ -228,16 +308,6 @@ def save(self):
                 self.destdir = GLib.get_user_special_dir(GLib.UserDirectory.DIRECTORY_DESKTOP)
                 self.save()
 
-    def run(self):
-        self.dialog.present()
-
-    def on_response(self, dialog, response):
-        if response == Gtk.ResponseType.OK:
-            self.save()
-            self.callback(True, self.item_path)
-        else:
-            self.callback(False, self.item_path)
-
 class LauncherEditor(ItemEditor):
     ui_file = '/usr/share/cinnamon/cinnamon-desktop-editor/launcher-editor.ui'
 
@@ -246,12 +316,6 @@ def build_ui(self):
         self.builder.get_object('name-entry').connect('changed', self.resync_validity)
         self.builder.get_object('exec-entry').connect('changed', self.resync_validity)
 
-        if self.is_nemo_launcher:
-            self.builder.get_object('nodisplay-check').set_visible(False)
-            self.builder.get_object('nodisplay-check').set_no_show_all(True)
-            self.builder.get_object('category-section').set_visible(False)
-            self.builder.get_object('category-section').set_no_show_all(True)
-
         self.category_widgets = {} # Map ID -> CheckButton
         self._setup_categories_list()
         self.fdo_categories = []
@@ -266,7 +330,7 @@ def resync_validity(self, *args):
     def _setup_categories_list(self):
         flowbox = self.builder.get_object('category-flowbox')
         DONT_SHOWS = ["Other"]
-        
+
         tree = CMenu.Tree.new("cinnamon-applications.menu", CMenu.TreeFlags.INCLUDE_NODISPLAY | CMenu.TreeFlags.SHOW_EMPTY)
         if tree.load_sync():
             root = tree.get_root_directory()
@@ -299,15 +363,15 @@ def load(self):
         try:
             flowbox = self.builder.get_object('category-flowbox')
             self.fdo_categories = self.keyfile.get_string_list(DESKTOP_GROUP, "Categories")
-            cinnamon_categories = self._convert_to_cinnamon(self.fdo_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
 
     def get_keyfile_edits(self):
-        self.fdo_categories = self._convert_to_fdo(self.fdo_categories)
+        self.fdo_categories = self._cinnamon_to_fdo(self.fdo_categories)
         categories_val = ";".join(self.fdo_categories)
         if categories_val:
             categories_val += ";"
@@ -322,21 +386,11 @@ def get_keyfile_edits(self):
                     Icon=self.icon_chooser.get_icon(),
                     Type="Application")
 
-    def pick_exec(self, button):
-        chooser = Gtk.FileChooserDialog(title=_("Choose a command"),
-                                        parent=self.dialog,
-                                        buttons=(Gtk.STOCK_CANCEL, Gtk.ResponseType.REJECT,
-                                                 Gtk.STOCK_OK, Gtk.ResponseType.ACCEPT))
-        response = chooser.run()
-        if response == Gtk.ResponseType.ACCEPT:
-            self.builder.get_object('exec-entry').set_text(escape_space(chooser.get_filename()))
-        chooser.destroy()
-
     def check_custom_path(self):
         if self.item_path:
             self.item_path = os.path.join(getUserItemPath(), os.path.split(self.item_path)[1])
 
-    def _convert_to_cinnamon(self, fdo_cats):
+    def _fdo_to_cinnamon(self, fdo_cats):
         # These conversions are based on /etc/xdg/menus/cinnamon-applications.menu
         cats = list(fdo_cats)
 
@@ -362,10 +416,9 @@ def _convert_to_cinnamon(self, fdo_cats):
         if "System" in cats:
             cats.append("Administration")
 
-
         return cats
 
-    def _convert_to_fdo(self, fdo_cats):
+    def _cinnamon_to_fdo(self, fdo_cats):
         # These conversions are based on /etc/xdg/menus/cinnamon-applications.menu
         mappings = {
             "Accessories": "Utility",
@@ -386,7 +439,7 @@ def _convert_to_fdo(self, fdo_cats):
             else:
                 if fdo_cat in fdo_cats:
                     fdo_cats.remove(fdo_cat)
-                    
+
         if self.category_widgets["Accessories"].get_active():
             if "System" in fdo_cats:
                 fdo_cats.remove("System")
@@ -399,7 +452,7 @@ def _convert_to_fdo(self, fdo_cats):
         if self.category_widgets["Preferences"].get_active(): 
             if "System" in fdo_cats:
                 fdo_cats.remove("System")
-        
+
         return fdo_cats
 
     def _clear_menu_overrides(self):
@@ -438,8 +491,8 @@ def _clear_menu_overrides(self):
 
     def save(self):
         super(LauncherEditor, self).save()
-        if not self.is_nemo_launcher:
-            self._clear_menu_overrides()
+        subprocess.Popen(['update-desktop-database', getUserItemPath()], env=os.environ)
+        self._clear_menu_overrides()
 
 class DirectoryEditor(ItemEditor):
     ui_file = '/usr/share/cinnamon/cinnamon-desktop-editor/directory-editor.ui'
@@ -549,17 +602,6 @@ def in_hicolor(self, path):
 
         return False
 
-    def pick_exec(self, button):
-        chooser = Gtk.FileChooserDialog(title=_("Choose a command"),
-                                        parent=self.dialog,
-                                        buttons=(Gtk.STOCK_CANCEL, Gtk.ResponseType.REJECT,
-                                                 Gtk.STOCK_OK, Gtk.ResponseType.ACCEPT))
-        response = chooser.run()
-        if response == Gtk.ResponseType.ACCEPT:
-            self.builder.get_object('exec-entry').set_text(escape_space(chooser.get_filename()))
-        chooser.destroy()
-
-
 class Main:
     def __init__(self):
         parser = OptionParser()
@@ -606,7 +648,7 @@ def __init__(self):
             editor = CinnamonLauncherEditor(self.orig_file, self.panel_launcher_cb, icon_size=self.icon_size)
             editor.dialog.show_all()
         elif self.mode == "nemo-launcher":
-            editor = LauncherEditor(self.orig_file, self.nemo_launcher_cb, self.dest_dir, is_nemo_launcher=True)
+            editor = NemoLauncherEditor(self.orig_file, self.nemo_launcher_cb, self.dest_dir)
             editor.dialog.show_all()
         else:
             print("Invalid args")

files/usr/share/cinnamon/cinnamon-desktop-editor/launcher-editor.ui

@@ -7,7 +7,7 @@
     <property name="border-width">4</property>
     <property name="title" translatable="yes">Launcher Properties</property>
     <property name="type-hint">dialog</property>
-    <property name="default-width">450</property>
+    <property name="default-width">500</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-box">
         <property name="can-focus">False</property>