Imported Upstream version 0.8.6

1 files changed, 40 insertions, 7 deletions

diff --git a/src/basegui.h b/src/basegui.h
index 893fcd8..13bea02 100644
--- a/src/basegui.h
+++ b/src/basegui.h
@@ -51,17 +51,17 @@ class FindSubtitlesWindow;
 class VideoPreview;
 #endif
 
-
 class MyAction;
 class MyActionGroup;
-
 class PreferencesDialog;
-
 class Favorites;
 class TVList;
-
 class UpdateChecker;
 
+#if !defined(Q_OS_WIN) || defined(PORTABLE_APP)
+#define REMINDER_ACTIONS 1
+#endif
+
 class BaseGui : public QMainWindow
 {
     Q_OBJECT
@@ -106,6 +106,9 @@ public slots:
 	virtual void helpFAQ();
 	virtual void helpCLOptions();
 	virtual void helpCheckUpdates();
+#ifdef REMINDER_ACTIONS
+	virtual void helpDonate();
+#endif
 	virtual void helpShowConfig();
 	virtual void helpAbout();
 	virtual void helpAboutQt();
@@ -126,7 +129,9 @@ public slots:
 	virtual void showVideoPreviewDialog();
 #endif
 
+#ifdef YOUTUBE_SUPPORT
 	virtual void showTubeBrowser();
+#endif
 
 	virtual void showPlaylist();
 	virtual void showPlaylist(bool b);
@@ -182,6 +187,7 @@ protected slots:
 	virtual void playlistHasFinished();
 
 	virtual void displayState(Core::State state);
+	virtual void displayMessage(QString message, int time);
 	virtual void displayMessage(QString message);
 	virtual void gotCurrentTime(double);
 
@@ -206,8 +212,19 @@ protected slots:
 	void reportNewVersionAvailable(QString);
 #endif
 
-#if !defined(Q_OS_WIN)
-	void testUpdate();
+#ifdef CHECK_UPGRADED
+	void checkIfUpgraded();
+#endif
+
+#ifdef REMINDER_ACTIONS
+	void checkReminder();
+#endif
+
+#ifdef YOUTUBE_SUPPORT
+	void YTNoSignature(const QString &);
+	#ifdef YT_USE_SCRIPT
+	void YTUpdateScript();
+	#endif
 #endif
 
 #if AUTODISABLE_ACTIONS
@@ -216,7 +233,10 @@ protected slots:
 	virtual void togglePlayAction(Core::State);
 #endif
 
-	virtual void resizeWindow(int w, int h);
+	void changeSizeFactor(int factor);
+	void toggleDoubleSize();
+	void resizeMainWindow(int w, int h);
+	void resizeWindow(int w, int h);
 	virtual void hidePanel();
 
 	/* virtual void playlistVisibilityChanged(); */
@@ -312,6 +332,9 @@ signals:
 	//! Sent when the user wants to close the main window
 	void quitSolicited();
 
+	//! Sent when another instance requested to play a file
+	void openFileRequested();
+
 #ifdef GUI_CHANGE_ON_RUNTIME
 	void guiChanged(QString gui);
 #endif
@@ -457,7 +480,9 @@ protected:
 	MyAction * showPlaylistAct;
 	MyAction * showPropertiesAct;
 	MyAction * showPreferencesAct;
+#ifdef YOUTUBE_SUPPORT
 	MyAction * showTubeBrowserAct;
+#endif
 #ifdef LOG_MPLAYER
 	MyAction * showLogMplayerAct;
 #endif
@@ -470,7 +495,13 @@ protected:
 	MyAction * showFAQAct;
 	MyAction * showCLOptionsAct; // Command line options
 	MyAction * showCheckUpdatesAct;
+#if defined(YOUTUBE_SUPPORT) && defined(YT_USE_SCRIPT)
+	MyAction * updateYTAct;
+#endif
 	MyAction * showConfigAct;
+#ifdef REMINDER_ACTIONS
+	MyAction * donateAct;
+#endif
 	MyAction * aboutQtAct;
 	MyAction * aboutThisAct;
 
@@ -640,6 +671,8 @@ protected:
 	MyAction * stereoAct;
 	MyAction * leftChannelAct;
 	MyAction * rightChannelAct;
+	MyAction * monoAct;
+	MyAction * reverseAct;
 
 	// Other groups
 #if PROGRAM_SWITCH