diff --git a/.github/workflows/taskon-tests.yml b/.github/workflows/taskon-tests.yml index fb634ca..7a16717 100644 --- a/.github/workflows/taskon-tests.yml +++ b/.github/workflows/taskon-tests.yml @@ -80,7 +80,7 @@ jobs: - name: Build Windows executable with PyInstaller (include assets) shell: cmd run: | - pyinstaller taskon/main.py --onefile --noconsole --name TaskOn --icon=taskon/assets/images/growing-seed.ico ^ + pyinstaller taskon/main.py --onefile --noconsole --name TaskOn --icon=taskon/assets/images/growing-seed-main.ico ^ --add-data "taskon/assets/audio;assets/audio" ^ --add-data "taskon/assets/images;assets/images" diff --git a/taskon/app.py b/taskon/app.py index 7b2f6cb..9caec69 100644 --- a/taskon/app.py +++ b/taskon/app.py @@ -53,8 +53,9 @@ def __init__(self, root, images, audio_service: IAudioService, config: TaskConfi # -------------------------- def start(self): - """Start a new session if no tick timer is running.""" - if self.timer.is_tick_timer_running(): + """Start a new session if no tick timer or main timer is running.""" + if (self.timer.is_tick_timer_running() or + self.timer.is_timer_running()): return session_type = self.task_manager.next_session() diff --git a/taskon/assets/images/growing-seed-main.ico b/taskon/assets/images/growing-seed-main.ico new file mode 100644 index 0000000..812957c Binary files /dev/null and b/taskon/assets/images/growing-seed-main.ico differ diff --git a/taskon/timer.py b/taskon/timer.py index 87420c4..853da3e 100644 --- a/taskon/timer.py +++ b/taskon/timer.py @@ -50,17 +50,17 @@ def __init__(self, root, on_tick, on_tick_alarm, on_tick_finish, # Timer Start / Tick Methods # -------------------------- + def start_tick(self): + """Start simple second-based countdown timer.""" + logger.info("[START] Ticking Timer Start") + self._count_down_tick() + def start_timer(self, seconds): """Start main countdown timer.""" self.remaining = seconds logger.info(f"[START] Main Timer For {seconds}s Start") self._count_down_timer() - def start_tick(self): - """Start simple second-based countdown timer.""" - logger.info("[START] Ticking Timer Start") - self._count_down_tick() - def _count_down_tick(self): """Internal method: simple countdown in seconds.""" count_min = math.floor(self.counter_seconds / 60)