make 2nd-INSTANCE based on v1.28.1

RoderickQiu · Feb 12, 2023 · ab30243 · ab30243
1 parent 2b3ce95
commit ab30243
Show file tree

Hide file tree

Showing 21 changed files with 29 additions and 28 deletions.
diff --git a/about.html b/about.html
@@ -2,7 +2,7 @@
 <html>
 
 <head>
-    <title>About wnr</title>
+    <title>About wnr-2nd</title>
     <meta charset="UTF-8" />
     <meta http-equiv="Content-Type" content="text/html" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimal-ui" />
@@ -33,7 +33,7 @@
                     <img src="res/icons/wnrIcon.png" width="100%" />
                 </div>
                 <div class="col-8" id="about-content">
-                    <h1>wnr</h1>
+                    <h1>wnr-2nd</h1>
                     <p class="small text-muted">
                         <script>document.write(i18n.__('version') + require("./package.json").version);</script>
                         |

diff --git a/custom-dialog.html b/custom-dialog.html
@@ -2,7 +2,7 @@
 <html>
 
 <head>
-    <title>wnr</title>
+    <title>wnr-2nd</title>
     <meta charset="UTF-8" />
     <meta http-equiv="Content-Type" content="text/html" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimal-ui" />

diff --git a/external-title.html b/external-title.html
@@ -2,7 +2,7 @@
 <html>
 
 <head>
-    <title>wnr</title>
+    <title>wnr-2nd</title>
     <meta charset="UTF-8" />
     <meta http-equiv="Content-Type" content="text/html" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimal-ui" />

diff --git a/floating.html b/floating.html
@@ -2,7 +2,7 @@
 <html>
 
 <head>
-    <title>wnr</title>
+    <title>wnr-2nd</title>
     <meta charset="UTF-8" />
     <meta http-equiv="Content-Type" content="text/html" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimal-ui" />

diff --git a/index.html b/index.html
@@ -2,7 +2,7 @@
 <html>
 
 <head>
-    <title>wnr</title>
+    <title>wnr-2nd</title>
     <meta charset="UTF-8" />
     <meta http-equiv="Content-Type" content="text/html" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimal-ui" />
@@ -126,6 +126,7 @@
             </script>
         </div>
         <div id="controller">
+            <span class="small text-grey">2nd&nbsp;&nbsp;&nbsp;&nbsp;|</span>&nbsp;&nbsp;
             <a href="javascript:statistics()" class="small rest" id="statistics"><i
                     class="iconfont icon-statistics"></i></a>&nbsp;&nbsp;
             <a href="javascript:call('locker')" class="small rest" id="locker" style="display: none"><i

diff --git a/locales/en.json b/locales/en.json
@@ -27,7 +27,7 @@
 	"update-web-problem" : "Unable check for update right now. ",
 	"update-web-problem-msg" : "Cannot check for update right now. \rMaybe there is a problem with your network. Please try again later.",
 	"settings" : "Settings",
-	"info" : "About wnr",
+	"info" : "About wnr-2nd",
 	"window-hide" : "Hide the window to system tray",
 	"window-max" : "Maximize this window",
 	"window-minimize" : "Minimize to taskbar",
@@ -70,14 +70,14 @@
 	"newbie-for-settings" : "Some tips about wnr preferences",
 	"newbie-for-settings-tip" : "The preferences will automatically be saved. Some preferences needs a restart.",
 	"alarm-for-not-using-wnr-dialog-box-title" : "Long time no see... ",
-	"alarm-for-not-using-wnr-dialog-box-content" : "Open wnr and start your timer! ",
+	"alarm-for-not-using-wnr-dialog-box-content" : "Open wnr-2nd and start your timer! ",
 	"all-sum-part-1" : "all together",
 	"all-sum-part-2" : "minutes, to ",
 	"only-one-min-left" : "Less than 1 min left",
 	"only-one-min-left-msg" : "Only a few amount of time left! ",
 	"operations" : "Options",
 	"tourguide" : "Tourguide",
-	"about" : "About wnr",
+	"about" : "About wnr-2nd",
 	"focus-mode-part-1" : "Full",
 	"focus-mode-part-2" : "screen",
 	"wrong-folder-notification-title" : "Not in Applications folder",

diff --git a/locales/zh-CN.json b/locales/zh-CN.json
@@ -27,7 +27,7 @@
 	"update-web-problem" : "暂时无法检测更新。",
 	"update-web-problem-msg" : "暂时无法检测更新，可能是网络连接有问题，请稍后再试。",
 	"settings" : "设置",
