diff options
author | Konstantinos Sideris <sideris.konstantin@gmail.com> | 2017-12-10 15:22:01 +0200 |
---|---|---|
committer | Konstantinos Sideris <sideris.konstantin@gmail.com> | 2017-12-10 15:22:01 +0200 |
commit | 19bae2a2e63cc520d25a50658a3d923e083c0098 (patch) | |
tree | 781d97e9ef826331b63322f31cc47152aa29326b /src | |
parent | bba3bba55aebf076cc439b4ab15d02c9c7063d10 (diff) |
Add gui option for joining rooms (#25)
Diffstat (limited to 'src')
-rw-r--r-- | src/ChatPage.cc | 2 | ||||
-rw-r--r-- | src/SideBarActions.cc | 43 | ||||
-rw-r--r-- | src/dialogs/JoinRoom.cc | 26 | ||||
-rw-r--r-- | src/ui/TextField.cc | 3 |
4 files changed, 66 insertions, 8 deletions
diff --git a/src/ChatPage.cc b/src/ChatPage.cc index 100c18f4..25b8fe66 100644 --- a/src/ChatPage.cc +++ b/src/ChatPage.cc @@ -68,6 +68,8 @@ ChatPage::ChatPage(QSharedPointer<MatrixClient> client, QWidget *parent) sidebarActions_ = new SideBarActions(this); connect( sidebarActions_, &SideBarActions::showSettings, this, &ChatPage::showUserSettingsPage); + connect( + sidebarActions_, &SideBarActions::joinRoom, client_.data(), &MatrixClient::joinRoom); user_info_widget_ = new UserInfoWidget(sideBar_); room_list_ = new RoomList(client, sideBar_); diff --git a/src/SideBarActions.cc b/src/SideBarActions.cc index 3e741406..f6e99270 100644 --- a/src/SideBarActions.cc +++ b/src/SideBarActions.cc @@ -1,6 +1,8 @@ #include <QIcon> #include "Config.h" +#include "MainWindow.h" +#include "OverlayModal.h" #include "SideBarActions.h" #include "Theme.h" @@ -27,12 +29,53 @@ SideBarActions::SideBarActions(QWidget *parent) settingsBtn_->setIconSize( QSize(conf::sidebarActions::iconSize, conf::sidebarActions::iconSize)); + addMenu_ = new Menu(this); + createRoomAction_ = new QAction(tr("Create new room"), this); + joinRoomAction_ = new QAction(tr("Join a room"), this); + + connect(joinRoomAction_, &QAction::triggered, this, [=]() { + if (joinRoomDialog_.isNull()) { + joinRoomDialog_ = + QSharedPointer<dialogs::JoinRoom>(new dialogs::JoinRoom(this)); + + connect(joinRoomDialog_.data(), + &dialogs::JoinRoom::closing, + this, + [=](bool isJoining, const QString &room) { + joinRoomModal_->fadeOut(); + + if (isJoining && !room.isEmpty()) + emit joinRoom(room); + }); + } + + if (joinRoomModal_.isNull()) { + joinRoomModal_ = QSharedPointer<OverlayModal>( + new OverlayModal(MainWindow::instance(), joinRoomDialog_.data())); + joinRoomModal_->setDuration(0); + joinRoomModal_->setColor(QColor(30, 30, 30, 170)); + } + + joinRoomModal_->fadeIn(); + }); + + addMenu_->addAction(createRoomAction_); + addMenu_->addAction(joinRoomAction_); + createRoomBtn_ = new FlatButton(this); createRoomBtn_->setIcon(createRoomIcon); createRoomBtn_->setCornerRadius(conf::sidebarActions::iconSize / 2); createRoomBtn_->setIconSize( QSize(conf::sidebarActions::iconSize, conf::sidebarActions::iconSize)); + connect(createRoomBtn_, &QPushButton::clicked, this, [=]() { + auto pos = mapToGlobal(createRoomBtn_->pos()); + auto padding = conf::sidebarActions::iconSize / 2; + + addMenu_->popup( + QPoint(pos.x() + padding, pos.y() - padding - addMenu_->sizeHint().height())); + }); + joinRoomBtn_ = new FlatButton(this); joinRoomBtn_->setIcon(joinRoomIcon); joinRoomBtn_->setCornerRadius(conf::sidebarActions::iconSize / 2); diff --git a/src/dialogs/JoinRoom.cc b/src/dialogs/JoinRoom.cc index 5b874011..59e1748d 100644 --- a/src/dialogs/JoinRoom.cc +++ b/src/dialogs/JoinRoom.cc @@ -1,8 +1,10 @@ #include <QLabel> +#include <QStyleOption> #include <QVBoxLayout> #include "Config.h" #include "FlatButton.h" +#include "TextField.h" #include "Theme.h" #include "dialogs/JoinRoom.h" @@ -35,17 +37,25 @@ JoinRoom::JoinRoom(QWidget *parent) QFont font; font.setPixelSize(conf::headerFontSize); - auto label = new QLabel(tr("Room alias to join:"), this); - label->setFont(font); + roomInput_ = new TextField(this); + roomInput_->setLabel(tr("Room ID or alias")); - roomAliasEdit_ = new QLineEdit(this); - - layout->addWidget(label); - layout->addWidget(roomAliasEdit_); + layout->addWidget(roomInput_); layout->addLayout(buttonLayout); + // TODO: input validation with error messages. connect(confirmBtn_, &QPushButton::clicked, [=]() { - emit closing(true, roomAliasEdit_->text()); + emit closing(true, roomInput_->text()); + roomInput_->clear(); }); - connect(cancelBtn_, &QPushButton::clicked, [=]() { emit closing(false, nullptr); }); + connect(cancelBtn_, &QPushButton::clicked, [=]() { emit closing(false, ""); }); +} + +void +JoinRoom::paintEvent(QPaintEvent *) +{ + QStyleOption opt; + opt.init(this); + QPainter p(this); + style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this); } diff --git a/src/ui/TextField.cc b/src/ui/TextField.cc index ff662a11..9b410ae5 100644 --- a/src/ui/TextField.cc +++ b/src/ui/TextField.cc @@ -127,6 +127,7 @@ void TextField::setLabelColor(const QColor &color) { label_color_ = color; + update(); } QColor @@ -143,6 +144,7 @@ void TextField::setInkColor(const QColor &color) { ink_color_ = color; + update(); } QColor @@ -159,6 +161,7 @@ void TextField::setUnderlineColor(const QColor &color) { underline_color_ = color; + update(); } QColor |