bugs fixed & optimized

Author: RoderickQiu

locales/en.json

@@ -89,7 +89,7 @@
     "s": "s",
     "times": "loops",
     "welcomer1": "Welcome",
-    "welcomer2": "When you're in the zone, taking a break is the last thing on your mind. However, you may end up with some serious health issues down the line, and you may not be as productive as you would if you followed a strict work/break schedule. wnr is a simple, Electron-based application that was designed to help you remember when breaks are needed. It allows you to configure work/rest intervals that are then enforced, which will have many positive health effects in the long run. (From Softpedia)",
+    "welcomer2": "wnr is a simple app that can help you remember when breaks are needed.",
     "welcomer3": "Take a tour",
     "welcomer4": "Skip the tour",
     "welcomer5": "Open settings first",
@@ -99,7 +99,7 @@
     "loadingtip3": "this link",
     "loadingtip4": "to see the offline guide. (might be out of date)",
     "settingstip": "Some tips about wnr settings",
-    "settingstipmsg": "Welcome to settings! When you change one field, the setting will automatially be set. Some settings needs a restart.",
+    "settingstipmsg": "The setting will automatically be saved. Some settings needs a restart.",
     "alarmtip": "Long time no see... ",
     "alarmtipmsg": "Open wnr and have a healthier schedule! ",
     "allsum1": "all together",
@@ -121,5 +121,7 @@
     "default2": "tasks",
     "edit": "Edit",
     "isalarmtipon": "Tip for not using wnr: ",
-    "isalarmtipontip": "If it is enabled, wnr will send tips for you if you aren't really using wnr. "
+    "isalarmtipontip": "If it is enabled, wnr will send tips for you if you aren't really using wnr. ",
+    "isonemintipon": "Tip for only 1 min left: ",
+    "isonemintipontip": "If it is enabled, wnr will send you a tip that your time is running out in 1 min. "
 }

locales/zh.json

@@ -89,7 +89,7 @@
     "s": "秒",
     "times": "次",
     "welcomer1": "欢迎使用wnr",
-    "welcomer2": "wnr是一款时间管理程序。人们常常遇到这样的情况：一直在聚精会神工作，既觉得做了太久已经很累了，又觉得“把这个做完再休息如何”，便一直没有休息，实质上影响了效率。而wnr就是一款为了解决这个问题而出现的软件。",
+    "welcomer2": "wnr是一款时间管理程序，能帮助您调节工作与休息。",
     "welcomer3": "熟悉一下wnr",
     "welcomer4": "直接进入wnr",
     "welcomer5": "先调整下设置",
@@ -99,7 +99,7 @@
     "loadingtip3": "此链接",
     "loadingtip4": "加载本地帮助手册。（本地帮助手册可能已经过时。）",
     "settingstip": "你似乎是第一次打开设置",
-    "settingstipmsg": "很好，你已经迈出了第一步。wnr的设置组件非常强大，可以丰富和方便你的wnr体验。所有设置都会自动生效，部分组件在被设置后会自动重启程序以应用设置，望知悉。",
+    "settingstipmsg": "所有设置都会自动生效，部分组件在被设置后会自动重启程序以应用设置，望知悉。",
     "alarmtip": "你已经很久没有开始一个新计划了。",
     "alarmtipmsg": "打开wnr，开始一个新计划吧！",
     "allsum1": "共计",
@@ -121,5 +121,7 @@
     "default2": "任务",
     "edit": "编辑预设",
     "isalarmtipon": "是否要让wnr发出使用提醒：",
-    "isalarmtipontip": "如果此项被选中，则wnr会在您一直不使用的时候提示您使用wnr，提高效率。"
+    "isalarmtipontip": "如果此项被选中，则wnr会在您一直不使用的时候提示您使用wnr，提高效率。",
+    "isonemintipon": "是否要让wnr在时间仅剩下一分钟时发出提醒：",
+    "isonemintipontip": "如果此项被选中，则wnr会在时间仅剩下一分钟时发出提醒，提示您进行暂时收尾工作。"
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wnr",
-  "version": "1.5.2",
+  "version": "1.5.3",
   "description": "It's a timer app with strong expansibility for computers. The name is an abbr of \"Work and Rest\".",
   "main": "main.js",
   "scripts": {
@@ -30,7 +30,7 @@
     "winreg": "1.2.4"
   },
   "devDependencies": {
-    "electron": "5.0.5",
-    "electron-builder": "20.44.4"
+    "electron": "5.0.7",
+    "electron-builder": "21.1.1"
   }
 }

settings.html

@@ -128,6 +128,14 @@
                     <script>document.write(i18n.__('isalarmtipontip'));</script>
                 </span>
             </div>
+            <div class="align-content-center form-text">
+                <label>
+                    <script>document.write(i18n.__('isonemintipon'));</script></label>
+                <input id="onemintip-set" type="checkbox" onchange="onemintipset()" />
+                <br /><span class="text-muted small">
+                    <script>document.write(i18n.__('isonemintipontip'));</script>
+                </span>
+            </div>
             <br />
             <p class="lead"><i class="fa fa-ellipsis-h fa-fw" aria-hidden="true"></i>
                 <script>document.write(i18n.__('otherthings'));</script>
@@ -272,6 +280,12 @@
             if (document.getElementById("alarmtip-set").checked == true) store.set("alarmtip", true);
             else store.set("alarmtip", false);
         }
+        if (store.get("onemintip") != false) document.getElementById("onemintip-set").checked = true;
+        else document.getElementById("onemintip-set").checked = false;
+        function onemintipset() {
+            if (document.getElementById("onemintip-set").checked == true) store.set("onemintip", true);
+            else store.set("onemintip", false);
+        }
         $("#hotkey1-set").val(store.get("hotkey1").toUpperCase());
         function hotkey1set() {
             if ($("#hotkey1-set").val() != null && $("#hotkey1-set").val()) {

style.css

@@ -154,6 +154,10 @@ li {
     border-width: 1.5px;
 }
 
+.dropdown-item:focus {
+    color: #f5f5f5;
+}
+
 #dropdownMenuButton {
     color: #999999;
 }

timer.html

@@ -215,8 +215,8 @@
                     minutes = parseInt((seconds - hours * 3600) / 60);
                     seconds = seconds - hours * 3600 - minutes * 60;
                     $("#now-timing").text(hours + h + minutes + min + seconds + s);
-                    if (minutes == 0 && morethan1) {
-                        ipc.send("1min");
+                    if (minutes == 0 && morethan1 && hours == 0) {
+                        if (store.get("onemintip") != false) ipc.send("1min");
                         morethan1 = 0;
                     }
                 } else {