make lint
This commit is contained in:
parent
4e603387c6
commit
f57622901c
@ -22,6 +22,7 @@
|
|||||||
#include <QWidget>
|
#include <QWidget>
|
||||||
|
|
||||||
#include "Cache.h"
|
#include "Cache.h"
|
||||||
|
#include "CommunitiesList.h"
|
||||||
#include "MatrixClient.h"
|
#include "MatrixClient.h"
|
||||||
#include "QuickSwitcher.h"
|
#include "QuickSwitcher.h"
|
||||||
#include "RoomList.h"
|
#include "RoomList.h"
|
||||||
@ -33,7 +34,6 @@
|
|||||||
#include "TopRoomBar.h"
|
#include "TopRoomBar.h"
|
||||||
#include "TypingDisplay.h"
|
#include "TypingDisplay.h"
|
||||||
#include "UserInfoWidget.h"
|
#include "UserInfoWidget.h"
|
||||||
#include "CommunitiesList.h"
|
|
||||||
|
|
||||||
constexpr int CONSENSUS_TIMEOUT = 1000;
|
constexpr int CONSENSUS_TIMEOUT = 1000;
|
||||||
constexpr int SHOW_CONTENT_TIMEOUT = 3000;
|
constexpr int SHOW_CONTENT_TIMEOUT = 3000;
|
||||||
|
@ -1,13 +1,13 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <QWidget>
|
|
||||||
#include <QScrollArea>
|
#include <QScrollArea>
|
||||||
#include <QSharedPointer>
|
#include <QSharedPointer>
|
||||||
#include <QVBoxLayout>
|
#include <QVBoxLayout>
|
||||||
|
#include <QWidget>
|
||||||
|
|
||||||
#include "MatrixClient.h"
|
|
||||||
#include "CommunitiesListItem.h"
|
#include "CommunitiesListItem.h"
|
||||||
#include "Community.h"
|
#include "Community.h"
|
||||||
|
#include "MatrixClient.h"
|
||||||
#include "ui/Theme.h"
|
#include "ui/Theme.h"
|
||||||
|
|
||||||
class CommunitiesList : public QWidget
|
class CommunitiesList : public QWidget
|
||||||
@ -21,15 +21,13 @@ public:
|
|||||||
void setCommunities(const QMap<QString, QSharedPointer<Community>> &communities);
|
void setCommunities(const QMap<QString, QSharedPointer<Community>> &communities);
|
||||||
void clear();
|
void clear();
|
||||||
|
|
||||||
void addCommunity(QSharedPointer<Community> community,
|
void addCommunity(QSharedPointer<Community> community, const QString &community_id);
|
||||||
const QString &community_id);
|
|
||||||
void removeCommunity(const QString &community_id);
|
void removeCommunity(const QString &community_id);
|
||||||
signals:
|
signals:
|
||||||
void communityChanged(const QString &community_id);
|
void communityChanged(const QString &community_id);
|
||||||
|
|
||||||
public slots:
|
public slots:
|
||||||
void updateCommunityAvatar(const QString &community_id,
|
void updateCommunityAvatar(const QString &community_id, const QPixmap &img);
|
||||||
const QPixmap &img);
|
|
||||||
void highlightSelectedCommunity(const QString &community_id);
|
void highlightSelectedCommunity(const QString &community_id);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
@ -1,14 +1,14 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <QWidget>
|
#include <QDebug>
|
||||||
#include <QSharedPointer>
|
|
||||||
#include <QMouseEvent>
|
#include <QMouseEvent>
|
||||||
#include <QPainter>
|
#include <QPainter>
|
||||||
#include <QDebug>
|
#include <QSharedPointer>
|
||||||
|
#include <QWidget>
|
||||||
|
|
||||||
#include "ui/Theme.h"
|
|
||||||
#include "Menu.h"
|
|
||||||
#include "Community.h"
|
#include "Community.h"
|
||||||
|
#include "Menu.h"
|
||||||
|
#include "ui/Theme.h"
|
||||||
|
|
||||||
class CommunitiesListItem : public QWidget
|
class CommunitiesListItem : public QWidget
|
||||||
{
|
{
|
||||||
@ -61,10 +61,7 @@ inline void
|
|||||||
CommunitiesListItem::setAvatar(const QImage &avatar_image)
|
CommunitiesListItem::setAvatar(const QImage &avatar_image)
|
||||||
{
|
{
|
||||||
communityAvatar_ = QPixmap::fromImage(
|
communityAvatar_ = QPixmap::fromImage(
|
||||||
avatar_image.scaled(IconSize,
|
avatar_image.scaled(IconSize, IconSize, Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
|
||||||
IconSize,
|
|
||||||
Qt::IgnoreAspectRatio,
|
|
||||||
Qt::SmoothTransformation));
|
|
||||||
update();
|
update();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -78,6 +75,7 @@ public:
|
|||||||
protected:
|
protected:
|
||||||
void mousePressEvent(QMouseEvent *event) override;
|
void mousePressEvent(QMouseEvent *event) override;
|
||||||
void paintEvent(QPaintEvent *event) override;
|
void paintEvent(QPaintEvent *event) override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
const int IconSize = 55;
|
const int IconSize = 55;
|
||||||
};
|
};
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <QObject>
|
|
||||||
#include <QJsonObject>
|
#include <QJsonObject>
|
||||||
#include <QUrl>
|
#include <QObject>
|
||||||
#include <QString>
|
#include <QString>
|
||||||
|
#include <QUrl>
|
||||||
|
|
||||||
class Community : public QObject
|
class Community : public QObject
|
||||||
{
|
{
|
||||||
@ -55,7 +55,6 @@ Community::getLongDescription() const
|
|||||||
return long_description_;
|
return long_description_;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
inline const QList<QString>
|
inline const QList<QString>
|
||||||
Community::getRoomList() const
|
Community::getRoomList() const
|
||||||
{
|
{
|
||||||
|
@ -37,15 +37,25 @@ private:
|
|||||||
class Deserializable
|
class Deserializable
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
virtual void deserialize(const QJsonValue &) {}
|
virtual void deserialize(const QJsonValue &)
|
||||||
virtual void deserialize(const QJsonObject &) {}
|
{
|
||||||
virtual void deserialize(const QJsonDocument &) {}
|
}
|
||||||
virtual ~Deserializable() {}
|
virtual void deserialize(const QJsonObject &)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
virtual void deserialize(const QJsonDocument &)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
virtual ~Deserializable()
|
||||||
|
{
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
class Serializable
|
class Serializable
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
virtual QJsonObject serialize() const = 0;
|
virtual QJsonObject serialize() const = 0;
|
||||||
virtual ~Serializable() {}
|
virtual ~Serializable()
|
||||||
|
{
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
@ -85,7 +85,7 @@ private:
|
|||||||
QString selectedRoom_;
|
QString selectedRoom_;
|
||||||
|
|
||||||
bool filterRooms_ = false;
|
bool filterRooms_ = false;
|
||||||
QList<QString> roomFilter_ = QList<QString>(); //which rooms to include in the room list
|
QList<QString> roomFilter_ = QList<QString>(); // which rooms to include in the room list
|
||||||
|
|
||||||
QSharedPointer<MatrixClient> client_;
|
QSharedPointer<MatrixClient> client_;
|
||||||
};
|
};
|
||||||
|
@ -26,9 +26,7 @@ namespace matrix
|
|||||||
{
|
{
|
||||||
namespace events
|
namespace events
|
||||||
{
|
{
|
||||||
class AliasesEventContent
|
class AliasesEventContent : public Deserializable, public Serializable
|
||||||
: public Deserializable
|
|
||||||
, public Serializable
|
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
void deserialize(const QJsonValue &data) override;
|
void deserialize(const QJsonValue &data) override;
|
||||||
|
@ -30,9 +30,7 @@ namespace events
|
|||||||
* A picture that is associated with the room.
|
* A picture that is associated with the room.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
class AvatarEventContent
|
class AvatarEventContent : public Deserializable, public Serializable
|
||||||
: public Deserializable
|
|
||||||
, public Serializable
|
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
void deserialize(const QJsonValue &data) override;
|
void deserialize(const QJsonValue &data) override;
|
||||||
|
@ -32,9 +32,7 @@ namespace events
|
|||||||
* users which alias to use to advertise the room.
|
* users which alias to use to advertise the room.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
class CanonicalAliasEventContent
|
class CanonicalAliasEventContent : public Deserializable, public Serializable
|
||||||
: public Deserializable
|
|
||||||
, public Serializable
|
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
void deserialize(const QJsonValue &data) override;
|
void deserialize(const QJsonValue &data) override;
|
||||||
|
@ -30,9 +30,7 @@ namespace events
|
|||||||
* of all other events.
|
* of all other events.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
class CreateEventContent
|
class CreateEventContent : public Deserializable, public Serializable
|
||||||
: public Deserializable
|
|
||||||
, public Serializable
|
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
void deserialize(const QJsonValue &data) override;
|
void deserialize(const QJsonValue &data) override;
|
||||||
|
@ -62,9 +62,7 @@ bool
|
|||||||
isStateEvent(EventType type);
|
isStateEvent(EventType type);
|
||||||
|
|
||||||
template<class Content>
|
template<class Content>
|
||||||
class Event
|
class Event : public Deserializable, public Serializable
|
||||||
: public Deserializable
|
|
||||||
, public Serializable
|
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
inline Content content() const;
|
inline Content content() const;
|
||||||
|
@ -32,9 +32,7 @@ enum class HistoryVisibility {
|
|||||||
WorldReadable,
|
WorldReadable,
|
||||||
};
|
};
|
||||||
|
|
||||||
class HistoryVisibilityEventContent
|
class HistoryVisibilityEventContent : public Deserializable, public Serializable
|
||||||
: public Deserializable
|
|
||||||
, public Serializable
|
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
inline HistoryVisibility historyVisibility() const;
|
inline HistoryVisibility historyVisibility() const;
|
||||||
|
@ -44,9 +44,7 @@ enum class JoinRule {
|
|||||||
* Describes how users are allowed to join the room.
|
* Describes how users are allowed to join the room.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
class JoinRulesEventContent
|
class JoinRulesEventContent : public Deserializable, public Serializable
|
||||||
: public Deserializable
|
|
||||||
, public Serializable
|
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
void deserialize(const QJsonValue &data) override;
|
void deserialize(const QJsonValue &data) override;
|
||||||
|
@ -47,9 +47,7 @@ enum class Membership {
|
|||||||
* The current membership state of a user in the room.
|
* The current membership state of a user in the room.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
class MemberEventContent
|
class MemberEventContent : public Deserializable, public Serializable
|
||||||
: public Deserializable
|
|
||||||
, public Serializable
|
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
void deserialize(const QJsonValue &data) override;
|
void deserialize(const QJsonValue &data) override;
|
||||||
|
@ -57,9 +57,7 @@ enum class MessageEventType {
|
|||||||
MessageEventType
|
MessageEventType
|
||||||
extractMessageEventType(const QJsonObject &data);
|
extractMessageEventType(const QJsonObject &data);
|
||||||
|
|
||||||
class MessageEventContent
|
class MessageEventContent : public Deserializable, public Serializable
|
||||||
: public Deserializable
|
|
||||||
, public Serializable
|
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
void deserialize(const QJsonValue &data) override;
|
void deserialize(const QJsonValue &data) override;
|
||||||
|
@ -29,9 +29,7 @@ namespace events
|
|||||||
* A human-friendly room name designed to be displayed to the end-user.
|
* A human-friendly room name designed to be displayed to the end-user.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
class NameEventContent
|
class NameEventContent : public Deserializable, public Serializable
|
||||||
: public Deserializable
|
|
||||||
, public Serializable
|
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
void deserialize(const QJsonValue &data) override;
|
void deserialize(const QJsonValue &data) override;
|
||||||
|
@ -36,9 +36,7 @@ enum class PowerLevels {
|
|||||||
* Defines the power levels (privileges) of users in the room.
|
* Defines the power levels (privileges) of users in the room.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
class PowerLevelsEventContent
|
class PowerLevelsEventContent : public Deserializable, public Serializable
|
||||||
: public Deserializable
|
|
||||||
, public Serializable
|
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
void deserialize(const QJsonValue &data) override;
|
void deserialize(const QJsonValue &data) override;
|
||||||
|
@ -30,9 +30,7 @@ namespace events
|
|||||||
* room.
|
* room.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
class TopicEventContent
|
class TopicEventContent : public Deserializable, public Serializable
|
||||||
: public Deserializable
|
|
||||||
, public Serializable
|
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
void deserialize(const QJsonValue &data) override;
|
void deserialize(const QJsonValue &data) override;
|
||||||
|
@ -49,7 +49,7 @@ ChatPage::ChatPage(QSharedPointer<MatrixClient> client, QWidget *parent)
|
|||||||
|
|
||||||
communitiesList_ = new CommunitiesList(client, this);
|
communitiesList_ = new CommunitiesList(client, this);
|
||||||
communitiesSideBarLayout_->addWidget(communitiesList_);
|
communitiesSideBarLayout_->addWidget(communitiesList_);
|
||||||
//communitiesSideBarLayout_->addStretch(1);
|
// communitiesSideBarLayout_->addStretch(1);
|
||||||
topLayout_->addWidget(communitiesSideBar_);
|
topLayout_->addWidget(communitiesSideBar_);
|
||||||
|
|
||||||
auto splitter = new Splitter(this);
|
auto splitter = new Splitter(this);
|
||||||
@ -220,11 +220,15 @@ ChatPage::ChatPage(QSharedPointer<MatrixClient> client, QWidget *parent)
|
|||||||
SIGNAL(getOwnCommunitiesResponse(QList<QString>)),
|
SIGNAL(getOwnCommunitiesResponse(QList<QString>)),
|
||||||
this,
|
this,
|
||||||
SLOT(updateOwnCommunitiesInfo(QList<QString>)));
|
SLOT(updateOwnCommunitiesInfo(QList<QString>)));
|
||||||
connect(client_.data(), &MatrixClient::communityProfileRetrieved, this,
|
connect(client_.data(),
|
||||||
|
&MatrixClient::communityProfileRetrieved,
|
||||||
|
this,
|
||||||
[=](QString communityId, QJsonObject profile) {
|
[=](QString communityId, QJsonObject profile) {
|
||||||
communityManager_[communityId]->parseProfile(profile);
|
communityManager_[communityId]->parseProfile(profile);
|
||||||
});
|
});
|
||||||
connect(client_.data(), &MatrixClient::communityRoomsRetrieved, this,
|
connect(client_.data(),
|
||||||
|
&MatrixClient::communityRoomsRetrieved,
|
||||||
|
this,
|
||||||
[=](QString communityId, QJsonObject rooms) {
|
[=](QString communityId, QJsonObject rooms) {
|
||||||
communityManager_[communityId]->parseRooms(rooms);
|
communityManager_[communityId]->parseRooms(rooms);
|
||||||
|
|
||||||
@ -232,7 +236,8 @@ ChatPage::ChatPage(QSharedPointer<MatrixClient> client, QWidget *parent)
|
|||||||
if (communityId == "world") {
|
if (communityId == "world") {
|
||||||
room_list_->setFilterRooms(false);
|
room_list_->setFilterRooms(false);
|
||||||
} else {
|
} else {
|
||||||
room_list_->setRoomFilter(communityManager_[communityId]->getRoomList());
|
room_list_->setRoomFilter(
|
||||||
|
communityManager_[communityId]->getRoomList());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -265,12 +270,16 @@ ChatPage::ChatPage(QSharedPointer<MatrixClient> client, QWidget *parent)
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
connect(communitiesList_, &CommunitiesList::communityChanged, this, [=](const QString &communityId) {
|
connect(communitiesList_,
|
||||||
|
&CommunitiesList::communityChanged,
|
||||||
|
this,
|
||||||
|
[=](const QString &communityId) {
|
||||||
current_community_ = communityId;
|
current_community_ = communityId;
|
||||||
if (communityId == "world") {
|
if (communityId == "world") {
|
||||||
room_list_->setFilterRooms(false);
|
room_list_->setFilterRooms(false);
|
||||||
} else {
|
} else {
|
||||||
room_list_->setRoomFilter(communityManager_[communityId]->getRoomList());
|
room_list_->setRoomFilter(
|
||||||
|
communityManager_[communityId]->getRoomList());
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -35,35 +35,44 @@ CommunitiesList::CommunitiesList(QSharedPointer<MatrixClient> client, QWidget *p
|
|||||||
WorldCommunityListItem *world_list_item = new WorldCommunityListItem();
|
WorldCommunityListItem *world_list_item = new WorldCommunityListItem();
|
||||||
contentsLayout_->addWidget(world_list_item);
|
contentsLayout_->addWidget(world_list_item);
|
||||||
communities_.insert("world", QSharedPointer<CommunitiesListItem>(world_list_item));
|
communities_.insert("world", QSharedPointer<CommunitiesListItem>(world_list_item));
|
||||||
connect(world_list_item, &WorldCommunityListItem::clicked,
|
connect(world_list_item,
|
||||||
this, &CommunitiesList::highlightSelectedCommunity);
|
&WorldCommunityListItem::clicked,
|
||||||
|
this,
|
||||||
|
&CommunitiesList::highlightSelectedCommunity);
|
||||||
contentsLayout_->addStretch(1);
|
contentsLayout_->addStretch(1);
|
||||||
|
|
||||||
scrollArea_->setWidget(scrollAreaContents_);
|
scrollArea_->setWidget(scrollAreaContents_);
|
||||||
topLayout_->addWidget(scrollArea_);
|
topLayout_->addWidget(scrollArea_);
|
||||||
|
|
||||||
connect(client_.data(), &MatrixClient::communityProfileRetrieved, this,
|
connect(client_.data(),
|
||||||
|
&MatrixClient::communityProfileRetrieved,
|
||||||
|
this,
|
||||||
[=](QString communityId, QJsonObject profile) {
|
[=](QString communityId, QJsonObject profile) {
|
||||||
client_->fetchCommunityAvatar(communityId, QUrl(profile["avatar_url"].toString()));
|
client_->fetchCommunityAvatar(communityId,
|
||||||
|
QUrl(profile["avatar_url"].toString()));
|
||||||
});
|
});
|
||||||
connect(client_.data(),
|
connect(client_.data(),
|
||||||
SIGNAL(communityAvatarRetrieved(const QString &, const QPixmap &)),
|
SIGNAL(communityAvatarRetrieved(const QString &, const QPixmap &)),
|
||||||
this,
|
this,
|
||||||
SLOT(updateCommunityAvatar(const QString &,const QPixmap &)));
|
SLOT(updateCommunityAvatar(const QString &, const QPixmap &)));
|
||||||
}
|
}
|
||||||
|
|
||||||
CommunitiesList::~CommunitiesList() {}
|
CommunitiesList::~CommunitiesList()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
CommunitiesList::setCommunities(const QMap<QString, QSharedPointer<Community>> &communities)
|
CommunitiesList::setCommunities(const QMap<QString, QSharedPointer<Community>> &communities)
|
||||||
{
|
{
|
||||||
communities_.clear();
|
communities_.clear();
|
||||||
|
|
||||||
//TODO: still not sure how to handle the "world" special-case
|
// TODO: still not sure how to handle the "world" special-case
|
||||||
WorldCommunityListItem *world_list_item = new WorldCommunityListItem();
|
WorldCommunityListItem *world_list_item = new WorldCommunityListItem();
|
||||||
communities_.insert("world", QSharedPointer<CommunitiesListItem>(world_list_item));
|
communities_.insert("world", QSharedPointer<CommunitiesListItem>(world_list_item));
|
||||||
connect(world_list_item, &WorldCommunityListItem::clicked,
|
connect(world_list_item,
|
||||||
this, &CommunitiesList::highlightSelectedCommunity);
|
&WorldCommunityListItem::clicked,
|
||||||
|
this,
|
||||||
|
&CommunitiesList::highlightSelectedCommunity);
|
||||||
contentsLayout_->insertWidget(0, world_list_item);
|
contentsLayout_->insertWidget(0, world_list_item);
|
||||||
|
|
||||||
for (auto it = communities.constBegin(); it != communities.constEnd(); it++) {
|
for (auto it = communities.constBegin(); it != communities.constEnd(); it++) {
|
||||||
@ -89,18 +98,19 @@ CommunitiesList::clear()
|
|||||||
void
|
void
|
||||||
CommunitiesList::addCommunity(QSharedPointer<Community> community, const QString &community_id)
|
CommunitiesList::addCommunity(QSharedPointer<Community> community, const QString &community_id)
|
||||||
{
|
{
|
||||||
CommunitiesListItem *list_item = new CommunitiesListItem(community,
|
CommunitiesListItem *list_item =
|
||||||
community_id,
|
new CommunitiesListItem(community, community_id, scrollArea_);
|
||||||
scrollArea_);
|
|
||||||
|
|
||||||
communities_.insert(community_id, QSharedPointer<CommunitiesListItem>(list_item));
|
communities_.insert(community_id, QSharedPointer<CommunitiesListItem>(list_item));
|
||||||
|
|
||||||
client_->fetchCommunityAvatar(community_id, community->getAvatar());
|
client_->fetchCommunityAvatar(community_id, community->getAvatar());
|
||||||
|
|
||||||
contentsLayout_->insertWidget(contentsLayout_->count()-1, list_item);
|
contentsLayout_->insertWidget(contentsLayout_->count() - 1, list_item);
|
||||||
|
|
||||||
connect(list_item, &CommunitiesListItem::clicked,
|
connect(list_item,
|
||||||
this, &CommunitiesList::highlightSelectedCommunity);
|
&CommunitiesListItem::clicked,
|
||||||
|
this,
|
||||||
|
&CommunitiesList::highlightSelectedCommunity);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
@ -118,7 +128,6 @@ CommunitiesList::updateCommunityAvatar(const QString &community_id, const QPixma
|
|||||||
}
|
}
|
||||||
|
|
||||||
communities_.value(community_id)->setAvatar(img.toImage());
|
communities_.value(community_id)->setAvatar(img.toImage());
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
@ -7,13 +7,15 @@ CommunitiesListItem::CommunitiesListItem(QSharedPointer<Community> community,
|
|||||||
, community_(community)
|
, community_(community)
|
||||||
, communityId_(community_id)
|
, communityId_(community_id)
|
||||||
{
|
{
|
||||||
//menu_ = new Menu(this);
|
// menu_ = new Menu(this);
|
||||||
setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
|
setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
|
||||||
setFixedHeight(ui::sidebar::CommunitiesSidebarSize);
|
setFixedHeight(ui::sidebar::CommunitiesSidebarSize);
|
||||||
setFixedWidth(ui::sidebar::CommunitiesSidebarSize);
|
setFixedWidth(ui::sidebar::CommunitiesSidebarSize);
|
||||||
}
|
}
|
||||||
|
|
||||||
CommunitiesListItem::~CommunitiesListItem() {}
|
CommunitiesListItem::~CommunitiesListItem()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
CommunitiesListItem::setCommunity(QSharedPointer<Community> community)
|
CommunitiesListItem::setCommunity(QSharedPointer<Community> community)
|
||||||
@ -31,7 +33,8 @@ CommunitiesListItem::setPressedState(bool state)
|
|||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
CommunitiesListItem::mousePressEvent(QMouseEvent *event) {
|
CommunitiesListItem::mousePressEvent(QMouseEvent *event)
|
||||||
|
{
|
||||||
if (event->buttons() == Qt::RightButton) {
|
if (event->buttons() == Qt::RightButton) {
|
||||||
QWidget::mousePressEvent(event);
|
QWidget::mousePressEvent(event);
|
||||||
return;
|
return;
|
||||||
@ -47,7 +50,6 @@ CommunitiesListItem::paintEvent(QPaintEvent *event)
|
|||||||
{
|
{
|
||||||
Q_UNUSED(event);
|
Q_UNUSED(event);
|
||||||
|
|
||||||
|
|
||||||
QPainter p(this);
|
QPainter p(this);
|
||||||
p.setRenderHint(QPainter::TextAntialiasing);
|
p.setRenderHint(QPainter::TextAntialiasing);
|
||||||
p.setRenderHint(QPainter::SmoothPixmapTransform);
|
p.setRenderHint(QPainter::SmoothPixmapTransform);
|
||||||
@ -65,7 +67,7 @@ CommunitiesListItem::paintEvent(QPaintEvent *event)
|
|||||||
|
|
||||||
p.setPen(QColor("#333"));
|
p.setPen(QColor("#333"));
|
||||||
|
|
||||||
QRect avatarRegion((width()-IconSize)/2, (height()-IconSize)/2, IconSize, IconSize);
|
QRect avatarRegion((width() - IconSize) / 2, (height() - IconSize) / 2, IconSize, IconSize);
|
||||||
|
|
||||||
font.setBold(false);
|
font.setBold(false);
|
||||||
p.setPen(Qt::NoPen);
|
p.setPen(Qt::NoPen);
|
||||||
@ -91,14 +93,15 @@ CommunitiesListItem::paintEvent(QPaintEvent *event)
|
|||||||
p.save();
|
p.save();
|
||||||
|
|
||||||
QPainterPath path;
|
QPainterPath path;
|
||||||
path.addEllipse((width()-IconSize)/2, (height()-IconSize)/2, IconSize, IconSize);
|
path.addEllipse(
|
||||||
|
(width() - IconSize) / 2, (height() - IconSize) / 2, IconSize, IconSize);
|
||||||
p.setClipPath(path);
|
p.setClipPath(path);
|
||||||
|
|
||||||
p.drawPixmap(avatarRegion, communityAvatar_);
|
p.drawPixmap(avatarRegion, communityAvatar_);
|
||||||
p.restore();
|
p.restore();
|
||||||
}
|
}
|
||||||
|
|
||||||
//TODO: Discord-style community ping counts?
|
// TODO: Discord-style community ping counts?
|
||||||
/*if (unreadMsgCount_ > 0) {
|
/*if (unreadMsgCount_ > 0) {
|
||||||
QColor textColor("white");
|
QColor textColor("white");
|
||||||
QColor backgroundColor("#38A3D8");
|
QColor backgroundColor("#38A3D8");
|
||||||
@ -142,7 +145,7 @@ CommunitiesListItem::contextMenuEvent(QContextMenuEvent *event)
|
|||||||
{
|
{
|
||||||
Q_UNUSED(event);
|
Q_UNUSED(event);
|
||||||
|
|
||||||
//menu_->popup(event->globalPos());
|
// menu_->popup(event->globalPos());
|
||||||
}
|
}
|
||||||
|
|
||||||
WorldCommunityListItem::WorldCommunityListItem(QWidget *parent)
|
WorldCommunityListItem::WorldCommunityListItem(QWidget *parent)
|
||||||
@ -150,7 +153,9 @@ WorldCommunityListItem::WorldCommunityListItem(QWidget *parent)
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
WorldCommunityListItem::~WorldCommunityListItem() {}
|
WorldCommunityListItem::~WorldCommunityListItem()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
WorldCommunityListItem::mousePressEvent(QMouseEvent *event)
|
WorldCommunityListItem::mousePressEvent(QMouseEvent *event)
|
||||||
@ -190,10 +195,10 @@ WorldCommunityListItem::paintEvent(QPaintEvent *event)
|
|||||||
p.setPen(Qt::NoPen);
|
p.setPen(Qt::NoPen);
|
||||||
p.setBrush(brush);
|
p.setBrush(brush);
|
||||||
|
|
||||||
QRect avatarRegion((width()-IconSize)/2, (height()-IconSize)/2, IconSize, IconSize);
|
QRect avatarRegion((width() - IconSize) / 2, (height() - IconSize) / 2, IconSize, IconSize);
|
||||||
p.drawEllipse(avatarRegion.center(), IconSize / 2, IconSize / 2);
|
p.drawEllipse(avatarRegion.center(), IconSize / 2, IconSize / 2);
|
||||||
QPainterPath path;
|
QPainterPath path;
|
||||||
path.addEllipse((width()-IconSize)/2, (height()-IconSize)/2, IconSize, IconSize);
|
path.addEllipse((width() - IconSize) / 2, (height() - IconSize) / 2, IconSize, IconSize);
|
||||||
p.setClipPath(path);
|
p.setClipPath(path);
|
||||||
|
|
||||||
p.drawPixmap(avatarRegion, worldIcon);
|
p.drawPixmap(avatarRegion, worldIcon);
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#include "include/Community.h"
|
#include "include/Community.h"
|
||||||
|
|
||||||
#include <QJsonValue>
|
|
||||||
#include <QJsonArray>
|
#include <QJsonArray>
|
||||||
|
#include <QJsonValue>
|
||||||
|
|
||||||
void
|
void
|
||||||
Community::parseProfile(const QJsonObject &profile)
|
Community::parseProfile(const QJsonObject &profile)
|
||||||
@ -9,7 +9,7 @@ Community::parseProfile(const QJsonObject &profile)
|
|||||||
if (profile["name"].type() == QJsonValue::Type::String) {
|
if (profile["name"].type() == QJsonValue::Type::String) {
|
||||||
name_ = profile["name"].toString();
|
name_ = profile["name"].toString();
|
||||||
} else {
|
} else {
|
||||||
name_ = "Unnamed Community"; //TODO: what is correct here?
|
name_ = "Unnamed Community"; // TODO: what is correct here?
|
||||||
}
|
}
|
||||||
|
|
||||||
if (profile["avatar_url"].type() == QJsonValue::Type::String) {
|
if (profile["avatar_url"].type() == QJsonValue::Type::String) {
|
||||||
@ -29,7 +29,6 @@ Community::parseProfile(const QJsonObject &profile)
|
|||||||
} else {
|
} else {
|
||||||
long_description_ = "";
|
long_description_ = "";
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
@ -37,7 +36,7 @@ Community::parseRooms(const QJsonObject &rooms)
|
|||||||
{
|
{
|
||||||
rooms_.clear();
|
rooms_.clear();
|
||||||
|
|
||||||
for (auto i = 0; i<rooms["chunk"].toArray().size(); i++) {
|
for (auto i = 0; i < rooms["chunk"].toArray().size(); i++) {
|
||||||
rooms_.append(rooms["chunk"].toArray()[i].toObject()["room_id"].toString());
|
rooms_.append(rooms["chunk"].toArray()[i].toObject()["room_id"].toString());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -80,4 +80,6 @@ EmojiCategory::EmojiCategory(QString category, QList<Emoji> emoji, QWidget *pare
|
|||||||
connect(emojiListView_, &QListView::clicked, this, &EmojiCategory::clickIndex);
|
connect(emojiListView_, &QListView::clicked, this, &EmojiCategory::clickIndex);
|
||||||
}
|
}
|
||||||
|
|
||||||
EmojiCategory::~EmojiCategory() {}
|
EmojiCategory::~EmojiCategory()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
@ -485,7 +485,8 @@ const QList<Emoji> EmojiProvider::food = {
|
|||||||
Emoji{ QString::fromUtf8("\xf0\x9f\xa5\x84"), ":spoon:" },
|
Emoji{ QString::fromUtf8("\xf0\x9f\xa5\x84"), ":spoon:" },
|
||||||
};
|
};
|
||||||
|
|
||||||
const QList<Emoji> EmojiProvider::activity = {
|
const QList<Emoji> EmojiProvider::activity =
|
||||||
|
{
|
||||||
Emoji{ QString::fromUtf8("\xf0\x9f\x91\xbe"), ":space_invader:" },
|
Emoji{ QString::fromUtf8("\xf0\x9f\x91\xbe"), ":space_invader:" },
|
||||||
Emoji{ QString::fromUtf8("\xf0\x9f\x95\xb4"), ":levitate:" },
|
Emoji{ QString::fromUtf8("\xf0\x9f\x95\xb4"), ":levitate:" },
|
||||||
Emoji{ QString::fromUtf8("\xf0\x9f\xa4\xba"), ":fencer:" },
|
Emoji{ QString::fromUtf8("\xf0\x9f\xa4\xba"), ":fencer:" },
|
||||||
@ -535,16 +536,11 @@ const QList<Emoji> EmojiProvider::activity = {
|
|||||||
Emoji{ QString::fromUtf8("\xf0\x9f\x9a\xb4\xf0\x9f\x8f\xbe"), ":bicyclist_tone4:" },
|
Emoji{ QString::fromUtf8("\xf0\x9f\x9a\xb4\xf0\x9f\x8f\xbe"), ":bicyclist_tone4:" },
|
||||||
Emoji{ QString::fromUtf8("\xf0\x9f\x9a\xb4\xf0\x9f\x8f\xbf"), ":bicyclist_tone5:" },
|
Emoji{ QString::fromUtf8("\xf0\x9f\x9a\xb4\xf0\x9f\x8f\xbf"), ":bicyclist_tone5:" },
|
||||||
Emoji{ QString::fromUtf8("\xf0\x9f\x9a\xb5"), ":mountain_bicyclist:" },
|
Emoji{ QString::fromUtf8("\xf0\x9f\x9a\xb5"), ":mountain_bicyclist:" },
|
||||||
Emoji{ QString::fromUtf8("\xf0\x9f\x9a\xb5\xf0\x9f\x8f\xbb"),
|
Emoji{ QString::fromUtf8("\xf0\x9f\x9a\xb5\xf0\x9f\x8f\xbb"), ":mountain_bicyclist_tone1:" },
|
||||||
":mountain_bicyclist_tone1:" },
|
Emoji{ QString::fromUtf8("\xf0\x9f\x9a\xb5\xf0\x9f\x8f\xbc"), ":mountain_bicyclist_tone2:" },
|
||||||
Emoji{ QString::fromUtf8("\xf0\x9f\x9a\xb5\xf0\x9f\x8f\xbc"),
|
Emoji{ QString::fromUtf8("\xf0\x9f\x9a\xb5\xf0\x9f\x8f\xbd"), ":mountain_bicyclist_tone3:" },
|
||||||
":mountain_bicyclist_tone2:" },
|
Emoji{ QString::fromUtf8("\xf0\x9f\x9a\xb5\xf0\x9f\x8f\xbe"), ":mountain_bicyclist_tone4:" },
|
||||||
Emoji{ QString::fromUtf8("\xf0\x9f\x9a\xb5\xf0\x9f\x8f\xbd"),
|
Emoji{ QString::fromUtf8("\xf0\x9f\x9a\xb5\xf0\x9f\x8f\xbf"), ":mountain_bicyclist_tone5:" },
|
||||||
":mountain_bicyclist_tone3:" },
|
|
||||||
Emoji{ QString::fromUtf8("\xf0\x9f\x9a\xb5\xf0\x9f\x8f\xbe"),
|
|
||||||
":mountain_bicyclist_tone4:" },
|
|
||||||
Emoji{ QString::fromUtf8("\xf0\x9f\x9a\xb5\xf0\x9f\x8f\xbf"),
|
|
||||||
":mountain_bicyclist_tone5:" },
|
|
||||||
Emoji{ QString::fromUtf8("\xf0\x9f\xa4\xb8"), ":cartwheel:" },
|
Emoji{ QString::fromUtf8("\xf0\x9f\xa4\xb8"), ":cartwheel:" },
|
||||||
Emoji{ QString::fromUtf8("\xf0\x9f\xa4\xb8\xf0\x9f\x8f\xbb"), ":cartwheel_tone1:" },
|
Emoji{ QString::fromUtf8("\xf0\x9f\xa4\xb8\xf0\x9f\x8f\xbb"), ":cartwheel_tone1:" },
|
||||||
Emoji{ QString::fromUtf8("\xf0\x9f\xa4\xb8\xf0\x9f\x8f\xbc"), ":cartwheel_tone2:" },
|
Emoji{ QString::fromUtf8("\xf0\x9f\xa4\xb8\xf0\x9f\x8f\xbc"), ":cartwheel_tone2:" },
|
||||||
@ -630,7 +626,7 @@ const QList<Emoji> EmojiProvider::activity = {
|
|||||||
Emoji{ QString::fromUtf8("\xf0\x9f\xa5\x81"), ":drum:" },
|
Emoji{ QString::fromUtf8("\xf0\x9f\xa5\x81"), ":drum:" },
|
||||||
Emoji{ QString::fromUtf8("\xf0\x9f\x8e\xac"), ":clapper:" },
|
Emoji{ QString::fromUtf8("\xf0\x9f\x8e\xac"), ":clapper:" },
|
||||||
Emoji{ QString::fromUtf8("\xf0\x9f\x8f\xb9"), ":bow_and_arrow:" },
|
Emoji{ QString::fromUtf8("\xf0\x9f\x8f\xb9"), ":bow_and_arrow:" },
|
||||||
};
|
};
|
||||||
|
|
||||||
const QList<Emoji> EmojiProvider::travel = {
|
const QList<Emoji> EmojiProvider::travel = {
|
||||||
Emoji{ QString::fromUtf8("\xf0\x9f\x8f\x8e"), ":race_car:" },
|
Emoji{ QString::fromUtf8("\xf0\x9f\x8f\x8e"), ":race_car:" },
|
||||||
|
@ -22,7 +22,9 @@
|
|||||||
#include "Deserializable.h"
|
#include "Deserializable.h"
|
||||||
#include "Login.h"
|
#include "Login.h"
|
||||||
|
|
||||||
LoginRequest::LoginRequest() {}
|
LoginRequest::LoginRequest()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
LoginRequest::LoginRequest(QString username, QString password)
|
LoginRequest::LoginRequest(QString username, QString password)
|
||||||
: user_(username)
|
: user_(username)
|
||||||
|
@ -297,4 +297,6 @@ LoginPage::onBackButtonClicked()
|
|||||||
emit backButtonClicked();
|
emit backButtonClicked();
|
||||||
}
|
}
|
||||||
|
|
||||||
LoginPage::~LoginPage() {}
|
LoginPage::~LoginPage()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
@ -253,4 +253,6 @@ MainWindow::instance()
|
|||||||
return instance_;
|
return instance_;
|
||||||
}
|
}
|
||||||
|
|
||||||
MainWindow::~MainWindow() {}
|
MainWindow::~MainWindow()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
@ -230,7 +230,9 @@ MatrixClient::onGetOwnCommunitiesResponse(QNetworkReply *reply)
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
QList<QString> response;
|
QList<QString> response;
|
||||||
for (auto it = json["groups"].toArray().constBegin(); it != json["groups"].toArray().constEnd(); it++) {
|
for (auto it = json["groups"].toArray().constBegin();
|
||||||
|
it != json["groups"].toArray().constEnd();
|
||||||
|
it++) {
|
||||||
response.append(it->toString());
|
response.append(it->toString());
|
||||||
}
|
}
|
||||||
emit getOwnCommunitiesResponse(response);
|
emit getOwnCommunitiesResponse(response);
|
||||||
|
@ -181,4 +181,6 @@ RegisterPage::onRegisterButtonClicked()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
RegisterPage::~RegisterPage() {}
|
RegisterPage::~RegisterPage()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
@ -310,4 +310,6 @@ RoomInfoListItem::mousePressEvent(QMouseEvent *event)
|
|||||||
ripple_overlay_->addRipple(ripple);
|
ripple_overlay_->addRipple(ripple);
|
||||||
}
|
}
|
||||||
|
|
||||||
RoomInfoListItem::~RoomInfoListItem() {}
|
RoomInfoListItem::~RoomInfoListItem()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
@ -62,7 +62,9 @@ RoomList::RoomList(QSharedPointer<MatrixClient> client, QWidget *parent)
|
|||||||
SLOT(updateRoomAvatar(const QString &, const QPixmap &)));
|
SLOT(updateRoomAvatar(const QString &, const QPixmap &)));
|
||||||
}
|
}
|
||||||
|
|
||||||
RoomList::~RoomList() {}
|
RoomList::~RoomList()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
RoomList::clear()
|
RoomList::clear()
|
||||||
@ -291,11 +293,11 @@ RoomList::setFilterRooms(bool filterRooms)
|
|||||||
{
|
{
|
||||||
filterRooms_ = filterRooms;
|
filterRooms_ = filterRooms;
|
||||||
|
|
||||||
for (int i=0; i<contentsLayout_->count(); i++) {
|
for (int i = 0; i < contentsLayout_->count(); i++) {
|
||||||
|
// If roomFilter_ contains the room for the current RoomInfoListItem,
|
||||||
//If roomFilter_ contains the room for the current RoomInfoListItem,
|
// show the list item, otherwise hide it
|
||||||
//show the list item, otherwise hide it
|
RoomInfoListItem *listitem =
|
||||||
RoomInfoListItem *listitem = (RoomInfoListItem *) contentsLayout_->itemAt(i)->widget();
|
(RoomInfoListItem *)contentsLayout_->itemAt(i)->widget();
|
||||||
|
|
||||||
if (listitem != nullptr) {
|
if (listitem != nullptr) {
|
||||||
if (!filterRooms) {
|
if (!filterRooms) {
|
||||||
@ -310,10 +312,10 @@ RoomList::setFilterRooms(bool filterRooms)
|
|||||||
|
|
||||||
if (!roomFilter_.contains(selectedRoom_)) {
|
if (!roomFilter_.contains(selectedRoom_)) {
|
||||||
RoomInfoListItem *firstVisibleRoom = nullptr;
|
RoomInfoListItem *firstVisibleRoom = nullptr;
|
||||||
for (int i=0; i<contentsLayout_->count(); i++) {
|
for (int i = 0; i < contentsLayout_->count(); i++) {
|
||||||
QWidget *item = contentsLayout_->itemAt(i)->widget();
|
QWidget *item = contentsLayout_->itemAt(i)->widget();
|
||||||
if (item != nullptr && item->isVisible()) {
|
if (item != nullptr && item->isVisible()) {
|
||||||
firstVisibleRoom = (RoomInfoListItem *) item;
|
firstVisibleRoom = (RoomInfoListItem *)item;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -231,4 +231,6 @@ TextInputWidget::hideUploadSpinner()
|
|||||||
spinner_->stop();
|
spinner_->stop();
|
||||||
}
|
}
|
||||||
|
|
||||||
TextInputWidget::~TextInputWidget() {}
|
TextInputWidget::~TextInputWidget()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
@ -461,4 +461,6 @@ TimelineItem::descriptiveTime(const QDateTime &then)
|
|||||||
return then.toString("dd/MM/yy");
|
return then.toString("dd/MM/yy");
|
||||||
}
|
}
|
||||||
|
|
||||||
TimelineItem::~TimelineItem() {}
|
TimelineItem::~TimelineItem()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
@ -37,7 +37,9 @@ TimelineViewManager::TimelineViewManager(QSharedPointer<MatrixClient> client, QW
|
|||||||
client_.data(), &MatrixClient::messageSent, this, &TimelineViewManager::messageSent);
|
client_.data(), &MatrixClient::messageSent, this, &TimelineViewManager::messageSent);
|
||||||
}
|
}
|
||||||
|
|
||||||
TimelineViewManager::~TimelineViewManager() {}
|
TimelineViewManager::~TimelineViewManager()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
TimelineViewManager::messageSent(const QString &event_id, const QString &roomid, int txn_id)
|
TimelineViewManager::messageSent(const QString &event_id, const QString &roomid, int txn_id)
|
||||||
|
@ -171,4 +171,6 @@ TopRoomBar::setRoomSettings(QSharedPointer<RoomSettings> settings)
|
|||||||
roomSettings_ = settings;
|
roomSettings_ = settings;
|
||||||
}
|
}
|
||||||
|
|
||||||
TopRoomBar::~TopRoomBar() {}
|
TopRoomBar::~TopRoomBar()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
@ -121,7 +121,9 @@ UserInfoWidget::closeLogoutDialog(bool isLoggingOut)
|
|||||||
emit logout();
|
emit logout();
|
||||||
}
|
}
|
||||||
|
|
||||||
UserInfoWidget::~UserInfoWidget() {}
|
UserInfoWidget::~UserInfoWidget()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
UserInfoWidget::resizeEvent(QResizeEvent *event)
|
UserInfoWidget::resizeEvent(QResizeEvent *event)
|
||||||
|
@ -19,7 +19,9 @@ Avatar::Avatar(QWidget *parent)
|
|||||||
setSizePolicy(policy);
|
setSizePolicy(policy);
|
||||||
}
|
}
|
||||||
|
|
||||||
Avatar::~Avatar() {}
|
Avatar::~Avatar()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
QColor
|
QColor
|
||||||
Avatar::textColor() const
|
Avatar::textColor() const
|
||||||
|
@ -22,7 +22,9 @@ Badge::Badge(const QString &text, QWidget *parent)
|
|||||||
setText(text);
|
setText(text);
|
||||||
}
|
}
|
||||||
|
|
||||||
Badge::~Badge() {}
|
Badge::~Badge()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
Badge::init()
|
Badge::init()
|
||||||
|
@ -80,7 +80,9 @@ FlatButton::FlatButton(const QString &text, ui::Role role, QWidget *parent, ui::
|
|||||||
setRole(role);
|
setRole(role);
|
||||||
}
|
}
|
||||||
|
|
||||||
FlatButton::~FlatButton() {}
|
FlatButton::~FlatButton()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
FlatButton::applyPreset(ui::ButtonPreset preset)
|
FlatButton::applyPreset(ui::ButtonPreset preset)
|
||||||
@ -610,7 +612,9 @@ FlatButtonStateMachine::FlatButtonStateMachine(FlatButton *parent)
|
|||||||
addTransition(button_, QEvent::FocusOut, pressed_state_, hovered_state_);
|
addTransition(button_, QEvent::FocusOut, pressed_state_, hovered_state_);
|
||||||
}
|
}
|
||||||
|
|
||||||
FlatButtonStateMachine::~FlatButtonStateMachine() {}
|
FlatButtonStateMachine::~FlatButtonStateMachine()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
FlatButtonStateMachine::setOverlayOpacity(qreal opacity)
|
FlatButtonStateMachine::setOverlayOpacity(qreal opacity)
|
||||||
|
@ -70,7 +70,9 @@ RaisedButton::RaisedButton(const QString &text, QWidget *parent)
|
|||||||
setText(text);
|
setText(text);
|
||||||
}
|
}
|
||||||
|
|
||||||
RaisedButton::~RaisedButton() {}
|
RaisedButton::~RaisedButton()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
bool
|
bool
|
||||||
RaisedButton::event(QEvent *event)
|
RaisedButton::event(QEvent *event)
|
||||||
|
@ -25,7 +25,9 @@ Ripple::Ripple(const QPoint ¢er, RippleOverlay *overlay, QObject *parent)
|
|||||||
init();
|
init();
|
||||||
}
|
}
|
||||||
|
|
||||||
Ripple::~Ripple() {}
|
Ripple::~Ripple()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
Ripple::setRadius(qreal radius)
|
Ripple::setRadius(qreal radius)
|
||||||
|
@ -11,7 +11,9 @@ RippleOverlay::RippleOverlay(QWidget *parent)
|
|||||||
setAttribute(Qt::WA_NoSystemBackground);
|
setAttribute(Qt::WA_NoSystemBackground);
|
||||||
}
|
}
|
||||||
|
|
||||||
RippleOverlay::~RippleOverlay() {}
|
RippleOverlay::~RippleOverlay()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
RippleOverlay::addRipple(Ripple *ripple)
|
RippleOverlay::addRipple(Ripple *ripple)
|
||||||
|
@ -32,7 +32,9 @@ TextField::TextField(QWidget *parent)
|
|||||||
QCoreApplication::processEvents();
|
QCoreApplication::processEvents();
|
||||||
}
|
}
|
||||||
|
|
||||||
TextField::~TextField() {}
|
TextField::~TextField()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
TextField::setBackgroundColor(const QColor &color)
|
TextField::setBackgroundColor(const QColor &color)
|
||||||
@ -272,7 +274,9 @@ TextFieldStateMachine::TextFieldStateMachine(TextField *parent)
|
|||||||
connect(text_field_, SIGNAL(textChanged(QString)), this, SLOT(setupProperties()));
|
connect(text_field_, SIGNAL(textChanged(QString)), this, SLOT(setupProperties()));
|
||||||
}
|
}
|
||||||
|
|
||||||
TextFieldStateMachine::~TextFieldStateMachine() {}
|
TextFieldStateMachine::~TextFieldStateMachine()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
TextFieldStateMachine::setLabel(TextFieldLabel *label)
|
TextFieldStateMachine::setLabel(TextFieldLabel *label)
|
||||||
@ -349,7 +353,9 @@ TextFieldLabel::TextFieldLabel(TextField *parent)
|
|||||||
setFont(font);
|
setFont(font);
|
||||||
}
|
}
|
||||||
|
|
||||||
TextFieldLabel::~TextFieldLabel() {}
|
TextFieldLabel::~TextFieldLabel()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
TextFieldLabel::paintEvent(QPaintEvent *)
|
TextFieldLabel::paintEvent(QPaintEvent *)
|
||||||
|
@ -22,7 +22,9 @@ Theme::Theme(QObject *parent)
|
|||||||
setColor("Transparent", ui::Color::Transparent);
|
setColor("Transparent", ui::Color::Transparent);
|
||||||
}
|
}
|
||||||
|
|
||||||
Theme::~Theme() {}
|
Theme::~Theme()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
QColor
|
QColor
|
||||||
Theme::rgba(int r, int g, int b, qreal a) const
|
Theme::rgba(int r, int g, int b, qreal a) const
|
||||||
|
Loading…
Reference in New Issue
Block a user