summary refs log tree commit diff
path: root/src/ui/NhekoGlobalObject.cpp
diff options
context:
space:
mode:
authorDeepBlueV7.X <nicolas.werner@hotmail.de>2021-10-11 19:53:17 +0000
committerGitHub <noreply@github.com>2021-10-11 19:53:17 +0000
commit088765b427146eda759e0bff6ba28595bb86077c (patch)
treeac16516ff6a5a8648df9c647727fee24d2576757 /src/ui/NhekoGlobalObject.cpp
parentMerge pull request #755 from Nheko-Reborn/bootstrapping (diff)
parentUse better close-on-Enter logic (diff)
downloadnheko-088765b427146eda759e0bff6ba28595bb86077c.tar.xz
Merge pull request #741 from LorenDB/qmlJoinRoomDlg
QML the join room dialog
Diffstat (limited to 'src/ui/NhekoGlobalObject.cpp')
-rw-r--r--src/ui/NhekoGlobalObject.cpp8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/ui/NhekoGlobalObject.cpp b/src/ui/NhekoGlobalObject.cpp

index d687a308..11fc5681 100644 --- a/src/ui/NhekoGlobalObject.cpp +++ b/src/ui/NhekoGlobalObject.cpp
@@ -21,6 +21,7 @@ Nheko::Nheko() connect( UserSettings::instance().get(), &UserSettings::themeChanged, this, &Nheko::colorsChanged); connect(ChatPage::instance(), &ChatPage::contentLoaded, this, &Nheko::updateUserProfile); + connect(this, &Nheko::joinRoom, ChatPage::instance(), &ChatPage::joinRoom); } void @@ -97,13 +98,6 @@ Nheko::openCreateRoomDialog() const } void -Nheko::openJoinRoomDialog() const -{ - MainWindow::instance()->openJoinRoomDialog( - [](const QString &room_id) { ChatPage::instance()->joinRoom(room_id); }); -} - -void Nheko::reparent(QWindow *win) const { win->setTransientParent(MainWindow::instance()->windowHandle());