added changing of name through edit modal, removed old roomsettings

3 files changed, 7 insertions, 7 deletions

diff --git a/resources/qml/RoomSettings.qml b/resources/qml/RoomSettings.qml

index 5d2baba1..eabe68f5 100644
--- a/resources/qml/RoomSettings.qml
+++ b/resources/qml/RoomSettings.qml
@@ -12,13 +12,11 @@ ApplicationWindow {
 
 	x: MainWindow.x + (MainWindow.width / 2) - (width / 2)
     y: MainWindow.y + (MainWindow.height / 2) - (height / 2)
-    height: 600
-    width: 420
-    minimumHeight: 420
+    minimumWidth: 340
+    minimumHeight: 600
     palette: colors
     color: colors.window
     modality: Qt.WindowModal
-    flags: Qt.WindowStaysOnTopHint
 
     Shortcut {
         sequence: StandardKey.Cancel
@@ -100,6 +98,8 @@ ApplicationWindow {
         ImageButton {
             Layout.alignment: Qt.AlignHCenter
             image: ":/icons/icons/ui/edit.png"
+            visible: roomSettings.canChangeNameAndTopic
+            onClicked: roomSettings.openEditModal()
         }
 
         MatrixText {
@@ -248,6 +248,7 @@ ApplicationWindow {
         Button {
             Layout.alignment: Qt.AlignRight
             text: "Ok"
+            onClicked: close()
         }
     }
 }
\ No newline at end of file
diff --git a/resources/qml/TopBar.qml b/resources/qml/TopBar.qml

index 273ed8ab..c64eddd4 100644
--- a/resources/qml/TopBar.qml
+++ b/resources/qml/TopBar.qml
@@ -68,7 +68,7 @@ Rectangle {
 
             MouseArea {
                 anchors.fill: parent
-                onClicked: TimelineManager.openRoomSettings()
+                onClicked: TimelineManager.timeline.openRoomSettings()
             }
 
         }
@@ -114,7 +114,7 @@ Rectangle {
 
                 MenuItem {
                     text: qsTr("Settings")
-                    onTriggered: TimelineManager.openRoomSettings()
+                    onTriggered: TimelineManager.timeline.openRoomSettings()
                 }
 
             }
diff --git a/resources/qml/UserProfile.qml b/resources/qml/UserProfile.qml

index 37ae6de8..e8d41073 100644
--- a/resources/qml/UserProfile.qml
+++ b/resources/qml/UserProfile.qml
@@ -113,7 +113,6 @@ ApplicationWindow {
                     }
                 }
             }
-
         }
 
         MatrixText {