Keyboard shortcut fix (#4706)

Author: cagnulein

src/homeform.cpp

@@ -4951,6 +4951,8 @@ bool homeform::handleKeyboardShortcut(const QString &sequence) {
         Lap();
     } else if (matches(QZSettings::shortcut_start_stop, QZSettings::default_shortcut_start_stop)) {
         StartRequested();
+    } else if (matches(QZSettings::shortcut_stop, QZSettings::default_shortcut_stop)) {
+        StopRequested();
     } else {
         return false;
     }
@@ -5525,10 +5527,7 @@ void homeform::Minus(const QString &name) {
         }
     } else if (name.contains(QStringLiteral("remainingtimetrainprogramrow"))) {
         if (bluetoothManager->device() && trainProgram) {
-            // Offset:
-            // 1. To account for current tick
-            // 2. To bounce back to previous
-            trainProgram->decreaseElapsedTime(QTime(0, 0, 0).secsTo(trainProgram->currentRowElapsedTime()) + 2);
+            trainProgram->goToPreviousRow();
         }
     } else if (name.contains(QStringLiteral("peloton_offset")) || name.contains(QStringLiteral("peloton_remaining"))) {
         if (bluetoothManager->device() && trainProgram) {
@@ -6099,7 +6098,10 @@ void homeform::update() {
             remaningTimeTrainingProgramCurrentRow->setValue(
                 trainProgram->currentRowRemainingTime().toString(QStringLiteral("h:mm:ss")));
             remaningTimeTrainingProgramCurrentRow->setSecondLine(
-                trainProgram->currentRowElapsedTime().toString(QStringLiteral("h:mm:ss")));
+                trainProgram->currentRowElapsedTime().toString(QStringLiteral("h:mm:ss")) +
+                QStringLiteral(" (") + QString::number(trainProgram->currentLogicalStep()) +
+                QStringLiteral("/") + QString::number(trainProgram->totalLogicalSteps()) +
+                QStringLiteral(")"));
             targetMets->setValue(QString::number(trainProgram->currentTargetMets(), 'f', 1));
             trainrow next = trainProgram->getRowFromCurrent(1);
             trainrow next_1 = trainProgram->getRowFromCurrent(2);

src/homeform.h

@@ -656,6 +656,7 @@ class homeform : public QObject {
     Q_INVOKABLE void sendMail();
 
     Q_INVOKABLE void keyboardStartStop() { StartRequested(); }
+    Q_INVOKABLE void keyboardStop() { StopRequested(); }
     Q_INVOKABLE void keyboardLap() { Lap(); }
     Q_INVOKABLE void keyboardPlus(const QString &name) { Plus(name); }
     Q_INVOKABLE void keyboardMinus(const QString &name) { Minus(name); }

src/main.qml

@@ -207,7 +207,8 @@ ApplicationWindow {
         property string shortcut_preset_powerzone_7: ""
         property string shortcut_auto_resistance: ""
         property string shortcut_lap: ""
-        property string shortcut_start_stop: ""        
+        property string shortcut_start_stop: ""
+        property string shortcut_stop: ""
     }
 
 
@@ -1514,6 +1515,7 @@ ApplicationWindow {
             Shortcut { context: Qt.WindowShortcut; sequence: settings.shortcut_auto_resistance; enabled: shortcutReady(sequence); onActivated: rootItem.setAutoResistance(!rootItem.autoResistance) }
             Shortcut { context: Qt.WindowShortcut; sequence: settings.shortcut_lap; enabled: shortcutReady(sequence); onActivated: rootItem.keyboardLap() }
             Shortcut { context: Qt.WindowShortcut; sequence: settings.shortcut_start_stop; enabled: shortcutReady(sequence); onActivated: rootItem.keyboardStartStop() }
+            Shortcut { context: Qt.WindowShortcut; sequence: settings.shortcut_stop; enabled: shortcutReady(sequence); onActivated: rootItem.keyboardStop() }
         }
     }
 }

src/qzsettings.cpp

@@ -1230,8 +1230,10 @@ const QString QZSettings::shortcut_lap = QStringLiteral("shortcut_lap");
 const QString QZSettings::default_shortcut_lap = QStringLiteral("");
 const QString QZSettings::shortcut_start_stop = QStringLiteral("shortcut_start_stop");
 const QString QZSettings::default_shortcut_start_stop = QStringLiteral("");
+const QString QZSettings::shortcut_stop = QStringLiteral("shortcut_stop");
+const QString QZSettings::default_shortcut_stop = QStringLiteral("");
 
-const uint32_t allSettingsCount = 961;
+const uint32_t allSettingsCount = 962;
 
 QVariant allSettings[allSettingsCount][2] = {
     {QZSettings::cryptoKeySettingsProfiles, QZSettings::default_cryptoKeySettingsProfiles},
@@ -2210,6 +2212,7 @@ QVariant allSettings[allSettingsCount][2] = {
     {QZSettings::shortcut_auto_resistance, QZSettings::default_shortcut_auto_resistance},
     {QZSettings::shortcut_lap, QZSettings::default_shortcut_lap},
     {QZSettings::shortcut_start_stop, QZSettings::default_shortcut_start_stop},
+    {QZSettings::shortcut_stop, QZSettings::default_shortcut_stop},
     {QZSettings::step_gain, QZSettings::default_step_gain},
     {QZSettings::proform_carbon_tlx_treadmill, QZSettings::default_proform_carbon_tlx_treadmill},
     {QZSettings::proform_carbon_tlx_v84_314_treadmill, QZSettings::default_proform_carbon_tlx_v84_314_treadmill},

src/qzsettings.h

@@ -3157,7 +3157,10 @@ class QZSettings {
 
     static const QString shortcut_start_stop;
     static const QString default_shortcut_start_stop;
-    
+
+    static const QString shortcut_stop;
+    static const QString default_shortcut_stop;
+
     /*
      * @brief Gain multiplier applied to step count calculated from cadence for calibration purposes
      */

src/settings-catalog.json

@@ -2,7 +2,7 @@
   "$schema": "https://qdomyos-zwift.local/settings-catalog.schema.json",
   "schemaVersion": 1,
   "format": "qdomyos-zwift-settings-catalog",
-  "settingCount": 949,
+  "settingCount": 950,
   "pages": [
     {
       "key": "page_custom_gear_table",
@@ -13453,6 +13453,19 @@
       "defaultExpression": "\"\"",
       "options": null
     },
+    {
+      "key": "shortcut_stop",
+      "name": "Stop",
+      "description": null,
+      "parent": "Keyboard Shortcuts",
+      "type": "string",
+      "qmlType": "string",
+      "control": "text",
+      "visible": true,
+      "defaultValue": "",
+      "defaultExpression": "\"\"",
+      "options": null
+    },
     {
       "key": "garmin_download_workouts_on_start",
       "name": "Fetch Garmin Workouts on Startup",

src/settings-shortcuts.qml

@@ -91,6 +91,7 @@ ScrollView {
         property string shortcut_auto_resistance: ""
         property string shortcut_lap: ""
         property string shortcut_start_stop: ""
+        property string shortcut_stop: ""
     }
 
     ColumnLayout {
@@ -179,9 +180,13 @@ ScrollView {
             ColumnLayout {
                 anchors.fill: parent
                 RowLayout {
-                    Label { text: qsTr("Start / Stop"); Layout.fillWidth: true }
+                    Label { text: qsTr("Start / Pause"); Layout.fillWidth: true }
                     ShortcutField { text: settings.shortcut_start_stop; settingName: "shortcut_start_stop" }
                 }
+                RowLayout {
+                    Label { text: qsTr("Stop"); Layout.fillWidth: true }
+                    ShortcutField { text: settings.shortcut_stop; settingName: "shortcut_stop" }
+                }
                 RowLayout {
                     Label { text: qsTr("Lap"); Layout.fillWidth: true }
                     ShortcutField { text: settings.shortcut_lap; settingName: "shortcut_lap" }

src/settings.qml

@@ -1689,7 +1689,8 @@ import Qt.labs.platform 1.1
             property string app_language: "auto"
 
             property bool garmin_download_workouts_on_start: true
-            property bool trainprogram_clipboard_workout_enabled: false            
+            property bool trainprogram_clipboard_workout_enabled: false         
+            property string shortcut_stop: ""   
         }