rnhmjoj
/
nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

make lint

This commit is contained in:
Loren Burkholder 2021-07-17 13:31:38 -04:00
parent 182de32380
commit d2d5229ede
7 changed files with 72 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
resources/qml/InviteDialog.qml
View File

@ -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()
}
}
}

4
resources/qml/RoomMembers.qml
View File

@ -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

1
resources/qml/TimelineView.qml
View File

@ -157,6 +157,7 @@ Item {
Layout.alignment: Qt.AlignHCenter
enabled: false
}
MatrixText {
text: parent.roomName
font.pixelSize: 24

43
src/ChatPage.cpp
View File

@ -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();
// 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);
// 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;
// }
// 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));
// });
// });
// }
// });
// emit showNotification(tr("Invited user:
// %1").arg(user));
// });
// });
// }
// });
connect(
view_manager_,

4
src/InviteesModel.cpp
View File

@ -1,3 +1,7 @@
// SPDX-FileCopyrightText: 2021 Nheko Contributors
//
// SPDX-License-Identifier: GPL-3.0-or-later
#include "InviteesModel.h"
#include "Cache.h"

4
src/InviteesModel.h
View File

@ -1,3 +1,7 @@
// SPDX-FileCopyrightText: 2021 Nheko Contributors
//
// SPDX-License-Identifier: GPL-3.0-or-later
#ifndef INVITEESMODEL_H
#define INVITEESMODEL_H

6
src/timeline/TimelineViewManager.cpp
View File

@ -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); });
//}