Page & popups: standardized keyboard accept/cancel

src/gui/Popups/HColumnPopup.qml

@@ -10,6 +10,8 @@ HPopup {
     default property alias pageData: page.columnData
     readonly property alias page: page
 
+    signal keyboardAccept()
+
 
     HColumnPage {
         id: page
@@ -23,5 +25,8 @@ HPopup {
             topPadding + bottomPadding + implicitContentHeight,
         )
         useVariableSpacing: false
+
+        Keys.onReturnPressed: popup.keyboardAccept()
+        Keys.onEnterPressed: popup.keyboardAccept()
     }
 }

src/gui/Popups/HFlickableColumnPopup.qml

@@ -10,6 +10,8 @@ HPopup {
     default property alias pageData: page.columnData
     readonly property alias page: page
 
+    signal keyboardAccept()
+
 
     HFlickableColumnPage {
         id: page
@@ -21,5 +23,8 @@ HPopup {
             popup.maximumPreferredHeight,
             implicitHeaderHeight + implicitFooterHeight + contentHeight,
         )
+
+        Keys.onReturnPressed: popup.keyboardAccept()
+        Keys.onEnterPressed: popup.keyboardAccept()
     }
 }

src/gui/Popups/PasswordPopup.qml

@@ -74,6 +74,7 @@ HFlickableColumnPopup {
     }
 
     onOpened: passwordField.forceActiveFocus()
+    onKeyboardAccept: popup.validate()
 
 
     SummaryLabel { id: summary }
@@ -90,8 +91,6 @@ HFlickableColumnPopup {
             onTextChanged: passwordValid =
                 validateWhileTyping ? verifyPassword(text) : null
 
-            onAccepted: popup.validate()
-
             Layout.fillWidth: true
         }
 

src/gui/Popups/RedactPopup.qml

@@ -51,6 +51,7 @@ HFlickableColumnPopup {
     }
 
     onOpened: reasonField.item.forceActiveFocus()
+    onKeyboardAccept: popup.remove()
 
 
     SummaryLabel {
@@ -80,7 +81,6 @@ HFlickableColumnPopup {
 
         HTextField {
             width: parent.width
-            onAccepted: popup.remove()
         }
     }
 }

src/gui/Popups/RemoveMemberPopup.qml

@@ -48,6 +48,7 @@ HFlickableColumnPopup {
     }
 
     onOpened: reasonField.item.forceActiveFocus()
+    onKeyboardAccept: popup.remove()
 
 
     SummaryLabel {
@@ -70,7 +71,6 @@ HFlickableColumnPopup {
 
         HTextField {
             width: parent.width
-            onAccepted: popup.remove()
         }
     }
 }