From b6f71a8bc2c124de9ae9af113e80ba908a7ea65a Mon Sep 17 00:00:00 2001
From: Loren Burkholder <computersemiexpert@outlook.com>
Date: Fri, 29 Sep 2023 22:49:45 -0400
Subject: [PATCH] Add close button and room open button to room directory
dialog
---
resources/qml/dialogs/RoomDirectory.qml | 26 ++++++++++++++++++++++---
1 file changed, 23 insertions(+), 3 deletions(-)
diff --git a/resources/qml/dialogs/RoomDirectory.qml b/resources/qml/dialogs/RoomDirectory.qml
index a6f53d2ec..97943e93c 100644
--- a/resources/qml/dialogs/RoomDirectory.qml
+++ b/resources/qml/dialogs/RoomDirectory.qml
@@ -112,9 +112,17 @@ ApplicationWindow {
Layout.row: 1
Layout.column: 1
id: joinRoomButton
- enabled: model.canJoin
- text: "Join"
- onClicked: publicRooms.joinRoom(model.index)
+ enabled: model.roomid !== ""
+ text: model.canJoin ? qsTr("Join") : qsTr("Open")
+ onClicked: {
+ if (model.canJoin)
+ publicRooms.joinRoom(model.index);
+ else
+ {
+ Rooms.setCurrentRoom(model.roomid);
+ roomDirectoryWindow.close();
+ }
+ }
}
}
@@ -184,4 +192,16 @@ ApplicationWindow {
}
+ footer: RowLayout {
+ spacing: Nheko.paddingMedium
+ width: parent.width
+
+ Button {
+ text: qsTr("Close")
+ onClicked: roomDirectoryWindow.close()
+ Layout.alignment: Qt.AlignRight
+ Layout.margins: Nheko.paddingMedium
+ }
+ }
+
}
--
GitLab