From 88cfa3a8fa7554ab545f6779f2dda9709f72fbbb Mon Sep 17 00:00:00 2001 From: trilene Date: Wed, 22 Jul 2020 21:15:45 -0400 Subject: Polish voice call UI --- src/dialogs/AcceptCall.cpp | 68 ++++++++++++++++++++++++++++++++++++---------- src/dialogs/AcceptCall.h | 9 ++++-- src/dialogs/PlaceCall.cpp | 36 ++++++++++++++++-------- src/dialogs/PlaceCall.h | 11 ++++++-- 4 files changed, 93 insertions(+), 31 deletions(-) (limited to 'src/dialogs') diff --git a/src/dialogs/AcceptCall.cpp b/src/dialogs/AcceptCall.cpp index f04a613a..6b5e2e60 100644 --- a/src/dialogs/AcceptCall.cpp +++ b/src/dialogs/AcceptCall.cpp @@ -1,43 +1,83 @@ #include #include +#include #include #include "Config.h" +#include "Utils.h" #include "dialogs/AcceptCall.h" +#include "ui/Avatar.h" namespace dialogs { -AcceptCall::AcceptCall(const QString &caller, const QString &displayName, QWidget *parent) - : QWidget(parent) +AcceptCall::AcceptCall( + const QString &caller, + const QString &displayName, + const QString &roomName, + const QString &avatarUrl, + QWidget *parent) : QWidget(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); - buttonLayout->setMargin(0); + QFont f; + f.setPointSizeF(f.pointSizeF()); + + QFont labelFont; + labelFont.setWeight(QFont::Medium); + + QLabel *displayNameLabel = nullptr; + if (!displayName.isEmpty() && displayName != caller) { + displayNameLabel = new QLabel(displayName, this); + labelFont.setPointSizeF(f.pointSizeF() * 2); + displayNameLabel ->setFont(labelFont); + displayNameLabel ->setAlignment(Qt::AlignCenter); + } + QLabel *callerLabel = new QLabel(caller, this); + labelFont.setPointSizeF(f.pointSizeF() * 1.2); + callerLabel->setFont(labelFont); + callerLabel->setAlignment(Qt::AlignCenter); + + QLabel *voiceCallLabel = new QLabel("Voice Call", this); + labelFont.setPointSizeF(f.pointSizeF() * 1.1); + voiceCallLabel->setFont(labelFont); + voiceCallLabel->setAlignment(Qt::AlignCenter); + + auto avatar = new Avatar(this, QFontMetrics(f).height() * 6); + if (!avatarUrl.isEmpty()) + avatar->setImage(avatarUrl); + else + avatar->setLetter(utils::firstChar(roomName)); + + const int iconSize = 24; + auto buttonLayout = new QHBoxLayout(); + buttonLayout->setSpacing(20); acceptBtn_ = new QPushButton(tr("Accept"), this); acceptBtn_->setDefault(true); - rejectBtn_ = new QPushButton(tr("Reject"), this); + acceptBtn_->setIcon(QIcon(":/icons/icons/ui/place-call.png")); + acceptBtn_->setIconSize(QSize(iconSize, iconSize)); - buttonLayout->addStretch(1); + rejectBtn_ = new QPushButton(tr("Reject"), this); + rejectBtn_->setIcon(QIcon(":/icons/icons/ui/end-call.png")); + rejectBtn_->setIconSize(QSize(iconSize, iconSize)); buttonLayout->addWidget(acceptBtn_); buttonLayout->addWidget(rejectBtn_); - QLabel *label; - if (!displayName.isEmpty() && displayName != caller) - label = new QLabel("Accept call from " + displayName + " (" + caller + ")?", this); - else - label = new QLabel("Accept call from " + caller + "?", this); - - layout->addWidget(label); + if (displayNameLabel) + layout->addWidget(displayNameLabel, 0, Qt::AlignCenter); + layout->addWidget(callerLabel, 0, Qt::AlignCenter); + layout->addWidget(voiceCallLabel, 0, Qt::AlignCenter); + layout->addWidget(avatar, 0, Qt::AlignCenter); layout->addLayout(buttonLayout); connect(acceptBtn_, &QPushButton::clicked, this, [this]() { diff --git a/src/dialogs/AcceptCall.h b/src/dialogs/AcceptCall.h index a410d6b7..8e3ed3b2 100644 --- a/src/dialogs/AcceptCall.h +++ b/src/dialogs/AcceptCall.h @@ -1,9 +1,9 @@ #pragma once -#include #include class QPushButton; +class QString; namespace dialogs { @@ -12,7 +12,12 @@ class AcceptCall : public QWidget Q_OBJECT public: - AcceptCall(const QString &caller, const QString &displayName, QWidget *parent = nullptr); + AcceptCall( + const QString &caller, + const QString &displayName, + const QString &roomName, + const QString &avatarUrl, + QWidget *parent = nullptr); signals: void accept(); diff --git a/src/dialogs/PlaceCall.cpp b/src/dialogs/PlaceCall.cpp index 8b37ff6a..c5c78f94 100644 --- a/src/dialogs/PlaceCall.cpp +++ b/src/dialogs/PlaceCall.cpp @@ -4,12 +4,18 @@ #include #include "Config.h" +#include "Utils.h" #include "dialogs/PlaceCall.h" +#include "ui/Avatar.h" namespace dialogs { -PlaceCall::PlaceCall(const QString &callee, const QString &displayName, QWidget *parent) - : QWidget(parent) +PlaceCall::PlaceCall( + const QString &callee, + const QString &displayName, + const QString &roomName, + const QString &avatarUrl, + QWidget *parent) : QWidget(parent) { setAutoFillBackground(true); setWindowFlags(Qt::Tool | Qt::WindowStaysOnTopHint); @@ -20,25 +26,31 @@ PlaceCall::PlaceCall(const QString &callee, const QString &displayName, QWidget layout->setSpacing(conf::modals::WIDGET_SPACING); layout->setMargin(conf::modals::WIDGET_MARGIN); - auto buttonLayout = new QHBoxLayout(); + auto buttonLayout = new QHBoxLayout(this); buttonLayout->setSpacing(15); buttonLayout->setMargin(0); + QFont f; + f.setPointSizeF(f.pointSizeF()); + auto avatar = new Avatar(this, QFontMetrics(f).height() * 3); + if (!avatarUrl.isEmpty()) + avatar->setImage(avatarUrl); + else + avatar->setLetter(utils::firstChar(roomName)); + voiceBtn_ = new QPushButton(tr("Voice Call"), this); voiceBtn_->setDefault(true); - videoBtn_ = new QPushButton(tr("Video Call"), this); + //videoBtn_ = new QPushButton(tr("Video Call"), this); cancelBtn_ = new QPushButton(tr("Cancel"), this); buttonLayout->addStretch(1); + buttonLayout->addWidget(avatar); buttonLayout->addWidget(voiceBtn_); - buttonLayout->addWidget(videoBtn_); + //buttonLayout->addWidget(videoBtn_); buttonLayout->addWidget(cancelBtn_); - QLabel *label; - if (!displayName.isEmpty() && displayName != callee) - label = new QLabel("Place a call to " + displayName + " (" + callee + ")?", this); - else - label = new QLabel("Place a call to " + callee + "?", this); + QString name = displayName.isEmpty() ? callee : displayName; + QLabel *label = new QLabel("Place a call to " + name + "?", this); layout->addWidget(label); layout->addLayout(buttonLayout); @@ -47,10 +59,10 @@ PlaceCall::PlaceCall(const QString &callee, const QString &displayName, QWidget emit voice(); emit close(); }); - connect(videoBtn_, &QPushButton::clicked, this, [this]() { + /*connect(videoBtn_, &QPushButton::clicked, this, [this]() { emit video(); emit close(); - }); + });*/ connect(cancelBtn_, &QPushButton::clicked, this, [this]() { emit cancel(); emit close(); diff --git a/src/dialogs/PlaceCall.h b/src/dialogs/PlaceCall.h index b4de1428..1c157b7b 100644 --- a/src/dialogs/PlaceCall.h +++ b/src/dialogs/PlaceCall.h @@ -12,16 +12,21 @@ class PlaceCall : public QWidget Q_OBJECT public: - PlaceCall(const QString &callee, const QString &displayName, QWidget *parent = nullptr); + PlaceCall( + const QString &callee, + const QString &displayName, + const QString &roomName, + const QString &avatarUrl, + QWidget *parent = nullptr); signals: void voice(); - void video(); +// void video(); void cancel(); private: QPushButton *voiceBtn_; - QPushButton *videoBtn_; +// QPushButton *videoBtn_; QPushButton *cancelBtn_; }; -- cgit 1.5.1