Changeset 165 for smplayer/trunk/src/basegui.h

Timestamp:

May 16, 2014, 9:51:55 AM (11 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: update trunk to latest 0.8.7

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• src/basegui.h (modified) (19 diffs)

smplayer/trunk/src/basegui.h

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2013 Ricardo Villalba <rvm@users.sourceforge.net>
+    Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
@@ -34 +34 @@
 #endif
 
+//#define SHARE_MENU
+
 class QWidget;
 class QMenu;
@@ -41 +43 @@
 class QLabel;
 class FilePropertiesDialog;
-class VideoEqualizer2;
+class VideoEqualizer;
 class AudioEqualizer;
 class Playlist;
@@ -59 +61 @@
 class UpdateChecker;
 
-#if !defined(Q_OS_WIN) || defined(PORTABLE_APP)
-#define REMINDER_ACTIONS 1
-#endif
 
 class BaseGui : public QMainWindow
@@ -100 +99 @@
         virtual void openDVDFromFolder();
         virtual void openDVDFromFolder(QString directory);
+#ifdef BLURAY_SUPPORT
+        void openBluRay();
+        void openBluRayFromFolder();
+        void openBluRayFromFolder(QString directory);
+#endif
         virtual void openDirectory();
         virtual void openDirectory(QString directory);
@@ -112 +116 @@
         virtual void helpShowConfig();
         virtual void helpAbout();
-        virtual void helpAboutQt();
-
+
+#ifdef SHARE_MENU
         virtual void shareSMPlayer();
+#endif
 
         virtual void loadSub();
@@ -202 +207 @@
         virtual void updateMediaInfo();
 
+        void gotNoFileToPlay();
+
         void checkPendingActionsToRun();
 
@@ -227 +234 @@
         #endif
 #endif
+        void gotForbidden();
 
 #if AUTODISABLE_ACTIONS
@@ -272 +280 @@
         virtual void saveActions();
 
-        // Check the mouse pos in fullscreen mode, to
-        // show the controlwidget if it's moved to
-        // the bottom area.
-        virtual void checkMousePos( QPoint );
-        virtual void moveWindow(QPoint diff);
+        virtual void moveWindowDiff(QPoint diff);
 
         // Single instance stuff
@@ -318 +322 @@
         void timeChanged(QString time_ready_to_print);
 
-        void cursorNearTop(QPoint);
-        void cursorNearBottom(QPoint);
-        void cursorFarEdges();
-        
+        /*
         void wheelUp();
         void wheelDown();
+        */
         /*
         void doubleClicked();
@@ -346 +348 @@
         virtual void showEvent( QShowEvent * );
 #ifdef Q_OS_WIN
+        #ifdef AVOID_SCREENSAVER
         /* Disable screensaver by event */
         virtual bool winEvent ( MSG * m, long * result );
+        #endif
 #endif
 
@@ -376 +380 @@
 
 protected:
-        virtual void wheelEvent( QWheelEvent * e ) ;
+        /* virtual void wheelEvent( QWheelEvent * e ) ; */
 
 protected:
@@ -389 +393 @@
         MyAction * openDVDAct;
         MyAction * openDVDFolderAct;
+#ifdef BLURAY_SUPPORT
+        MyAction * openBluRayAct;
+        MyAction * openBluRayFolderAct;
+#endif
         MyAction * openURLAct;
         MyAction * exitAct;
@@ -503 +511 @@
         MyAction * donateAct;
 #endif
-        MyAction * aboutQtAct;
         MyAction * aboutThisAct;
 
+#ifdef SHARE_MENU
         MyAction * facebookAct;
         MyAction * twitterAct;
@@ -511 +519 @@
         MyAction * hotmailAct;
         MyAction * yahooAct;
+#endif
 
         // Playlist
@@ -612 +621 @@
         MyAction * aspect32Act;         // 3:2
         MyAction * aspect43Act;         // 4:3
+        MyAction * aspect118Act;        // 11:8
         MyAction * aspect54Act;         // 5:4
         MyAction * aspect149Act;        // 14:9
@@ -742 +752 @@
         QMenu * subfps_menu;
 
+#ifdef SHARE_MENU
         QMenu * share_menu;
+#endif
 
         QMenu * popup;
@@ -758 +770 @@
         FilePropertiesDialog *file_dialog;
         Playlist * playlist;
-        VideoEqualizer2 * video_equalizer2;
+        VideoEqualizer * video_equalizer;
         AudioEqualizer * audio_equalizer;
 #ifdef FIND_SUBTITLES
@@ -789 +801 @@
 private:
         QString default_style;
-
-        bool near_top;
-        bool near_bottom;
 
         // Variables to restore pos and size of the window