Changing canonical alias and displaying local aliases are working.
This commit is contained in:
@@ -197,9 +197,11 @@ Dialog {
|
|||||||
ComboBox {
|
ComboBox {
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
|
|
||||||
model: room.aliases
|
id: canonicalAliasComboBox
|
||||||
|
|
||||||
currentIndex: room.aliases.indexOf(room.canonicalAlias)
|
model: room.remoteAliases
|
||||||
|
|
||||||
|
currentIndex: room.remoteAliases.indexOf(room.canonicalAlias)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -211,15 +213,17 @@ Dialog {
|
|||||||
Layout.alignment: Qt.AlignTop
|
Layout.alignment: Qt.AlignTop
|
||||||
|
|
||||||
wrapMode: Label.Wrap
|
wrapMode: Label.Wrap
|
||||||
text: "Aliases"
|
text: "Local Aliases"
|
||||||
color: MPalette.lighter
|
color: MPalette.lighter
|
||||||
}
|
}
|
||||||
|
|
||||||
ColumnLayout {
|
ColumnLayout {
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
|
|
||||||
|
spacing: 0
|
||||||
|
|
||||||
Repeater {
|
Repeater {
|
||||||
model: room.aliases
|
model: room.localAliases
|
||||||
|
|
||||||
delegate: Label {
|
delegate: Label {
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
@@ -295,6 +299,10 @@ Dialog {
|
|||||||
if (room.topic != roomTopicField.text) {
|
if (room.topic != roomTopicField.text) {
|
||||||
room.setTopic(roomTopicField.text)
|
room.setTopic(roomTopicField.text)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (room.canonicalAlias != room.remoteAliases[canonicalAliasComboBox.currentIndex]) {
|
||||||
|
room.setCanonicalAlias(room.remoteAliases[canonicalAliasComboBox.currentIndex])
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Submodule include/libQuotient updated: d3ddd394e8...fe82533860
Reference in New Issue
Block a user