Imported Upstream version 1.6

[minitube] / src / MainWindow.h

diff --git a/src/MainWindow.h b/src/MainWindow.h
old mode 100755 (executable)
new mode 100644 (file)
index 203a214..b0c71b0
--- a/src/MainWindow.h
+++ b/src/MainWindow.h
@@ -2,7 +2,6 @@
 #define MAINWINDOW_H
 
 #include <QtGui>
-#include "faderwidget/FaderWidget.h"
 #include "searchlineedit.h"
 #include <phonon/audiooutput.h>
 #include <phonon/volumeslider.h>
@@ -14,6 +13,8 @@
 #include "AboutView.h"
 #include "downloadview.h"
 
+class UpdateChecker;
+
 class MainWindow : public QMainWindow {
 
     Q_OBJECT
@@ -23,20 +24,27 @@ public:
     ~MainWindow();
     Phonon::SeekSlider* getSeekSlider() { return seekSlider; }
 
+public slots:
+    void showMedia(SearchParams *params);
+
 protected:
     void closeEvent(QCloseEvent *);
     bool eventFilter(QObject *obj, QEvent *event);
+    void dragEnterEvent(QDragEnterEvent *event);
+    void dropEvent(QDropEvent *event);
+    void resizeEvent(QResizeEvent *);
 
 private slots:
-    void fadeInWidget(QWidget *oldWidget, QWidget *newWidget);
+    void checkForUpdate();
+    void gotNewVersion(QString version);
     void goBack();
     void showSearch();
-    void showMedia(QString query);
     void visitSite();
     void donate();
     void about();
     void quit();
     void fullscreen();
+    void updateUIForFullscreen();
     void compactView(bool enable);
     void stop();
     void stateChanged(Phonon::State newState, Phonon::State oldState);
@@ -63,6 +71,8 @@ private slots:
     void downloadsFinished();
     void toggleDownloads(bool show);
 
+    void startToolbarSearch(QString query);
+
 private:
     void initPhonon();
     void createActions();
@@ -74,8 +84,9 @@ private:
     void showWidget(QWidget*);
     static QString formatTime(qint64 time);
 
+    UpdateChecker *updateChecker;
+
     // view mechanism
-    QPointer<FaderWidget> faderWidget;
     QStackedWidget *views;
     QStack<QWidget*> *history;
 
@@ -106,6 +117,7 @@ private:
     QAction *volumeUpAct;
     QAction *volumeDownAct;
     QAction *volumeMuteAct;
+    QAction *findVideoPartsAct;
 
     // playlist actions
     QAction *removeAct;
@@ -126,7 +138,6 @@ private:
 
     // phonon
     Phonon::SeekSlider *seekSlider;
-    // QSlider *slider;
     Phonon::VolumeSlider *volumeSlider;
     Phonon::MediaObject *mediaObject;
     Phonon::AudioOutput *audioOutput;