fix(dialog): sovled the problem of unexpected modification of timeout actions due to Pomodoro clock, and added a round in the middle of the prompt box of Pomodoro clock time notification

vladelaina · vladelaina · commit ee02b7b0c038 · 2025-12-12T12:08:59.000+08:00
diff --git a/resource/languages/de.ini b/resource/languages/de.ini
@@ -202,6 +202,9 @@
 "By Countdown Progress"="Nach Fortschritt des Countdowns"
 "Open animations folder"="Animationsordner öffnen"
 "(Supports GIF, WebP, PNG, etc.)"="(Unterstützt GIF, WebP, PNG, etc.)"
+"Pomodoro completed"="Pomodoro abgeschlossen"
+"Cycle"="Runde "
+"Round"=""
 
 # Schriftartlizenz-Dialog
 "Font License Agreement"="Benutzerdefinierte Schriftart-Funktion Lizenzvereinbarung"
diff --git a/resource/languages/en.ini b/resource/languages/en.ini
@@ -206,6 +206,8 @@
 "Open animations folder"="Open animations folder"
 "(Supports GIF, WebP, PNG, etc.)"="(Supports GIF, WebP, PNG, etc.)"
 "Pomodoro completed"="Pomodoro completed"
+"Cycle"="Round "
+"Round"=""
 
 # Font License Dialog
 "Font License Agreement"="Custom Font Feature License Agreement"
diff --git a/resource/languages/es.ini b/resource/languages/es.ini
@@ -193,6 +193,9 @@
 "By Countdown Progress"="Por progreso de la cuenta regresiva"
 "Open animations folder"="Abrir carpeta de animaciones"
 "(Supports GIF, WebP, PNG, etc.)"="(Soporta GIF, WebP, PNG, etc.)"
+"Pomodoro completed"="Pomodoro completado"
+"Cycle"="Ronda "
+"Round"=""
 
 # Diálogo de Licencia de Fuentes
 "Font License Agreement"="Acuerdo de Licencia de Función de Fuente Personalizada"
diff --git a/resource/languages/fr.ini b/resource/languages/fr.ini
@@ -201,6 +201,9 @@
 "By Countdown Progress"="Selon la progression du compte à rebours"
 "Open animations folder"="Ouvrir le dossier des animations"
 "(Supports GIF, WebP, PNG, etc.)"="(Supporte GIF, WebP, PNG, etc.)"
+"Pomodoro completed"="Pomodoro terminé"
+"Cycle"="Tour "
+"Round"=""
 
 # Dialogue de Licence de Police
 "Font License Agreement"="Accord de Licence de Fonction de Police Personnalisée"
diff --git a/resource/languages/ja.ini b/resource/languages/ja.ini
@@ -201,6 +201,9 @@
 "By Countdown Progress"="カウントダウン進行度で"
 "Open animations folder"="アニメーションフォルダーを開く"
 "(Supports GIF, WebP, PNG, etc.)"="(GIF、WebP、PNG などに対応)"
+"Pomodoro completed"="ポモドーロ完了"
+"Cycle"="ラウンド "
+"Round"=""
 
 # フォントライセンスダイアログ
 "Font License Agreement"="カスタムフォント機能ライセンス契約"
diff --git a/resource/languages/ko.ini b/resource/languages/ko.ini
@@ -205,6 +205,8 @@
 "Open animations folder"="애니메이션 폴더 열기"
 "(Supports GIF, WebP, PNG, etc.)"="(GIF, WebP, PNG 등 지원)"
 "Pomodoro completed"="뽀모도로 완료"
+"Cycle"="라운드 "
+"Round"=""
 
 # 글꼴 라이선스 대화 상자
 "Font License Agreement"="사용자 정의 글꼴 기능 라이선스 계약"
diff --git a/resource/languages/pt.ini b/resource/languages/pt.ini
@@ -201,6 +201,9 @@
 "By Countdown Progress"="Pelo progresso da contagem regressiva"
 "Open animations folder"="Abrir pasta de animações"
 "(Supports GIF, WebP, PNG, etc.)"="(Suporta GIF, WebP, PNG, etc.)"
+"Pomodoro completed"="Pomodoro concluído"
+"Cycle"="Rodada "
+"Round"=""
 
 # Diálogo de Licença de Fonte
 "Font License Agreement"="Acordo de Licença de Recurso de Fonte Personalizada"
