Merge pull request #1547 from rigrig/qmsched-new-menu

qmsched: support new bangle.js 2 menu, add /*LANG*/ hints

apps/qmsched/ChangeLog

@@ -5,4 +5,5 @@
 0.05: Avoid immediately redrawing widgets on load
 0.06: Fix: don't try to redraw widget when widgets not loaded
 0.07: Option to switch theme
-      Changed time selection to 5-minute intervals
+      Changed time selection to 5-minute intervals
+0.08: Support new Bangle.js 2 menu

apps/qmsched/app.js

@@ -1,8 +1,8 @@
 Bangle.loadWidgets();
 Bangle.drawWidgets();
 
-const modeNames = ["Off", "Alarms", "Silent"];
-
+const modeNames = [/*LANG*/"Off", /*LANG*/"Alarms", /*LANG*/"Silent"];
+const B2 = process.env.HWVERSION===2;
 // load global settings
 let bSettings = require('Storage').readJSON('setting.json',true)||{};
 let current = 0|bSettings.quiet;
@@ -109,34 +109,26 @@ function setAppQuietMode(mode) {
 
 let m;
 function showMainMenu() {
-  let menu = {
-    "": {"title": "Quiet Mode"},
-    "< Exit": () => load()
-  };
-  // "Current Mode""Silent" won't fit on Bangle.js 2
-  menu["Current"+((process.env.HWVERSION===2) ? "" : " Mode")] = {
+  let menu = {"": {"title": /*LANG*/"Quiet Mode"},};
+  menu[B2 ? /*LANG*/"< Back" : /*LANG*/"< Exit"] = () => {load();};
+  menu[/*LANG*/"Current Mode"] = {
     value: current,
     min:0, max:2, wrap: true,
-    format: () => modeNames[current],
+    format: v => modeNames[v],
     onchange: require("qmsched").setMode, // library calls setAppMode(), which updates `current`
   };
   scheds.sort((a, b) => (a.hr-b.hr));
   scheds.forEach((sched, idx) => {
-    menu[formatTime(sched.hr)] = {
-      format: () => modeNames[sched.mode], // abuse format to right-align text
-      onchange: () => {
-        m.draw = ()=> {}; // prevent redraw of main menu over edit menu (needed because we abuse format/onchange)
-        showEditMenu(idx);
-      }
-    };
+    menu[formatTime(sched.hr)] = () => { showEditMenu(idx); };
+    menu[formatTime(sched.hr)].format = () => modeNames[sched.mode]+' >'; // this does nothing :-(
   });
-  menu["Add Schedule"] = () => showEditMenu(-1);
-  menu["Switch Theme"] = {
+  menu[/*LANG*/"Add Schedule"] = () => showEditMenu(-1);
+  menu[/*LANG*/"Switch Theme"] = {
     value: !!get("switchTheme"),
     format: v => v ? /*LANG*/"Yes" : /*LANG*/"No",
     onchange: v => v ? set("switchTheme", v) : unset("switchTheme"),
   };
-  menu["LCD Settings"] = () => showOptionsMenu();
+  menu[/*LANG*/"LCD Settings"] = () => showOptionsMenu();
   m = E.showMenu(menu);
 }
 
@@ -150,25 +142,23 @@ function showEditMenu(index) {
     mins = Math.round((s.hr-hrs)*60);
     mode = s.mode;
   }
-  const menu = {
-    "": {"title": (isNew ? "Add" : "Edit")+" Schedule"},
-    "< Cancel": () => showMainMenu(),
-    "Hours": {
-      value: hrs,
-      min:0, max:23, wrap:true,
-      onchange: v => {hrs = v;},
-    },
-    "Minutes": {
-      value: mins,
-      min:0, max:55, step:5, wrap:true,
-      onchange: v => {mins = v;},
-    },
-    "Switch to": {
-      value: mode,
-      min:0, max:2, wrap:true,
-      format: v => modeNames[v],
-      onchange: v => {mode = v;},
-    },
+  let menu = {"": {"title": (isNew ? /*LANG*/"Add Schedule" : /*LANG*/"Edit Schedule")}};
+  menu[B2 ? /*LANG*/"< Back" : /*LANG*/"< Cancel"] =  () => showMainMenu();
+  menu[/*LANG*/"Hours"] = {
+    value: hrs,
+    min:0, max:23, wrap:true,
+    onchange: v => {hrs = v;},
+  };
+  menu[/*LANG*/"Minutes"] = {
+    value: mins,
+    min:0, max:55, step:5, wrap:true,
+    onchange: v => {mins = v;},
+  };
+  menu[/*LANG*/"Switch to"] = {
+    value: mode,
+    min:0, max:2, wrap:true,
+    format: v => modeNames[v],
+    onchange: v => {mode = v;},
   };
   function getSched() {
     return {
@@ -176,7 +166,7 @@ function showEditMenu(index) {
       mode: mode,
     };
   }
-  menu["> Save"] = function() {
+  menu[B2 ? /*LANG*/"Save" : /*LANG*/"> Save"] = function() {
     if (isNew) {
       scheds.push(getSched());
     } else {
@@ -186,7 +176,7 @@ function showEditMenu(index) {
     showMainMenu();
   };
   if (!isNew) {
-    menu["> Delete"] = function() {
+    menu[B2 ? /*LANG*/"Delete" : /*LANG*/"> Delete"] = function() {
       scheds.splice(index, 1);
       save();
       showMainMenu();
@@ -196,7 +186,7 @@ function showEditMenu(index) {
 }
 
 function showOptionsMenu() {
-  const disabledFormat = v => v ? "Off" : "-";
+  const disabledFormat = v => v ? /*LANG*/"Off" : "-";
   function toggle(option) {
     // we disable wakeOn* events by setting them to `false` in options
     // not disabled = not present in options at all
@@ -209,9 +199,9 @@ function showOptionsMenu() {
   }
   let resetTimeout;
   const oMenu = {
-    "": {"title": "LCD Settings"},
-    "< Back": () => showMainMenu(),
-    "LCD Brightness": {
+    "": {"title": /*LANG*/"LCD Settings"},
+    /*LANG*/"< Back": () => showMainMenu(),
+    /*LANG*/"LCD Brightness": {
       value: get("brightness", 0),
       min: 0, // 0 = use default
       max: 1,
@@ -233,7 +223,7 @@ function showOptionsMenu() {
         }
       },
     },
-    "LCD Timeout": {
+    /*LANG*/"LCD Timeout": {
       value: get("timeout", 0),
       min: 0, // 0 = use default  (no constant on for quiet mode)
       max: 60,
@@ -246,17 +236,17 @@ function showOptionsMenu() {
     },
     // we disable wakeOn* events by overwriting them as false in options
     // not disabled = not present in options at all
-    "Wake on FaceUp": {
+    /*LANG*/"Wake on FaceUp": {
       value: "wakeOnFaceUp" in options,
       format: disabledFormat,
       onchange: () => {toggle("wakeOnFaceUp");},
     },
-    "Wake on Touch": {
+    /*LANG*/"Wake on Touch": {
       value: "wakeOnTouch" in options,
       format: disabledFormat,
       onchange: () => {toggle("wakeOnTouch");},
     },
-    "Wake on Twist": {
+    /*LANG*/"Wake on Twist": {
       value: "wakeOnTwist" in options,
       format: disabledFormat,
       onchange: () => {toggle("wakeOnTwist");},

apps/qmsched/metadata.json

@@ -2,7 +2,7 @@
   "id": "qmsched",
   "name": "Quiet Mode Schedule and Widget",
   "shortName": "Quiet Mode",
-  "version": "0.07",
+  "version": "0.08",
   "description": "Automatically turn Quiet Mode on or off at set times, change theme and LCD options while Quiet Mode is active.",
   "icon": "app.png",
   "screenshots": [{"url":"screenshot_b1_main.png"},{"url":"screenshot_b1_edit.png"},{"url":"screenshot_b1_lcd.png"},