Merge branch 'master' into kf6

2023-08-27 19:18:07 +02:00
parent 725c6c30ce d11d6c74b3
commit 931d20fecd
2 changed files with 4 additions and 2 deletions
--- a/src/qml/Menu/GlobalMenu.qml
+++ b/src/qml/Menu/GlobalMenu.qml
@@ -24,7 +24,9 @@ Labs.MenuBar {
            text: i18nc("menu", "Configure NeoChat...")

            shortcut: StandardKey.Preferences
-            onTriggered: pageStack.pushDialogLayer("qrc:/SettingsPage.qml", {}, {
+            onTriggered: pageStack.pushDialogLayer("qrc:/SettingsPage.qml", {
+                connection: Controller.activeConnection
+            }, {
                title: i18n("Configure")
            })
        }
--- a/src/qml/main.qml
+++ b/src/qml/main.qml
@@ -388,7 +388,7 @@ Kirigami.ApplicationWindow {
    Shortcut {
        sequence: "Ctrl+Shift+,"
        onActivated: {
-            pageStack.pushDialogLayer("qrc:/SettingsPage.qml")
+            pageStack.pushDialogLayer("qrc:/SettingsPage.qml", {connection: Controller.activeConnection}, { title: i18n("Configure") })
        }
    }
 }