-	"info" : "关于 wnr",
+	"info" : "关于 wnr-2nd",
 	"window-hide" : "隐藏至托盘菜单",
 	"window-max" : "最大化窗口",
 	"window-minimize" : "最小化至任务栏",
@@ -68,8 +68,8 @@
 	"helper" : "帮助手册",
 	"newbie-for-settings" : "你似乎是第一次打开设置",
 	"newbie-for-settings-tip" : "设置会自动生效，部分组件在被设置后会自动重启程序，望知悉。",
-	"alarm-for-not-using-wnr-dialog-box-title" : "你已经很久没有使用 wnr了。",
-	"alarm-for-not-using-wnr-dialog-box-content" : "打开 wnr，继续你的时间计划吧！",
+	"alarm-for-not-using-wnr-dialog-box-title" : "你已经很久没有使用 wnr-2nd 了。",
+	"alarm-for-not-using-wnr-dialog-box-content" : "打开 wnr-2nd，继续你的时间计划吧！",
 	"all-sum-part-1" : "共计",
 	"all-sum-part-2" : "分钟，到",
 	"only-one-min-left" : "时间仅剩不到一分钟",
@@ -80,7 +80,7 @@
 	"focus-mode-part-1" : "全屏",
 	"focus-mode-part-2" : "专心",
 	"wrong-folder-notification-title" : "当前应用并不在应用程序文件夹中",
-	"wrong-folder-notification-content" : "把应用移到系统的应用程序文件夹中可以更方便地使用 wnr。",
+	"wrong-folder-notification-content" : "把应用移到系统的应用程序文件夹中可以更方便地使用 wnr-2nd。",
 	"extend-part-1" : "更多",
 	"extend-part-2" : "设置",
 	"default" : "预设任务",
@@ -93,7 +93,7 @@
 	"add" : "添加",
 	"delete" : "删除",
 	"predefined-tasks-settings" : "预设设置",
-	"window-close-dialog-box-title" : "是否要退出 wnr？",
+	"window-close-dialog-box-title" : "是否要退出 wnr-2nd？",
 	"copied" : "已经复制。",
 	"settings-backup-msg" : "备份 wnr 设置项：",
 	"settings-backup-tip" : "点击“复制”，可以复制并备份 wnr 设置项的口令。将口令粘贴到 wnr 的“导入设置”中，就可以实现设置的快捷导入。",

diff --git a/locales/zh-TW.json b/locales/zh-TW.json
@@ -16,7 +16,7 @@
 	"all-task-end" : "時間計劃完成了！",
 	"all-task-end-msg" : "祝賀你！設置個新計劃如何？",
 	"update" : "新版本可用！",
-	"update-msg" : "請更新 wnr，來體驗新功能並避免受到漏洞干擾。",
+	"update-msg" : "請更新 wnr-2nd，來體驗新功能並避免受到漏洞干擾。",
 	"update-content" : "更新內容：",
 	"update-content-error" : "無法獲取更新日誌。",
 	"update-chk" : "前往 GitHub 下載更新",
@@ -27,7 +27,7 @@
 	"update-web-problem" : "暫時無法檢測更新。",
 	"update-web-problem-msg" : "暫時無法檢測更新，可能是網絡連接有問題，請稍後再試。",
 	"settings" : "設置",
-	"info" : "關於 wnr",
+	"info" : "關於 wnr-2nd",
 	"window-hide" : "隱藏至托盤菜單",
 	"window-max" : "最大化窗口",
 	"window-minimize" : "最小化至任務欄",
@@ -80,7 +80,7 @@
 	"focus-mode-part-1" : "全屏",
 	"focus-mode-part-2" : "專心",
 	"wrong-folder-notification-title" : "當前應用並不在應用程序文件夾中",
-	"wrong-folder-notification-content" : "把應用移到系統的應用程序文件夾中可以更方便地使用 wnr。",
+	"wrong-folder-notification-content" : "把應用移到系統的應用程序文件夾中可以更方便地使用 wnr-2nd。",
 	"extend-part-1" : "更多",
 	"extend-part-2" : "設置",
 	"default" : "預設任務",
@@ -93,7 +93,7 @@
 	"add" : "添加",
 	"delete" : "刪除",
 	"predefined-tasks-settings" : "預設設置",
