update for more fine-grained long-break

Author: RoderickQiu

locales/en.json

@@ -331,14 +331,22 @@
 	"relaunch-tip": "Will restart wnr to apply the preferences.",
 	"global-settings": "3. Global Preferences",
 	"full-screen-focus-mode-tip": "Try this ultimate, strongest focus mode that prevents you from quitting.",
+	"long-break-settings": "Long break settings",
+	"long-break-settings-tip": "Customise your long break experience here.",
+	"long-break-threshold": "Start long break from...",
+	"long-break-threshold-tip": "When the number of loops reaches this threshold, a long break will be triggered.",
+	"dropdown-2-loops": "2 loops",
+	"dropdown-3-loops": "3 loops",
+	"dropdown-4-loops": "4 loops",
 	"long-break": "Long break",
-	"long-break-tip": "Make the last rest period of a timing schedule longer to have a more comfortable long break. When loop < 3, you will not have a long break.",
+	"long-break-tip": "Make the last rest period of a timing schedule longer to have a more comfortable long break.",
+	"dropdown-plus1min": "+1 min",
+	"dropdown-plus2min": "+2 min",
 	"dropdown-plus3min": "+3 min",
 	"dropdown-plus5min": "+5 min",
 	"dropdown-plus7min": "+7 min",
 	"dropdown-plus10min": "+10 min",
 	"dropdown-plus15min": "+15 min",
-	"dropdown-plus20min": "+20 min",
 	"should-nap-now": "Rest for a few seconds now!",
 	"should-nap-now-msg": "Then keep on working!",
 	"zoom-ratio": "Zoom ratio",
@@ -394,7 +402,6 @@
 	"dropdown-every3": "Every 3",
 	"dropdown-every4": "Every 4",
 	"dropdown-every5": "Every 5",
-	"dropdown-every6": "Every 6",
 	"theme-color": "Custom theme colors",
 	"theme-color-work": "Working (default red): ",
 	"theme-color-rest": "Resting (default blue): ",

locales/zh-CN.json

@@ -323,7 +323,6 @@
 	"fullscreen-experience-tip": "你可能是第一次使用全屏专心模式。（如果你不需要强力体验，可以在设置中开启宽松全屏模式。）",
 	"fullscreen-too-long-tip": "这次你似乎将开启一段很长的专心时间。",
 	"fullscreen-experience-tip-mistake": "误点？这次你可以撤销",
-
 	"quit-from-timer-in-lock-mode-msg": "锁定模式下退出需输入密码",
 	"focus-mode": "专心模式进行中",
 	"has-multi-displays": "为确保服务正常运行，请不要在专心模式运行时插、拔显示器。",
@@ -333,14 +332,22 @@
 	"manually-check-for-update": "手动检测更新",
 	"manually-check-for-update-tip-1": "（现在你正在使用",
 	"manually-check-for-update-tip-2": "）",
+	"long-break-settings": "长休息设置",
+	"long-break-settings-tip": "在此自定义您的长休息体验。",
+	"long-break-threshold": "长休息触发门槛...",
+	"long-break-threshold-tip": "当循环次数达到此设定值时，将触发长休息。",
+	"dropdown-2-loops": "2 次循环",
+	"dropdown-3-loops": "3 次循环",
+	"dropdown-4-loops": "4 次循环",
 	"long-break": "长休息",
-	"long-break-tip": "在每次时间计划的最后一个休息加上一段时间的补时，使之成为一个长休息（循环次数少于3次或无限模式时不会进行长休息）。",
+	"long-break-tip": "在每次时间计划的最后一个休息加上一段时间的补时，使之成为一个长休息。",
+	"dropdown-plus1min": "+1 分钟",
+	"dropdown-plus2min": "+2 分钟",
 	"dropdown-plus3min": "+3 分钟",
 	"dropdown-plus5min": "+5 分钟",
 	"dropdown-plus7min": "+7 分钟",
 	"dropdown-plus10min": "+10 分钟",
 	"dropdown-plus15min": "+15 分钟",
-	"dropdown-plus20min": "+20 分钟",
 	"should-nap-now": "现在小憩几秒钟吧！",
 	"should-nap-now-msg": "然后再继续努力工作！",
 	"zoom-ratio": "缩放比例",
@@ -396,7 +403,6 @@
 	"dropdown-every3": "每三次",
 	"dropdown-every4": "每四次",
 	"dropdown-every5": "每五次",
-	"dropdown-every6": "每六次",
 	"theme-color": "自定义主题颜色",
 	"theme-color-work": "工作（默认红色）：",
 	"theme-color-rest": "休息（默认蓝色）：",
@@ -417,5 +423,6 @@
 	"can-redo-msg": "是否需要对当前段时间进行重新计时？",
 	"custom": "自定义",
 	"custom-notify-sound": "自定义提示音",
-	"input-url": "输入路径"
+	"input-url": "输入路径",
+	"long-break-threshold-tip": "long-break-threshold-tip-[zh-CN]"
 }

locales/zh-TW.json

