feat(#55): add "Copy as new..." functionality for icons

Author: gridranger

pyproject.toml

@@ -22,10 +22,13 @@ ignore = ["E501", "W504"]
 max-complexity = 10
 
 [tool.pytest.ini_options]
-addopts = "--cov=src --cov=test --cov-report=term-missing:skip-covered --cov-fail-under=26"
+addopts = "--cov=src --cov=test --cov-report=term-missing:skip-covered --cov-fail-under=63"
 pythonpath = ["src/progman"]
 testpaths = ["test"]
 
+[tool.coverage.run]
+omit = ["src/progman/ui/*"]
+
 [tool.ruff]
 exclude = [".venv", "scripts"]
 lint.ignore = ["E501"]

src/progman/core/language.py

@@ -18,9 +18,9 @@ class Language:
             "window_list": "Window list"
         },
         "icon": {
-            "copy": "Copy",
-            "copy_to": "Copy to...",
-            "move_to": "Move to...",
+            "copy_as_new": "Copy as new...",
+            "copy_to": "Copy to",
+            "move_to": "Move to",
             "delete": "Delete",
             "properties": "Properties..."
         },
@@ -37,6 +37,7 @@ class Language:
             "browse": "Browse...",
             "cancel": "Cancel",
             "change_icon": "Change icon...",
+            "copy_as_new": "Copy as new...",
             "edit_icon": "Edit icon properties",
             "name": "Name:",
             "new_icon": "New icon properties",

src/progman/core/state.py

@@ -38,6 +38,9 @@ def add_group(self, group: Group) -> None:
 
     def add_shortcut(self, new_item: Shortcut) -> None:
         self.shortcuts.append(new_item)
+        for tag in new_item.tags:
+            group = self.group_windows[tag]
+            group.add_icon(new_item)
         for tag in new_item.tags:
             self._groups[tag].append(new_item)
 

src/progman/ui/appicon.py

@@ -14,6 +14,7 @@ def __init__(self, shortcut: Shortcut, *args: any, **kwargs: any) -> None:
         Icon.__init__(self, *args, **kwargs)
         self._shortcut = shortcut
         self._menu_items = [
+            MenuItem("copy_as_new", command=self.copy_as_new),
             MenuItem("copy_to", type="submenu"),
             MenuItem("move_to", type="submenu"),
             MenuItem("delete", command=self.delete_icon),
@@ -95,3 +96,8 @@ def _move_to_group(self, group: str) -> None:
 
     def _copy_to_group(self, group: str) -> None:
         self.app_state.copy_shortcut_to_new_group(self._shortcut, group)
+
+    def copy_as_new(self) -> None:
+        dialog = IconPropertiesDialog(self, "copy_as_new", self._shortcut)
+        if dialog.result:
+            self.app_state.add_shortcut(dialog.result)

src/progman/ui/mainwindow.py

@@ -101,7 +101,4 @@ def show_new_icon_dialog(self) -> None:
         dialog = IconPropertiesDialog(self, "new_icon")
         if dialog.result:
             self.app_state.add_shortcut(dialog.result)
-            for tag in dialog.result.tags:
-                group = self.app_state.group_windows[tag]
-                group.add_icon(dialog.result)
     # endregion

test/test_core/test_state.py

@@ -24,9 +24,11 @@ def test_add_group(self, set_geometry: Mock):
     def test_add_shortcut(self):
         mock_shortcut = Mock(tags=["foo"])
         self.test_object._groups["foo"] = Mock()
+        self.test_object.group_windows = {"foo": Mock()}
         self.test_object.add_shortcut(mock_shortcut)
         assert self.test_object.shortcuts == [mock_shortcut]
         self.test_object._groups["foo"].append.assert_called_once_with(mock_shortcut)
+        self.test_object.group_windows["foo"].add_icon.assert_called_once_with(mock_shortcut)
 
     def test_public_groups(self):
         self.test_object._groups = {"foo": Mock(), "bar": Mock(), "baz": Mock(), "New": Mock()}