-	"window-close-dialog-box-title" : "是否要退出 wnr？",
+	"window-close-dialog-box-title" : "是否要退出 wnr-2nd？",
 	"copied" : "已經複製。",
 	"settings-backup-msg" : "備份 wnr 設置項：",
 	"settings-backup-tip" : "點擊“複製”，可以複製並備份 wnr 設置項的口令。將口令粘貼到 wnr 的“導入設置”中，就可以實現設置的快捷導入。",

diff --git a/main.js b/main.js
@@ -44,7 +44,7 @@ app.commandLine.appendSwitch('autoplay-policy', 'no-user-gesture-required')//to
 process.env['ELECTRON_DISABLE_SECURITY_WARNINGS'] = 'true';//prevent seeing this meaningless alert
 
 //use native notification, declare package.json/build/appId beforehand
-app.on('ready', () => app.setAppUserModelId('com.scrisstudio.wnr'));
+app.on('ready', () => app.setAppUserModelId('com.scrisstudio.wnr2nd'));
 
 function createWindow() {
     //create the main window

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
-	"name" : "wnr",
-	"version" : "1.28.1",
+	"name" : "wnr-2nd",
+	"version" : "1.28.1-2nd",
 	"description" : "Work and rest, with wnr now!",
 	"main" : "main.js",
 	"scripts" : {
@@ -22,12 +22,12 @@
 	"author" : "RoderickQiu",
 	"license" : "MPL-2.0",
 	"homepage" : "https://getwnr.com",
-	"appId" : "com.scrisstudio.wnr",
+	"appId" : "com.scrisstudio.wnr2nd",
 	"build" : {
-		"appId" : "com.scrisstudio.wnr"
+		"appId" : "com.scrisstudio.wnr2nd"
 	},
 	"copyright" : "(c) Roderick Qiu",
-	"productName" : "wnr",
+	"productName" : "wnr-2nd",
 	"dependencies" : {
 		"@eastdesire/jscolor" : "2.5.1",
 		"@electron/remote" : "2.0.9",

diff --git a/placeholder.html b/placeholder.html
@@ -2,7 +2,7 @@
 <html>
 
 <head>
-    <title>wnr</title>
+    <title>wnr-2nd</title>
     <meta charset="UTF-8" />
     <meta http-equiv="Content-Type" content="text/html" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimal-ui" />

diff --git a/res/icons/iconMac.icns b/res/icons/iconMac.icns
diff --git a/res/icons/iconMac.png b/res/icons/iconMac.png
diff --git a/res/icons/iconMac.psd b/res/icons/iconMac.psd
diff --git a/res/icons/iconWin.ico b/res/icons/iconWin.ico
diff --git a/res/icons/trayIconMacTemplate.png b/res/icons/trayIconMacTemplate.png
diff --git a/res/icons/[email protected] b/res/icons/[email protected]
diff --git a/res/icons/wnrIcon.png b/res/icons/wnrIcon.png
diff --git a/res/icons/wnrIcon.psd b/res/icons/wnrIcon.psd
diff --git a/statistics.html b/statistics.html
@@ -2,7 +2,7 @@
 <html>
 
 <head>
-    <title>wnr</title>
+    <title>wnr-2nd</title>
     <meta charset="UTF-8" />
     <meta http-equiv="Content-Type" content="text/html" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimal-ui" />

diff --git a/timer.html b/timer.html
@@ -2,7 +2,7 @@
 <html>
 
 <head>
-    <title>wnr</title>
+    <title>wnr-2nd</title>
     <meta charset="UTF-8" />
     <meta http-equiv="Content-Type" content="text/html" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimal-ui" />
@@ -229,7 +229,7 @@ <h3>
     <div id="bottom-bar">&nbsp;</div>
 
     <div id="fullscreen-custom-dialog" class="justify-content-left align-content-left text-left d-none">
-        <p class="small text-grey font-weight-bolder" style="margin-left: 0" id="dialog-title">wnr</p>
+        <p class="small text-grey font-weight-bolder" style="margin-left: 0" id="dialog-title">wnr-2nd</p>
         <p id="dialog-msg" class="small" style="line-height: 1.5; width: 210px; line-break: anywhere">Message</p>
         <div id="dialog-buttons" style="width:210px" class="text-right">
             <a type="button" id="dialog-ok" class="btn btn-outline-primary btn-sm text-right"