diff --git a/resources/images/pajaDank.png b/resources/images/pajaDank.png new file mode 100644 index 00000000..c8746932 Binary files /dev/null and b/resources/images/pajaDank.png differ diff --git a/resources/resources.qrc b/resources/resources.qrc index cf41c346..12971380 100644 --- a/resources/resources.qrc +++ b/resources/resources.qrc @@ -74,6 +74,7 @@ avatars/pajlada.png images/download_update.png images/download_update_error.png + images/pajaDank.png qt.conf diff --git a/src/singletons/Resources.cpp b/src/singletons/Resources.cpp index 0180c581..fdbbf9bb 100644 --- a/src/singletons/Resources.cpp +++ b/src/singletons/Resources.cpp @@ -287,6 +287,8 @@ Resources::Resources() , splitHeaderContext(lli(":/images/tool_moreCollapser_off16.png")) , buttonBan(lli(":/images/button_ban.png", 0.25)) , buttonTimeout(lli(":/images/button_timeout.png", 0.25)) + , pajaDank(lli(":/images/pajaDank.png", 0.25)) + , ppHop(new Image("https://fourtf.com/ppHop.gif", 0.25)) { this->split.left = QIcon(":/images/split/splitleft.png"); this->split.right = QIcon(":/images/split/splitright.png"); diff --git a/src/singletons/Resources.hpp b/src/singletons/Resources.hpp index 7327c4da..86db4d84 100644 --- a/src/singletons/Resources.hpp +++ b/src/singletons/Resources.hpp @@ -86,6 +86,8 @@ public: Image *buttonBan; Image *buttonTimeout; + Image *pajaDank; + Image *ppHop; struct JSONCheermoteSet { QString prefix; diff --git a/src/widgets/settingspages/LookPage.cpp b/src/widgets/settingspages/LookPage.cpp index 7769d5b6..6f556f02 100644 --- a/src/widgets/settingspages/LookPage.cpp +++ b/src/widgets/settingspages/LookPage.cpp @@ -62,7 +62,7 @@ void LookPage::initializeUi() auto channelView = layout.emplace(); auto channel = this->createPreviewChannel(); channelView->setChannel(channel); - channelView->setScaleIndependantHeight(64); + channelView->setScaleIndependantHeight(74); } void LookPage::addInterfaceTab(LayoutCreator layout) @@ -276,24 +276,32 @@ ChannelPtr LookPage::createPreviewChannel() { auto message = MessagePtr(new Message()); + message->addElement(new TimestampElement(QTime(8, 13, 42))); message->addElement(new ImageElement(getApp()->resources->badgeModerator, MessageElement::BadgeChannelAuthority)); message->addElement(new ImageElement(getApp()->resources->badgeSubscriber, MessageElement::BadgeSubscription)); - message->addElement(new TimestampElement(QTime(8, 13, 42))); message->addElement(new TextElement("username1:", MessageElement::Username, QColor("#0094FF"), FontStyle::ChatMediumBold)); - message->addElement(new TextElement("This is a preview message :)", MessageElement::Text)); + message->addElement(new TextElement("This is a preview message", MessageElement::Text)); + message->addElement(new EmoteElement(EmoteData(getApp()->resources->pajaDank), + MessageElement::Flags::AlwaysShow)); + // message->addElement(new) channel->addMessage(message); } { auto message = MessagePtr(new Message()); + message->addElement(new TimestampElement(QTime(8, 15, 21))); message->addElement(new ImageElement(getApp()->resources->badgePremium, MessageElement::BadgeChannelAuthority)); - message->addElement(new TimestampElement(QTime(8, 15, 21))); message->addElement(new TextElement("username2:", MessageElement::Username, QColor("#FF6A00"), FontStyle::ChatMediumBold)); - message->addElement(new TextElement("This is another one :)", MessageElement::Text)); + message->addElement(new TextElement("This is another one", MessageElement::Text)); + message->addElement( + new EmoteElement(EmoteData(getApp()->resources->ppHop), MessageElement::BttvEmote)); + message->addElement( + (new TextElement("www.fourtf.com", MessageElement::Text, MessageColor::Link)) + ->setLink(Link(Link::Url, "https://www.fourtf.com"))); channel->addMessage(message); }