changed some filenames and stuff like that

src/widgets/chatwidget.cpp

@@ -4,7 +4,7 @@
 #include "notebookpage.hpp"
 #include "settingsmanager.hpp"
 #include "util/urlfetch.hpp"
-#include "widgets/qualitypopup.h"
+#include "widgets/qualitypopup.hpp"
 #include "widgets/textinputdialog.hpp"
 
 #include <QApplication>

src/widgets/chatwidgetheader.cpp

@@ -37,7 +37,7 @@ ChatWidgetHeader::ChatWidgetHeader(ChatWidget *_chatWidget)
     this->leftLabel.getLabel().setTextFormat(Qt::RichText);
     this->leftLabel.getLabel().setText("<img src=':/images/tool_moreCollapser_off16.png' />");
 
-    connect(&this->leftLabel, &ChatWidgetHeaderButton::clicked, this,
+    connect(&this->leftLabel, &RippleEffectLabel::clicked, this,
             &ChatWidgetHeader::leftButtonClicked);
 
     this->leftMenu.addAction("Add new split", this->chatWidget, &ChatWidget::doAddSplit,

src/widgets/chatwidgetheader.hpp

@@ -2,7 +2,7 @@
 
 #include "signallabel.hpp"
 #include "widgets/basewidget.hpp"
-#include "widgets/chatwidgetheaderbutton.hpp"
+#include "widgets/rippleeffectlabel.hpp"
 
 #include <QAction>
 #include <QHBoxLayout>
@@ -46,14 +46,14 @@ private:
     QHBoxLayout hbox;
 
     // top left
-    ChatWidgetHeaderButton leftLabel;
+    RippleEffectLabel leftLabel;
     QMenu leftMenu;
 
     // center
     SignalLabel channelNameLabel;
 
     // top right
-    ChatWidgetHeaderButton rightLabel;
+    RippleEffectLabel rightLabel;
     QMenu rightMenu;
 
     void leftButtonClicked();

src/widgets/chatwidgetinput.cpp

@@ -45,7 +45,7 @@ ChatWidgetInput::ChatWidgetInput(ChatWidget *_chatWidget, EmoteManager &emoteMan
         "<img src=':/images/Emoji_Color_1F60A_19.png' width='12' height='12' "
         "/>");
 
-    connect(&this->emotesLabel, &ChatWidgetHeaderButton::clicked, [this] {
+    connect(&this->emotesLabel, &RippleEffectLabel::clicked, [this] {
         if (this->emotePopup == nullptr) {
             this->emotePopup = new EmotePopup(this->colorScheme, this->emoteManager);
         }

src/widgets/chatwidgetinput.hpp

@@ -3,8 +3,8 @@
 #include "emotemanager.hpp"
 #include "resizingtextedit.hpp"
 #include "widgets/basewidget.hpp"
-#include "widgets/chatwidgetheaderbutton.hpp"
-#include "widgets/emotepopup.h"
+#include "widgets/rippleeffectlabel.hpp"
+#include "widgets/emotepopup.hpp"
 
 #include <QHBoxLayout>
 #include <QLabel>
@@ -46,7 +46,7 @@ private:
     QHBoxLayout editContainer;
     ResizingTextEdit textInput;
     QLabel textLengthLabel;
-    ChatWidgetHeaderButton emotesLabel;
+    RippleEffectLabel emotesLabel;
     QStringList prevMsg;
     unsigned int prevIndex = 0;
     virtual void refreshTheme() override;

src/widgets/emotepopup.cpp

@@ -1,4 +1,4 @@
-#include "emotepopup.h"
+#include "emotepopup.hpp"
 
 #include <QHBoxLayout>
 
@@ -64,7 +64,9 @@ void EmotePopup::loadChannel(std::shared_ptr<Channel> _channel)
     addEmotes(*channel->ffzChannelEmotes.get(), "FrankerFaceZ Channel Emotes",
               "FrankerFaceZ Channel Emote");
 
-    view->setChannel(emoteChannel);
+    //    addEmotes(this->emoteManager.getEmojis(), "Emojis", "Emoji");
+
+    this->view->setChannel(emoteChannel);
 }
 }
 }

src/widgets/notebookbutton.cpp

@@ -1,6 +1,6 @@
 #include "widgets/notebookbutton.hpp"
 #include "colorscheme.hpp"
-#include "widgets/fancybutton.hpp"
+#include "widgets/rippleeffectbutton.hpp"
 
 #include <QMouseEvent>
 #include <QPainter>

src/widgets/notebookbutton.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "fancybutton.hpp"
+#include "rippleeffectbutton.hpp"
 
 #include <QWidget>
 

src/widgets/qualitypopup.cpp

@@ -1,4 +1,4 @@
-#include "qualitypopup.h"
+#include "qualitypopup.hpp"
 
 #include <QProcess>
 

src/widgets/rippleeffectbutton.cpp

@@ -1,4 +1,4 @@
-#include "fancybutton.hpp"
+#include "rippleeffectbutton.hpp"
 
 #include <QDebug>
 #include <QPainter>

src/widgets/rippleeffectlabel.cpp

@@ -1,4 +1,4 @@
-#include "widgets/chatwidgetheaderbutton.hpp"
+#include "widgets/rippleeffectlabel.hpp"
 #include "colorscheme.hpp"
 #include "widgets/chatwidgetheader.hpp"
 
@@ -8,7 +8,7 @@
 namespace chatterino {
 namespace widgets {
 
-ChatWidgetHeaderButton::ChatWidgetHeaderButton(BaseWidget *parent, int spacing)
+RippleEffectLabel::RippleEffectLabel(BaseWidget *parent, int spacing)
     : FancyButton(parent)
 {
     setLayout(&this->ui.hbox);
@@ -23,12 +23,5 @@ ChatWidgetHeaderButton::ChatWidgetHeaderButton(BaseWidget *parent, int spacing)
     this->setMouseEffectColor(QColor(255, 255, 255, 63));
 }
 
-// void ChatWidgetHeaderButton::paintEvent(QPaintEvent *)
-//{
-//    QPainter painter(this);
-
-//    this->fancyPaint(painter);
-//}
-
 }  // namespace widgets
 }  // namespace chatterino

src/widgets/rippleeffectlabel.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "widgets/basewidget.hpp"
-#include "widgets/fancybutton.hpp"
+#include "widgets/rippleeffectbutton.hpp"
 #include "widgets/signallabel.hpp"
 
 #include <QHBoxLayout>
@@ -15,21 +15,16 @@ class ColorScheme;
 
 namespace widgets {
 
-class ChatWidgetHeader;
-
-class ChatWidgetHeaderButton : public FancyButton
+class RippleEffectLabel : public FancyButton
 {
 public:
-    explicit ChatWidgetHeaderButton(BaseWidget *parent, int spacing = 6);
+    explicit RippleEffectLabel(BaseWidget *parent, int spacing = 6);
 
     SignalLabel &getLabel()
     {
         return this->ui.label;
     }
 
-protected:
-    //    virtual void paintEvent(QPaintEvent *) override;
-
 private:
     struct {
         QHBoxLayout hbox;