Merge branch '66-plantingform-cannot-update-unit' into 'master'

Resolve "PlantingForm: cannot update unit"

Closes #66

See merge request ah/qrop!32

Author: andreh11

desktop/qml/PlantingDialog.qml

@@ -73,13 +73,14 @@ Dialog {
     contentHeight: scrollView.implicitHeight
 
     Shortcut {
-        sequence: "Ctrl+Enter"
-        enabled: parent.visible
+        sequences: ["Ctrl+Enter", "Ctrl+Return"]
+        enabled: dialog.visible
         context: Qt.ApplicationShortcut
-        onActivated: if (plantingForm.accepted) accept();
+        onActivated: {
+            if (plantingForm.accepted) accept();
+        }
     }
 
-
     header: PlantingFormHeader {
         visible: mode === "add"
         id: plantingFormHeader

desktop/qml/PlantingForm.qml

@@ -177,6 +177,7 @@ Flickable {
             var value = widgetField[i][2]
 
             if ((widget instanceof MyTextField && widget.manuallyModified)
+                    || (widget instanceof MyComboBox && widget.manuallyModified)
                     || (widget instanceof CheckBox && widget.manuallyModified)
                     || (widget instanceof DatePicker && widget.modified)) {
                 map[name] = value;

desktop/qml/TaskDialog.qml

@@ -68,6 +68,15 @@ Dialog {
     Material.background: Material.color(Material.Grey, Material.Shade100)
     height: sowPlantTask ? taskForm.implicitHeight + Units.smallSpacing : parent.height - 2 * Units.smallSpacing
 
+    Shortcut {
+        sequences: ["Ctrl+Enter", "Ctrl+Return"]
+        enabled: dialog.visible
+        context: Qt.ApplicationShortcut
+        onActivated: {
+            if (taskForm.accepted) accept();
+        }
+    }
+
     header: TaskDialogHeader {
         id: taskDialogHeader
         width: parent.width