impr: renamed timer/progress to live progress

monkeytypegame · Oct 16, 2023 · d8a4dba · d8a4dba
1 parent 60a0ea9
commit d8a4dba
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 25 deletions.
diff --git a/frontend/src/ts/commandline/lists/show-timer.ts b/frontend/src/ts/commandline/lists/show-timer.ts
@@ -1,13 +1,14 @@
 import * as UpdateConfig from "../../config";
 
 const subgroup: MonkeyTypes.CommandsSubgroup = {
-  title: "Timer/progress...",
+  title: "Live progress...",
   configKey: "showTimerProgress",
   list: [
     {
       id: "setTimerProgressOff",
       display: "off",
       configValue: false,
+      alias: "timer",
       exec: (): void => {
         UpdateConfig.setShowTimerProgress(false);
       },
@@ -16,6 +17,7 @@ const subgroup: MonkeyTypes.CommandsSubgroup = {
       id: "setTimerProgressOn",
       display: "on",
       configValue: true,
+      alias: "timer",
       exec: (): void => {
         UpdateConfig.setShowTimerProgress(true);
       },
@@ -26,8 +28,8 @@ const subgroup: MonkeyTypes.CommandsSubgroup = {
 const commands: MonkeyTypes.Command[] = [
   {
     id: "changeShowTimer",
-    display: "Timer/progress...",
-    icon: "fa-clock",
+    display: "Live progress...",
+    icon: "fa-chart-pie",
     subgroup,
   },
 ];

diff --git a/frontend/src/ts/commandline/lists/timer-color.ts b/frontend/src/ts/commandline/lists/timer-color.ts
@@ -1,13 +1,14 @@
 import * as UpdateConfig from "../../config";
 
 const subgroup: MonkeyTypes.CommandsSubgroup = {
-  title: "Timer/progress color...",
+  title: "Live progress color...",
   configKey: "timerColor",
   list: [
     {
       id: "setTimerColorBlack",
       display: "black",
       configValue: "black",
+      alias: "timer",
       exec: (): void => {
         UpdateConfig.setTimerColor("black");
       },
@@ -16,6 +17,7 @@ const subgroup: MonkeyTypes.CommandsSubgroup = {
       id: "setTimerColorSub",
       display: "sub",
       configValue: "sub",
+      alias: "timer",
       exec: (): void => {
         UpdateConfig.setTimerColor("sub");
       },
@@ -24,6 +26,7 @@ const subgroup: MonkeyTypes.CommandsSubgroup = {
       id: "setTimerColorText",
       display: "text",
       configValue: "text",
+      alias: "timer",
       exec: (): void => {
         UpdateConfig.setTimerColor("text");
       },
@@ -32,6 +35,7 @@ const subgroup: MonkeyTypes.CommandsSubgroup = {
       id: "setTimerColorMain",
       display: "main",
       configValue: "main",
+      alias: "timer",
       exec: (): void => {
         UpdateConfig.setTimerColor("main");
       },
@@ -42,8 +46,8 @@ const subgroup: MonkeyTypes.CommandsSubgroup = {
 const commands: MonkeyTypes.Command[] = [
   {
     id: "changeTimerColor",
-    display: "Timer/progress color...",
-    icon: "fa-clock",
+    display: "Live progress color...",
+    icon: "fa-chart-pie",
     subgroup,
   },
 ];

diff --git a/frontend/src/ts/commandline/lists/timer-opacity.ts b/frontend/src/ts/commandline/lists/timer-opacity.ts
@@ -1,13 +1,14 @@
 import * as UpdateConfig from "../../config";
 
 const subgroup: MonkeyTypes.CommandsSubgroup = {
-  title: "Timer/progress opacity...",
+  title: "Live progress opacity...",
   configKey: "timerOpacity",
   list: [
     {
       id: "setTimerOpacity.25",
       display: ".25",
       configValue: 0.25,
+      alias: "timer",
       exec: (): void => {
         UpdateConfig.setTimerOpacity("0.25");
       },
@@ -16,6 +17,7 @@ const subgroup: MonkeyTypes.CommandsSubgroup = {
       id: "setTimerOpacity.5",
       display: ".5",
       configValue: 0.5,
+      alias: "timer",
       exec: (): void => {
         UpdateConfig.setTimerOpacity("0.5");
       },
@@ -24,6 +26,7 @@ const subgroup: MonkeyTypes.CommandsSubgroup = {
       id: "setTimerOpacity.75",
       display: ".75",
       configValue: 0.75,
+      alias: "timer",
       exec: (): void => {
         UpdateConfig.setTimerOpacity("0.75");
       },
@@ -32,6 +35,7 @@ const subgroup: MonkeyTypes.CommandsSubgroup = {
       id: "setTimerOpacity1",
       display: "1",
       configValue: 1,
+      alias: "timer",
       exec: (): void => {
         UpdateConfig.setTimerOpacity("1");
       },
@@ -42,8 +46,8 @@ const subgroup: MonkeyTypes.CommandsSubgroup = {
 const commands: MonkeyTypes.Command[] = [
   {
     id: "changeTimerOpacity",
-    display: "Timer/progress opacity...",
-    icon: "fa-clock",
+    display: "Live progress opacity...",
+    icon: "fa-chart-pie",
     subgroup,
   },
 ];

diff --git a/frontend/src/ts/commandline/lists/timer-style.ts b/frontend/src/ts/commandline/lists/timer-style.ts
@@ -1,13 +1,14 @@
 import * as UpdateConfig from "../../config";
 
 const subgroup: MonkeyTypes.CommandsSubgroup = {
-  title: "Timer/progress style...",
+  title: "Live progress style...",
   configKey: "timerStyle",
   list: [
     {
       id: "setTimerStyleBar",
       display: "bar",
       configValue: "bar",
+      alias: "timer",
       exec: (): void => {
         UpdateConfig.setTimerStyle("bar");
       },
@@ -16,6 +17,7 @@ const subgroup: MonkeyTypes.CommandsSubgroup = {
       id: "setTimerStyleText",
       display: "text",
       configValue: "text",
+      alias: "timer",
       exec: (): void => {
         UpdateConfig.setTimerStyle("text");
       },
@@ -24,6 +26,7 @@ const subgroup: MonkeyTypes.CommandsSubgroup = {
       id: "setTimerStyleMini",
       display: "mini",
       configValue: "mini",
+      alias: "timer",
       exec: (): void => {
         UpdateConfig.setTimerStyle("mini");
       },
@@ -34,8 +37,8 @@ const subgroup: MonkeyTypes.CommandsSubgroup = {
 const commands: MonkeyTypes.Command[] = [
   {
     id: "changeTimerStyle",
-    display: "Timer/progress style...",
-    icon: "fa-clock",
+    display: "Live progress style...",
+    icon: "fa-chart-pie",
     subgroup,
   },
 ];

diff --git a/frontend/static/html/pages/settings.html b/frontend/static/html/pages/settings.html
@@ -1356,11 +1356,11 @@
   <div class="settingsGroup appearance">
     <div class="section timerStyle" section="">
       <div class="groupTitle">
-        <i class="fas fa-clock"></i>
-        <span>timer/progress style</span>
+        <i class="fas fa-chart-pie"></i>
+        <span>live progress style</span>
       </div>
       <div class="text">
-        Change the style of the timer/progress during a timed test.
+        Change the style of the timer/word count during a timed test.
       </div>
       <div class="buttons">
         <div
@@ -1391,11 +1391,12 @@
     </div>
     <div class="section timerColor" section="">
       <div class="groupTitle">
-        <i class="fas fa-clock"></i>
-        <span>timer/progress color</span>
+        <i class="fas fa-chart-pie"></i>
+        <span>live progress color</span>
       </div>
       <div class="text">
-        Change the color of the timer/progress number/bar and live speed number.
+        Change the color of the timer/word count number/bar and live speed
+        number.
       </div>
       <div class="buttons">
         <div
@@ -1434,11 +1435,11 @@
     </div>
     <div class="section timerOpacity" section="">
       <div class="groupTitle">
-        <i class="fas fa-clock"></i>
-        <span>timer/progress opacity</span>
+        <i class="fas fa-chart-pie"></i>
+        <span>live progress opacity</span>
       </div>
       <div class="text">
-        Change the opacity of the timer/progress number/bar and live speed
+        Change the opacity of the timer/word count number/bar and live speed
         number.
       </div>
       <div class="buttons">
@@ -2540,12 +2541,12 @@
     </div>
     <div class="section showTimerProgress">
       <div class="groupTitle">
-        <i class="fas fa-clock"></i>
-        <span>timer/progress</span>
+        <i class="fas fa-chart-pie"></i>
+        <span>live progress</span>
       </div>
       <div class="text">
-        Displays a live timer for timed tests and progress for words/custom
-        tests.
+        Displays a live timer for timed tests and word count for word based
+        tests (word, quote or custom mode).
       </div>
       <div class="buttons">
         <div