3 files changed, 14 insertions, 2 deletions
diff --git a/resources/qml/RoomSettings.qml b/resources/qml/RoomSettings.qml
index 106c9119..d6f3fe7b 100644
--- a/resources/qml/RoomSettings.qml
+++ b/resources/qml/RoomSettings.qml
@@ -16,7 +16,7 @@ ApplicationWindow {
minimumHeight: 420
palette: colors
color: colors.window
- title: "Room Settings"
+ title: roomSettings.roomName
modality: Qt.Modal
Shortcut {
diff --git a/resources/qml/TimelineView.qml b/resources/qml/TimelineView.qml
index c6c1e2b2..6b34f2ab 100644
--- a/resources/qml/TimelineView.qml
+++ b/resources/qml/TimelineView.qml
@@ -177,7 +177,9 @@ Page {
Connections {
target: TimelineManager
onOpenRoomSettingsDialog: {
- var roomSettings = roomSettingsComponent.createObject(timelineRoot);
+ var roomSettings = roomSettingsComponent.createObject(timelineRoot, {
+ "roomSettings": roomSettings
+ });
roomSettings.show();
}
}
diff --git a/resources/qml/ToggleButton.qml b/resources/qml/ToggleButton.qml
new file mode 100644
index 00000000..584fc693
--- /dev/null
+++ b/resources/qml/ToggleButton.qml
@@ -0,0 +1,10 @@
+import QtQuick 2.5
+import QtQuick.Controls 2.3
+import im.nheko 1.0
+
+Switch {
+ property color activeColor
+ property color disabledColor
+ property color inactiveColor
+ property color trackColor
+}
\ No newline at end of file
|
