ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix issues with global menu

Browse Source 
Smaller version of b5fcad3db0 that doesn't
have string changes.
This commit is contained in:
Joshua Goins
2025-05-21 16:36:23 -04:00
parent c88e843a34
commit 85262c70c3
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/qml/GlobalMenu.qml
View File

@@ -15,7 +15,7 @@ import org.kde.neochat.settings
Labs.MenuBar { Labs.MenuBar {
id: root id: root
property NeoChatConnection connection required property NeoChatConnection connection
Labs.Menu { Labs.Menu {
title: i18nc("menu", "NeoChat") title: i18nc("menu", "NeoChat")
@@ -40,7 +40,7 @@ Labs.MenuBar {
Labs.MenuItem { Labs.MenuItem {
text: i18nc("menu", "Find your friends") text: i18nc("menu", "Find your friends")
enabled: pageStack.layers.currentItem.title !== i18n("Find your friends") && AccountRegistry.accountCount > 0 enabled: pageStack.layers.currentItem.title !== i18n("Find your friends") && AccountRegistry.accountCount > 0
onTriggered: pushReplaceLayer(Qt.createComponent('org.kde.neochat', 'UserSearchPage'), { onTriggered: pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'UserSearchPage'), {
connection: root.connection connection: root.connection
}, { }, {
title: i18nc("@title", "Find your friends") title: i18nc("@title", "Find your friends")
@@ -51,8 +51,11 @@ Labs.MenuBar {
enabled: pageStack.layers.currentItem.title !== i18n("Find your friends") && AccountRegistry.accountCount > 0 enabled: pageStack.layers.currentItem.title !== i18n("Find your friends") && AccountRegistry.accountCount > 0
shortcut: StandardKey.New shortcut: StandardKey.New
onTriggered: { onTriggered: {
const dialog = createRoomDialog.createObject(root.overlay); pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'CreateRoomDialog'), {
dialog.open(); connection: root.connection
}, {
title: i18nc("@title", "Create a Room")
});
} }
} }
Labs.MenuItem { Labs.MenuItem {

5
src/qml/Main.qml
View File

@@ -73,9 +73,8 @@ Kirigami.ApplicationWindow {
Loader { Loader {
active: Kirigami.Settings.hasPlatformMenuBar && !Kirigami.Settings.isMobile active: Kirigami.Settings.hasPlatformMenuBar && !Kirigami.Settings.isMobile
sourceComponent: Qt.createComponent("org.kde.neochat", "GlobalMenu") sourceComponent: GlobalMenu {
onActiveChanged: if (active) { connection: root.connection
item.connection = root.connection;
} }
} }