cs_themes: Don't show the 'Other themes' menu label, fix row logic.

Follow-up to 1c21371:

- Uncategorized themes are listed first already, they don't need to
  be marked 'other' also.
- Fix Chooser row accounting, use real separators once more.
- Left-align the category label.

Author: mtwebster

files/usr/share/cinnamon/cinnamon-settings/bin/ChooserButtonWidgets.py

@@ -198,33 +198,31 @@ def add_picture(self, path, callback, title=None, id=None):
             self.row = self.row + 1
 
     def add_separator(self, label_text=None):
-        self.row = self.row + 1
-        
-        # Always use a MenuItem with label (or blank) instead of SeparatorMenuItem
-        # to avoid gray background issues
-        item = Gtk.MenuItem()
-        item.set_sensitive(False)
-        
+        if self.col > 0:
+            self.row = self.row + 1
+            self.col = 0
+
         if label_text is not None:
+            item = Gtk.MenuItem()
+            item.set_sensitive(False)
             # Add centered, bold label
             label = Gtk.Label()
             label.set_markup(f"<b>{label_text}</b>")
-            label.set_halign(Gtk.Align.CENTER)
+            label.set_halign(Gtk.Align.START)
             item.add(label)
         else:
-            # Add an empty label to create space without gray background
-            label = Gtk.Label()
-            label.set_text(" ")
-            item.add(label)
-            
-        self.menu.attach(item, 0, self.num_cols, self.row, self.row+1)
-        
-        # Reset column position after separator
-        self.col = 0
+            item = Gtk.SeparatorMenuItem()
 
-    def add_menuitem(self, menuitem):
+        self.menu.attach(item, 0, self.num_cols, self.row, self.row + 1)
         self.row = self.row + 1
+
+    def add_menuitem(self, menuitem):
+        if self.col > 0:
+            self.row = self.row + 1
+            self.col = 0
+
         self.menu.attach(menuitem, 0, self.num_cols, self.row, self.row+1)
+        self.row = self.row + 1
 
 class DateChooserButton(Gtk.Button):
     __gsignals__ = {

files/usr/share/cinnamon/cinnamon-settings/modules/cs_themes.py

@@ -737,15 +737,8 @@ def refresh_chooser(self, chooser, path_suffix, themes, callback):
             single_item_category_themes.sort(key=lambda x: (variant_sort_order.get(x['variant'], 3), x['name']))
             multi_item_category_themes.sort(key=lambda x: (x['category'], variant_sort_order.get(x['variant'], 3), x['name']))
 
-            # Reset column position at the start
-            chooser.col = 0
-            chooser.row = 0
-            
             # Display single-item category themes first, under an "Other Themes" label
             if single_item_category_themes:
-                chooser.add_separator(_("Other Themes"))
-                # Add an additional blank separator after the category label
-                chooser.add_separator()
                 for theme_info in single_item_category_themes:
                     theme = theme_info['name']
                     theme_path = None
@@ -793,8 +786,6 @@ def refresh_chooser(self, chooser, path_suffix, themes, callback):
                     current_category = category
                     current_variant = None # Reset variant when category changes
                     chooser.add_separator(category) # Category name separator
-                    # Add an additional blank separator after the category label
-                    chooser.add_separator()
 
                 # Update current_variant, no separator here if it's just a variant change
                 current_variant = variant
@@ -871,16 +862,9 @@ def refresh_chooser(self, chooser, path_suffix, themes, callback):
             # Sort both lists
             single_item_category_themes.sort(key=lambda x: (variant_sort_order.get(x['variant'], 3), x['name'].lower()))
             multi_item_category_themes.sort(key=lambda x: (x['category'].lower(), variant_sort_order.get(x['variant'], 3), x['name'].lower()))
-            
-            # Reset column position at the start
-            chooser.col = 0
-            chooser.row = 0
 
             # Display single-item category themes first, under an "Other Themes" label
             if single_item_category_themes:
-                chooser.add_separator(_("Other Themes"))
-                # Add an additional blank separator after the category label
-                chooser.add_separator()
                 for theme_info in single_item_category_themes:
                     theme_name = theme_info['name']
                     theme_path_val = theme_info['path'] # Renamed theme_path to avoid conflict
@@ -914,8 +898,6 @@ def refresh_chooser(self, chooser, path_suffix, themes, callback):
                     current_category = category
                     current_variant = None # Reset variant when category changes
                     chooser.add_separator(category) # Category name separator
-                    # Add an additional blank separator after the category label
-                    chooser.add_separator()
 
                 # Update current_variant, no separator here if it's just a variant change
                 current_variant = variant