Rename "Explore Rooms" dialog to just "Explore"
There's a bit of a discrepancy here, that directory will list both rooms and spaces. I also removed duplicated titles where applicable.
This commit is contained in:
@@ -45,14 +45,12 @@ Labs.MenuBar {
|
|||||||
}
|
}
|
||||||
Labs.MenuItem {
|
Labs.MenuItem {
|
||||||
icon.name: "compass-symbolic"
|
icon.name: "compass-symbolic"
|
||||||
text: i18nc("@action:inmenu", "Explore Rooms")
|
text: i18nc("@action:inmenu Explore public rooms and spaces", "Explore")
|
||||||
enabled: root.connection
|
enabled: root.connection
|
||||||
onTriggered: {
|
onTriggered: {
|
||||||
let dialog = root.appWindow.pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ExploreRoomsPage'), {
|
let dialog = root.appWindow.pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ExploreRoomsPage'), {
|
||||||
connection: root.connection
|
connection: root.connection
|
||||||
}, {
|
}, {});
|
||||||
title: i18nc("@title", "Explore Rooms")
|
|
||||||
});
|
|
||||||
dialog.roomSelected.connect((roomId, displayName, avatarUrl, alias, topic, memberCount, isJoined) => {
|
dialog.roomSelected.connect((roomId, displayName, avatarUrl, alias, topic, memberCount, isJoined) => {
|
||||||
RoomManager.resolveResource(roomId.length > 0 ? roomId : alias, isJoined ? "" : "join");
|
RoomManager.resolveResource(roomId.length > 0 ? roomId : alias, isJoined ? "" : "join");
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -30,15 +30,13 @@ Kirigami.SearchDialog {
|
|||||||
emptyText: i18nc("Placeholder message", "No room found")
|
emptyText: i18nc("Placeholder message", "No room found")
|
||||||
Kirigami.Action {
|
Kirigami.Action {
|
||||||
id: exploreRoomAction
|
id: exploreRoomAction
|
||||||
text: i18nc("@action:button", "Explore rooms")
|
text: i18nc("@action:button Explore public rooms and spaces", "Explore")
|
||||||
icon.name: "compass"
|
icon.name: "compass"
|
||||||
onTriggered: {
|
onTriggered: {
|
||||||
root.close()
|
root.close()
|
||||||
let dialog = root.window.pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ExploreRoomsPage'), {
|
let dialog = root.window.pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ExploreRoomsPage'), {
|
||||||
connection: root.connection
|
connection: root.connection
|
||||||
}, {
|
}, {});
|
||||||
title: i18nc("@title", "Explore Rooms")
|
|
||||||
});
|
|
||||||
dialog.roomSelected.connect((roomId, displayName, avatarUrl, alias, topic, memberCount, isJoined) => {
|
dialog.roomSelected.connect((roomId, displayName, avatarUrl, alias, topic, memberCount, isJoined) => {
|
||||||
RoomManager.resolveResource(roomId.length > 0 ? roomId : alias, isJoined ? "" : "join");
|
RoomManager.resolveResource(roomId.length > 0 ? roomId : alias, isJoined ? "" : "join");
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -50,7 +50,7 @@ SearchPage {
|
|||||||
*/
|
*/
|
||||||
signal roomSelected(string roomId, string displayName, url avatarUrl, string alias, string topic, int memberCount, bool isJoined)
|
signal roomSelected(string roomId, string displayName, url avatarUrl, string alias, string topic, int memberCount, bool isJoined)
|
||||||
|
|
||||||
title: i18nc("@action:title", "Explore Rooms")
|
title: i18nc("@action:title Explore public rooms and spaces", "Explore")
|
||||||
customPlaceholderText: publicRoomListModel.redirectedText
|
customPlaceholderText: publicRoomListModel.redirectedText
|
||||||
customPlaceholderIcon: "data-warning"
|
customPlaceholderIcon: "data-warning"
|
||||||
|
|
||||||
|
|||||||
@@ -46,15 +46,13 @@ Kirigami.NavigationTabBar {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
Kirigami.Action {
|
Kirigami.Action {
|
||||||
text: i18n("Explore rooms")
|
text: i18nc("@action:inmenu Explore public rooms and spaces", "Explore")
|
||||||
icon.name: "compass"
|
icon.name: "compass"
|
||||||
onTriggered: {
|
onTriggered: {
|
||||||
explorePopup.close();
|
explorePopup.close();
|
||||||
let dialog = (root.Kirigami.PageStack.pageStack as Kirigami.PageRow).pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ExploreRoomsPage'), {
|
let dialog = (root.Kirigami.PageStack.pageStack as Kirigami.PageRow).pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ExploreRoomsPage'), {
|
||||||
connection: root.connection
|
connection: root.connection
|
||||||
}, {
|
}, {});
|
||||||
title: i18nc("@title", "Explore Rooms")
|
|
||||||
});
|
|
||||||
dialog.roomSelected.connect((roomId, displayName, avatarUrl, alias, topic, memberCount, isJoined) => {
|
dialog.roomSelected.connect((roomId, displayName, avatarUrl, alias, topic, memberCount, isJoined) => {
|
||||||
RoomManager.resolveResource(roomId.length > 0 ? roomId : alias, isJoined ? "" : "join");
|
RoomManager.resolveResource(roomId.length > 0 ? roomId : alias, isJoined ? "" : "join");
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -222,14 +222,12 @@ Kirigami.Page {
|
|||||||
Kirigami.Action {
|
Kirigami.Action {
|
||||||
id: exploreRoomAction
|
id: exploreRoomAction
|
||||||
icon.name: RoomManager.sortFilterRoomTreeModel.filterText.length > 0 ? "search" : "compass"
|
icon.name: RoomManager.sortFilterRoomTreeModel.filterText.length > 0 ? "search" : "compass"
|
||||||
text: RoomManager.sortFilterRoomTreeModel.filterText.length > 0 ? i18nc("@action", "Search in room directory") : i18nc("@action", "Explore rooms")
|
text: RoomManager.sortFilterRoomTreeModel.filterText.length > 0 ? i18nc("@action:button Search public directory for this room", "Search for Room") : i18nc("@action:button Explore public rooms and spaces", "Explore")
|
||||||
onTriggered: {
|
onTriggered: {
|
||||||
let dialog = (root.Kirigami.PageStack.pageStack as Kirigami.PageRow).layers.push(Qt.createComponent('org.kde.neochat', 'ExploreRoomsPage'), {
|
let dialog = (root.Kirigami.PageStack.pageStack as Kirigami.PageRow).layers.push(Qt.createComponent('org.kde.neochat', 'ExploreRoomsPage'), {
|
||||||
connection: root.connection,
|
connection: root.connection,
|
||||||
keyword: RoomManager.sortFilterRoomTreeModel.filterText
|
keyword: RoomManager.sortFilterRoomTreeModel.filterText
|
||||||
}, {
|
}, {});
|
||||||
title: i18nc("@title", "Explore Rooms")
|
|
||||||
});
|
|
||||||
dialog.roomSelected.connect((roomId, displayName, avatarUrl, alias, topic, memberCount, isJoined) => {
|
dialog.roomSelected.connect((roomId, displayName, avatarUrl, alias, topic, memberCount, isJoined) => {
|
||||||
RoomManager.resolveResource(roomId.length > 0 ? roomId : alias, isJoined ? "" : "join");
|
RoomManager.resolveResource(roomId.length > 0 ? roomId : alias, isJoined ? "" : "join");
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -286,7 +286,7 @@ QQC2.Control {
|
|||||||
Layout.preferredHeight: width - Kirigami.Units.smallSpacing
|
Layout.preferredHeight: width - Kirigami.Units.smallSpacing
|
||||||
Layout.maximumHeight: width - Kirigami.Units.smallSpacing
|
Layout.maximumHeight: width - Kirigami.Units.smallSpacing
|
||||||
|
|
||||||
text: i18nc("@action:button", "Explore rooms")
|
text: i18nc("@action:button Explore public rooms and spaces", "Explore")
|
||||||
contentItem: Kirigami.Icon {
|
contentItem: Kirigami.Icon {
|
||||||
source: "compass"
|
source: "compass"
|
||||||
}
|
}
|
||||||
@@ -297,9 +297,7 @@ QQC2.Control {
|
|||||||
let dialog = (Kirigami.PageStack.pageStack as Kirigami.PageRow).pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ExploreRoomsPage'), {
|
let dialog = (Kirigami.PageStack.pageStack as Kirigami.PageRow).pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ExploreRoomsPage'), {
|
||||||
connection: root.connection,
|
connection: root.connection,
|
||||||
keyword: RoomManager.sortFilterRoomTreeModel.filterText
|
keyword: RoomManager.sortFilterRoomTreeModel.filterText
|
||||||
}, {
|
}, {});
|
||||||
title: i18nc("@title", "Explore Rooms")
|
|
||||||
});
|
|
||||||
dialog.roomSelected.connect((roomId, displayName, avatarUrl, alias, topic, memberCount, isJoined) => {
|
dialog.roomSelected.connect((roomId, displayName, avatarUrl, alias, topic, memberCount, isJoined) => {
|
||||||
RoomManager.resolveResource(roomId.length > 0 ? roomId : alias, isJoined ? "" : "join");
|
RoomManager.resolveResource(roomId.length > 0 ? roomId : alias, isJoined ? "" : "join");
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -138,9 +138,7 @@ Kirigami.Dialog {
|
|||||||
connection: root.room.connection,
|
connection: root.room.connection,
|
||||||
showOnlySpaces: true,
|
showOnlySpaces: true,
|
||||||
showOnlySpacesButton: false
|
showOnlySpacesButton: false
|
||||||
}, {
|
}, {});
|
||||||
title: i18nc("@title", "Explore Rooms")
|
|
||||||
});
|
|
||||||
dialog.roomSelected.connect((roomId, displayName, avatarUrl, alias, topic, memberCount, isJoined) => {
|
dialog.roomSelected.connect((roomId, displayName, avatarUrl, alias, topic, memberCount, isJoined) => {
|
||||||
chosenRoomDelegate.roomId = roomId;
|
chosenRoomDelegate.roomId = roomId;
|
||||||
chosenRoomDelegate.displayName = displayName;
|
chosenRoomDelegate.displayName = displayName;
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ Kirigami.Dialog {
|
|||||||
let dialog = ((root.QQC2.ApplicationWindow.window as Kirigami.ApplicationWindow).pageStack as Kirigami.PageRow).pushDialogLayer(Qt.createComponent('org.kde.neochat.libneochat', 'ExploreRoomsPage'), {
|
let dialog = ((root.QQC2.ApplicationWindow.window as Kirigami.ApplicationWindow).pageStack as Kirigami.PageRow).pushDialogLayer(Qt.createComponent('org.kde.neochat.libneochat', 'ExploreRoomsPage'), {
|
||||||
connection: root.connection
|
connection: root.connection
|
||||||
}, {
|
}, {
|
||||||
title: i18nc("@title", "Explore Rooms")
|
title: i18nc("@title Explore public rooms and spaces", "Explore")
|
||||||
});
|
});
|
||||||
dialog.roomSelected.connect((roomId, displayName, avatarUrl, alias, topic, memberCount, isJoined) => {
|
dialog.roomSelected.connect((roomId, displayName, avatarUrl, alias, topic, memberCount, isJoined) => {
|
||||||
chosenRoomDelegate.roomId = roomId;
|
chosenRoomDelegate.roomId = roomId;
|
||||||
@@ -123,9 +123,7 @@ Kirigami.Dialog {
|
|||||||
onClicked: {
|
onClicked: {
|
||||||
let dialog = pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ExploreRoomsPage'), {
|
let dialog = pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ExploreRoomsPage'), {
|
||||||
connection: root.connection
|
connection: root.connection
|
||||||
}, {
|
}, {});
|
||||||
title: i18nc("@title", "Explore Rooms")
|
|
||||||
});
|
|
||||||
dialog.roomSelected.connect((roomId, displayName, avatarUrl, alias, topic, memberCount, isJoined) => {
|
dialog.roomSelected.connect((roomId, displayName, avatarUrl, alias, topic, memberCount, isJoined) => {
|
||||||
chosenRoomDelegate.roomId = roomId;
|
chosenRoomDelegate.roomId = roomId;
|
||||||
chosenRoomDelegate.displayName = displayName;
|
chosenRoomDelegate.displayName = displayName;
|
||||||
|
|||||||
Reference in New Issue
Block a user