feat(#60, #61): move hidden and new icons to group from context menu

Author: gridranger

Diff for: src/progman/core/language.py

@@ -48,7 +48,7 @@ class Language:
         },
         "window": {
             "new_icon": "New icon...",
-            "add_uncategorized": "Add uncategorized icon",
+            "add_new": "Add uncategorized icon",
             "add_hidden": "Add hidden icon"
         }
     }

Diff for: src/progman/core/state.py

@@ -50,3 +50,10 @@ def copy_shortcut_to_new_group(self, shortcut: Shortcut, group: str) -> None:
         self._groups[group].append(shortcut)
         if group in self.group_windows:
             self.group_windows[group].add_icon(shortcut)
+
+    def unhide_shortcut(self, shortcut: Shortcut, new_group: str) -> None:
+        current_hidden_group = shortcut.tags[0]
+        self._groups[current_hidden_group].shortcuts.remove(shortcut)
+        shortcut.tags = [new_group]
+        shortcut.managed_by_user = True
+        self.add_shortcut(shortcut)

Diff for: src/progman/ui/contextmenu.py

@@ -1,4 +1,4 @@
-from tkinter import Event, Menu, Misc
+from tkinter import END, Event, Menu, Misc
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
@@ -31,3 +31,10 @@ def bind_context_menu_to(self, items_to_bind_to: list[Misc]) -> None:
 
     def show_context_menu(self, event: Event) -> None:
         self._context_menu.post(event.x_root, event.y_root)
+
+    @staticmethod
+    def delete_items_from_menu(menu: Menu) -> None:
+        menu_items = menu.index(END)
+        if menu_items is not None:
+            for i in range(menu_items, -1, -1):
+                menu.delete(i)

Diff for: src/progman/ui/groupwindow.py

@@ -1,6 +1,7 @@
+from functools import partial
 from tkinter import Event, Misc, Toplevel
 
-from core import MenuItem, Shortcut
+from core import HIDDEN_TAGS, Group, MenuItem, Shortcut
 from ui.appdrawer import AppDrawer
 from ui.iconpropertiesdialog import IconPropertiesDialog
 from ui.progmanwidgets import ProgmanWidget
@@ -17,9 +18,10 @@ def __init__(self, parent: Misc | None, group_name: str, *args: any, **kwargs: a
         self._group_name = group_name
         self._menu_items = [
             MenuItem("new_icon", self._create_new_icon),
-            MenuItem("add_uncategorized", self._add_uncategorized_icon, state="disabled"),
-            MenuItem("add_hidden", self._add_hidden_icon, state="disabled"),
+            MenuItem("add_new", type="submenu"),
+            MenuItem("add_hidden", type="submenu")
         ]
+        self._group_hashes = dict([(tag, 0) for tag in HIDDEN_TAGS])
 
     @property
     def group_name(self) -> str:
@@ -57,8 +59,20 @@ def _create_new_icon(self) -> None:
         if dialog.result:
             self.app_state.add_shortcut(dialog.result)
 
-    def _add_uncategorized_icon(self) -> None:
-        pass
+    def show_context_menu(self, event: Event) -> None:
+        for tag in HIDDEN_TAGS:
+            if hash(self.app_state.groups[tag]) != self._group_hashes[tag]:
+                self.delete_items_from_menu(self._sub_menus["add_" + tag.lower()])
+                self._generate_group_menu(self.app_state.groups[tag], tag)
+        Window.show_context_menu(self, event)
 
-    def _add_hidden_icon(self) -> None:
-        pass
+    def _generate_group_menu(self, group: Group, tag: str) -> None:
+        sub_menu = f"add_{tag.lower()}"
+        for shortcut in sorted(group.shortcuts, key=lambda x: x.name.lower()):
+            name = f"{shortcut.name} ({shortcut.target_path})" if shortcut.target_path else shortcut.name
+            self._sub_menus[sub_menu].add_command(label=name,
+                                                  command=partial(self._add_hidden_tagged_shortcut, shortcut))
+        self._group_hashes[tag] = hash(self.app_state.groups[tag])
+
+    def _add_hidden_tagged_shortcut(self, shortcut: Shortcut) -> None:
+        self.app_state.unhide_shortcut(shortcut, self._group_name)

Diff for: src/progman/ui/icon.py

@@ -1,5 +1,5 @@
 from abc import ABC, abstractmethod
-from tkinter import END, Event, Frame, Label, Menu, PhotoImage
+from tkinter import Event, Frame, Label, PhotoImage
 from typing import TYPE_CHECKING
 
 from ui.contextmenu import ContextMenu
@@ -70,9 +70,3 @@ def select(self) -> None:
     def deselect(self) -> None:
         self._text_label.config(background=self.theme.background,
                                 foreground=self.theme.foreground)
-
-    def delete_items_from_menu(self, menu: Menu) -> None:
-        menu_items = menu.index(END)
-        if menu_items is not None:
-            for i in range(menu_items, -1, -1):
-                menu.delete(i)