diff --git a/resource/languages/ru.ini b/resource/languages/ru.ini
@@ -203,6 +203,9 @@
 "By Countdown Progress"="По прогрессу обратного отсчёта"
 "Open animations folder"="Открыть папку анимаций"
 "(Supports GIF, WebP, PNG, etc.)"="(Поддерживает GIF, WebP, PNG и др.)"
+"Pomodoro completed"="Помодоро завершён"
+"Cycle"="Раунд "
+"Round"=""
 
 # Диалог лицензии шрифта
 "Font License Agreement"="Лицензионное соглашение пользовательского шрифта"
diff --git a/resource/languages/zh-Hant.ini b/resource/languages/zh-Hant.ini
@@ -203,6 +203,9 @@
 "By Countdown Progress"="按倒數進度"
 "Open animations folder"="打開動畫資料夾"
 "(Supports GIF, WebP, PNG, etc.)"="(支援 GIF、WebP、PNG 等)"
+"Pomodoro completed"="番茄時間完成"
+"Cycle"="第"
+"Round"="輪"
 
 # 字型授權對話框
 "Font License Agreement"="自訂字型功能說明及版權提示"
diff --git a/resource/languages/zh_CN.ini b/resource/languages/zh_CN.ini
@@ -206,6 +206,8 @@
 "Open animations folder"="打开动画文件夹"
 "(Supports GIF, WebP, PNG, etc.)"="(支持 GIF、WebP、PNG 等)"
 "Pomodoro completed"="番茄时间完成"
+"Cycle"="第"
+"Round"="轮"
 
 # 字体许可对话框
 "Font License Agreement"="自定义字体功能说明及版权提示"
