optimized

RoderickQiu · Mar 15, 2020 · 6b450fb · 6b450fb
1 parent 5716e9a
commit 6b450fb
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 45 deletions.
diff --git a/locales/en.json b/locales/en.json
@@ -72,9 +72,9 @@
     "manually-check-for-update-tip-1": "(Now ",
     "manually-check-for-update-tip-2": ")",
     "hotkey-for-show-or-hide-setting": "Open/Hide hotkey: ",
-    "hotkey-for-show-or-hide-setting-tip": "(Hide wnr to the system tray.) ",
+    "hotkey-for-show-or-hide-setting-tip": "Hide wnr to the system tray. ",
     "hotkey-for-start-or-stop-setting": "Start/Stop hotkey: ",
-    "hotkey-for-start-or-stop-setting-tip": "(Fast start/stop the timer. Only available when there is a timer working.) ",
+    "hotkey-for-start-or-stop-setting-tip": "Fast start/stop the timer. Only available when there is a timer working. ",
     "delete-all-data": "Delete",
     "delete-all-data-msg": "Delete all data: ",
     "delete-all-data-dialog-box-title": "Are you sure you want to delete all data? ",
@@ -90,10 +90,6 @@
     "welcome-part-4": "Skip the tour",
     "welcome-part-5": "Open settings first",
     "helper": "Guide",
-    "welcome-loading-tip-1": "Loading...",
-    "welcome-loading-tip-2": "If you cannot see the guide, please click",
-    "welcome-loading-tip-3": "this link",
-    "welcome-loading-tip-4": "to see the offline guide. (might be out of date)",
     "newbie-for-settings": "Some tips about wnr settings",
     "newbie-for-settings-tip": "The setting will automatically be saved. Some settings needs a restart.",
     "alarm-for-not-using-wnr-dialog-box-title": "Long time no see... ",
@@ -128,14 +124,14 @@
     "focus-when-working": "Focus when working",
     "focus-when-resting": "Focus when resting",
     "set-as-default-task": "Set this as default",
-    "predefined-tasks-settings-tip": "(The task with red title is the default task. If infinity mode is on, the loops settings will be ignored. )",
+    "predefined-tasks-settings-tip": "The task with red title is the default task. If infinity mode is on, the loops settings will be ignored. ",
     "is-auto-start-task-setting-on": "Auto start default task: ",
     "is-auto-start-task-setting-on-tip": "If it is enabled, wnr will automatically start the default predefined task if there is one.",
     "window-close-dialog-box-title": "Are you sure you want to quit",
     "window-close-dialog-box-content": "If you really have something to do which makes a must to quit wnr, check that checkbox.",
     "window-close-dialog-box-chk": "Yes, quit",
     "locker": "Lock Mode",
-    "locker-settings": "Lock Mode Settings",
+    "locker-settings": "Lock Mode",
     "locker-settings-tip-part-1": "When lock mode is on, you cannot edit settings or exit wnr. ",
     "locker-settings-tip-part-2": "On macOS, the dock icon and top bar will be hidden. Status: ",
     "on": "on",
@@ -163,7 +159,7 @@
     "settings-import-error": "Invalid token.",
     "menu": "Menu",
     "prevent-stop": "Cannot exit, because you've entered lock mode.",
-    "infinity": "Infinity",
+    "infinity": "Infinity Mode",
     "is-infinity-mode-setting-on": "Infinity mode: ",
     "is-infinity-mode-setting-on-tip": "If it is enabled, wnr will automatically loop in an infinite way.",
     "stop-now": "Stop this meaningless attempt and return to focus now",
@@ -179,9 +175,9 @@
     "should-sent-msg-part-1": "We will collect some non-privacy information anonymously, such as which country you came from. Your settings and usage logs won't be uploaded. You have the right to secede, though we sincerely want to have some basic data to improve our service quality. Your data won't be identified and will be stored anonymously, and will never be shown for commercial use. ",
     "should-sent-msg-part-2": "If it is needed, you can refer to our analysis service provider's",
     "should-sent-msg-part-3": "Privacy Policy",
-    "notification-settings": "Notifications",
-    "timer-settings": "Timer",
-    "general-settings": "General",
+    "notification-settings": "1. Notifications",
+    "timer-settings": "2. Timer",
+    "general-settings": "3. General",
     "windows-7-notification": "You are using Windows 7",
     "windows-7-notification-msg": "If the application isn't working properly, please apply for \"Vista Compatibility Mode\". "
 }
diff --git a/locales/zh-CN.json b/locales/zh-CN.json
@@ -90,10 +90,6 @@
 	"welcome-part-4": "直接进入wnr",
 	"welcome-part-5": "先调整下设置",
 	"helper": "帮助手册",
