diff --git a/resources/qml/InviteDialog.qml b/resources/qml/InviteDialog.qml
index 2932e3989b89f96fa5a7e6127c9dacbb13d72e2a..ae74d3da0a42cab0aeedf13a06894ea36791a451 100644
--- a/resources/qml/InviteDialog.qml
+++ b/resources/qml/InviteDialog.qml
@@ -1,3 +1,7 @@
+// SPDX-FileCopyrightText: 2021 Nheko Contributors
+//
+// SPDX-License-Identifier: GPL-3.0-or-later
+
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick.Layouts 1.12
@@ -11,14 +15,11 @@ ApplicationWindow {
property InviteesModel invitees
function addInvite() {
- if (inviteeEntry.text.match("@.+?:.{3,}"))
- {
+ if (inviteeEntry.text.match("@.+?:.{3,}")) {
invitees.addUser(inviteeEntry.text);
inviteeEntry.clear();
- }
- else
- {
- warningLabel.show()
+ } else {
+ warningLabel.show();
}
}
@@ -57,19 +58,29 @@ ApplicationWindow {
placeholderText: qsTr("@joe:matrix.org", "Example user id. The name 'joe' can be localized however you want.")
Layout.fillWidth: true
- onAccepted: if (text !== "") addInvite()
+ onAccepted: {
+ if (text !== "") {
+ addInvite();
+ }
+ }
Component.onCompleted: forceActiveFocus()
Shortcut {
sequence: "Ctrl+Enter"
onActivated: invitees.accept()
}
+
}
Button {
text: qsTr("Add")
- onClicked: if (inviteeEntry.text !== "") addInvite()
+ onClicked: {
+ if (inviteeEntry.text !== "") {
+ addInvite();
+ }
+ }
}
+
}
Label {
@@ -85,26 +96,28 @@ ApplicationWindow {
visible: false
opacity: 0
state: "hidden"
-
states: [
State {
name: "shown"
+
PropertyChanges {
target: warningLabel
opacity: 1
visible: true
}
+
},
State {
name: "hidden"
+
PropertyChanges {
target: warningLabel
opacity: 0
visible: false
}
+
}
]
-
transitions: [
Transition {
from: "shown"
@@ -122,7 +135,9 @@ ApplicationWindow {
target: warningLabel
property: "visible"
}
+
}
+
}
]
@@ -134,6 +149,7 @@ ApplicationWindow {
running: false
onTriggered: warningLabel.state = "hidden"
}
+
}
ListView {
@@ -174,9 +190,13 @@ ApplicationWindow {
Layout.fillHeight: true
Layout.fillWidth: true
}
+
}
+
}
+
}
+
}
footer: DialogButtonBox {
@@ -194,7 +214,9 @@ ApplicationWindow {
Button {
text: qsTr("Cancel")
DialogButtonBox.buttonRole: DialogButtonBox.DestructiveRole
- onClicked: inviteDialogRoot.close();
+ onClicked: inviteDialogRoot.close()
}
+
}
+
}
diff --git a/resources/qml/RoomMembers.qml b/resources/qml/RoomMembers.qml
index 8addd704fe977573bbf1b5374fc8917fa31f1b7a..44b917b12cecbafe207014eef04f0e397dbd280f 100644
--- a/resources/qml/RoomMembers.qml
+++ b/resources/qml/RoomMembers.qml
@@ -1,3 +1,7 @@
+// SPDX-FileCopyrightText: 2021 Nheko Contributors
+//
+// SPDX-License-Identifier: GPL-3.0-or-later
+
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick.Layouts 1.12
diff --git a/resources/qml/TimelineView.qml b/resources/qml/TimelineView.qml
index d515b9b4ea599d0945a8a3558752c73b43f3d271..148a5817766800a8fce2b59c73dac6cc80be3b60 100644
--- a/resources/qml/TimelineView.qml
+++ b/resources/qml/TimelineView.qml
@@ -157,6 +157,7 @@ Item {
Layout.alignment: Qt.AlignHCenter
enabled: false
}
+
MatrixText {
text: parent.roomName
font.pixelSize: 24
diff --git a/src/ChatPage.cpp b/src/ChatPage.cpp
index 8b4cfeefe04dbd2d5554a23cab33d94a4bf4f033..70fd32fd52c177466a404b60f861f3a65c608621 100644
--- a/src/ChatPage.cpp
+++ b/src/ChatPage.cpp
@@ -117,29 +117,32 @@ ChatPage::ChatPage(QSharedPointer<UserSettings> userSettings, QWidget *parent)
connect(this, &ChatPage::loggedOut, this, &ChatPage::logout);
// TODO: once this signal is moved, reenable this
-// connect(view_manager_, &TimelineViewManager::inviteUsers, this, [this](QStringList users) {
-// const auto room_id = currentRoom().toStdString();
-
-// for (int ii = 0; ii < users.size(); ++ii) {
-// QTimer::singleShot(ii * 500, this, [this, room_id, ii, users]() {
-// const auto user = users.at(ii);
-
-// http::client()->invite_user(
-// room_id,
-// user.toStdString(),
-// [this, user](const mtx::responses::RoomInvite &,
-// mtx::http::RequestErr err) {
-// if (err) {
-// emit showNotification(
-// tr("Failed to invite user: %1").arg(user));
-// return;
-// }
-
-// emit showNotification(tr("Invited user: %1").arg(user));
-// });
-// });
-// }
-// });
+ // connect(view_manager_, &TimelineViewManager::inviteUsers, this, [this](QStringList
+ // users) {
+ // const auto room_id = currentRoom().toStdString();
+
+ // for (int ii = 0; ii < users.size(); ++ii) {
+ // QTimer::singleShot(ii * 500, this, [this, room_id, ii, users]() {
+ // const auto user = users.at(ii);
+
+ // http::client()->invite_user(
+ // room_id,
+ // user.toStdString(),
+ // [this, user](const mtx::responses::RoomInvite &,
+ // mtx::http::RequestErr err) {
+ // if (err) {
+ // emit showNotification(
+ // tr("Failed to invite user:
+ // %1").arg(user));
+ // return;
+ // }
+
+ // emit showNotification(tr("Invited user:
+ // %1").arg(user));
+ // });
+ // });
+ // }
+ // });
connect(
view_manager_,
diff --git a/src/InviteesModel.cpp b/src/InviteesModel.cpp
index 1da7baf45940c6ba3e3d1f58fceea81909a64dcc..590546902295cc0c3d598f5b20e35542c3a3296f 100644
--- a/src/InviteesModel.cpp
+++ b/src/InviteesModel.cpp
@@ -1,3 +1,7 @@
+// SPDX-FileCopyrightText: 2021 Nheko Contributors
+//
+// SPDX-License-Identifier: GPL-3.0-or-later
+
#include "InviteesModel.h"
#include "Cache.h"
diff --git a/src/InviteesModel.h b/src/InviteesModel.h
index 4bcc4e9d79887b9462b493c96515b73a3de57fb7..ac9208a036dc80c7434a04127aa2d2a31e996718 100644
--- a/src/InviteesModel.h
+++ b/src/InviteesModel.h
@@ -1,3 +1,7 @@
+// SPDX-FileCopyrightText: 2021 Nheko Contributors
+//
+// SPDX-License-Identifier: GPL-3.0-or-later
+
#ifndef INVITEESMODEL_H
#define INVITEESMODEL_H
diff --git a/src/timeline/TimelineViewManager.cpp b/src/timeline/TimelineViewManager.cpp
index 08b88efd181db5c09e2d0db1807c495333776f0e..8daa2124900ec5fd5e7b35ae77b32fe29c0b2b15 100644
--- a/src/timeline/TimelineViewManager.cpp
+++ b/src/timeline/TimelineViewManager.cpp
@@ -430,10 +430,10 @@ TimelineViewManager::openImageOverlayInternal(QString eventId, QImage img)
});
}
-//void
-//TimelineViewManager::openInviteUsersDialog()
+// void
+// TimelineViewManager::openInviteUsersDialog()
//{
- // TODO: move this somewhere where it will actually work (probably Rooms)
+// TODO: move this somewhere where it will actually work (probably Rooms)
// MainWindow::instance()->openInviteUsersDialog(
// [this](const QStringList &invitees) { emit inviteUsers(invitees); });
//}