Merge pull request #130 from Nheko-Reborn/0.7.0-dev

0.7.0 dev merge to master

1 files changed, 19 insertions, 19 deletions

diff --git a/src/dialogs/UserProfile.cpp b/src/dialogs/UserProfile.cpp

index b8040f9f..f1dd77df 100644
--- a/src/dialogs/UserProfile.cpp
+++ b/src/dialogs/UserProfile.cpp
@@ -1,13 +1,12 @@
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QListWidget>
-#include <QSettings>
 #include <QShortcut>
 #include <QVBoxLayout>
 
-#include "AvatarProvider.h"
 #include "Cache.h"
 #include "ChatPage.h"
+#include "Logging.h"
 #include "MatrixClient.h"
 #include "Utils.h"
 #include "dialogs/UserProfile.h"
@@ -16,6 +15,8 @@
 
 using namespace dialogs;
 
+Q_DECLARE_METATYPE(std::vector<DeviceInfo>)
+
 constexpr int BUTTON_SIZE       = 36;
 constexpr int BUTTON_RADIUS     = BUTTON_SIZE / 2;
 constexpr int WIDGET_MARGIN     = 20;
@@ -49,7 +50,6 @@ UserProfile::UserProfile(QWidget *parent)
 {
         setAutoFillBackground(true);
         setWindowFlags(Qt::Tool | Qt::WindowStaysOnTopHint);
-        setWindowModality(Qt::WindowModal);
         setAttribute(Qt::WA_DeleteOnClose, true);
 
         QIcon banIcon, kickIcon, ignoreIcon, startChatIcon;
@@ -61,7 +61,6 @@ UserProfile::UserProfile(QWidget *parent)
         banBtn_->setIcon(banIcon);
         banBtn_->setIconSize(QSize(BUTTON_RADIUS, BUTTON_RADIUS));
         banBtn_->setToolTip(tr("Ban the user from the room"));
-        banBtn_->setDisabled(true); // Not used yet.
 
         ignoreIcon.addFile(":/icons/icons/ui/volume-off-indicator.png");
         ignoreBtn_ = new FlatButton(this);
@@ -79,7 +78,6 @@ UserProfile::UserProfile(QWidget *parent)
         kickBtn_->setIcon(kickIcon);
         kickBtn_->setIconSize(QSize(BUTTON_RADIUS, BUTTON_RADIUS));
         kickBtn_->setToolTip(tr("Kick the user from the room"));
-        kickBtn_->setDisabled(true); // Not used yet.
 
         startChatIcon.addFile(":/icons/icons/ui/black-bubble-speech.png");
         startChat_ = new FlatButton(this);
@@ -102,6 +100,13 @@ UserProfile::UserProfile(QWidget *parent)
                 emit ChatPage::instance()->createRoom(req);
         });
 
+        connect(banBtn_, &QPushButton::clicked, this, [this] {
+                ChatPage::instance()->banUser(userIdLabel_->text(), "");
+        });
+        connect(kickBtn_, &QPushButton::clicked, this, [this] {
+                ChatPage::instance()->kickUser(userIdLabel_->text(), "");
+        });
+
         // Button line
         auto btnLayout = new QHBoxLayout;
         btnLayout->addStretch(1);
@@ -114,9 +119,8 @@ UserProfile::UserProfile(QWidget *parent)
         btnLayout->setSpacing(8);
         btnLayout->setMargin(0);
 
-        avatar_ = new Avatar(this);
+        avatar_ = new Avatar(this, 128);
         avatar_->setLetter("X");
-        avatar_->setSize(128);
 
         QFont font;
         font.setPointSizeF(font.pointSizeF() * 2);
@@ -167,10 +171,6 @@ UserProfile::UserProfile(QWidget *parent)
         vlayout->setAlignment(avatar_, Qt::AlignCenter | Qt::AlignTop);
         vlayout->setAlignment(userIdLabel_, Qt::AlignCenter | Qt::AlignTop);
 
-        setAutoFillBackground(true);
-        setWindowFlags(Qt::Tool | Qt::WindowStaysOnTopHint);
-        setWindowModality(Qt::WindowModal);
-
         QFont largeFont;
         largeFont.setPointSizeF(largeFont.pointSizeF() * 1.5);
 
@@ -181,9 +181,10 @@ UserProfile::UserProfile(QWidget *parent)
         vlayout->setSpacing(WIDGET_SPACING);
         vlayout->setContentsMargins(WIDGET_MARGIN, TOP_WIDGET_MARGIN, WIDGET_MARGIN, WIDGET_MARGIN);
 
-        qRegisterMetaType<std::vector<DeviceInfo>>();
+        static auto ignored = qRegisterMetaType<std::vector<DeviceInfo>>();
+        (void)ignored;
 
-        auto closeShortcut = new QShortcut(QKeySequence(tr("ESC")), this);
+        auto closeShortcut = new QShortcut(QKeySequence(QKeySequence::Cancel), this);
         connect(closeShortcut, &QShortcut::activated, this, &UserProfile::close);
         connect(okBtn, &QPushButton::clicked, this, &UserProfile::close);
 }
@@ -204,22 +205,21 @@ UserProfile::init(const QString &userId, const QString &roomId)
 {
         resetToDefaults();
 
-        auto displayName = Cache::displayName(roomId, userId);
+        auto displayName = cache::displayName(roomId, userId);
 
         userIdLabel_->setText(userId);
         displayNameLabel_->setText(displayName);
         avatar_->setLetter(utils::firstChar(displayName));
 
-        AvatarProvider::resolve(
-          roomId, userId, this, [this](const QImage &img) { avatar_->setImage(img); });
+        avatar_->setImage(roomId, userId);
 
         auto localUser = utils::localUser();
 
         try {
                 bool hasMemberRights =
-                  cache::client()->hasEnoughPowerLevel({mtx::events::EventType::RoomMember},
-                                                       roomId.toStdString(),
-                                                       localUser.toStdString());
+                  cache::hasEnoughPowerLevel({mtx::events::EventType::RoomMember},
+                                             roomId.toStdString(),
+                                             localUser.toStdString());
                 if (!hasMemberRights) {
                         kickBtn_->hide();
                         banBtn_->hide();