Move LeaveRoom dialog to MainWindow (#87)
1 files changed, 1 insertions, 28 deletions
diff --git a/src/TopRoomBar.cc b/src/TopRoomBar.cc
index d34e59ad..d3ae307f 100644
--- a/src/TopRoomBar.cc
+++ b/src/TopRoomBar.cc
@@ -119,24 +119,7 @@ TopRoomBar::TopRoomBar(QWidget *parent)
leaveRoom_ = new QAction(tr("Leave room"), this);
connect(leaveRoom_, &QAction::triggered, this, [=]() {
- if (leaveRoomDialog_.isNull()) {
- leaveRoomDialog_ =
- QSharedPointer<dialogs::LeaveRoom>(new dialogs::LeaveRoom(this));
-
- connect(leaveRoomDialog_.data(),
- SIGNAL(closing(bool)),
- this,
- SLOT(closeLeaveRoomDialog(bool)));
- }
-
- if (leaveRoomModal_.isNull()) {
- leaveRoomModal_ = QSharedPointer<OverlayModal>(
- new OverlayModal(MainWindow::instance(), leaveRoomDialog_.data()));
- leaveRoomModal_->setDuration(0);
- leaveRoomModal_->setColor(QColor(30, 30, 30, 170));
- }
-
- leaveRoomModal_->fadeIn();
+ MainWindow::instance()->openLeaveRoomDialog();
});
menu_->addAction(toggleNotifications_);
@@ -161,16 +144,6 @@ TopRoomBar::TopRoomBar(QWidget *parent)
}
void
-TopRoomBar::closeLeaveRoomDialog(bool leaving)
-{
- leaveRoomModal_->fadeOut();
-
- if (leaving) {
- emit leaveRoom();
- }
-}
-
-void
TopRoomBar::updateRoomAvatarFromName(const QString &name)
{
avatar_->setLetter(utils::firstChar(name));
|