diff --git a/CHANGELOG.md b/CHANGELOG.md index c4e810de..5d58d047 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,9 +10,12 @@ ### Improvements - Don't enable tray by default. -- Remove room re-ordering option. - Hard-coded pixel values were removed. The sizes are derived from the font. +### Removed +- Remove room re-ordering option. +- Built-in emoji picker & emoji font. + ## [0.6.1] - 2018-09-26 ### Improvements diff --git a/CMakeLists.txt b/CMakeLists.txt index 8dd99719..98f7a723 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -176,10 +176,6 @@ set(SRC_FILES src/dialogs/RoomSettings.cpp # Emoji - src/emoji/Category.cpp - src/emoji/ItemDelegate.cpp - src/emoji/Panel.cpp - src/emoji/PickButton.cpp src/emoji/Provider.cpp # Timeline @@ -302,12 +298,6 @@ qt5_wrap_cpp(MOC_HEADERS src/dialogs/ReCaptcha.h src/dialogs/RoomSettings.h - # Emoji - src/emoji/Category.h - src/emoji/ItemDelegate.h - src/emoji/Panel.h - src/emoji/PickButton.h - # Timeline src/timeline/TimelineItem.h src/timeline/TimelineView.h diff --git a/README.md b/README.md index 21c6d257..0f907186 100644 --- a/README.md +++ b/README.md @@ -266,7 +266,6 @@ Here is a screen shot to get a feel for the UI, but things will probably change. ### Third party -- [Emoji One](http://emojione.com) - [Font Awesome](http://fontawesome.io/) - [Open Sans](https://fonts.google.com/specimen/Open+Sans) diff --git a/resources/fonts/EmojiOne/emojione-android.ttf b/resources/fonts/EmojiOne/emojione-android.ttf deleted file mode 100644 index 4cd640d0..00000000 Binary files a/resources/fonts/EmojiOne/emojione-android.ttf and /dev/null differ diff --git a/resources/icons/emoji-categories/activity.png b/resources/icons/emoji-categories/activity.png deleted file mode 100644 index 2d360762..00000000 Binary files a/resources/icons/emoji-categories/activity.png and /dev/null differ diff --git a/resources/icons/emoji-categories/activity@2x.png b/resources/icons/emoji-categories/activity@2x.png deleted file mode 100644 index d8f88711..00000000 Binary files a/resources/icons/emoji-categories/activity@2x.png and /dev/null differ diff --git a/resources/icons/emoji-categories/flags.png b/resources/icons/emoji-categories/flags.png deleted file mode 100644 index 9a52000f..00000000 Binary files a/resources/icons/emoji-categories/flags.png and /dev/null differ diff --git a/resources/icons/emoji-categories/flags@2x.png b/resources/icons/emoji-categories/flags@2x.png deleted file mode 100644 index 45350593..00000000 Binary files a/resources/icons/emoji-categories/flags@2x.png and /dev/null differ diff --git a/resources/icons/emoji-categories/foods.png b/resources/icons/emoji-categories/foods.png deleted file mode 100644 index 15c31069..00000000 Binary files a/resources/icons/emoji-categories/foods.png and /dev/null differ diff --git a/resources/icons/emoji-categories/foods@2x.png b/resources/icons/emoji-categories/foods@2x.png deleted file mode 100644 index bbdd2a3c..00000000 Binary files a/resources/icons/emoji-categories/foods@2x.png and /dev/null differ diff --git a/resources/icons/emoji-categories/nature.png b/resources/icons/emoji-categories/nature.png deleted file mode 100644 index eb1786cf..00000000 Binary files a/resources/icons/emoji-categories/nature.png and /dev/null differ diff --git a/resources/icons/emoji-categories/nature@2x.png b/resources/icons/emoji-categories/nature@2x.png deleted file mode 100644 index 81db5c08..00000000 Binary files a/resources/icons/emoji-categories/nature@2x.png and /dev/null differ diff --git a/resources/icons/emoji-categories/objects.png b/resources/icons/emoji-categories/objects.png deleted file mode 100644 index 45c6eb37..00000000 Binary files a/resources/icons/emoji-categories/objects.png and /dev/null differ diff --git a/resources/icons/emoji-categories/objects@2x.png b/resources/icons/emoji-categories/objects@2x.png deleted file mode 100644 index 01fd5cb4..00000000 Binary files a/resources/icons/emoji-categories/objects@2x.png and /dev/null differ diff --git a/resources/icons/emoji-categories/people.png b/resources/icons/emoji-categories/people.png deleted file mode 100644 index 710e808a..00000000 Binary files a/resources/icons/emoji-categories/people.png and /dev/null differ diff --git a/resources/icons/emoji-categories/people@2x.png b/resources/icons/emoji-categories/people@2x.png deleted file mode 100644 index 142ba09e..00000000 Binary files a/resources/icons/emoji-categories/people@2x.png and /dev/null differ diff --git a/resources/icons/emoji-categories/symbols.png b/resources/icons/emoji-categories/symbols.png deleted file mode 100644 index 08184de1..00000000 Binary files a/resources/icons/emoji-categories/symbols.png and /dev/null differ diff --git a/resources/icons/emoji-categories/symbols@2x.png b/resources/icons/emoji-categories/symbols@2x.png deleted file mode 100644 index b5e7cc6c..00000000 Binary files a/resources/icons/emoji-categories/symbols@2x.png and /dev/null differ diff --git a/resources/icons/emoji-categories/travel.png b/resources/icons/emoji-categories/travel.png deleted file mode 100644 index 93da773e..00000000 Binary files a/resources/icons/emoji-categories/travel.png and /dev/null differ diff --git a/resources/icons/emoji-categories/travel@2x.png b/resources/icons/emoji-categories/travel@2x.png deleted file mode 100644 index 2f72a281..00000000 Binary files a/resources/icons/emoji-categories/travel@2x.png and /dev/null differ diff --git a/resources/res.qrc b/resources/res.qrc index cef55773..69dd6f76 100644 --- a/resources/res.qrc +++ b/resources/res.qrc @@ -63,22 +63,6 @@ icons/ui/edit.png icons/ui/edit@2x.png - icons/emoji-categories/people.png - icons/emoji-categories/people@2x.png - icons/emoji-categories/nature.png - icons/emoji-categories/nature@2x.png - icons/emoji-categories/foods.png - icons/emoji-categories/foods@2x.png - icons/emoji-categories/activity.png - icons/emoji-categories/activity@2x.png - icons/emoji-categories/travel.png - icons/emoji-categories/travel@2x.png - icons/emoji-categories/objects.png - icons/emoji-categories/objects@2x.png - icons/emoji-categories/symbols.png - icons/emoji-categories/symbols@2x.png - icons/emoji-categories/flags.png - icons/emoji-categories/flags@2x.png nheko.png @@ -104,7 +88,6 @@ fonts/OpenSans/OpenSans-Italic.ttf fonts/OpenSans/OpenSans-Bold.ttf fonts/OpenSans/OpenSans-Semibold.ttf - fonts/EmojiOne/emojione-android.ttf styles/system.qss diff --git a/resources/styles/nheko-dark.qss b/resources/styles/nheko-dark.qss index b203ad22..1f6631f7 100644 --- a/resources/styles/nheko-dark.qss +++ b/resources/styles/nheko-dark.qss @@ -184,18 +184,6 @@ RegisterPage { color: #caccd1; } -emoji--Panel, -emoji--Panel > * { - background-color: #202228; - color: #caccd1; -} - -emoji--Category, -emoji--Category > * { - background-color: #2d3139; - color: #caccd1; -} - FloatingButton { qproperty-backgroundColor: #2d3139; qproperty-foregroundColor: white; diff --git a/resources/styles/nheko.qss b/resources/styles/nheko.qss index 3ebf8415..408d954e 100644 --- a/resources/styles/nheko.qss +++ b/resources/styles/nheko.qss @@ -182,18 +182,6 @@ RegisterPage { color: #333; } -emoji--Panel, -emoji--Panel > * { - background-color: #eee; - color: #333; -} - -emoji--Category, -emoji--Category > * { - background-color: white; - color: #ccc; -} - FloatingButton { qproperty-backgroundColor: #efefef; qproperty-foregroundColor: black; diff --git a/src/TextInputWidget.cpp b/src/TextInputWidget.cpp index 5fcba7a9..89513037 100644 --- a/src/TextInputWidget.cpp +++ b/src/TextInputWidget.cpp @@ -513,22 +513,8 @@ TextInputWidget::TextInputWidget(QWidget *parent) sendMessageBtn_->setIcon(send_message_icon); sendMessageBtn_->setIconSize(QSize(ButtonHeight, ButtonHeight)); - emojiBtn_ = new emoji::PickButton(this); - emojiBtn_->setToolTip(tr("Emoji")); - -#if defined(Q_OS_MAC) - // macOS has a native emoji picker. - emojiBtn_->hide(); -#endif - - QIcon emoji_icon; - emoji_icon.addFile(":/icons/icons/ui/smile.png"); - emojiBtn_->setIcon(emoji_icon); - emojiBtn_->setIconSize(QSize(ButtonHeight, ButtonHeight)); - topLayout_->addWidget(sendFileBtn_); topLayout_->addWidget(input_); - topLayout_->addWidget(emojiBtn_); topLayout_->addWidget(sendMessageBtn_); setLayout(topLayout_); @@ -541,11 +527,6 @@ TextInputWidget::TextInputWidget(QWidget *parent) connect(input_, &FilteredTextEdit::audio, this, &TextInputWidget::uploadAudio); connect(input_, &FilteredTextEdit::video, this, &TextInputWidget::uploadVideo); connect(input_, &FilteredTextEdit::file, this, &TextInputWidget::uploadFile); - connect(emojiBtn_, - SIGNAL(emojiSelected(const QString &)), - this, - SLOT(addSelectedEmoji(const QString &))); - connect(input_, &FilteredTextEdit::startedTyping, this, &TextInputWidget::startedTyping); connect(input_, &FilteredTextEdit::stoppedTyping, this, &TextInputWidget::stoppedTyping); @@ -554,22 +535,6 @@ TextInputWidget::TextInputWidget(QWidget *parent) input_, &FilteredTextEdit::startedUpload, this, &TextInputWidget::showUploadSpinner); } -void -TextInputWidget::addSelectedEmoji(const QString &emoji) -{ - QTextCursor cursor = input_->textCursor(); - - QTextCharFormat charfmt; - input_->setCurrentCharFormat(charfmt); - - input_->insertPlainText(emoji); - cursor.movePosition(QTextCursor::End); - - input_->setCurrentCharFormat(charfmt); - - input_->show(); -} - void TextInputWidget::command(QString command, QString args) { diff --git a/src/TextInputWidget.h b/src/TextInputWidget.h index 8f634f6b..1fb6d7f2 100644 --- a/src/TextInputWidget.h +++ b/src/TextInputWidget.h @@ -30,7 +30,6 @@ #include "SuggestionsPopup.h" #include "dialogs/PreviewUploadOverlay.h" -#include "emoji/PickButton.h" namespace dialogs { class PreviewUploadOverlay; @@ -160,9 +159,6 @@ public slots: void focusLineEdit() { input_->setFocus(); } void addReply(const QString &username, const QString &msg); -private slots: - void addSelectedEmoji(const QString &emoji); - signals: void sendTextMessage(QString msg); void sendEmoteMessage(QString msg); @@ -193,7 +189,6 @@ private: FlatButton *sendFileBtn_; FlatButton *sendMessageBtn_; - emoji::PickButton *emojiBtn_; QColor borderColor_; }; diff --git a/src/emoji/Category.cpp b/src/emoji/Category.cpp deleted file mode 100644 index fbfbf4fc..00000000 --- a/src/emoji/Category.cpp +++ /dev/null @@ -1,90 +0,0 @@ -/* - * nheko Copyright (C) 2017 Konstantinos Sideris - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include -#include -#include - -#include "Config.h" - -#include "emoji/Category.h" - -using namespace emoji; - -Category::Category(QString category, std::vector emoji, QWidget *parent) - : QWidget(parent) -{ - mainLayout_ = new QVBoxLayout(this); - mainLayout_->setMargin(0); - mainLayout_->setSpacing(0); - - emojiListView_ = new QListView(); - itemModel_ = new QStandardItemModel(this); - - delegate_ = new ItemDelegate(this); - data_ = new Emoji; - - emojiListView_->setItemDelegate(delegate_); - emojiListView_->setModel(itemModel_); - emojiListView_->setViewMode(QListView::IconMode); - emojiListView_->setFlow(QListView::LeftToRight); - emojiListView_->setResizeMode(QListView::Adjust); - emojiListView_->verticalScrollBar()->setEnabled(false); - emojiListView_->horizontalScrollBar()->setEnabled(false); - - const int cols = 7; - const int rows = emoji.size() / 7; - - // TODO: Be precise here. Take the parent into consideration. - emojiListView_->setFixedSize(cols * 50 + 20, rows * 50 + 20); - emojiListView_->setGridSize(QSize(50, 50)); - emojiListView_->setDragEnabled(false); - emojiListView_->setEditTriggers(QAbstractItemView::NoEditTriggers); - - for (const auto &e : emoji) { - data_->unicode = e.unicode; - - auto item = new QStandardItem; - item->setSizeHint(QSize(24, 24)); - - QVariant unicode(data_->unicode); - item->setData(unicode.toString(), Qt::UserRole); - - itemModel_->appendRow(item); - } - - QFont font; - font.setWeight(QFont::Medium); - - category_ = new QLabel(category, this); - category_->setFont(font); - category_->setStyleSheet("margin: 20px 0 20px 8px;"); - - mainLayout_->addWidget(category_); - mainLayout_->addWidget(emojiListView_); - - connect(emojiListView_, &QListView::clicked, this, &Category::clickIndex); -} - -void -Category::paintEvent(QPaintEvent *) -{ - QStyleOption opt; - opt.init(this); - QPainter p(this); - style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this); -} diff --git a/src/emoji/Category.h b/src/emoji/Category.h deleted file mode 100644 index a14029c8..00000000 --- a/src/emoji/Category.h +++ /dev/null @@ -1,59 +0,0 @@ -/* - * nheko Copyright (C) 2017 Konstantinos Sideris - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -#include -#include -#include -#include - -#include "ItemDelegate.h" - -namespace emoji { - -class Category : public QWidget -{ - Q_OBJECT - -public: - Category(QString category, std::vector emoji, QWidget *parent = nullptr); - -signals: - void emojiSelected(const QString &emoji); - -protected: - void paintEvent(QPaintEvent *event) override; - -private slots: - void clickIndex(const QModelIndex &index) - { - emit emojiSelected(index.data(Qt::UserRole).toString()); - }; - -private: - QVBoxLayout *mainLayout_; - - QStandardItemModel *itemModel_; - QListView *emojiListView_; - - emoji::Emoji *data_; - emoji::ItemDelegate *delegate_; - - QLabel *category_; -}; -} // namespace emoji diff --git a/src/emoji/ItemDelegate.cpp b/src/emoji/ItemDelegate.cpp deleted file mode 100644 index 50a1b7ed..00000000 --- a/src/emoji/ItemDelegate.cpp +++ /dev/null @@ -1,48 +0,0 @@ -/* - * nheko Copyright (C) 2017 Konstantinos Sideris - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include -#include - -#include "emoji/ItemDelegate.h" - -using namespace emoji; - -ItemDelegate::ItemDelegate(QObject *parent) - : QStyledItemDelegate(parent) -{ - data_ = new Emoji; -} - -ItemDelegate::~ItemDelegate() { delete data_; } - -void -ItemDelegate::paint(QPainter *painter, - const QStyleOptionViewItem &option, - const QModelIndex &index) const -{ - Q_UNUSED(index); - - QStyleOptionViewItem viewOption(option); - - auto emoji = index.data(Qt::UserRole).toString(); - - QFont font("Emoji One"); - - painter->setFont(font); - painter->drawText(viewOption.rect, Qt::AlignCenter, emoji); -} diff --git a/src/emoji/ItemDelegate.h b/src/emoji/ItemDelegate.h deleted file mode 100644 index e0456308..00000000 --- a/src/emoji/ItemDelegate.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - * nheko Copyright (C) 2017 Konstantinos Sideris - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -#include -#include -#include - -#include "Provider.h" - -namespace emoji { - -class ItemDelegate : public QStyledItemDelegate -{ - Q_OBJECT - -public: - explicit ItemDelegate(QObject *parent = nullptr); - ~ItemDelegate(); - - void paint(QPainter *painter, - const QStyleOptionViewItem &option, - const QModelIndex &index) const override; - -private: - Emoji *data_; -}; -} // namespace emoji diff --git a/src/emoji/Panel.cpp b/src/emoji/Panel.cpp deleted file mode 100644 index 710b501e..00000000 --- a/src/emoji/Panel.cpp +++ /dev/null @@ -1,236 +0,0 @@ -/* - * nheko Copyright (C) 2017 Konstantinos Sideris - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include -#include -#include - -#include "ui/DropShadow.h" -#include "ui/FlatButton.h" - -#include "emoji/Category.h" -#include "emoji/Panel.h" - -using namespace emoji; - -Panel::Panel(QWidget *parent) - : QWidget(parent) - , shadowMargin_{2} - , width_{370} - , height_{350} - , categoryIconSize_{20} -{ - setStyleSheet("QWidget {border: none;}" - "QScrollBar:vertical { width: 0px; margin: 0px; }" - "QScrollBar::handle:vertical { min-height: 30px; }"); - - setAttribute(Qt::WA_ShowWithoutActivating, true); - setWindowFlags(Qt::Tool | Qt::FramelessWindowHint | Qt::NoDropShadowWindowHint); - - auto mainWidget = new QWidget(this); - mainWidget->setMaximumSize(width_, height_); - - auto topLayout = new QVBoxLayout(this); - topLayout->addWidget(mainWidget); - topLayout->setMargin(shadowMargin_); - topLayout->setSpacing(0); - - auto contentLayout = new QVBoxLayout(mainWidget); - contentLayout->setMargin(0); - contentLayout->setSpacing(0); - - auto emojiCategories = new QFrame(mainWidget); - - auto categoriesLayout = new QHBoxLayout(emojiCategories); - categoriesLayout->setSpacing(0); - categoriesLayout->setMargin(0); - - QIcon icon; - - auto peopleCategory = new FlatButton(emojiCategories); - icon.addFile(":/icons/icons/emoji-categories/people.png"); - peopleCategory->setIcon(icon); - peopleCategory->setIconSize(QSize(categoryIconSize_, categoryIconSize_)); - - auto natureCategory_ = new FlatButton(emojiCategories); - icon.addFile(":/icons/icons/emoji-categories/nature.png"); - natureCategory_->setIcon(icon); - natureCategory_->setIconSize(QSize(categoryIconSize_, categoryIconSize_)); - - auto foodCategory_ = new FlatButton(emojiCategories); - icon.addFile(":/icons/icons/emoji-categories/foods.png"); - foodCategory_->setIcon(icon); - foodCategory_->setIconSize(QSize(categoryIconSize_, categoryIconSize_)); - - auto activityCategory = new FlatButton(emojiCategories); - icon.addFile(":/icons/icons/emoji-categories/activity.png"); - activityCategory->setIcon(icon); - activityCategory->setIconSize(QSize(categoryIconSize_, categoryIconSize_)); - - auto travelCategory = new FlatButton(emojiCategories); - icon.addFile(":/icons/icons/emoji-categories/travel.png"); - travelCategory->setIcon(icon); - travelCategory->setIconSize(QSize(categoryIconSize_, categoryIconSize_)); - - auto objectsCategory = new FlatButton(emojiCategories); - icon.addFile(":/icons/icons/emoji-categories/objects.png"); - objectsCategory->setIcon(icon); - objectsCategory->setIconSize(QSize(categoryIconSize_, categoryIconSize_)); - - auto symbolsCategory = new FlatButton(emojiCategories); - icon.addFile(":/icons/icons/emoji-categories/symbols.png"); - symbolsCategory->setIcon(icon); - symbolsCategory->setIconSize(QSize(categoryIconSize_, categoryIconSize_)); - - auto flagsCategory = new FlatButton(emojiCategories); - icon.addFile(":/icons/icons/emoji-categories/flags.png"); - flagsCategory->setIcon(icon); - flagsCategory->setIconSize(QSize(categoryIconSize_, categoryIconSize_)); - - categoriesLayout->addWidget(peopleCategory); - categoriesLayout->addWidget(natureCategory_); - categoriesLayout->addWidget(foodCategory_); - categoriesLayout->addWidget(activityCategory); - categoriesLayout->addWidget(travelCategory); - categoriesLayout->addWidget(objectsCategory); - categoriesLayout->addWidget(symbolsCategory); - categoriesLayout->addWidget(flagsCategory); - - scrollArea_ = new QScrollArea(this); - scrollArea_->setWidgetResizable(true); - scrollArea_->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); - - auto scrollWidget = new QWidget(this); - auto scrollLayout = new QVBoxLayout(scrollWidget); - - scrollLayout->setMargin(0); - scrollLayout->setSpacing(0); - scrollArea_->setWidget(scrollWidget); - - auto peopleEmoji = - new Category(tr("Smileys & People"), emoji_provider_.people, scrollWidget); - scrollLayout->addWidget(peopleEmoji); - - auto natureEmoji = - new Category(tr("Animals & Nature"), emoji_provider_.nature, scrollWidget); - scrollLayout->addWidget(natureEmoji); - - auto foodEmoji = new Category(tr("Food & Drink"), emoji_provider_.food, scrollWidget); - scrollLayout->addWidget(foodEmoji); - - auto activityEmoji = new Category(tr("Activity"), emoji_provider_.activity, scrollWidget); - scrollLayout->addWidget(activityEmoji); - - auto travelEmoji = - new Category(tr("Travel & Places"), emoji_provider_.travel, scrollWidget); - scrollLayout->addWidget(travelEmoji); - - auto objectsEmoji = new Category(tr("Objects"), emoji_provider_.objects, scrollWidget); - scrollLayout->addWidget(objectsEmoji); - - auto symbolsEmoji = new Category(tr("Symbols"), emoji_provider_.symbols, scrollWidget); - scrollLayout->addWidget(symbolsEmoji); - - auto flagsEmoji = new Category(tr("Flags"), emoji_provider_.flags, scrollWidget); - scrollLayout->addWidget(flagsEmoji); - - contentLayout->addWidget(scrollArea_); - contentLayout->addWidget(emojiCategories); - - connect(peopleEmoji, &Category::emojiSelected, this, &Panel::emojiSelected); - connect(peopleCategory, &QPushButton::clicked, [this, peopleEmoji]() { - this->showCategory(peopleEmoji); - }); - - connect(natureEmoji, &Category::emojiSelected, this, &Panel::emojiSelected); - connect(natureCategory_, &QPushButton::clicked, [this, natureEmoji]() { - this->showCategory(natureEmoji); - }); - - connect(foodEmoji, &Category::emojiSelected, this, &Panel::emojiSelected); - connect(foodCategory_, &QPushButton::clicked, [this, foodEmoji]() { - this->showCategory(foodEmoji); - }); - - connect(activityEmoji, &Category::emojiSelected, this, &Panel::emojiSelected); - connect(activityCategory, &QPushButton::clicked, [this, activityEmoji]() { - this->showCategory(activityEmoji); - }); - - connect(travelEmoji, &Category::emojiSelected, this, &Panel::emojiSelected); - connect(travelCategory, &QPushButton::clicked, [this, travelEmoji]() { - this->showCategory(travelEmoji); - }); - - connect(objectsEmoji, &Category::emojiSelected, this, &Panel::emojiSelected); - connect(objectsCategory, &QPushButton::clicked, [this, objectsEmoji]() { - this->showCategory(objectsEmoji); - }); - - connect(symbolsEmoji, &Category::emojiSelected, this, &Panel::emojiSelected); - connect(symbolsCategory, &QPushButton::clicked, [this, symbolsEmoji]() { - this->showCategory(symbolsEmoji); - }); - - connect(flagsEmoji, &Category::emojiSelected, this, &Panel::emojiSelected); - connect(flagsCategory, &QPushButton::clicked, [this, flagsEmoji]() { - this->showCategory(flagsEmoji); - }); -} - -void -Panel::showCategory(const Category *category) -{ - auto posToGo = category->mapToParent(QPoint()).y(); - auto current = scrollArea_->verticalScrollBar()->value(); - - if (current == posToGo) - return; - - // HACK - // If we want to go to a previous category and position the label at the top - // the 6*50 offset won't work because not all the categories have the same - // height. To ensure the category is at the top, we move to the top and go as - // normal to the next category. - if (current > posToGo) - this->scrollArea_->ensureVisible(0, 0, 0, 0); - - posToGo += 6 * 50; - this->scrollArea_->ensureVisible(0, posToGo, 0, 0); -} - -void -Panel::paintEvent(QPaintEvent *event) -{ - Q_UNUSED(event); - - QStyleOption opt; - opt.init(this); - QPainter p(this); - style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this); - - DropShadow::draw(p, - shadowMargin_, - 4.0, - QColor(120, 120, 120, 92), - QColor(255, 255, 255, 0), - 0.0, - 1.0, - 0.6, - width(), - height()); -} diff --git a/src/emoji/Panel.h b/src/emoji/Panel.h deleted file mode 100644 index ad233c27..00000000 --- a/src/emoji/Panel.h +++ /dev/null @@ -1,66 +0,0 @@ -/* - * nheko Copyright (C) 2017 Konstantinos Sideris - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -#include - -#include "Provider.h" - -namespace emoji { - -class Category; - -class Panel : public QWidget -{ - Q_OBJECT - -public: - Panel(QWidget *parent = nullptr); - -signals: - void mouseLeft(); - void emojiSelected(const QString &emoji); - -protected: - void leaveEvent(QEvent *event) override - { - emit leaving(); - QWidget::leaveEvent(event); - } - - void paintEvent(QPaintEvent *event) override; - -signals: - void leaving(); - -private: - void showCategory(const Category *category); - - Provider emoji_provider_; - - QScrollArea *scrollArea_; - - int shadowMargin_; - - // Panel dimensions. - int width_; - int height_; - - int categoryIconSize_; -}; -} // namespace emoji diff --git a/src/emoji/PickButton.cpp b/src/emoji/PickButton.cpp deleted file mode 100644 index 608b4fa2..00000000 --- a/src/emoji/PickButton.cpp +++ /dev/null @@ -1,82 +0,0 @@ -/* - * nheko Copyright (C) 2017 Konstantinos Sideris - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include - -#include "emoji/Panel.h" -#include "emoji/PickButton.h" - -using namespace emoji; - -// Number of milliseconds after which the panel will be hidden -// if the mouse cursor is not on top of the widget. -constexpr int HIDE_TIMEOUT = 300; - -PickButton::PickButton(QWidget *parent) - : FlatButton(parent) - , panel_{nullptr} -{ - connect(&hideTimer_, &QTimer::timeout, this, &PickButton::hidePanel); - connect(this, &QPushButton::clicked, this, [this]() { - if (panel_ && panel_->isVisible()) { - hidePanel(); - return; - } - - showPanel(); - }); -} - -void -PickButton::hidePanel() -{ - if (panel_ && !panel_->underMouse()) { - hideTimer_.stop(); - panel_->hide(); - } -} - -void -PickButton::showPanel() -{ - if (panel_.isNull()) { - panel_ = QSharedPointer(new Panel(this)); - connect(panel_.data(), &Panel::emojiSelected, this, &PickButton::emojiSelected); - connect(panel_.data(), &Panel::leaving, this, [this]() { panel_->hide(); }); - } - - if (panel_->isVisible()) - return; - - QPoint pos(rect().x(), rect().y()); - pos = this->mapToGlobal(pos); - - auto panel_size = panel_->sizeHint(); - - auto x = pos.x() - panel_size.width() + horizontal_distance_; - auto y = pos.y() - panel_size.height() - vertical_distance_; - - panel_->move(x, y); - panel_->show(); -} - -void -PickButton::leaveEvent(QEvent *e) -{ - hideTimer_.start(HIDE_TIMEOUT); - FlatButton::leaveEvent(e); -} diff --git a/src/emoji/PickButton.h b/src/emoji/PickButton.h deleted file mode 100644 index 97ed8c37..00000000 --- a/src/emoji/PickButton.h +++ /dev/null @@ -1,55 +0,0 @@ -/* - * nheko Copyright (C) 2017 Konstantinos Sideris - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -#include -#include -#include - -#include "ui/FlatButton.h" - -namespace emoji { - -class Panel; - -class PickButton : public FlatButton -{ - Q_OBJECT -public: - explicit PickButton(QWidget *parent = nullptr); - -signals: - void emojiSelected(const QString &emoji); - -protected: - void leaveEvent(QEvent *e) override; - -private: - void showPanel(); - void hidePanel(); - - // Vertical distance from panel's bottom. - int vertical_distance_ = 10; - - // Horizontal distance from panel's bottom right corner. - int horizontal_distance_ = 70; - - QSharedPointer panel_; - QTimer hideTimer_; -}; -} // namespace emoji diff --git a/src/main.cpp b/src/main.cpp index 8556f8cb..cc7ba103 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -131,7 +131,6 @@ main(int argc, char *argv[]) QFontDatabase::addApplicationFont(":/fonts/fonts/OpenSans/OpenSans-Italic.ttf"); QFontDatabase::addApplicationFont(":/fonts/fonts/OpenSans/OpenSans-Bold.ttf"); QFontDatabase::addApplicationFont(":/fonts/fonts/OpenSans/OpenSans-Semibold.ttf"); - QFontDatabase::addApplicationFont(":/fonts/fonts/EmojiOne/emojione-android.ttf"); app.setWindowIcon(QIcon(":/logos/nheko.png")); diff --git a/src/timeline/TimelineItem.cpp b/src/timeline/TimelineItem.cpp index fc7868de..e962d468 100644 --- a/src/timeline/TimelineItem.cpp +++ b/src/timeline/TimelineItem.cpp @@ -594,7 +594,7 @@ TimelineItem::markReceived(bool isEncrypted) void TimelineItem::generateBody(const QString &body) { - body_ = new TextLabel(replaceEmoji(body), this); + body_ = new TextLabel(body, this); body_->setTextInteractionFlags(Qt::TextSelectableByMouse | Qt::TextBrowserInteraction); connect(body_, &TextLabel::userProfileTriggered, this, [](const QString &user_id) { @@ -667,25 +667,6 @@ TimelineItem::generateTimestamp(const QDateTime &time) QString(" %1 ").arg(time.toString("HH:mm"))); } -QString -TimelineItem::replaceEmoji(const QString &body) -{ - QString fmtBody = ""; - - QVector utf32_string = body.toUcs4(); - - for (auto &code : utf32_string) { - // TODO: Be more precise here. - if (code > 9000) - fmtBody += QString("") + - QString::fromUcs4(&code, 1) + ""; - else - fmtBody += QString::fromUcs4(&code, 1); - } - - return fmtBody; -} - void TimelineItem::setupAvatarLayout(const QString &userName) { diff --git a/src/timeline/TimelineItem.h b/src/timeline/TimelineItem.h index 9b23a731..8159e370 100644 --- a/src/timeline/TimelineItem.h +++ b/src/timeline/TimelineItem.h @@ -256,7 +256,6 @@ private: //! has been acknowledged by the server. bool isReceived_ = false; - QString replaceEmoji(const QString &body); QString event_id_; QString room_id_;