mirror of
https://github.com/Nheko-Reborn/nheko.git
synced 2024-11-25 20:48:52 +03:00
QML the join room dialog
This commit is contained in:
parent
7eb9071b50
commit
e9ed12e27b
10 changed files with 92 additions and 144 deletions
|
@ -281,7 +281,6 @@ set(SRC_FILES
|
||||||
src/dialogs/CreateRoom.cpp
|
src/dialogs/CreateRoom.cpp
|
||||||
src/dialogs/FallbackAuth.cpp
|
src/dialogs/FallbackAuth.cpp
|
||||||
src/dialogs/ImageOverlay.cpp
|
src/dialogs/ImageOverlay.cpp
|
||||||
src/dialogs/JoinRoom.cpp
|
|
||||||
src/dialogs/LeaveRoom.cpp
|
src/dialogs/LeaveRoom.cpp
|
||||||
src/dialogs/Logout.cpp
|
src/dialogs/Logout.cpp
|
||||||
src/dialogs/PreviewUploadOverlay.cpp
|
src/dialogs/PreviewUploadOverlay.cpp
|
||||||
|
@ -496,7 +495,6 @@ qt5_wrap_cpp(MOC_HEADERS
|
||||||
src/dialogs/CreateRoom.h
|
src/dialogs/CreateRoom.h
|
||||||
src/dialogs/FallbackAuth.h
|
src/dialogs/FallbackAuth.h
|
||||||
src/dialogs/ImageOverlay.h
|
src/dialogs/ImageOverlay.h
|
||||||
src/dialogs/JoinRoom.h
|
|
||||||
src/dialogs/LeaveRoom.h
|
src/dialogs/LeaveRoom.h
|
||||||
src/dialogs/Logout.h
|
src/dialogs/Logout.h
|
||||||
src/dialogs/PreviewUploadOverlay.h
|
src/dialogs/PreviewUploadOverlay.h
|
||||||
|
|
|
@ -118,6 +118,13 @@ Page {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Component {
|
||||||
|
id: joinRoomDialog
|
||||||
|
|
||||||
|
JoinRoomDialog {
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Shortcut {
|
Shortcut {
|
||||||
sequence: "Ctrl+K"
|
sequence: "Ctrl+K"
|
||||||
onActivated: {
|
onActivated: {
|
||||||
|
@ -148,6 +155,11 @@ Page {
|
||||||
dialog.open();
|
dialog.open();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function onOpenJoinRoomDialog() {
|
||||||
|
var dialog = joinRoomDialog.createObject(timelineRoot);
|
||||||
|
dialog.show();
|
||||||
|
}
|
||||||
|
|
||||||
target: Nheko
|
target: Nheko
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
64
resources/qml/dialogs/JoinRoomDialog.qml
Normal file
64
resources/qml/dialogs/JoinRoomDialog.qml
Normal file
|
@ -0,0 +1,64 @@
|
||||||
|
// SPDX-FileCopyrightText: 2021 Nheko Contributors
|
||||||
|
//
|
||||||
|
// SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
|
||||||
|
import ".."
|
||||||
|
import QtQuick 2.12
|
||||||
|
import QtQuick.Controls 2.5
|
||||||
|
import QtQuick.Layouts 1.3
|
||||||
|
import im.nheko 1.0
|
||||||
|
|
||||||
|
ApplicationWindow {
|
||||||
|
id: joinRoomRoot
|
||||||
|
|
||||||
|
title: qsTr("Join room")
|
||||||
|
modality: Qt.WindowModal
|
||||||
|
flags: Qt.Dialog | Qt.WindowCloseButtonHint | Qt.WindowTitleHint
|
||||||
|
palette: Nheko.colors
|
||||||
|
color: Nheko.colors.window
|
||||||
|
Component.onCompleted: Nheko.reparent(joinRoomRoot)
|
||||||
|
width: 350
|
||||||
|
height: fontMetrics.lineSpacing * 7
|
||||||
|
|
||||||
|
ColumnLayout {
|
||||||
|
spacing: Nheko.paddingMedium
|
||||||
|
anchors.margins: Nheko.paddingMedium
|
||||||
|
anchors.fill: parent
|
||||||
|
|
||||||
|
Label {
|
||||||
|
id: promptLabel
|
||||||
|
|
||||||
|
text: qsTr("Room ID or alias")
|
||||||
|
color: Nheko.colors.text
|
||||||
|
}
|
||||||
|
|
||||||
|
MatrixTextField {
|
||||||
|
id: input
|
||||||
|
|
||||||
|
Layout.fillWidth: true
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
footer: DialogButtonBox {
|
||||||
|
onAccepted: {
|
||||||
|
Nheko.joinRoom(input.text);
|
||||||
|
joinRoomRoot.close();
|
||||||
|
}
|
||||||
|
onRejected: {
|
||||||
|
joinRoomRoot.close();
|
||||||
|
}
|
||||||
|
|
||||||
|
Button {
|
||||||
|
text: "Join"
|
||||||
|
enabled: input.text.match("#.+?:.{3,}")
|
||||||
|
DialogButtonBox.buttonRole: DialogButtonBox.AcceptRole
|
||||||
|
}
|
||||||
|
|
||||||
|
Button {
|
||||||
|
text: "Cancel"
|
||||||
|
DialogButtonBox.buttonRole: DialogButtonBox.RejectRole
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
|
@ -158,10 +158,19 @@
|
||||||
<file>qml/device-verification/EmojiVerification.qml</file>
|
<file>qml/device-verification/EmojiVerification.qml</file>
|
||||||
<file>qml/device-verification/NewVerificationRequest.qml</file>
|
<file>qml/device-verification/NewVerificationRequest.qml</file>
|
||||||
<file>qml/device-verification/Failed.qml</file>
|
<file>qml/device-verification/Failed.qml</file>
|
||||||
<file>qml/device-verification/Success.qml</file>
|
<file>qml/device-verification/Success.qml</file>
|
||||||
<file>qml/dialogs/InputDialog.qml</file>
|
|
||||||
<file>qml/dialogs/ImagePackSettingsDialog.qml</file>
|
<file>qml/dialogs/ImagePackSettingsDialog.qml</file>
|
||||||
<file>qml/dialogs/ImagePackEditorDialog.qml</file>
|
<file>qml/dialogs/ImagePackEditorDialog.qml</file>
|
||||||
|
<file>qml/dialogs/InputDialog.qml</file>
|
||||||
|
<file>qml/dialogs/InviteDialog.qml</file>
|
||||||
|
<file>qml/dialogs/JoinRoomDialog.qml</file>
|
||||||
|
<file>qml/dialogs/LogoutDialog.qml</file>
|
||||||
|
<file>qml/dialogs/RawMessageDialog.qml</file>
|
||||||
|
<file>qml/dialogs/ReadReceipts.qml</file>
|
||||||
|
<file>qml/dialogs/RoomDirectory.qml</file>
|
||||||
|
<file>qml/dialogs/RoomMembers.qml</file>
|
||||||
|
<file>qml/dialogs/RoomSettings.qml</file>
|
||||||
|
<file>qml/dialogs/UserProfile.qml</file>
|
||||||
<file>qml/ui/Ripple.qml</file>
|
<file>qml/ui/Ripple.qml</file>
|
||||||
<file>qml/ui/Spinner.qml</file>
|
<file>qml/ui/Spinner.qml</file>
|
||||||
<file>qml/ui/animations/BlinkAnimation.qml</file>
|
<file>qml/ui/animations/BlinkAnimation.qml</file>
|
||||||
|
@ -176,15 +185,7 @@
|
||||||
<file>qml/components/AdaptiveLayout.qml</file>
|
<file>qml/components/AdaptiveLayout.qml</file>
|
||||||
<file>qml/components/AdaptiveLayoutElement.qml</file>
|
<file>qml/components/AdaptiveLayoutElement.qml</file>
|
||||||
<file>qml/components/AvatarListTile.qml</file>
|
<file>qml/components/AvatarListTile.qml</file>
|
||||||
<file>qml/components/FlatButton.qml</file>
|
<file>qml/components/FlatButton.qml</file>
|
||||||
<file>qml/dialogs/InviteDialog.qml</file>
|
|
||||||
<file>qml/dialogs/RawMessageDialog.qml</file>
|
|
||||||
<file>qml/dialogs/ReadReceipts.qml</file>
|
|
||||||
<file>qml/dialogs/RoomDirectory.qml</file>
|
|
||||||
<file>qml/dialogs/RoomMembers.qml</file>
|
|
||||||
<file>qml/dialogs/RoomSettings.qml</file>
|
|
||||||
<file>qml/dialogs/UserProfile.qml</file>
|
|
||||||
<file>qml/dialogs/LogoutDialog.qml</file>
|
|
||||||
</qresource>
|
</qresource>
|
||||||
<qresource prefix="/media">
|
<qresource prefix="/media">
|
||||||
<file>media/ring.ogg</file>
|
<file>media/ring.ogg</file>
|
||||||
|
|
|
@ -33,7 +33,6 @@
|
||||||
#include "ui/SnackBar.h"
|
#include "ui/SnackBar.h"
|
||||||
|
|
||||||
#include "dialogs/CreateRoom.h"
|
#include "dialogs/CreateRoom.h"
|
||||||
#include "dialogs/JoinRoom.h"
|
|
||||||
#include "dialogs/LeaveRoom.h"
|
#include "dialogs/LeaveRoom.h"
|
||||||
|
|
||||||
MainWindow *MainWindow::instance_ = nullptr;
|
MainWindow *MainWindow::instance_ = nullptr;
|
||||||
|
@ -324,18 +323,6 @@ MainWindow::showOverlayProgressBar()
|
||||||
showSolidOverlayModal(spinner_);
|
showSolidOverlayModal(spinner_);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
|
||||||
MainWindow::openJoinRoomDialog(std::function<void(const QString &room_id)> callback)
|
|
||||||
{
|
|
||||||
auto dialog = new dialogs::JoinRoom(this);
|
|
||||||
connect(dialog, &dialogs::JoinRoom::joinRoom, this, [callback](const QString &room) {
|
|
||||||
if (!room.isEmpty())
|
|
||||||
callback(room);
|
|
||||||
});
|
|
||||||
|
|
||||||
showDialog(dialog);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
void
|
||||||
MainWindow::openCreateRoomDialog(
|
MainWindow::openCreateRoomDialog(
|
||||||
std::function<void(const mtx::requests::CreateRoom &request)> callback)
|
std::function<void(const mtx::requests::CreateRoom &request)> callback)
|
||||||
|
|
|
@ -37,7 +37,6 @@ struct CreateRoom;
|
||||||
namespace dialogs {
|
namespace dialogs {
|
||||||
class CreateRoom;
|
class CreateRoom;
|
||||||
class InviteUsers;
|
class InviteUsers;
|
||||||
class JoinRoom;
|
|
||||||
class LeaveRoom;
|
class LeaveRoom;
|
||||||
class Logout;
|
class Logout;
|
||||||
class MemberList;
|
class MemberList;
|
||||||
|
@ -64,6 +63,7 @@ public:
|
||||||
void openCreateRoomDialog(
|
void openCreateRoomDialog(
|
||||||
std::function<void(const mtx::requests::CreateRoom &request)> callback);
|
std::function<void(const mtx::requests::CreateRoom &request)> callback);
|
||||||
void openJoinRoomDialog(std::function<void(const QString &room_id)> callback);
|
void openJoinRoomDialog(std::function<void(const QString &room_id)> callback);
|
||||||
|
void openLogoutDialog();
|
||||||
|
|
||||||
void hideOverlay();
|
void hideOverlay();
|
||||||
void showSolidOverlayModal(QWidget *content, QFlags<Qt::AlignmentFlag> flags = Qt::AlignCenter);
|
void showSolidOverlayModal(QWidget *content, QFlags<Qt::AlignmentFlag> flags = Qt::AlignCenter);
|
||||||
|
|
|
@ -1,73 +0,0 @@
|
||||||
// SPDX-FileCopyrightText: 2021 Nheko Contributors
|
|
||||||
//
|
|
||||||
// SPDX-License-Identifier: GPL-3.0-or-later
|
|
||||||
|
|
||||||
#include <QLabel>
|
|
||||||
#include <QPushButton>
|
|
||||||
#include <QVBoxLayout>
|
|
||||||
|
|
||||||
#include "dialogs/JoinRoom.h"
|
|
||||||
|
|
||||||
#include "Config.h"
|
|
||||||
#include "ui/TextField.h"
|
|
||||||
|
|
||||||
using namespace dialogs;
|
|
||||||
|
|
||||||
JoinRoom::JoinRoom(QWidget *parent)
|
|
||||||
: QFrame(parent)
|
|
||||||
{
|
|
||||||
setAutoFillBackground(true);
|
|
||||||
setWindowFlags(Qt::Tool | Qt::WindowStaysOnTopHint);
|
|
||||||
setWindowModality(Qt::WindowModal);
|
|
||||||
setAttribute(Qt::WA_DeleteOnClose, true);
|
|
||||||
|
|
||||||
setMinimumWidth(conf::modals::MIN_WIDGET_WIDTH);
|
|
||||||
setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
|
|
||||||
|
|
||||||
auto layout = new QVBoxLayout(this);
|
|
||||||
layout->setSpacing(conf::modals::WIDGET_SPACING);
|
|
||||||
layout->setMargin(conf::modals::WIDGET_MARGIN);
|
|
||||||
|
|
||||||
auto buttonLayout = new QHBoxLayout();
|
|
||||||
buttonLayout->setSpacing(15);
|
|
||||||
|
|
||||||
confirmBtn_ = new QPushButton(tr("Join"), this);
|
|
||||||
confirmBtn_->setDefault(true);
|
|
||||||
cancelBtn_ = new QPushButton(tr("Cancel"), this);
|
|
||||||
|
|
||||||
buttonLayout->addStretch(1);
|
|
||||||
buttonLayout->addWidget(cancelBtn_);
|
|
||||||
buttonLayout->addWidget(confirmBtn_);
|
|
||||||
|
|
||||||
roomInput_ = new TextField(this);
|
|
||||||
roomInput_->setLabel(tr("Room ID or alias"));
|
|
||||||
|
|
||||||
layout->addWidget(roomInput_);
|
|
||||||
layout->addLayout(buttonLayout);
|
|
||||||
layout->addStretch(1);
|
|
||||||
|
|
||||||
connect(roomInput_, &QLineEdit::returnPressed, this, &JoinRoom::handleInput);
|
|
||||||
connect(confirmBtn_, &QPushButton::clicked, this, &JoinRoom::handleInput);
|
|
||||||
connect(cancelBtn_, &QPushButton::clicked, this, &JoinRoom::close);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
JoinRoom::handleInput()
|
|
||||||
{
|
|
||||||
if (roomInput_->text().isEmpty())
|
|
||||||
return;
|
|
||||||
|
|
||||||
// TODO: input validation with error messages.
|
|
||||||
emit joinRoom(roomInput_->text());
|
|
||||||
roomInput_->clear();
|
|
||||||
|
|
||||||
emit close();
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
JoinRoom::showEvent(QShowEvent *event)
|
|
||||||
{
|
|
||||||
roomInput_->setFocus();
|
|
||||||
|
|
||||||
QFrame::showEvent(event);
|
|
||||||
}
|
|
|
@ -1,36 +0,0 @@
|
||||||
// SPDX-FileCopyrightText: 2021 Nheko Contributors
|
|
||||||
//
|
|
||||||
// SPDX-License-Identifier: GPL-3.0-or-later
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include <QFrame>
|
|
||||||
|
|
||||||
class QPushButton;
|
|
||||||
class TextField;
|
|
||||||
|
|
||||||
namespace dialogs {
|
|
||||||
|
|
||||||
class JoinRoom : public QFrame
|
|
||||||
{
|
|
||||||
Q_OBJECT
|
|
||||||
public:
|
|
||||||
JoinRoom(QWidget *parent = nullptr);
|
|
||||||
|
|
||||||
signals:
|
|
||||||
void joinRoom(const QString &room);
|
|
||||||
|
|
||||||
protected:
|
|
||||||
void showEvent(QShowEvent *event) override;
|
|
||||||
|
|
||||||
private slots:
|
|
||||||
void handleInput();
|
|
||||||
|
|
||||||
private:
|
|
||||||
QPushButton *confirmBtn_;
|
|
||||||
QPushButton *cancelBtn_;
|
|
||||||
|
|
||||||
TextField *roomInput_;
|
|
||||||
};
|
|
||||||
|
|
||||||
} // dialogs
|
|
|
@ -21,6 +21,7 @@ Nheko::Nheko()
|
||||||
connect(
|
connect(
|
||||||
UserSettings::instance().get(), &UserSettings::themeChanged, this, &Nheko::colorsChanged);
|
UserSettings::instance().get(), &UserSettings::themeChanged, this, &Nheko::colorsChanged);
|
||||||
connect(ChatPage::instance(), &ChatPage::contentLoaded, this, &Nheko::updateUserProfile);
|
connect(ChatPage::instance(), &ChatPage::contentLoaded, this, &Nheko::updateUserProfile);
|
||||||
|
connect(this, &Nheko::joinRoom, ChatPage::instance(), &ChatPage::joinRoom);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
@ -96,13 +97,6 @@ Nheko::openCreateRoomDialog() const
|
||||||
[](const mtx::requests::CreateRoom &req) { ChatPage::instance()->createRoom(req); });
|
[](const mtx::requests::CreateRoom &req) { ChatPage::instance()->createRoom(req); });
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
|
||||||
Nheko::openJoinRoomDialog() const
|
|
||||||
{
|
|
||||||
MainWindow::instance()->openJoinRoomDialog(
|
|
||||||
[](const QString &room_id) { ChatPage::instance()->joinRoom(room_id); });
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
void
|
||||||
Nheko::reparent(QWindow *win) const
|
Nheko::reparent(QWindow *win) const
|
||||||
{
|
{
|
||||||
|
|
|
@ -50,7 +50,6 @@ public:
|
||||||
Q_INVOKABLE void showUserSettingsPage() const;
|
Q_INVOKABLE void showUserSettingsPage() const;
|
||||||
Q_INVOKABLE void logout() const;
|
Q_INVOKABLE void logout() const;
|
||||||
Q_INVOKABLE void openCreateRoomDialog() const;
|
Q_INVOKABLE void openCreateRoomDialog() const;
|
||||||
Q_INVOKABLE void openJoinRoomDialog() const;
|
|
||||||
Q_INVOKABLE void reparent(QWindow *win) const;
|
Q_INVOKABLE void reparent(QWindow *win) const;
|
||||||
|
|
||||||
public slots:
|
public slots:
|
||||||
|
@ -61,6 +60,8 @@ signals:
|
||||||
void profileChanged();
|
void profileChanged();
|
||||||
|
|
||||||
void openLogoutDialog();
|
void openLogoutDialog();
|
||||||
|
void openJoinRoomDialog();
|
||||||
|
void joinRoom(QString roomId);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
QScopedPointer<UserProfile> currentUser_;
|
QScopedPointer<UserProfile> currentUser_;
|
||||||
|
|
Loading…
Reference in a new issue