fix several issues

fix: #140, #141, #143

Author: RoderickQiu

floating.html

@@ -73,6 +73,10 @@
             $("#floating-unhover").css("opacity", "1");
         }
 
+        function semihover() {
+            hover();
+        }
+
         let isWorking = true;
 
         function stopper() {
@@ -142,14 +146,19 @@
             if (message.method === 2 && method === 1) {
                 $(".work").addClass("rest");
                 $(".work").removeClass("work");
-                $('#floating-bottom-bar').css("background-color", "#5490ea19");
+                if (message.isOnlyRest) {
+                    $(".rest").addClass("onlyRest");
+                    $('#floating-bottom-bar').css("background-color", newOnlyRestColor + "19");
+                } else {
+                    $('#floating-bottom-bar').css("background-color", newRestColor + "19");
+                }
                 method = 2;
             }
 
             if (message.method === 1 && method === 2) {
                 $(".rest").addClass("work");
                 $(".rest").removeClass("rest");
-                $('#floating-bottom-bar').css("background-color", "#ea545419");
+                $('#floating-bottom-bar').css("background-color", newWorkColor + "19");
                 method = 1;
             }
 
@@ -160,6 +169,11 @@
                 method = 3;
             }
 
+            if (message.isOnlyRest && method === 2) {
+                $(".rest").addClass("onlyRest");
+                $('#floating-bottom-bar').css("background-color", newOnlyRestColor + "19");
+            }
+
             ipc.removeAllListeners('floating-stop-sync');
             ipc.on("floating-stop-sync", function (event, message) {
                 isWorking = message;

index.html

@@ -373,6 +373,14 @@ <h6 id="new-feature-title" class="rest"></h6>
                 $("#statistics-back").show();
                 $("#logo-bar").hide();
                 onlyrest = true;
+                let countdownTime = store.has("simple-countdown-time") ? store.get("simple-countdown-time") : 2;
+                let countdownFocus = store.has("simple-countdown-focus") ? store.get("simple-countdown-focus") : false;
+                $("#rest-time-onlyrest").val(shi.ArabicNumberTimeParser(countdownTime, {
+                    as: 'm',
+                    lang: store.get("i18n").replace(/-/g, '_'),
+                    ignoreError: true
+                }));
+                document.getElementById("focus-rest-set-onlyrest").checked = countdownFocus;
                 allSet();
                 $("#rest-time-onlyrest").focus();
                 $(".work").addClass("onlyRest");//onlyRest mode now has specific color
@@ -571,12 +579,6 @@ <h6 id="new-feature-title" class="rest"></h6>
             document.getElementById("focus-work-set").checked = focusWhenWorking;
             document.getElementById("focus-rest-set").checked = focusWhenResting;
 
-            $("#rest-time-onlyrest").val(shi.ArabicNumberTimeParser(restTime, {
-                as: 'm',
-                lang: store.get("i18n").replace(/-/g, '_'),
-                ignoreError: true
-            }));
-            document.getElementById("focus-rest-set-onlyrest").checked = focusWhenResting;
 
             allSet();
         }

locales/en.json

@@ -394,6 +394,10 @@
 	"theme-color-positive": "Stopwatch (default green): ",
 	"autostarttask": "Auto start default task",
 	"autostarttask-tip": "When a default task is set and this setting is on, wnr will automatically start the default task every time this app is opened. ",
+	"simple-countdown-settings": "Simple countdown settings",
+	"simple-countdown-settings-tip": "These settings are independent from predefined tasks and only affect the simple countdown mode.",
+	"simple-countdown-time": "Default countdown time (minutes)",
+	"simple-countdown-focus": "Full screen focus mode",
 	"withdraw-timing": "Withdraw timing",
 	"fail-to-withdraw": "You cannot withdraw timing currently. ",
 	"statistics-enter": "Enter statistics",

locales/zh-CN.json

@@ -396,6 +396,10 @@
 	"theme-color-positive": "正计时（默认绿色）：",
 	"autostarttask": "自动开始默认预设",
 	"autostarttask-tip": "当设置了默认预设且开启了此选项后，将在每次打开 wnr 软件时自动开始默认预设的计时，以提升强力水平。",
+	"simple-countdown-settings": "单纯计时设置",
+	"simple-countdown-settings-tip": "这些设置独立于预设任务，仅影响单纯计时模式。",
+	"simple-countdown-time": "默认计时时间（分钟）",
+	"simple-countdown-focus": "全屏专心模式",
 	"withdraw-timing": "提前退出计时",
 	"fail-to-withdraw": "当前不能提前退出。",
 	"statistics-enter": "进入统计界面",

locales/zh-TW.json

@@ -389,6 +389,10 @@
 	"theme-color-positive": "正計時（默認綠色）：",
 	"autostarttask": "自動開始默認預設",
 	"autostarttask-tip": "當設置了默認預設且開啟了此選項後，將在每次打開 wnr 軟件時自動開始默認預設的計時，以提升強力水平。",
+	"simple-countdown-settings": "單純計時設置",
+	"simple-countdown-settings-tip": "這些設置獨立於預設任務，僅影響單純計時模式。",
+	"simple-countdown-time": "默認計時時間（分鐘）",
+	"simple-countdown-focus": "全屏專心模式",
 	"withdraw-timing": "提前退出計時",
 	"fail-to-withdraw": "當前不能提前退出。",
 	"statistics-enter": "進入統計界面",

preferences-items.js

@@ -17,6 +17,17 @@ if (store.get("islocked") !== true) {
         }, {
             type: "selection",
             id: "autostarttask"
+        }, {
+            type: "collapse",
+            id: "simple-countdown-settings",
+            inner: [
+                {
+                    type: "title",
+                    id: "simple-countdown-settings-tip"
+                }, {
+                    type: "simple-countdown-settings"
+                }
+            ],
         }, {
             type: "collapse",
             id: "task-reservation",

preferences-renderer.js

@@ -368,6 +368,44 @@ function domString(type) {
             </script>
             </div><br/>`;
             break;
+        case "simple-countdown-settings":
+            let defaultCountdownTime = store.has("simple-countdown-time") ? store.get("simple-countdown-time") : 2;
+            let defaultCountdownFocus = store.has("simple-countdown-focus") ? store.get("simple-countdown-focus") : false;
+            appendDOMString = `
+            <div class="w-100 row align-items-center">
+                <div class="col-8 text-left">
+                    <label>
+                        ${ i18n.__("simple-countdown-time") }
+                    </label>
+                </div>
+                <div class="col-4 text-right">
+                    <input id="simple-countdown-time-input" type="number" class="hotkeyset" 
+                           value="${ defaultCountdownTime }" 
+                           onchange="store.set('simple-countdown-time', Number($('#simple-countdown-time-input').val()))"
+                           oninput="if (Number(value) > 1440) value = 1440; if (Number(value) < 0.1) value = 0.1"
+                           style="ime-mode:Disabled" 
+                           title="${ i18n.__('what-can-be-here-predefined-tasks') }" />
+                    <span class="text-muted small"> ${ i18n.__('min') }</span>
+                </div>
+            </div>
+            <br/>
+            <div class="w-100 row align-items-center">
+                <div class="col-9 text-left">
+                    <label>
+                        ${ i18n.__("simple-countdown-focus") }
+                    </label>
+                </div>
+                <div class="col-3 text-right">
+                    <label class="switch-slide">
+                        <input type="checkbox" id="simple-countdown-focus-checkbox" hidden
+                               ${ defaultCountdownFocus ? 'checked' : '' }
+                               onclick="store.set('simple-countdown-focus', $('#simple-countdown-focus-checkbox').prop('checked'))">
+                        <label for="simple-countdown-focus-checkbox" class="switch-slide-label"></label>
+                    </label>
+                </div>
+            </div>
+            <br/>`;
+            break;
         case "personalization-notify-sound":
             appendDOMString = `
             <div class="w-100 row align-items-center">

style.css

@@ -210,6 +210,10 @@ li input:nth-last-child(4)::after {
     color: #a26ae5c2;
 }
 
+#rest-time-onlyrest {
+    min-width: 225px;
+}
+
 .text-grey {
     color: #6c757d;
 }

timer.html

@@ -388,7 +388,8 @@ <h3>
                                         (times === 0 ? firstTimeDiscount : 0)) / 60000,
                                 percentage: Math.round(lastRecordedProgress * 100),
                                 method: method,
-                                isWorking: isClockWorking
+                                isWorking: isClockWorking,
+                                isOnlyRest: isOnlyRest
                             });
                         }, 500 * floatingRepeater);
                 else
@@ -792,9 +793,11 @@ <h3>
                 wasCounting = !wasCounting;
                 if (isClockWorking) {
                     window.clearInterval(int);
-                    pauseInt = setTimeout(function () {
-                        ipc.send("can-redo-alert");
-                    }, 1000 * 60 * 7);
+                    if (store.get("alarmtip") !== false) {
+                        pauseInt = setTimeout(function () {
+                            ipc.send("can-redo-alert");
+                        }, 1000 * 60 * 7);
+                    }
                     $("#stopper").html("<i class='iconfont icon-play' aria-hidden='true'></i>");
                     isClockWorking = 0;//to stop
                     ipc.send("tray-image-change", "stop");
@@ -1323,7 +1326,8 @@ <h3>
                             val: seconds / 60,
                             percentage: naturalProgress,
                             method: method,
-                            isWorking: isClockWorking
+                            isWorking: isClockWorking,
+                            isOnlyRest: isOnlyRest
                         });
                         $bottomBar.css("width", naturalProgress + "%");
                     }