diff --git a/src/timer/timer_events.c b/src/timer/timer_events.c
@@ -335,75 +335,81 @@ static void FormatPomodoroTime(int seconds, wchar_t* buffer, size_t bufferSize)
 static BOOL HandlePomodoroCompletion(HWND hwnd) {
     wchar_t completionMsg[256];
     wchar_t timeStr[32];
-    
+
     int completedIndex = current_pomodoro_time_index;
-    
-    int times_count = (pomodoro_initial_times_count > 0) 
+
+    int times_count = (pomodoro_initial_times_count > 0)
         ? pomodoro_initial_times_count : g_AppConfig.pomodoro.times_count;
-    int loop_count = (pomodoro_initial_loop_count > 0) 
+    int loop_count = (pomodoro_initial_loop_count > 0)
         ? pomodoro_initial_loop_count : g_AppConfig.pomodoro.loop_count;
-    
+
     if (times_count <= 0) times_count = 1;
     if (loop_count <= 0) loop_count = 1;
-    
-    int currentStep = complete_pomodoro_cycles * times_count + completedIndex + 1;
-    int totalSteps = times_count * loop_count;
-    
+
+    /* Current step within this cycle (1-based) */
+    int stepInCycle = completedIndex + 1;
+    /* Current cycle number (1-based) */
+    int currentCycle = complete_pomodoro_cycles + 1;
+
     if (completedIndex < g_AppConfig.pomodoro.times_count) {
         FormatPomodoroTime(g_AppConfig.pomodoro.times[completedIndex], timeStr, sizeof(timeStr)/sizeof(wchar_t));
     } else {
         wcscpy_s(timeStr, 32, L"?");
     }
-    
+
     if (!AdvancePomodoroState()) {
         const wchar_t* completed_text = GetLocalizedString(NULL, L"Pomodoro completed");
-        if (totalSteps > 1) {
+        const wchar_t* cycle_text = GetLocalizedString(NULL, L"Cycle");
+        const wchar_t* round_text = GetLocalizedString(NULL, L"Round");
+        if (times_count > 1 || loop_count > 1) {
             _snwprintf_s(completionMsg, sizeof(completionMsg)/sizeof(wchar_t), _TRUNCATE,
-                    L"%ls %ls (%d/%d)",
+                    L"%ls %ls (%ls%d/%d%ls %d/%d)",
                     timeStr,
                     completed_text,
-                    currentStep,
-                    totalSteps);
+                    cycle_text,
+                    currentCycle,
+                    loop_count,
+                    round_text,
+                    stepInCycle,
+                    times_count);
         } else {
             _snwprintf_s(completionMsg, sizeof(completionMsg)/sizeof(wchar_t), _TRUNCATE,
                     L"%ls %ls",
                     timeStr,
                     completed_text);
         }
         ShowNotification(hwnd, completionMsg);
-        
+
         ResetTimerState(0);
         ResetPomodoroState();
-        
+
         const wchar_t* cycle_complete_text = GetLocalizedString(NULL, L"All Pomodoro cycles completed!");
-        wchar_t finalMsg[MESSAGE_BUFFER_SIZE];
-        _snwprintf_s(finalMsg, sizeof(finalMsg)/sizeof(wchar_t), _TRUNCATE,
-                    L"%ls (%d/%d)",
-                    cycle_complete_text,
-                    totalSteps,
-                    totalSteps);
-        ShowNotification(hwnd, finalMsg);
-        if (CLOCK_TIMEOUT_ACTION == TIMEOUT_ACTION_MESSAGE) {
-            ReadNotificationSoundConfig();
-            PlayNotificationSound(hwnd);
-        }
-        
+        ShowNotification(hwnd, cycle_complete_text);
+        ReadNotificationSoundConfig();
+        PlayNotificationSound(hwnd);
+
         CLOCK_COUNT_UP = FALSE;
         CLOCK_SHOW_CURRENT_TIME = FALSE;
         message_shown = TRUE;
         InvalidateRect(hwnd, NULL, TRUE);
         KillTimer(hwnd, TIMER_ID_MAIN);
         return FALSE;
     }
-    
+
     const wchar_t* completed_text = GetLocalizedString(NULL, L"Pomodoro completed");
-    if (totalSteps > 1) {
+    const wchar_t* cycle_text = GetLocalizedString(NULL, L"Cycle");
+    const wchar_t* round_text = GetLocalizedString(NULL, L"Round");
+    if (times_count > 1 || loop_count > 1) {
         _snwprintf_s(completionMsg, sizeof(completionMsg)/sizeof(wchar_t), _TRUNCATE,
-                L"%ls %ls (%d/%d)",
+                L"%ls %ls (%ls%d/%d%ls %d/%d)",
                 timeStr,
                 completed_text,
-                currentStep,
-                totalSteps);
+                cycle_text,
+                currentCycle,
+                loop_count,
+                round_text,
+                stepInCycle,
+                times_count);
     } else {
         _snwprintf_s(completionMsg, sizeof(completionMsg)/sizeof(wchar_t), _TRUNCATE,
                 L"%ls %ls",
@@ -412,10 +418,8 @@ static BOOL HandlePomodoroCompletion(HWND hwnd) {
     }
     ShowNotification(hwnd, completionMsg);
 
-    if (CLOCK_TIMEOUT_ACTION == TIMEOUT_ACTION_MESSAGE) {
-        ReadNotificationSoundConfig();
-        PlayNotificationSound(hwnd);
-    }
+    ReadNotificationSoundConfig();
+    PlayNotificationSound(hwnd);
 
     if (current_pomodoro_time_index >= g_AppConfig.pomodoro.times_count) {
         ResetPomodoroState();
diff --git a/src/window_procedure/window_commands_timer.c b/src/window_procedure/window_commands_timer.c
@@ -223,19 +223,16 @@ LRESULT CmdSetCountdownTime(HWND hwnd, WPARAM wp, LPARAM lp) {
 LRESULT CmdPomodoroStart(HWND hwnd, WPARAM wp, LPARAM lp) {
     (void)wp; (void)lp;
     CleanupBeforeTimerAction();
-    
+
     if (!IsWindowVisible(hwnd)) ShowWindow(hwnd, SW_SHOW);
-    
+
     extern void InitializePomodoro(void);
     InitializePomodoro();
-    
+
     CLOCK_SHOW_CURRENT_TIME = FALSE;
     CLOCK_COUNT_UP = FALSE;
     CLOCK_IS_PAUSED = FALSE;
-    
-    extern TimeoutActionType CLOCK_TIMEOUT_ACTION;
-    CLOCK_TIMEOUT_ACTION = TIMEOUT_ACTION_MESSAGE;
-    
+
     KillTimer(hwnd, 1);
     ResetTimerWithInterval(hwnd);
     InvalidateRect(hwnd, NULL, TRUE);
