Merge pull request #3838

luigi1111 · luigi1111 · commit 9c383bcc24b1 · 2022-03-02T19:05:53.000-05:00
ddd95f7 settings: bind return key after password change (reemuru)
diff --git a/main.qml b/main.qml
@@ -1709,6 +1709,9 @@ ApplicationWindow {
             informationPopup.open();
         }
         onRejectedNewPassword: {}
+        Keys.enabled: !passwordDialog.visible && informationPopup.visible
+        Keys.onEnterPressed: informationPopup.close()
+        Keys.onReturnPressed: informationPopup.close()
     }
 
     DevicePassphraseDialog {

Original file line number	Diff line number	Diff line change
`@@ -1709,6 +1709,9 @@ ApplicationWindow {`
`1709`	`1709`	`informationPopup.open();`
`1710`	`1710`	`}`
`1711`	`1711`	`onRejectedNewPassword: {}`
	`1712`	`+ Keys.enabled: !passwordDialog.visible && informationPopup.visible`
	`1713`	`+ Keys.onEnterPressed: informationPopup.close()`
	`1714`	`+ Keys.onReturnPressed: informationPopup.close()`
`1712`	`1715`	`}`
`1713`	`1716`
`1714`	`1717`	`DevicePassphraseDialog {`