file-listing: a few improvements

applets/file-listing/__init__.py

@@ -24,7 +24,7 @@ import panorama_panel

                                
                                
                                
                            
                                
                                    
                                        
                                            24  
                                            import gi
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            25  
                                            gi.require_version("Gtk", "4.0")
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            26  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        27 -
                                        from gi.repository import Gtk, GLib, Gio, Gdk, GObject
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        27 +
                                        from gi.repository import Gtk, GLib, Gio, Gdk, GObject, GioUnix
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            28  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            29  
                                            module_directory = Path(__file__).resolve().parent
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            30  
                                            locale.bindtextdomain("panorama-panel-file-listing", module_directory / "locale")
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -60,7 +60,7 @@ class FileMenuLinkIter(Gio.MenuLinkIter, GObject.Object):

                                
                                
                                
                            
                                
                                    
                                        
                                            60  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            61  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            62  
                                            class FileMenu(Gio.MenuModel, GObject.Object):
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        63 -
                                            def __init__(self, root: Path, storage: dict[str, GObject.Object], new_action_callback, prune_action_callback, **kwargs):
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        63 +
                                            def __init__(self, root: Path, storage: dict[str, GObject.Object], new_action_callback, prune_action_callback, show_hidden=False, **kwargs):
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            64  
                                                    GObject.Object.__init__(self, **kwargs)
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            65  
                                                    self.root: Path = root
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            66  
                                                    self.links: dict[str, Gio.MenuModel] = {}
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -68,6 +68,7 @@ class FileMenu(Gio.MenuModel, GObject.Object):

                                
                                
                                
                            
                                
                                    
                                        
                                            68  
                                                    self.storage = storage
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            69  
                                                    self.callback = new_action_callback
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            70  
                                                    self.callback_prune = prune_action_callback
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        71 +
                                                self.show_hidden = show_hidden
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            72  
                                                    self.enabled = False
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            73  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            74  
                                                def do_is_mutable(self):
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -76,7 +77,16 @@ class FileMenu(Gio.MenuModel, GObject.Object):

                                
                                
                                
                            
                                
                                    
                                        
                                            77  
                                                def do_get_n_items(self):
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            78  
                                                    if not self.enabled:
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            79  
                                                        return 0
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        79 -
                                                self.files = list(self.root.iterdir())
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        80 +
                                                if self.show_hidden:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        81 +
                                                    self.files = sorted(
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        82 +
                                                            self.root.iterdir(),
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        83 +
                                                            key=lambda p: GLib.utf8_collate_key_for_filename(p.name, len(p.name))
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        84 +
                                                    )
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        85 +
                                                else:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        86 +
                                                    self.files = sorted(
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        87 +
                                                            (p for p in self.root.iterdir() if not p.name.startswith(".")),
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        88 +
                                                            key=lambda p: GLib.utf8_collate_key_for_filename(p.name, len(p.name))
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        89 +
                                                    )
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            90  
                                                    return len(self.files)
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            91  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            92  
                                                def do_get_item_attribute_value(self, item_index, attribute, expected_type = None):
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -96,7 +106,7 @@ class FileMenu(Gio.MenuModel, GObject.Object):

                                
                                
                                
                            
                                
                                    
                                        
                                            106  
                                                def make_submenu(self, name):
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            107  
                                                    action_id = hashlib.md5(str(self.root / name).encode())
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            108  
                                                    if name not in self.links:
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        99 -
                                                    menu = FileMenu(self.root / name, self.storage, self.callback, self.callback_prune)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        109 +
                                                    menu = FileMenu(self.root / name, self.storage, self.callback, self.callback_prune, show_hidden=self.show_hidden)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            110  
                                                        container = Gio.Menu()
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            111  
                                                        options_section = Gio.Menu()
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            112  
                                                        open_directory = Gio.MenuItem()
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -181,6 +191,18 @@ class FileListingApplet(panorama_panel.Applet):

                                
                                
                                
                            
                                
                                    
                                        
                                            191  
                                                    self.button = Gtk.MenuButton()
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            192  
                                                    self.button.set_has_frame(False)
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            193  
                                                    self.append(self.button)
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        194 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        195 +
                                                self.inner_box = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        196 +
                                                self.button.set_child(self.inner_box)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        197 +
                                                self.icon_name = config.get("icon_name")
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        198 +
                                                self.show_hidden = config.get("show_hidden", False)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        199 +
                                                self.icon_size = config.get("icon_size", 24)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        200 +
                                                self.label = config.get("label")
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        201 +
                                                if config.get("icon_name"):
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        202 +
                                                    self.inner_box.append(Gtk.Image(icon_name=config["icon_name"], pixel_size=config.get("icon_size", 24)))
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        203 +
                                                if config.get("label"):
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        204 +
                                                    self.inner_box.append(Gtk.Label.new(config["label"]))
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        205 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            206  
                                                    self.button.set_always_show_arrow(True)
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            207  
                                                    self.popover = Gtk.PopoverMenu(flags=Gtk.PopoverMenuFlags.NESTED, has_arrow=False)
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            208  
                                                    self.actions = {}
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -192,7 +214,7 @@ class FileListingApplet(panorama_panel.Applet):

                                
                                
                                
                            
                                
                                    
                                        
                                            214  
                                                    self.options_section.append_item(open_directory)
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            215  
                                                    self.container_menu.append_section(None, self.options_section)
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            216  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        195 -
                                                self.menu = FileMenu(self.directory, self.actions, self.new_action, self.delete_action)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        217 +
                                                self.menu = FileMenu(self.directory, self.actions, self.new_action, self.delete_action, show_hidden=self.show_hidden)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            218  
                                                    self.container_menu.append_section(None, self.menu)
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            219  
                                                    self.container_menu.file_list = self.menu
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            220  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -222,7 +244,11 @@ class FileListingApplet(panorama_panel.Applet):

                                
                                
                                
                            
                                
                                    
                                        
                                            244  
                                                    self.action_group.remove(f"submenu-status-{action_id.hexdigest()}")
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            245  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            246  
                                                def open_file(self, action, data: GLib.Variant):
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        225 -
                                                Gio.AppInfo.launch_default_for_uri(GLib.filename_to_uri(data.get_string()))
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        247 +
                                                uri = GLib.filename_to_uri(data.get_string())
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        248 +
                                                try:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        249 +
                                                    GioUnix.DesktopAppInfo.new_from_filename(data.get_string()).launch()
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        250 +
                                                except TypeError:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        251 +
                                                    Gio.AppInfo.launch_default_for_uri(uri)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            252  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            253  
                                                def submenu_changed(self, action, parameter):
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            254  
                                                    if action.get_state():
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -231,7 +257,13 @@ class FileListingApplet(panorama_panel.Applet):

                                
                                
                                
                            
                                
                                    
                                        
                                            257  
                                                        action.submenu.prune()
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            258  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            259  
                                                def get_config(self):
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        234 -
                                                return {"directory": str(self.directory)}
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        260 +
                                                return {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        261 +
                                                    "directory": str(self.directory),
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        262 +
                                                    "icon_name": self.icon_name,
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        263 +
                                                    "icon_size": self.icon_size,
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        264 +
                                                    "label": self.label,
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        265 +
                                                    "show_hidden": self.show_hidden,
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        266 +
                                                }
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            267  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            268  
                                                def set_panel_position(self, position):
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            269  
                                                    self.button.set_direction(panorama_panel.POSITION_TO_ARROW[panorama_panel.OPPOSITE_POSITION[position]])
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                            
                                

config.yaml

@@ -95,4 +95,4 @@ panels:

                                
                                
                                
                            
                                
                                    
                                        
                                            95  
                                                centre: []
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            96  
                                                right:
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            97  
                                                - FileListingApplet:
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        98 -
                                                directory: /home/vlad
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        98 +
                                                directory: "~"
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                            
                                

shared/panorama_panel.py

@@ -1,7 +1,7 @@

                                
                                
                                
                            
                                
                                    
                                        
                                            1  
                                            import gi
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            2  
                                            gi.require_version("Gtk", "4.0")
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            3  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        4 -
                                        from gi.repository import Gtk, Gdk, GObject, GLib
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        4 +
                                        from gi.repository import Gtk, Gdk, Gio, GObject, GLib
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            5  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            6  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            7  
                                            class Applet(Gtk.Box):