X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fsearchview.h;h=a5342c9accc46cbd758328e972701937d6715a70;hb=fe9d17324e88a65d4f28afccf21857c5a5e60649;hp=01895eb7147fcc9c20832ee44b1eea2cc5d0e78e;hpb=29f9a13b38a0547b70236d24300668385e1dbf6e;p=minitube

diff --git a/src/searchview.h b/src/searchview.h
index 01895eb..a5342c9 100644
--- a/src/searchview.h
+++ b/src/searchview.h
@@ -18,13 +18,11 @@ along with Minitube.  If not, see <http://www.gnu.org/licenses/>.
 
 $END_LICENSE */
 
-#ifndef __SEARCHVIEW_H__
-#define __SEARCHVIEW_H__
+#ifndef SEARCHVIEW_H
+#define SEARCHVIEW_H
 
-#include <QtGui>
-#if QT_VERSION >= 0x050000
 #include <QtWidgets>
-#endif
+
 #include "view.h"
 
 class SearchWidget;
@@ -32,13 +30,14 @@ class SearchParams;
 class YTSuggester;
 class ChannelSuggest;
 class Suggestion;
+class ClickableLabel;
+class MessageBar;
 
 class SearchView : public View {
-
     Q_OBJECT
 
 public:
-    SearchView(QWidget *parent = 0);
+    SearchView(QWidget *parent = nullptr);
     void updateRecentKeywords();
     void updateRecentChannels();
 
@@ -50,32 +49,33 @@ public slots:
     void watchKeywords(const QString &query);
 
 signals:
-    void search(SearchParams*);
-
-protected:
-    void paintEvent(QPaintEvent *);
+    void search(SearchParams *);
 
 private slots:
     void watch();
     void textChanged(const QString &text);
     void searchTypeChanged(int index);
     void suggestionAccepted(Suggestion *suggestion);
+    void onChannelSuggestions(const QVector<Suggestion *> &suggestions);
 
 private:
+    void maybeShowMessage();
     YTSuggester *youtubeSuggest;
     ChannelSuggest *channelSuggest;
 
-    QComboBox *typeCombo;
+    MessageBar *messageBar;
     SearchWidget *queryEdit;
     QLabel *recentKeywordsLabel;
     QBoxLayout *recentKeywordsLayout;
     QLabel *recentChannelsLabel;
     QBoxLayout *recentChannelsLayout;
-    QLabel *message;
-    QPushButton *watchButton;
 
     QStringList recentKeywords;
     QStringList recentChannels;
+
+    QVector<Suggestion *> lastChannelSuggestions;
+
+    ClickableLabel *logo;
 };
 
-#endif // __SEARCHVIEW_H__
+#endif // SEARCHVIEW_H