Add animation

xitomatl/app.py

@@ -5,6 +5,7 @@
 from PySide6.QtGui import QIcon
 from PySide6.QtWidgets import QApplication, QMenu, QSystemTrayIcon
 
+from xitomatl.animation import NotifyAnimation
 from xitomatl.icon import task_icon
 from xitomatl.pomodoro import Pomodoro, State
 
@@ -36,6 +37,9 @@ def __init__(self, argv, settings):
 
         self.icon_size = int(settings.value("icon_size", DEFAULT_ICON_SIZE))
 
+        self.animation = NotifyAnimation()
+        self.animation.icon_changed.connect(self.icon.setIcon)
+
         menu = QMenu()
         menu.addAction(
             QIcon.fromTheme("media-playback-start"),
@@ -85,13 +89,21 @@ def on_icon_middle_click(self):
         self.pomodoro.stop()
 
     def on_state_changed(self):
+        task = self.pomodoro.current_task()
+        remaining = self.pomodoro.remaining_minutes()
         icon = task_icon(
-            self.pomodoro.current_task(),
+            task,
             self.pomodoro.state,
-            self.pomodoro.remaining_minutes(),
+            remaining,
             self.icon_size,
         )
-        self.icon.setIcon(icon)
+
+        self.animation.set_icon(icon)
+        if task.animated and remaining <= 0:
+            self.animation.start()
+        else:
+            self.animation.stop()
+
         self.icon.setToolTip(f"{QApplication.applicationName()}: {self.pomodoro}")
 
         act = self.task_actions[self.current_task_index]

xitomatl/icon.py

@@ -3,7 +3,6 @@
 from PySide6.QtGui import (
     QFont,
     QFontMetrics,
-    QIcon,
     QPainter,
     QPainterPath,
     QPen,
@@ -48,7 +47,7 @@ def render_text(painter, task, size, icon_text):
 
 
 def task_icon(task, state, remaining_minutes, icon_size):
-    """Created QIcon for given task and state."""
+    """Created QPixmap for given task and state."""
     pix = QPixmap(icon_size, icon_size)
     pix.fill(Qt.transparent)
     try:
@@ -88,4 +87,4 @@ def task_icon(task, state, remaining_minutes, icon_size):
     finally:
         painter.end()
 
-    return QIcon(pix)
+    return pix

xitomatl/tasks.py

@@ -1,46 +1,12 @@
 # SPDX-License-Identifier: LGPL-2.0-or-later
 from copy import copy
+from dataclasses import dataclass, field, fields
 
 from PySide6.QtGui import QColor
 
 DEFAULT_FONT = "Noto Sans Mono Condensed"
 DEFAULT_TIMEOUT_FONT = "Noto Sans Mono Condensed ExtraBold"
 DEFAULT_TASK_CACHE_KEY = "__default__"
-DEFAULT_TASK_ARGS = dict(
-    name="focus",
-    minutes=25,
-    in_menu=True,
-    command_start="",
-    command_stop="",
-    command_finish="",
-    image="",
-    # Normal appearance options
-    font=DEFAULT_FONT,
-    color=QColor("#007ba7"),
-    line_color=QColor("transparent"),
-    line_width=0,
-    text_color=QColor("white"),
-    text_stroke_width=0,
-    text_stroke_color=QColor("transparent"),
-    text_size=65,
-    text_x=0,
-    text_y=0,
-    icon_radius=30,
-    icon_padding=10,
-    # Timed out appearance options
-    timeout_font=DEFAULT_TIMEOUT_FONT,
-    timeout_color=QColor("#ff0040"),
-    timeout_line_color=QColor("transparent"),
-    timeout_line_width=0,
-    timeout_text_color=QColor("white"),
-    timeout_text_stroke_width=0,
-    timeout_text_stroke_color=QColor("transparent"),
-    timeout_text_size=65,
-    timeout_text_x=0,
-    timeout_text_y=0,
-    timeout_icon_radius=30,
-    timeout_icon_padding=10,
-)
 
 
 def to_bool(value):
@@ -61,10 +27,50 @@ def __getattr__(self, attr):
         return getattr(self.task, attr)
 
 
+def color_field(color_name):
+    # pylint: disable=invalid-field-call
+    return field(default_factory=lambda: QColor(color_name))
+
+
+@dataclass
 class Task:
-    def __init__(self, **kwargs):
-        for k, v in DEFAULT_TASK_ARGS.items():
-            setattr(self, k, kwargs.get(k, v))
+    name: str = "focus"
+    minutes: int = 25
+    in_menu: bool = True
+    command_start: str = ""
+    command_stop: str = ""
+    command_finish: str = ""
+    image: str = ""
+
+    # Normal appearance options
+    font: str = DEFAULT_FONT
+    color: QColor = color_field("#007ba7")
+    line_color: QColor = color_field("transparent")
+    line_width: int = 0
+    text_color: QColor = color_field("white")
+    text_stroke_width: int = 0
+    text_stroke_color: QColor = color_field("transparent")
+    text_size: int = 65
+    text_x: int = 0
+    text_y: int = 0
+    icon_radius: int = 30
+    icon_padding: int = 10
+
+    # Timed out appearance options
+    timeout_font = DEFAULT_TIMEOUT_FONT
+    timeout_color: QColor = color_field("#ff0040")
+    timeout_line_color: QColor = color_field("transparent")
+    timeout_line_width: int = 0
+    timeout_text_color: QColor = color_field("white")
+    timeout_text_stroke_width: int = 0
+    timeout_text_stroke_color: QColor = color_field("transparent")
+    timeout_text_size: int = 65
+    timeout_text_x: int = 0
+    timeout_text_y: int = 0
+    timeout_icon_radius: int = 30
+    timeout_icon_padding: int = 10
+
+    animated: bool = True
 
     def __str__(self):
         return f"{self.name}/{self.minutes}"
@@ -85,6 +91,7 @@ def __init__(self, minutes=5, in_menu=False):
             in_menu=in_menu,
             icon_radius=100,
             text_y=0,
+            animated=True,
         )
 
 
@@ -94,13 +101,13 @@ def read_task(settings, task_cache):
     default_task.name = name
     task = task_cache.setdefault(name, default_task)
 
-    for key, default_value in DEFAULT_TASK_ARGS.items():
-        value = settings.value(key)
+    for field_ in fields(Task):
+        value = settings.value(field_.name)
         if value:
-            convert = type(default_value)
+            convert = field_.type
             if convert is bool:
                 convert = to_bool
-            setattr(task, key, convert(value))
+            setattr(task, field_.name, convert(value))
 
     task_cache[DEFAULT_TASK_CACHE_KEY] = copy(task)
     return copy(task)