summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Cache.cc3
-rw-r--r--src/ChatPage.cc3
-rw-r--r--src/Deserializable.cc3
-rw-r--r--src/EmojiPanel.cc26
-rw-r--r--src/EmojiPickButton.cc3
-rw-r--r--src/Login.cc3
-rw-r--r--src/LoginPage.cc10
-rw-r--r--src/MainWindow.cc4
-rw-r--r--src/QuickSwitcher.cc3
-rw-r--r--src/Register.cc3
-rw-r--r--src/RegisterPage.cc11
-rw-r--r--src/SideBarActions.cc65
-rw-r--r--src/TextInputWidget.cc13
-rw-r--r--src/TopRoomBar.cc4
-rw-r--r--src/UserInfoWidget.cc8
-rw-r--r--src/WelcomePage.cc9
16 files changed, 120 insertions, 51 deletions
diff --git a/src/Cache.cc b/src/Cache.cc
index c96ec37d..3f7b141b 100644
--- a/src/Cache.cc
+++ b/src/Cache.cc
@@ -36,8 +36,7 @@ Cache::Cache(const QString &userId)
, roomDb_{ 0 }
, isMounted_{ false }
, userId_{ userId }
-{
-}
+{}
void
Cache::setup()
diff --git a/src/ChatPage.cc b/src/ChatPage.cc
index 92692fc1..24844183 100644
--- a/src/ChatPage.cc
+++ b/src/ChatPage.cc
@@ -60,8 +60,11 @@ ChatPage::ChatPage(QSharedPointer<MatrixClient> client, QWidget *parent)
sideBarMainLayout_->setSpacing(0);
sideBarMainLayout_->setMargin(0);
+ sidebarActions_ = new SideBarActions(this);
+
sideBarLayout_->addLayout(sideBarTopLayout_);
sideBarLayout_->addLayout(sideBarMainLayout_);
+ sideBarLayout_->addWidget(sidebarActions_);
sideBarTopWidget_ = new QWidget(sideBar_);
sideBarTopWidget_->setStyleSheet("background-color: #d6dde3; color: #ebebeb;");
diff --git a/src/Deserializable.cc b/src/Deserializable.cc
index 9bef7d68..6033f898 100644
--- a/src/Deserializable.cc
+++ b/src/Deserializable.cc
@@ -23,8 +23,7 @@
DeserializationException::DeserializationException(const std::string &msg)
: msg_(msg)
-{
-}
+{}
const char *
DeserializationException::what() const noexcept
diff --git a/src/EmojiPanel.cc b/src/EmojiPanel.cc
index 2730ddb5..16299ace 100644
--- a/src/EmojiPanel.cc
+++ b/src/EmojiPanel.cc
@@ -63,43 +63,53 @@ EmojiPanel::EmojiPanel(QWidget *parent)
categoriesLayout->setSpacing(6);
categoriesLayout->setMargin(5);
+ QIcon icon;
+
auto peopleCategory = new FlatButton(emojiCategories);
- peopleCategory->setIcon(QIcon(":/icons/icons/emoji-categories/people.png"));
+ icon.addFile(":/icons/icons/emoji-categories/people.png");
+ peopleCategory->setIcon(icon);
peopleCategory->setIconSize(QSize(categoryIconSize_, categoryIconSize_));
peopleCategory->setForegroundColor("gray");
auto natureCategory_ = new FlatButton(emojiCategories);
- natureCategory_->setIcon(QIcon(":/icons/icons/emoji-categories/nature.png"));
+ icon.addFile(":/icons/icons/emoji-categories/nature.png");
+ natureCategory_->setIcon(icon);
natureCategory_->setIconSize(QSize(categoryIconSize_, categoryIconSize_));
natureCategory_->setForegroundColor("gray");
auto foodCategory_ = new FlatButton(emojiCategories);
- foodCategory_->setIcon(QIcon(":/icons/icons/emoji-categories/foods.png"));
+ icon.addFile(":/icons/icons/emoji-categories/foods.png");
+ foodCategory_->setIcon(icon);
foodCategory_->setIconSize(QSize(categoryIconSize_, categoryIconSize_));
foodCategory_->setForegroundColor("gray");
auto activityCategory = new FlatButton(emojiCategories);
- activityCategory->setIcon(QIcon(":/icons/icons/emoji-categories/activity.png"));
+ icon.addFile(":/icons/icons/emoji-categories/activity.png");
+ activityCategory->setIcon(icon);
activityCategory->setIconSize(QSize(categoryIconSize_, categoryIconSize_));
activityCategory->setForegroundColor("gray");
auto travelCategory = new FlatButton(emojiCategories);
- travelCategory->setIcon(QIcon(":/icons/icons/emoji-categories/travel.png"));
+ icon.addFile(":/icons/icons/emoji-categories/travel.png");
+ travelCategory->setIcon(icon);
travelCategory->setIconSize(QSize(categoryIconSize_, categoryIconSize_));
travelCategory->setForegroundColor("gray");
auto objectsCategory = new FlatButton(emojiCategories);
- objectsCategory->setIcon(QIcon(":/icons/icons/emoji-categories/objects.png"));
+ icon.addFile(":/icons/icons/emoji-categories/objects.png");
+ objectsCategory->setIcon(icon);
objectsCategory->setIconSize(QSize(categoryIconSize_, categoryIconSize_));
objectsCategory->setForegroundColor("gray");
auto symbolsCategory = new FlatButton(emojiCategories);
- symbolsCategory->setIcon(QIcon(":/icons/icons/emoji-categories/symbols.png"));
+ icon.addFile(":/icons/icons/emoji-categories/symbols.png");
+ symbolsCategory->setIcon(icon);
symbolsCategory->setIconSize(QSize(categoryIconSize_, categoryIconSize_));
symbolsCategory->setForegroundColor("gray");
auto flagsCategory = new FlatButton(emojiCategories);
- flagsCategory->setIcon(QIcon(":/icons/icons/emoji-categories/flags.png"));
+ icon.addFile(":/icons/icons/emoji-categories/flags.png");
+ flagsCategory->setIcon(icon);
flagsCategory->setIconSize(QSize(categoryIconSize_, categoryIconSize_));
flagsCategory->setForegroundColor("gray");
diff --git a/src/EmojiPickButton.cc b/src/EmojiPickButton.cc
index 4f7dd59e..06d97d4c 100644
--- a/src/EmojiPickButton.cc
+++ b/src/EmojiPickButton.cc
@@ -22,8 +22,7 @@
EmojiPickButton::EmojiPickButton(QWidget *parent)
: FlatButton(parent)
, panel_{ nullptr }
-{
-}
+{}
void
EmojiPickButton::enterEvent(QEvent *e)
diff --git a/src/Login.cc b/src/Login.cc
index d0dd1ea9..16c6f172 100644
--- a/src/Login.cc
+++ b/src/Login.cc
@@ -27,8 +27,7 @@ LoginRequest::LoginRequest() {}
LoginRequest::LoginRequest(QString username, QString password)
: user_(username)
, password_(password)
-{
-}
+{}
QByteArray
LoginRequest::serialize() noexcept
diff --git a/src/LoginPage.cc b/src/LoginPage.cc
index fd7fede3..bbe2a134 100644
--- a/src/LoginPage.cc
+++ b/src/LoginPage.cc
@@ -42,16 +42,16 @@ LoginPage::LoginPage(QSharedPointer<MatrixClient> client, QWidget *parent)
top_bar_layout_->addStretch(1);
QIcon icon;
- icon.addFile(":/icons/icons/left-angle.png", QSize(), QIcon::Normal, QIcon::Off);
+ icon.addFile(":/icons/icons/ui/angle-pointing-to-left.png");
back_button_->setIcon(icon);
- back_button_->setIconSize(QSize(24, 24));
+ back_button_->setIconSize(QSize(32, 32));
- QIcon advanced_settings_icon;
- advanced_settings_icon.addFile(":/icons/icons/cog.png", QSize(), QIcon::Normal, QIcon::Off);
+ QIcon logo;
+ logo.addFile(":/logos/login.png");
logo_ = new QLabel(this);
- logo_->setPixmap(QPixmap(":/logos/nheko-128.png"));
+ logo_->setPixmap(logo.pixmap(128));
logo_layout_ = new QHBoxLayout();
logo_layout_->setContentsMargins(0, 0, 0, 20);
diff --git a/src/MainWindow.cc b/src/MainWindow.cc
index 06f8245c..8cb2b562 100644
--- a/src/MainWindow.cc
+++ b/src/MainWindow.cc
@@ -176,8 +176,8 @@ MainWindow::showChatPage(QString userid, QString homeserver, QString token)
new LoadingIndicator(this),
[=](LoadingIndicator *indicator) { indicator->deleteLater(); });
spinner_->setColor("#acc7dc");
- spinner_->setFixedHeight(120);
- spinner_->setFixedWidth(120);
+ spinner_->setFixedHeight(100);
+ spinner_->setFixedWidth(100);
spinner_->start();
}
diff --git a/src/QuickSwitcher.cc b/src/QuickSwitcher.cc
index 29876f99..5b459eaf 100644
--- a/src/QuickSwitcher.cc
+++ b/src/QuickSwitcher.cc
@@ -24,8 +24,7 @@
RoomSearchInput::RoomSearchInput(QWidget *parent)
: TextField(parent)
-{
-}
+{}
bool
RoomSearchInput::focusNextPrevChild(bool next)
diff --git a/src/Register.cc b/src/Register.cc
index 2e2c227c..db3ce4f9 100644
--- a/src/Register.cc
+++ b/src/Register.cc
@@ -25,8 +25,7 @@
RegisterRequest::RegisterRequest(const QString &username, const QString &password)
: user_(username)
, password_(password)
-{
-}
+{}
QByteArray
RegisterRequest::serialize() noexcept
diff --git a/src/RegisterPage.cc b/src/RegisterPage.cc
index e485de7d..bcd02be0 100644
--- a/src/RegisterPage.cc
+++ b/src/RegisterPage.cc
@@ -38,17 +38,20 @@ RegisterPage::RegisterPage(QSharedPointer<MatrixClient> client, QWidget *parent)
back_button_->setMinimumSize(QSize(30, 30));
QIcon icon;
- icon.addFile(":/icons/icons/left-angle.png", QSize(), QIcon::Normal, QIcon::Off);
+ icon.addFile(":/icons/icons/ui/angle-pointing-to-left.png");
back_button_->setIcon(icon);
- back_button_->setIconSize(QSize(24, 24));
+ back_button_->setIconSize(QSize(32, 32));
back_layout_->addWidget(back_button_, 0, Qt::AlignLeft | Qt::AlignVCenter);
back_layout_->addStretch(1);
+ QIcon logo;
+ logo.addFile(":/logos/register.png");
+
logo_ = new Avatar(this);
- logo_->setImage(QImage(":/logos/nheko-128.png"));
- logo_->setSize(80);
+ logo_->setIcon(logo);
+ logo_->setSize(128);
logo_layout_ = new QHBoxLayout();
logo_layout_->setMargin(0);
diff --git a/src/SideBarActions.cc b/src/SideBarActions.cc
new file mode 100644
index 00000000..d4874c6a
--- /dev/null
+++ b/src/SideBarActions.cc
@@ -0,0 +1,65 @@
+#include <QDebug>
+#include <QIcon>
+
+#include "Config.h"
+#include "Theme.h"
+#include <SideBarActions.h>
+
+SideBarActions::SideBarActions(QWidget *parent)
+ : QWidget{ parent }
+{
+ setFixedHeight(conf::sidebarActions::height);
+
+ QSizePolicy sizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
+ setSizePolicy(sizePolicy);
+
+ layout_ = new QHBoxLayout(this);
+ layout_->setMargin(0);
+
+ QIcon settingsIcon;
+ settingsIcon.addFile(":/icons/icons/ui/settings.png");
+
+ QIcon createRoomIcon;
+ createRoomIcon.addFile(":/icons/icons/ui/add-square-button.png");
+
+ QIcon joinRoomIcon;
+ joinRoomIcon.addFile(":/icons/icons/ui/speech-bubbles-comment-option.png");
+
+ settingsBtn_ = new FlatButton(this);
+ settingsBtn_->setIcon(settingsIcon);
+ settingsBtn_->setCornerRadius(conf::sidebarActions::iconSize / 2);
+ settingsBtn_->setIconSize(
+ QSize(conf::sidebarActions::iconSize, conf::sidebarActions::iconSize));
+
+ createRoomBtn_ = new FlatButton(this);
+ createRoomBtn_->setIcon(createRoomIcon);
+ createRoomBtn_->setCornerRadius(conf::sidebarActions::iconSize / 2);
+ createRoomBtn_->setIconSize(
+ QSize(conf::sidebarActions::iconSize, conf::sidebarActions::iconSize));
+
+ joinRoomBtn_ = new FlatButton(this);
+ joinRoomBtn_->setIcon(joinRoomIcon);
+ joinRoomBtn_->setCornerRadius(conf::sidebarActions::iconSize / 2);
+ joinRoomBtn_->setIconSize(
+ QSize(conf::sidebarActions::iconSize, conf::sidebarActions::iconSize));
+
+ layout_->addWidget(createRoomBtn_);
+ layout_->addWidget(joinRoomBtn_);
+ layout_->addWidget(settingsBtn_);
+}
+
+SideBarActions::~SideBarActions() {}
+
+void
+SideBarActions::resizeEvent(QResizeEvent *event)
+{
+ Q_UNUSED(event);
+
+ if (width() <= ui::sidebar::SmallSize) {
+ joinRoomBtn_->hide();
+ createRoomBtn_->hide();
+ } else {
+ joinRoomBtn_->show();
+ createRoomBtn_->show();
+ }
+}
diff --git a/src/TextInputWidget.cc b/src/TextInputWidget.cc
index b90a7caa..0d5e1102 100644
--- a/src/TextInputWidget.cc
+++ b/src/TextInputWidget.cc
@@ -45,7 +45,7 @@ TextInputWidget::TextInputWidget(QWidget *parent)
{
setFont(QFont("Emoji One"));
- setFixedHeight(50);
+ setFixedHeight(conf::textInput::height);
setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
setCursor(Qt::ArrowCursor);
setStyleSheet("background-color: #fff;");
@@ -55,15 +55,13 @@ TextInputWidget::TextInputWidget(QWidget *parent)
topLayout_->setContentsMargins(15, 0, 15, 5);
QIcon send_file_icon;
- send_file_icon.addFile(":/icons/icons/clip-dark.png", QSize(), QIcon::Normal, QIcon::Off);
+ send_file_icon.addFile(":/icons/icons/ui/paper-clip-outline.png");
sendFileBtn_ = new FlatButton(this);
- sendFileBtn_->setForegroundColor(QColor("#acc7dc"));
sendFileBtn_->setIcon(send_file_icon);
sendFileBtn_->setIconSize(QSize(24, 24));
spinner_ = new LoadingIndicator(this);
- spinner_->setColor("#acc7dc");
spinner_->setFixedHeight(32);
spinner_->setFixedWidth(32);
spinner_->hide();
@@ -79,19 +77,16 @@ TextInputWidget::TextInputWidget(QWidget *parent)
input_->setStyleSheet("color: #333333; border: none; padding-top: 5px; margin: 0 5px");
sendMessageBtn_ = new FlatButton(this);
- sendMessageBtn_->setForegroundColor(QColor("#acc7dc"));
QIcon send_message_icon;
- send_message_icon.addFile(
- ":/icons/icons/share-dark.png", QSize(), QIcon::Normal, QIcon::Off);
+ send_message_icon.addFile(":/icons/icons/ui/cursor.png");
sendMessageBtn_->setIcon(send_message_icon);
sendMessageBtn_->setIconSize(QSize(24, 24));
emojiBtn_ = new EmojiPickButton(this);
- emojiBtn_->setForegroundColor(QColor("#acc7dc"));
QIcon emoji_icon;
- emoji_icon.addFile(":/icons/icons/smile.png", QSize(), QIcon::Normal, QIcon::Off);
+ emoji_icon.addFile(":/icons/icons/ui/smile.png");
emojiBtn_->setIcon(emoji_icon);
emojiBtn_->setIconSize(QSize(24, 24));
diff --git a/src/TopRoomBar.cc b/src/TopRoomBar.cc
index 3f93cad3..5a1f2d25 100644
--- a/src/TopRoomBar.cc
+++ b/src/TopRoomBar.cc
@@ -62,13 +62,11 @@ TopRoomBar::TopRoomBar(QWidget *parent)
textLayout_->addWidget(topicLabel_);
settingsBtn_ = new FlatButton(this);
- settingsBtn_->setForegroundColor(QColor("#acc7dc"));
settingsBtn_->setFixedSize(buttonSize_, buttonSize_);
settingsBtn_->setCornerRadius(buttonSize_ / 2);
QIcon settings_icon;
- settings_icon.addFile(
- ":/icons/icons/vertical-ellipsis.png", QSize(), QIcon::Normal, QIcon::Off);
+ settings_icon.addFile(":/icons/icons/ui/vertical-ellipsis.png");
settingsBtn_->setIcon(settings_icon);
settingsBtn_->setIconSize(QSize(buttonSize_ / 2, buttonSize_ / 2));
diff --git a/src/UserInfoWidget.cc b/src/UserInfoWidget.cc
index 09a75a3b..04cfec74 100644
--- a/src/UserInfoWidget.cc
+++ b/src/UserInfoWidget.cc
@@ -29,7 +29,7 @@ UserInfoWidget::UserInfoWidget(QWidget *parent)
, user_id_("@user:homeserver.org")
, logoutModal_{ nullptr }
, logoutDialog_{ nullptr }
- , logoutButtonSize_{ 32 }
+ , logoutButtonSize_{ 20 }
{
QSizePolicy sizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
setSizePolicy(sizePolicy);
@@ -77,15 +77,13 @@ UserInfoWidget::UserInfoWidget(QWidget *parent)
buttonLayout_->setMargin(0);
logoutButton_ = new FlatButton(this);
- logoutButton_->setForegroundColor(QColor("#555459"));
- logoutButton_->setFixedSize(logoutButtonSize_, logoutButtonSize_);
logoutButton_->setCornerRadius(logoutButtonSize_ / 2);
QIcon icon;
- icon.addFile(":/icons/icons/power-button-off.png", QSize(), QIcon::Normal, QIcon::Off);
+ icon.addFile(":/icons/icons/ui/power-button-off.png");
logoutButton_->setIcon(icon);
- logoutButton_->setIconSize(QSize(logoutButtonSize_ / 2, logoutButtonSize_ / 2));
+ logoutButton_->setIconSize(QSize(logoutButtonSize_, logoutButtonSize_));
buttonLayout_->addWidget(logoutButton_);
diff --git a/src/WelcomePage.cc b/src/WelcomePage.cc
index 5ea145f7..1fc0c19b 100644
--- a/src/WelcomePage.cc
+++ b/src/WelcomePage.cc
@@ -29,11 +29,14 @@ WelcomePage::WelcomePage(QWidget *parent)
auto topLayout_ = new QVBoxLayout(this);
topLayout_->setSpacing(20);
- QFont headingFont("Open Sans", 23);
- QFont subTitleFont("Open Sans", 22);
+ QFont headingFont("Open Sans", 22);
+ QFont subTitleFont("Open Sans", 21);
+
+ QIcon icon;
+ icon.addFile(":/logos/splash.png");
auto logo_ = new QLabel(this);
- logo_->setPixmap(QPixmap(":/logos/nheko-256.png"));
+ logo_->setPixmap(icon.pixmap(256));
logo_->setAlignment(Qt::AlignCenter);
QString heading(tr("Welcome to nheko! The desktop client for the Matrix protocol."));
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-30 18:25:53 +0000