@@ -324,14 +324,22 @@
 	"manually-check-for-update": "手動檢測更新",
 	"manually-check-for-update-tip-1": "（現在你正在使用",
 	"manually-check-for-update-tip-2": "）",
+	"long-break-settings": "長休息設定",
+	"long-break-settings-tip": "在此自定義您的長休息體驗。",
+	"long-break-threshold": "長休息觸發門檻...",
+	"long-break-threshold-tip": "當循環次數達到此設定值時，將觸發長休息。",
+	"dropdown-2-loops": "2 次循環",
+	"dropdown-3-loops": "3 次循環",
+	"dropdown-4-loops": "4 次循環",
 	"long-break": "長休息",
-	"long-break-tip": "在每次時間計劃的最後一個休息加上一段時間的補時，使之成爲一個長休息（循環次數少於3次或無限模式時不會進行長休息）。",
+	"long-break-tip": "在每次時間計劃的最後一個休息加上一段時間的補時，使之成爲一個長休息。",
+	"dropdown-plus1min": "+1 分鐘",
+	"dropdown-plus2min": "+2 分鐘",
 	"dropdown-plus3min": "+3 分鐘",
 	"dropdown-plus5min": "+5 分鐘",
 	"dropdown-plus7min": "+7 分鐘",
 	"dropdown-plus10min": "+10 分鐘",
 	"dropdown-plus15min": "+15 分鐘",
-	"dropdown-plus20min": "+20 分鐘",
 	"should-nap-now": "現在小憩幾秒鐘吧！",
 	"should-nap-now-msg": "然後再繼續努力工作！",
 	"zoom-ratio": "縮放比例",
@@ -389,7 +397,6 @@
 	"dropdown-every3": "每三次",
 	"dropdown-every4": "每四次",
 	"dropdown-every5": "每五次",
-	"dropdown-every6": "每六次",
 	"theme-color": "自定義主題顏色",
 	"theme-color-work": "工作（默認紅色）：",
 	"theme-color-rest": "休息（默認藍色）：",

preferences-items.js

@@ -90,15 +90,29 @@ if (store.get("islocked") !== true) {
             choices: ['never', '5%', '7%', '10%', '15%', '20%', '25%', '30%'],
             def: 0
         }, {
-            type: "dropdown",
-            id: "long-break",
-            choices: ['never', 'plus3min', 'plus5min', 'plus7min', 'plus10min', 'plus15min', 'plus20min'],
-            def: 0
-        }, {
-            type: "dropdown",
-            id: "long-break-mode-alter",
-            choices: ['last', 'every2', 'every3', 'every4', 'every5', 'every6'],
-            def: 0
+            type: "collapse",
+            id: "long-break-settings",
+            inner: [
+                {
+                    type: "title",
+                    id: "long-break-settings-tip"
+                }, {
+                    type: "dropdown",
+                    id: "long-break",
+                    choices: ['never', 'plus1min', 'plus2min', 'plus3min', 'plus5min', 'plus7min', 'plus10min', 'plus15min'],
+                    def: 0
+                }, {
+                    type: "dropdown",
+                    id: "long-break-threshold",
+                    choices: ['2-loops', '3-loops', '4-loops'],
+                    def: 1
+                }, {
+                    type: "dropdown",
+                    id: "long-break-mode-alter",
+                    choices: ['last', 'every2', 'every3', 'every4', 'every5'],
+                    def: 0
+                }
+            ]
         }, {
             type: "selection",
             id: "timing-after-locked",

timer.html

@@ -533,7 +533,7 @@ <h3>
 
         function longBreakGetter() {
             if (store.has("long-break")) {
-                let choices = [0, 3, 5, 7, 10, 15, 20];
+                let choices = [0, 1, 2, 3, 5, 7, 10, 15];
                 return choices[store.get("long-break")];
             } else return 0;
         }
@@ -578,13 +578,14 @@ <h3>
                 isOnlyRest = isFirstTimeOnlyRest,
                 firstTimeDiscount = isNaN(decodeURI($_GET['discount'])) ? 0 : decodeURI($_GET['discount']) * 60000,
                 longBreakFrequence = -1,
+                longBreakLoopThreshold = (store.has("long-break-threshold") ? store.get("long-break-threshold") : 1) + 2,
                 sessionId = Date.now().toString() + Math.random().toString(36).substr(2, 9),
                 recordedRecaps = new Set();
 
         if (isOnlyRest) ipc.send("enter-only-rest");
 
         if (store.has("long-break-mode-alter")) {
-            let frequenceList = [-1, 2, 3, 4, 5, 6];
+            let frequenceList = [-1, 2, 3, 4, 5];
             longBreakFrequence = frequenceList[store.get("long-break-mode-alter")];
         }
 
@@ -1215,7 +1216,7 @@ <h3>
             }
 
             function shouldLongBreak() {
-                if (longBreakFrequence === -1) return times === loop * 2 - 1 && loop > 2;
+                if (longBreakFrequence === -1) return times === loop * 2 - 1 && loop >= longBreakLoopThreshold;
                 else return ((times + 1) % (longBreakFrequence * 2)) === 0; // new long break optimization
             }