diff --git a/src/dialogs/AcceptCall.cpp b/src/dialogs/AcceptCall.cpp
index 6b5e2e60..58348b15 100644
--- a/src/dialogs/AcceptCall.cpp
+++ b/src/dialogs/AcceptCall.cpp
@@ -1,4 +1,5 @@
#include <QLabel>
+#include <QPixmap>
#include <QPushButton>
#include <QString>
#include <QVBoxLayout>
@@ -10,12 +11,12 @@
namespace dialogs {
-AcceptCall::AcceptCall(
- const QString &caller,
- const QString &displayName,
- const QString &roomName,
- const QString &avatarUrl,
- 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);
@@ -39,8 +40,8 @@ AcceptCall::AcceptCall(
if (!displayName.isEmpty() && displayName != caller) {
displayNameLabel = new QLabel(displayName, this);
labelFont.setPointSizeF(f.pointSizeF() * 2);
- displayNameLabel ->setFont(labelFont);
- displayNameLabel ->setAlignment(Qt::AlignCenter);
+ displayNameLabel->setFont(labelFont);
+ displayNameLabel->setAlignment(Qt::AlignCenter);
}
QLabel *callerLabel = new QLabel(caller, this);
@@ -48,19 +49,23 @@ AcceptCall::AcceptCall(
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);
+ avatar->setImage(avatarUrl);
else
- avatar->setLetter(utils::firstChar(roomName));
+ avatar->setLetter(utils::firstChar(roomName));
+
+ const int iconSize = 24;
+ QLabel *callTypeIndicator = new QLabel(this);
+ QPixmap callIndicator(":/icons/icons/ui/place-call.png");
+ callTypeIndicator->setPixmap(callIndicator.scaled(iconSize * 2, iconSize * 2));
+
+ QLabel *callTypeLabel = new QLabel("Voice Call", this);
+ labelFont.setPointSizeF(f.pointSizeF() * 1.1);
+ callTypeLabel->setFont(labelFont);
+ callTypeLabel->setAlignment(Qt::AlignCenter);
- const int iconSize = 24;
- auto buttonLayout = new QHBoxLayout();
+ auto buttonLayout = new QHBoxLayout;
buttonLayout->setSpacing(20);
acceptBtn_ = new QPushButton(tr("Accept"), this);
acceptBtn_->setDefault(true);
@@ -74,10 +79,11 @@ AcceptCall::AcceptCall(
buttonLayout->addWidget(rejectBtn_);
if (displayNameLabel)
- layout->addWidget(displayNameLabel, 0, Qt::AlignCenter);
+ 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->addWidget(callTypeIndicator, 0, Qt::AlignCenter);
+ layout->addWidget(callTypeLabel, 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 8e3ed3b2..5d2251fd 100644
--- a/src/dialogs/AcceptCall.h
+++ b/src/dialogs/AcceptCall.h
@@ -12,12 +12,11 @@ class AcceptCall : public QWidget
Q_OBJECT
public:
- AcceptCall(
- const QString &caller,
- const QString &displayName,
- const QString &roomName,
- const QString &avatarUrl,
- 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 81dd85dd..0fda1794 100644
--- a/src/dialogs/PlaceCall.cpp
+++ b/src/dialogs/PlaceCall.cpp
@@ -10,12 +10,12 @@
namespace dialogs {
-PlaceCall::PlaceCall(
- const QString &callee,
- const QString &displayName,
- const QString &roomName,
- const QString &avatarUrl,
- 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);
@@ -34,11 +34,13 @@ PlaceCall::PlaceCall(
f.setPointSizeF(f.pointSizeF());
auto avatar = new Avatar(this, QFontMetrics(f).height() * 3);
if (!avatarUrl.isEmpty())
- avatar->setImage(avatarUrl);
+ avatar->setImage(avatarUrl);
else
- avatar->setLetter(utils::firstChar(roomName));
-
- voiceBtn_ = new QPushButton(tr("Voice Call"), this);
+ avatar->setLetter(utils::firstChar(roomName));
+ const int iconSize = 24;
+ voiceBtn_ = new QPushButton(tr("Voice"), this);
+ voiceBtn_->setIcon(QIcon(":/icons/icons/ui/place-call.png"));
+ voiceBtn_->setIconSize(QSize(iconSize, iconSize));
voiceBtn_->setDefault(true);
cancelBtn_ = new QPushButton(tr("Cancel"), this);
@@ -47,7 +49,7 @@ PlaceCall::PlaceCall(
buttonLayout->addWidget(voiceBtn_);
buttonLayout->addWidget(cancelBtn_);
- QString name = displayName.isEmpty() ? callee : displayName;
+ QString name = displayName.isEmpty() ? callee : displayName;
QLabel *label = new QLabel("Place a call to " + name + "?", this);
layout->addWidget(label);
diff --git a/src/dialogs/PlaceCall.h b/src/dialogs/PlaceCall.h
index ed6fb750..f6db9ab5 100644
--- a/src/dialogs/PlaceCall.h
+++ b/src/dialogs/PlaceCall.h
@@ -12,12 +12,11 @@ class PlaceCall : public QWidget
Q_OBJECT
public:
- PlaceCall(
- const QString &callee,
- const QString &displayName,
- const QString &roomName,
- const QString &avatarUrl,
- QWidget *parent = nullptr);
+ PlaceCall(const QString &callee,
+ const QString &displayName,
+ const QString &roomName,
+ const QString &avatarUrl,
+ QWidget *parent = nullptr);
signals:
void voice();
|