-	"welcome-loading-tip-1": "正在加载……",
-	"welcome-loading-tip-2": "如果一直无法加载，请点击",
-	"welcome-loading-tip-3": "此链接",
-	"welcome-loading-tip-4": "加载本地帮助手册。（本地帮助手册可能已经过时。）",
 	"newbie-for-settings": "你似乎是第一次打开设置",
 	"newbie-for-settings-tip": "所有设置都会自动生效，部分组件在被设置后会自动重启程序以应用设置，望知悉。",
 	"alarm-for-not-using-wnr-dialog-box-title": "你已经很久没有开始一个新计划了。",
@@ -134,8 +130,8 @@
 	"window-close-dialog-box-title": "是否要退出wnr？",
 	"window-close-dialog-box-content": "如果确实要退出则勾选选框。",
 	"window-close-dialog-box-chk": "确定要退出",
-	"locker": "开启/关闭锁定模式",
-	"locker-settings": "锁定模式设置",
+	"locker": "开/关锁定模式",
+	"locker-settings": "锁定模式",
 	"locker-settings-tip-part-1": "打开锁定模式后，将无法修改设置，无法随意退出程序。",
 	"locker-settings-tip-part-2": "功能类似于家长控制。如果自控力较弱，不妨让别人输入密码，打开锁定模式。目前的状态：",
 	"on": "开",
@@ -179,9 +175,9 @@
 	"should-sent-msg-part-1": "我们会匿名采集打开wnr的次数、你来自什么国家等不重要的非隐私数据；你的使用记录、设置等不会被上传。你有权拒绝上传数据，虽然我们希望获得数据以改进服务。数据不会用于商业目的公开，并将会被匿名保存。",
 	"should-sent-msg-part-2": "如果需要，你可以查看我们的服务提供商的",
 	"should-sent-msg-part-3": "隐私协议",
-	"notification-settings": "提醒设置",
-	"timer-settings": "计时器设置",
-	"general-settings": "通用设置",
+	"notification-settings": "1. 提醒设置",
+	"timer-settings": "2. 计时器设置",
+	"general-settings": "3. 通用设置",
 	"windows-7-notification": "你正在使用Windows7",
 	"windows-7-notification-msg": "如果你在使用时出现wnr黑屏的情况，请为wnr打开“Vista兼容模式”。"
 }
diff --git a/locales/zh-TW.json b/locales/zh-TW.json
@@ -90,10 +90,6 @@
     "welcome-part-4": "直接進入wnr",
     "welcome-part-5": "先調整下設置",
     "helper": "幫助手冊",
-    "welcome-loading-tip-1": "正在加載……",
-    "welcome-loading-tip-2": "如果一直無法加載，請點擊",
-    "welcome-loading-tip-3": "此鏈接",
-    "welcome-loading-tip-4": "加載本地幫助手冊。（本地幫助手冊可能已經過時。）",
     "newbie-for-settings": "你似乎是第一次打開設置",
     "newbie-for-settings-tip": "所有設置都會自動生效，部分組件在被設置後會自動重啟程序以應用設置，望知悉。",
     "alarm-for-not-using-wnr-dialog-box-title": "你已經很久沒有開始一個新計劃了。",
@@ -134,8 +130,8 @@
     "window-close-dialog-box-title": "是否要退出wnr？",
     "window-close-dialog-box-content": "如果確實要退出則勾選選框。",
     "window-close-dialog-box-chk": "確定要退出",
-    "locker": "開啟/關閉鎖定模式",
-    "locker-settings": "鎖定模式設置",
+    "locker": "開/關鎖定模式",
+    "locker-settings": "鎖定模式",
     "locker-settings-tip-part-1": "打開鎖定模式後，將無法修改設置，無法隨意退出程序。",
     "locker-settings-tip-part-2": "功能類似於家長控制。如果自控力較弱，不妨讓別人輸入密碼，打開鎖定模式。目前的狀態：",
     "on": "開",
@@ -179,9 +175,9 @@
     "should-sent-msg-part-1": "我們會匿名采集打開wnr的次數、你來自什麽國家等不重要的非隱私數據；你的使用記錄、設置等不會被上傳。你有權拒絕上傳數據，雖然我們希望獲得數據以改進服務。數據不會用于商業目的公開，並將會被匿名保存。",
     "should-sent-msg-part-2": "如果需要，你可以查看我們的服務提供商的",
     "should-sent-msg-part-3": "隱私協議",
