Changeset 181 for smplayer/trunk/src/baseguiplus.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/baseguiplus.h (modified) (10 diffs)

smplayer/trunk/src/baseguiplus.h

@@ -21 +21 @@
 
 #include "basegui.h"
+#include "widgetactions.h"
 #include <QSystemTrayIcon>
 #include <QPoint>
 #include "guiconfig.h"
+
+#define SCREENS_SUPPORT
+//#define DETACH_VIDEO_OPTION
 
 class QMenu;
@@ -30 +34 @@
 class TimeSliderAction;
 class VolumeSliderAction;
+class TimeLabelAction;
+class InfoWindow;
+class GlobalShortcuts;
 
 class BaseGuiPlus : public BaseGui
@@ -41 +48 @@
         virtual bool startHidden();
 
+#ifdef SCREENS_SUPPORT
+        /* virtual void toggleFullscreen(bool); */
+#endif
+
+public slots:
+#ifdef GLOBALSHORTCUTS
+        virtual void showPreferencesDialog();
+#endif
+
 protected:
         virtual void retranslateStrings();
+        virtual void populateMainMenu();
 
         void loadConfig();
@@ -48 +65 @@
         void updateShowAllAct();
 
-    virtual void aboutToEnterFullscreen();
-    virtual void aboutToExitFullscreen();
+        virtual void aboutToEnterFullscreen();
+        virtual void aboutToExitFullscreen();
         virtual void aboutToEnterCompactMode();
         virtual void aboutToExitCompactMode();
@@ -58 +75 @@
         TimeSliderAction * createTimeSliderAction(QWidget * parent);
         VolumeSliderAction * createVolumeSliderAction(QWidget * parent);
+        TimeLabelAction * createTimeLabelAction(TimeLabelAction::TimeLabelType type, QWidget * parent);
+
+#ifdef SCREENS_SUPPORT
+        bool isVideoDetached();
+#endif
 
 protected slots:
@@ -71 +93 @@
         virtual void showAll();
         virtual void quit();
-#ifdef Q_OS_OS2
-        void trayAvailable();
-#endif
 
 #if DOCK_PLAYLIST
@@ -89 +108 @@
 #endif
 
+#ifdef SCREENS_SUPPORT
+        void updateSendToScreen();
+        void sendVideoToScreen(int screen);
+
+        void detachVideo(bool);
+
+        void showScreensInfo();
+#endif
+
+#ifdef GLOBALSHORTCUTS
+        void updateGlobalShortcuts();
+#endif
 
 protected:
@@ -97 +128 @@
         MyAction * showTrayAct;
         MyAction * showAllAct;
+
+#ifdef DETACH_VIDEO_OPTION
+        MyAction * detachVideoAct;
+#endif
+
+#ifdef SCREENS_SUPPORT
+        MyAction * showScreensInfoAct;
+        QMenu * sendToScreen_menu;
+        MyActionGroup * sendToScreenGroup;
+
+        InfoWindow * screens_info_window;
+        QLabel * detached_label;
+#endif
+
+#ifdef GLOBALSHORTCUTS
+        GlobalShortcuts * global_shortcuts;
+#endif
 
         // To save state
@@ -108 +156 @@
         //bool infowindow_visible;
 
-   int widgets_size; // To be able to restore the original size after exiting from compact mode
+        int widgets_size; // To be able to restore the original size after exiting from compact mode
 
 #if DOCK_PLAYLIST
-    PlaylistDock * playlistdock;
+        PlaylistDock * playlistdock;
         bool fullscreen_playlist_was_visible;
         bool fullscreen_playlist_was_floating;
@@ -117 +165 @@
         bool ignore_playlist_events;
 #endif
-
 };