Skip to content

Commit c04c357

Browse files
committed
updated
1 parent abc0780 commit c04c357

21 files changed

+702
-467
lines changed

docs/bangzhu.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,14 @@ <h2 class="h4">1、如何使用</h2>
4848
先是一段工作时间,然后是一段休息时间。<br />
4949
你可以设定循环的次数。<br />
5050
还可以设定任务名称,以及添加备注。<br />
51+
你还可以很方便地查看总时间。<br />
5152
<img src="https://raw.githubusercontent.com/RoderickQiu/wnr/master/res/preview/preview-7.png"
5253
class="img-fluid" /><br />
5354
按下<kbd>Enter</kbd>键开始计时。快去工作吧!<br />
5455
如果需要使用电脑,则你可以将wnr最小化或隐藏到托盘菜单。<br />
5556
在特殊情况下,你可以暂停、跳过或是放弃计时。<br />
57+
最底部的进度条可以告诉你还剩下多少时间。<br />
58+
还剩下一分钟时,你会收到一个通知提醒。
5659
<img src="https://raw.githubusercontent.com/RoderickQiu/wnr/master/res/preview/preview-8.png"
5760
class="img-fluid" /><br />
5861
当时间结束时,我们会提醒你。<br />

docs/help.html

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

docs/style.css

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
html, body{
1+
html, body {
22
font-family: "方正悠黑", "Source Han Sans CN", -apple-system, "Microsoft YaHei UI", "微软雅黑", sans-serif;
33
width: 100%;
44
min-height: 100%;
@@ -8,47 +8,52 @@ html, body{
88
align-items: center;
99
}
1010

11-
a{
11+
a {
1212
color: #5490ea;
1313
}
1414

15-
img{
15+
img {
1616
width: 324px;
1717
height: 308px;
1818
}
1919

20-
::-webkit-scrollbar-track{
21-
background-color: #fefefe;
20+
::-webkit-scrollbar-track {
21+
background-color: #fefefe;
2222
}
23-
::-webkit-scrollbar{
24-
width: 12px;
25-
background-color: #f5f5f5;
23+
24+
::-webkit-scrollbar {
25+
width: 4px;
26+
background-color: #f5f5f5;
2627
}
27-
::-webkit-scrollbar-thumb{
28-
background-color: #5555558f;
28+
29+
::-webkit-scrollbar-thumb {
30+
background-color: #5555558f;
2931
}
30-
::-webkit-scrollbar-thumb:active{
32+
33+
::-webkit-scrollbar-thumb:active {
3134
background-color: #4a9af68f;
3235
}
3336

34-
#footer{
37+
#footer {
3538
position: absolute;
3639
bottom: 5px;
3740
text-align: center;
3841
}
39-
@media(max-height:600px){
40-
#footer{
42+
43+
@media(max-height:600px) {
44+
#footer {
4145
position: relative;
4246
}
4347
}
4448

45-
#howtodoit{
49+
#howtodoit {
4650
padding: 0 1.5rem;
4751
}
4852

49-
.work{
53+
.work {
5054
color: #ea5454;
5155
}
52-
.rest{
56+
57+
.rest {
5358
color: #5490ea;
5459
}

locales/en.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"tip": "Press Enter to submit.",
3535
"backindex": "Give up the schedule & Back",
3636
"skipper": "Skip current timer",
37-
"notenough": "Some information wasn't given so we cannot start the timer.",
37+
"notenough": "Some information wasn't given or the time is too short, so we cannot start the timer.",
3838
"toolong": "The time is too long. Please make your work time and your rest time less than a day.",
3939
"back": "Back",
4040
"ended": "End!",

main.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ ipcMain.on('warninggiver-allend', function () {
274274
})
275275

276276
ipcMain.on('updateavailable', function () {
277-
dialog.showMessageBox(win, {
277+
dialog.showMessageBox(settingsWin, {
278278
title: i18n.__('update'),
279279
type: "warning",
280280
message: i18n.__('updatemsg'),
@@ -288,23 +288,23 @@ ipcMain.on('updateavailable', function () {
288288
})
289289

290290
ipcMain.on('noupdateavailable', function () {
291-
dialog.showMessageBox(win, {
291+
dialog.showMessageBox(settingsWin, {
292292
title: i18n.__('noupdate'),
293293
type: "info",
294294
message: i18n.__('noupdatemsg')
295295
})
296296
})
297297

298298
ipcMain.on('webproblem', function () {
299-
dialog.showMessageBox(win, {
299+
dialog.showMessageBox(settingsWin, {
300300
title: i18n.__('webproblem'),
301301
type: "info",
302302
message: i18n.__('webproblemmsg')
303303
})
304304
})
305305

306306
ipcMain.on('deleteall', function () {
307-
dialog.showMessageBox(win, {
307+
dialog.showMessageBox(settingsWin, {
308308
title: i18n.__('deletealltitle'),
309309
type: "warning",
310310
message: i18n.__('deleteallcontent'),

0 commit comments

Comments
 (0)