-    "notification-settings": "提醒設置",
-    "timer-settings": "計時器設置",
-    "general-settings": "通用設置",
+    "notification-settings": "1. 提醒設置",
+    "timer-settings": "2. 計時器設置",
+    "general-settings": "3. 通用設置",
     "windows-7-notification": "你正在使用Windows7",
     "windows-7-notification-msg": "如果你在使用時出現wnr黑屏的情況，請爲wnr打開“Vista兼容模式”。"
 }
diff --git a/res/builder/mac.js b/res/builder/mac.js
@@ -18,7 +18,7 @@ const config = {
     "dmg": {
         "icon": "res/icons/iconMac.icns",
         "backgroundColor": "#fefefe",
-        "artifactName": "${productName} ${version} MacOS.${ext}"
+        "artifactName": "${productName}-${version}-MacOS.${ext}"
     }
 }
 

diff --git a/res/builder/win.js b/res/builder/win.js
@@ -24,7 +24,7 @@ const config = {
         "license": "LICENSE",
         "oneClick": false,
         "installerSidebar": "res/builder/nsisResources/installerSidebar.bmp",
-        "artifactName": "${productName} ${version} Setup.${ext}"
+        "artifactName": "${productName}-${version}-Setup.${ext}"
     }
 }
 

diff --git a/settings.html b/settings.html
@@ -397,8 +397,10 @@
                             <script>document.write(cmdOrCtrl._("short", "pascal"))</script>
                             + Shift + Alt + <input id="hotkey-for-show-or-hide-setting" class="hotkeyset" type="text"
                                 maxlength="1" onchange="hotkeyForShowOrHideSetting()" />.<br />
+                            <script>document.write(i18n.__('hotkey-for-show-or-hide-setting-tip')); </script>
+                            <br />
                             <b>
-                                <script>document.write(i18n.__('hotkey-for-show-or-hide-setting-tip') + i18n.__('need-to-restart-now-tip'));</script>
+                                <script>document.write(i18n.__('need-to-restart-now-tip'));</script>
                             </b>
                         </p>
                     </li>
@@ -409,8 +411,10 @@
                             <script>document.write(cmdOrCtrl._("short", "pascal"))</script>
                             + Shift + Alt + <input id="hotkey-for-start-or-stop-setting" class="hotkeyset" type="text"
                                 maxlength="1" onchange="hotkeyForStartOrStopSetting()" />.<br />
+                            <script>document.write(i18n.__('hotkey-for-start-or-stop-setting-tip')); </script>
+                            <br />
                             <b>
-                                <script>document.write(i18n.__('hotkey-for-start-or-stop-setting-tip') + i18n.__('need-to-restart-now-tip'));</script>
+                                <script>document.write(i18n.__('need-to-restart-now-tip'));</script>
                             </b>
                         </p>
                     </li>

diff --git a/style.css b/style.css
@@ -359,12 +359,6 @@ li {
     outline: none;
 }
 
-#welcome-loading-tip {
-    position: absolute;
-    top: 50%;
-    bottom: 50%;
-}
-
 #bottom-bar {
     position: absolute;
     bottom: 0px;

diff --git a/tourguide.html b/tourguide.html
@@ -12,7 +12,6 @@
         }
     </script>
     <!-- solve the electron-jquery conflict, style changed due to a vscode problem -->
-    <!-- solve the electron-jquery conflict -->
     <script src="res/lib/jquery.slim.min.js"></script>
     <script src="res/lib/bootstrap.min.js"></script>
     <link rel="stylesheet" type="text/css" href="res/lib/bootstrap.min.css" />
@@ -24,9 +23,6 @@
 <body>
     <script src="supporter.js"></script>
     <div class="d-flex mx-auto justify-content-center align-items-center text-dark" id="main">
-        <div id="welcome-loading-tip">
-            <script>document.write(i18n.__('welcome-loading-tip-1'))</script>
-        </div>
         <div id="about" class="justify-content-center text-center small">
             <div id="tourguide-part-1">
                 <p class="h3 rest font-weight-bolder">

diff --git a/yarn.lock b/yarn.lock
@@ -2983,7 +2983,7 @@ window-size@^0.1.4:
   resolved "https://registry.npm.taobao.org/window-size/download/window-size-0.1.4.tgz#f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876"
   integrity sha1-+OGqHuWlPsW/FR/6CXQqatdpeHY=
 
-windows-release@^3.2.0:
+[email protected]:
   version "3.2.0"
   resolved "https://registry.npm.taobao.org/windows-release/download/windows-release-3.2.0.tgz#8122dad5afc303d833422380680a79cdfa91785f"
   integrity sha1-gSLa1a/DA9gzQiOAaAp5zfqReF8=