updated

RoderickQiu · Jun 1, 2019 · c04c357 · c04c357
1 parent abc0780
commit c04c357
Show file tree

Hide file tree

Showing 21 changed files with 702 additions and 467 deletions.
diff --git a/docs/bangzhu.html b/docs/bangzhu.html
@@ -48,11 +48,14 @@ <h2 class="h4">1、如何使用</h2>
                 先是一段工作时间，然后是一段休息时间。<br />
                 你可以设定循环的次数。<br />
                 还可以设定任务名称，以及添加备注。<br />
+                你还可以很方便地查看总时间。<br />
                 <img src="https://raw.githubusercontent.com/RoderickQiu/wnr/master/res/preview/preview-7.png"
                     class="img-fluid" /><br />
                 按下<kbd>Enter</kbd>键开始计时。快去工作吧！<br />
                 如果需要使用电脑，则你可以将wnr最小化或隐藏到托盘菜单。<br />
                 在特殊情况下，你可以暂停、跳过或是放弃计时。<br />
+                最底部的进度条可以告诉你还剩下多少时间。<br />
+                还剩下一分钟时，你会收到一个通知提醒。
                 <img src="https://raw.githubusercontent.com/RoderickQiu/wnr/master/res/preview/preview-8.png"
                     class="img-fluid" /><br />
                 当时间结束时，我们会提醒你。<br />

diff --git a/docs/help.html b/docs/help.html
@@ -48,12 +48,14 @@ <h2 class="h4">1. How to use it</h2>
                 First, there will be a period of work time, and then a period of rest time. <br />
                 It will repeat for the time you entered in "loop for". <br />
                 Title and notes are selective.<br />
+                You can also see how many time in total this schedule is going to cost.<br />
                 <img src="https://raw.githubusercontent.com/RoderickQiu/wnr/master/res/preview/preview-2.png"
                     class="img-fluid" /><br />
                 As the key <kbd>Enter</kbd> is clicked, the timer starts. Now, go & do your work! <br />
                 You can hide the window to the system tray<br /> (The hotkey is <kbd>Ctrl+Shift+Alt+W</kbd>) if you are
                 going to do some computer-relative work. <br />
                 The timer can be paused, skipped or given up when you have to stop to do another thing. <br />
+                When there is only 1 minute left, a notification is given.<br />
                 <img src="https://raw.githubusercontent.com/RoderickQiu/wnr/master/res/preview/preview-3.png"
                     class="img-fluid" /><br />
                 When the time ends, a warning is given. <br />

diff --git a/docs/style.css b/docs/style.css
@@ -1,4 +1,4 @@
-html, body{
+html, body {
     font-family: "方正悠黑", "Source Han Sans CN", -apple-system, "Microsoft YaHei UI", "微软雅黑", sans-serif;
     width: 100%;
     min-height: 100%;
@@ -8,47 +8,52 @@ html, body{
     align-items: center;
 }
 
-a{
+a {
     color: #5490ea;
 }
 
-img{
+img {
     width: 324px;
     height: 308px;
 }
 
-::-webkit-scrollbar-track{
-	background-color: #fefefe;
+::-webkit-scrollbar-track {
+    background-color: #fefefe;
 }
-::-webkit-scrollbar{
-	width: 12px;
-	background-color: #f5f5f5;
+
+::-webkit-scrollbar {
+    width: 4px;
+    background-color: #f5f5f5;
 }
-::-webkit-scrollbar-thumb{
-	background-color: #5555558f;
+
+::-webkit-scrollbar-thumb {
+    background-color: #5555558f;
 }
-::-webkit-scrollbar-thumb:active{
+
+::-webkit-scrollbar-thumb:active {
     background-color: #4a9af68f;
 }
 
-#footer{
+#footer {
     position: absolute;
     bottom: 5px;
     text-align: center;
 }
-@media(max-height:600px){
-    #footer{
+
+@media(max-height:600px) {
+    #footer {
         position: relative;
     }
 }
 
-#howtodoit{
+#howtodoit {
     padding: 0 1.5rem;
 }
 
-.work{
+.work {
     color: #ea5454;
 }
-.rest{
+
+.rest {
     color: #5490ea;
 }
diff --git a/locales/en.json b/locales/en.json
@@ -34,7 +34,7 @@
     "tip": "Press Enter to submit.",
     "backindex": "Give up the schedule & Back",
     "skipper": "Skip current timer",
-    "notenough": "Some information wasn't given so we cannot start the timer.",
+    "notenough": "Some information wasn't given or the time is too short, so we cannot start the timer.",
     "toolong": "The time is too long. Please make your work time and your rest time less than a day.",
     "back": "Back",
     "ended": "End!",

diff --git a/main.js b/main.js
@@ -274,7 +274,7 @@ ipcMain.on('warninggiver-allend', function () {
 })
 
 ipcMain.on('updateavailable', function () {
-    dialog.showMessageBox(win, {
+    dialog.showMessageBox(settingsWin, {
         title: i18n.__('update'),
         type: "warning",
         message: i18n.__('updatemsg'),
@@ -288,23 +288,23 @@ ipcMain.on('updateavailable', function () {
 })
 
 ipcMain.on('noupdateavailable', function () {
-    dialog.showMessageBox(win, {
+    dialog.showMessageBox(settingsWin, {
         title: i18n.__('noupdate'),
         type: "info",
         message: i18n.__('noupdatemsg')
     })
 })
 
 ipcMain.on('webproblem', function () {
-    dialog.showMessageBox(win, {
+    dialog.showMessageBox(settingsWin, {
         title: i18n.__('webproblem'),
         type: "info",
         message: i18n.__('webproblemmsg')
     })
 })
 
 ipcMain.on('deleteall', function () {
-    dialog.showMessageBox(win, {
+    dialog.showMessageBox(settingsWin, {
         title: i18n.__('deletealltitle'),
         type: "warning",
         message: i18n.__('deleteallcontent'),