nemo-action-layout-editor: UI improvement for enabling/disabling

mtwebster · mtwebster · commit bc252a055b92 · 2025-09-25T11:16:40.000-04:00
actions.

- Use GtkCellRendererToggles to allow toggling actions, remove the
  switch for the 'selected' row.
- Italicize disabled actions.
diff --git a/action-layout-editor/nemo_action_layout_editor.py b/action-layout-editor/nemo_action_layout_editor.py
@@ -182,7 +182,6 @@ def __init__(self, window, builder=None):
         self.clear_icon_button = self.builder.get_object("clear_icon_button")
         self.icon_selector_menu_button = self.builder.get_object("icon_selector_menu_button")
         self.icon_selector_image = self.builder.get_object("icon_selector_image")
-        self.action_enabled_switch = self.builder.get_object("action_enabled_switch")
         self.selected_item_widgets_group = XApp.VisibilityGroup.new(True, True, [
             self.icon_selector_menu_button,
             self.name_entry
@@ -244,11 +243,16 @@ def __init__(self, window, builder=None):
             visible=True
         )
 
-        # Icon and label
+        # Checkbox, Icon and label
         column = Gtk.TreeViewColumn()
         self.treeview.append_column(column)
         column.set_expand(True)
+        column.set_spacing(2)
 
+        cell = Gtk.CellRendererToggle(activatable=True)
+        cell.connect("toggled", self.on_action_row_toggled)
+        column.pack_start(cell, False)
+        column.set_cell_data_func(cell, self.toggle_render_func)
         cell = Gtk.CellRendererPixbuf()
         column.pack_start(cell, False)
         column.set_cell_data_func(cell, self.menu_icon_render_func)
@@ -286,7 +290,7 @@ def __init__(self, window, builder=None):
         self.name_entry.connect("changed", self.on_name_entry_changed)
         self.name_entry.connect("icon-press", self.on_name_entry_icon_clicked)
         self.remove_submenu_button.connect("clicked", self.on_remove_submenu_clicked)
-        self.action_enabled_switch.connect("notify::active", self.on_action_enabled_switch_notify)
+
         self.treeview.connect("row-activated", self.on_row_activated)
 
         # DND
@@ -686,8 +690,6 @@ def update_row_controls(self):
             orig_icon = row.get_icon_string(original=True)
             self.original_icon_menu_item.set_sensitive(orig_icon is not None and orig_icon != row.get_icon_string())
             self.selected_item_widgets_group.set_sensitive(row.enabled and row_type != ROW_TYPE_SEPARATOR)
-            self.action_enabled_switch.set_active(row.enabled)
-            self.action_enabled_switch.set_sensitive(row_type == ROW_TYPE_ACTION)
             self.remove_submenu_button.set_sensitive(row_type in (ROW_TYPE_SUBMENU, ROW_TYPE_SEPARATOR))
 
             if row_type == ROW_TYPE_ACTION and row.get_custom_label() is not None:
@@ -699,12 +701,25 @@ def update_row_controls(self):
 
         self.updating_row_edit_fields = False
 
-    def on_row_activated(self, path, column, data=None):
-        row_type = self.get_selected_row_field(ROW_TYPE)
-        if row_type != ROW_TYPE_ACTION:
+    def _toggle_row_enabled(self, row):
+        row.enabled = not row.enabled
+        self.selected_row_changed(needs_saved=False)
+        self.save_disabled_list()
+
+    def on_row_activated(self, treeview, path, column, data=None):
+        if self.updating_row_edit_fields:
             return
 
-        self.action_enabled_switch.set_active(not self.action_enabled_switch.get_active())
+        row = self.get_selected_row_field(ROW_OBJ)
+        if row is not None:
+            self._toggle_row_enabled(row)
+
+    def on_action_row_toggled(self, renderer, path, data=None):
+        iter = self.model.get_iter(path)
+        row = self.model.get_value(iter, ROW_OBJ)
+
+        if row is not None:
+            self._toggle_row_enabled(row)
 
     def set_icon_button(self, row):
         for image, use_orig in ([self.icon_selector_image, False], [self.original_icon_menu_image, True]):
@@ -890,18 +905,6 @@ def on_name_entry_icon_clicked(self, entry, icon_pos, event, data=None):
             row.set_custom_label(None)
             self.selected_row_changed()
 
-    def on_action_enabled_switch_notify(self, switch, pspec):
-        if self.updating_row_edit_fields:
-            return
-
-        row = self.get_selected_row_field(ROW_OBJ)
-        if row is not None:
-            row.enabled = switch.get_active()
-            # The layout file does not track active/inactive actions,
-            # so this shouldn't prompt a layout save.
-            self.selected_row_changed(needs_saved=False)
-            self.save_disabled_list()
-
     def on_accel_edited(self, accel, path, key, mods, kc, data=None):
         if not self.validate_accelerator(key, mods):
             return
@@ -988,6 +991,15 @@ def check_for_action_conflict(iter):
         return not conflict
 
     # Cell render functions
+    def toggle_render_func(self, column, cell, model, iter, data):
+        row_type = model.get_value(iter, ROW_TYPE)
+        row = model.get_value(iter, ROW_OBJ)
+
+        if row_type in (ROW_TYPE_SUBMENU, ROW_TYPE_SEPARATOR):
+            cell.set_property("visible", False)
+        else:
+            cell.set_property("visible", True)
+            cell.set_property("active", row.enabled)
 
     def menu_icon_render_func(self, column, cell, model, iter, data):
         row = model.get_value(iter, ROW_OBJ)
@@ -1009,6 +1021,7 @@ def menu_label_render_func(self, column, cell, model, iter, data):
         else:
             cell.set_property("markup", row.get_label())
             cell.set_property("weight", Pango.Weight.NORMAL if row.enabled else Pango.Weight.ULTRALIGHT)
+            cell.set_property("style", Pango.Style.NORMAL if row.enabled else Pango.Style.ITALIC)
 
     def accel_render_func(self, column, cell, model, iter, data):
         row_type = model.get_value(iter, ROW_TYPE)
diff --git a/gresources/nemo-action-layout-editor.glade b/gresources/nemo-action-layout-editor.glade
@@ -7,6 +7,16 @@
     <property name="can-focus">False</property>
     <property name="icon-name">list-remove-symbolic</property>
   </object>
+  <object class="GtkImage" id="image5">
+    <property name="visible">True</property>
+    <property name="can-focus">False</property>
+    <property name="icon-name">go-up-symbolic</property>
+  </object>
+  <object class="GtkImage" id="image6">
+    <property name="visible">True</property>
+    <property name="can-focus">False</property>
+    <property name="icon-name">go-down-symbolic</property>
+  </object>
   <object class="GtkBox" id="layout_editor_box">
     <property name="visible">True</property>
     <property name="can-focus">False</property>
@@ -221,28 +231,15 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkBox">
+                              <object class="GtkLabel">
                                 <property name="visible">True</property>
                                 <property name="can-focus">False</property>
-                                <child>
-                                  <object class="GtkSwitch" id="action_enabled_switch">
-                                    <property name="visible">True</property>
-                                    <property name="can-focus">True</property>
-                                    <property name="tooltip-text" translatable="yes">Enabled</property>
-                                    <property name="halign">center</property>
-                                    <property name="valign">center</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">2</property>
-                                  </packing>
-                                </child>
+                                <property name="label" translatable="yes">Appearance:</property>
+                                <property name="xalign">1</property>
                               </object>
                               <packing>
-                                <property name="expand">False</property>
+                                <property name="expand">True</property>
                                 <property name="fill">True</property>
-                                <property name="pack-type">end</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
@@ -350,16 +347,6 @@
       <widget name="name_entry"/>
     </widgets>
   </object>
-  <object class="GtkImage" id="image5">
-    <property name="visible">True</property>
-    <property name="can-focus">False</property>
-    <property name="icon-name">go-up-symbolic</property>
-  </object>
-  <object class="GtkImage" id="image6">
-    <property name="visible">True</property>
-    <property name="can-focus">False</property>
-    <property name="icon-name">go-down-symbolic</property>
-  </object>
   <object class="GtkWindow" id="main_window">
     <property name="can-focus">False</property>
     <property name="border-width">4</property>
