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

Timestamp:

Aug 31, 2016, 5:31:04 PM (9 years ago)

Author:

Silvan Scherrer

Message:

smplayer: update trunk to version 16.8.0

Location:

smplayer/trunk

Files:

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

smplayer/trunk/src/basegui.h

@@ -29 +29 @@
 #include "guiconfig.h"
 
-#ifdef Q_OS_WIN
 #ifdef AVOID_SCREENSAVER
-/* Disable screensaver by event */
 #include <windows.h>
-#endif
 #endif
 
@@ -41 +38 @@
 
 //#define SHARE_MENU
+//#define DETECT_MINIMIZE_WORKAROUND
+
+#if !defined(Q_OS_WIN) && QT_VERSION >= 0x050000 && QT_VERSION < 0x050501
+#define NUMPAD_WORKAROUND
+#endif
 
 class QWidget;
 class QMenu;
 class LogWindow;
+class InfoWindow;
 class MplayerWindow;
 
@@ -208 +211 @@
         virtual void exitFullscreenIfNeeded();
         virtual void playlistHasFinished();
+        virtual void addToPlaylistCurrentFile();
 
         virtual void displayState(Core::State state);
@@ -321 +325 @@
         void applyStyles();
 
-#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
-#ifdef AVOID_SCREENSAVER
-        /* Disable screensaver by event */
+        virtual void setTabletMode(bool);
+
+#ifdef Q_OS_WIN
+        void checkSystemTabletMode();
+        void systemTabletModeChanged(bool);
+        
+        #ifdef AVOID_SCREENSAVER
         void clear_just_stopped();
-#endif
+        #endif
 #endif
 
@@ -344 +352 @@
         void videoInfoChanged(int width, int height, double fps);
         void timeChanged(QString time_ready_to_print);
+        void timeChanged(double current_time);
 
         /*
@@ -365 +374 @@
 #endif
 
+        void preferencesChanged();
+        void tabletModeChanged(bool new_mode);
+
 protected:
         virtual void retranslateStrings();
         virtual void changeEvent(QEvent * event);
-#if QT_VERSION < 0x050000
+#ifndef DETECT_MINIMIZE_WORKAROUND
         virtual void hideEvent( QHideEvent * );
         virtual void showEvent( QShowEvent * );
@@ -375 +387 @@
         bool was_minimized;
 #endif
+
 #ifdef Q_OS_WIN
-        #ifdef AVOID_SCREENSAVER
-        /* Disable screensaver by event */
         virtual bool winEvent ( MSG * m, long * result );
+        #if QT_VERSION >= 0x050000
+        virtual bool nativeEvent(const QByteArray &eventType, void * message, long * result);
         #endif
+#endif
+
+#ifdef NUMPAD_WORKAROUND
+        void keyPressEvent(QKeyEvent *event);
 #endif
 
@@ -397 +414 @@
         void createFilePropertiesDialog();
         void setDataToFileProperties();
-        void initializeGui();
+
         void createActions();
 #if AUTODISABLE_ACTIONS
@@ -403 +420 @@
 #endif
         void createMenus();
+        virtual void populateMainMenu();
 #ifdef BOOKMARKS
         void updateBookmarks();
@@ -541 +559 @@
         MyAction * showLogSmplayerAct;
 #endif
+        MyAction * tabletModeAct;
 
         // Menu Help
@@ -769 +788 @@
         QMenu *subtitlesMenu;
         QMenu *browseMenu;
+        QMenu *viewMenu;
         QMenu *optionsMenu;
         QMenu *helpMenu;
@@ -802 +822 @@
         QMenu * audiofilter_menu;
 #if defined(LOG_MPLAYER) || defined(LOG_SMPLAYER)
-        QMenu * logs_menu;
+        //QMenu * logs_menu;
 #endif
         QMenu * zoom_menu;
@@ -819 +839 @@
         QMenu * popup;
         QMenu * recentfiles_menu;
+        QMenu * access_menu;
 
 #ifdef LOG_MPLAYER
@@ -826 +847 @@
         LogWindow * smplayer_log_window;
 #endif
-        LogWindow * clhelp_window;
+        InfoWindow * clhelp_window;
 
         PreferencesDialog *pref_dialog;
@@ -845 +866 @@
         Favorites * favorites;
 
+#ifdef TV_SUPPORT
         TVList * tvlist;
         TVList * radiolist;
+#endif
 
 #ifdef UPDATE_CHECKER
@@ -878 +901 @@
         bool was_maximized;
 
-#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
 #ifdef AVOID_SCREENSAVER
-        /* Disable screensaver by event */
         bool just_stopped;
-#endif
 #endif
 
@@ -894 +914 @@
         bool ignore_show_hide_events;
 };
-    
-#endif
-
+
+#endif
+