Changeset 175 for smplayer/vendor/current/src/basegui.h

Timestamp:

May 3, 2016, 2:14:41 PM (9 years ago)

Author:

Silvan Scherrer

Message:

smplayer: update vendor to version 16.4

File:

• smplayer/vendor/current/src/basegui.h (modified) (29 diffs)

smplayer/vendor/current/src/basegui.h ¶

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>
+    Copyright (C) 2006-2016 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
@@ -17 +17 @@
 */
 
-#ifndef _BASEGUI_H_
-#define _BASEGUI_H_
+#ifndef BASEGUI_H
+#define BASEGUI_H
 
 #include <QMainWindow>
@@ -36 +36 @@
 #endif
 
+#ifdef MOUSE_GESTURES
+        #define MG_DELAYED_SEEK
+#endif
+
 //#define SHARE_MENU
 
@@ -63 +67 @@
 class UpdateChecker;
 
+#ifdef SHARE_WIDGET
+class ShareWidget;
+#endif
 
 class BaseGui : public QMainWindow
@@ -69 +76 @@
     
 public:
-    BaseGui( QWidget* parent = 0, Qt::WindowFlags flags = 0 );
+        BaseGui( QWidget* parent = 0, Qt::WindowFlags flags = 0 );
         ~BaseGui();
 
@@ -87 +94 @@
         void recordSmplayerLog(QString line);
 #endif
+
+        Core * getCore() { return core; };
+        Playlist * getPlaylist() { return playlist; };
 
 public slots:
@@ -113 +123 @@
         virtual void helpCLOptions();
         virtual void helpCheckUpdates();
-#ifdef REMINDER_ACTIONS
+#ifdef SHARE_ACTIONS
         virtual void helpDonate();
 #endif
@@ -159 +169 @@
         virtual void showSubDelayDialog();
         virtual void showAudioDelayDialog();
+        virtual void showStereo3dDialog();
+#ifdef BOOKMARKS
+        virtual void showAddBookmarkDialog();
+        virtual void showBookmarkDialog();
+#endif
 
         virtual void exitFullscreen();
@@ -218 +233 @@
 #endif
 
-#ifdef UPDATE_CHECKER
-        void reportNewVersionAvailable(QString);
-#endif
-
 #ifdef CHECK_UPGRADED
         void checkIfUpgraded();
 #endif
 
-#ifdef REMINDER_ACTIONS
+#if defined(SHARE_ACTIONS) && !defined(SHARE_WIDGET)
         void checkReminder();
 #endif
 
 #ifdef YOUTUBE_SUPPORT
+        void YTNoSslSupport();
         void YTNoSignature(const QString &);
-        #ifdef YT_USE_SCRIPT
+        #ifdef YT_USE_YTSIG
         void YTUpdateScript();
         #endif
@@ -241 +253 @@
         virtual void enableActionsOnPlaying();
         virtual void disableActionsOnStop();
+#endif
         virtual void togglePlayAction(Core::State);
-#endif
 
         void changeSizeFactor(int factor);
@@ -249 +261 @@
         void resizeWindow(int w, int h);
         virtual void hidePanel();
+        void centerWindow();
 
         /* virtual void playlistVisibilityChanged(); */
@@ -282 +295 @@
         virtual void saveActions();
 
+        virtual void processMouseMovedDiff(QPoint diff);
         virtual void moveWindowDiff(QPoint diff);
+#ifdef MG_DELAYED_SEEK
+        virtual void delayedSeek();
+#endif
 
         // Single instance stuff
@@ -298 +315 @@
         // stylesheet
 #if ALLOW_CHANGE_STYLESHEET
-        virtual void loadQss(QString filename);
+        virtual QString loadQss(QString filename);
         virtual void changeStyleSheet(QString style);
 #endif
+
+        void applyStyles();
 
 #if defined(Q_OS_WIN) || defined(Q_OS_OS2)
@@ -349 +368 @@
         virtual void retranslateStrings();
         virtual void changeEvent(QEvent * event);
+#if QT_VERSION < 0x050000
         virtual void hideEvent( QHideEvent * );
         virtual void showEvent( QShowEvent * );
+#else
+        virtual bool event(QEvent * e);
+        bool was_minimized;
+#endif
 #ifdef Q_OS_WIN
         #ifdef AVOID_SCREENSAVER
@@ -379 +403 @@
 #endif
         void createMenus();
+#ifdef BOOKMARKS
+        void updateBookmarks();
+#endif
         void updateRecents();
         void configureDiscDevices();
+        void setupNetworkProxy();
         /* virtual void closeEvent( QCloseEvent * e ); */
 
@@ -412 +440 @@
         MyAction * stopAct;
         MyAction * frameStepAct;
+        MyAction * frameBackStepAct;
         MyAction * rewind1Act;
         MyAction * rewind2Act;
@@ -441 +470 @@
         MyAction * screenshotAct;
         MyAction * screenshotsAct;
+#ifdef CAPTURE_STREAM
+        MyAction * capturingAct;
+#endif
 #ifdef VIDEOPREVIEW
         MyAction * videoPreviewAct;
@@ -446 +478 @@
         MyAction * flipAct;
         MyAction * mirrorAct;
+        MyAction * stereo3dAct;
         MyAction * postProcessingAct;
         MyAction * phaseAct;
@@ -464 +497 @@
         MyAction * audioDelayAct; // Ask for delay
         MyAction * extrastereoAct;
+#ifdef MPLAYER_SUPPORT
         MyAction * karaokeAct;
+#endif
         MyAction * volnormAct;
         MyAction * loadAudioAct;
@@ -481 +516 @@
         MyAction * incSubScaleAct;
         MyAction * decSubScaleAct;
-        MyAction * useAssAct;
+#ifdef MPV_SUPPORT
+        MyAction * seekNextSubAct;
+        MyAction * seekPrevSubAct;
+#endif
+        MyAction * useCustomSubStyleAct;
         MyAction * useForcedSubsOnlyAct;
         MyAction * subVisibilityAct;
@@ -508 +547 @@
         MyAction * showCLOptionsAct; // Command line options
         MyAction * showCheckUpdatesAct;
-#if defined(YOUTUBE_SUPPORT) && defined(YT_USE_SCRIPT)
+#if defined(YOUTUBE_SUPPORT) && defined(YT_USE_YTSIG)
         MyAction * updateYTAct;
 #endif
         MyAction * showConfigAct;
-#ifdef REMINDER_ACTIONS
+#ifdef SHARE_ACTIONS
         MyAction * donateAct;
 #endif
@@ -524 +563 @@
         MyAction * yahooAct;
 #endif
+
+        // OSD
+        MyAction * incOSDScaleAct;
+        MyAction * decOSDScaleAct;
 
         // Playlist
@@ -559 +602 @@
 
         MyAction * showFilenameAct;
+        MyAction * showTimeAct;
         MyAction * toggleDeinterlaceAct;
 
@@ -573 +617 @@
         MyAction * autoZoom235Act;
 
-#if USE_MPLAYER_PANSCAN
-        MyAction * incPanscanAct;
-        MyAction * decPanscanAct;
-#endif
 
         // OSD Action Group 
@@ -696 +736 @@
         MyActionGroup * audioTrackGroup;
         MyActionGroup * subtitleTrackGroup;
+#ifdef MPV_SUPPORT
+        MyActionGroup * secondarySubtitleTrackGroup;
+#endif
         MyActionGroup * titleGroup;
+        MyActionGroup * chapterGroup;
         MyActionGroup * angleGroup;
-        MyActionGroup * chapterGroup;
+#ifdef BOOKMARKS
+        MyActionGroup * bookmarkGroup;
+        MyAction * addBookmarkAct;
+        MyAction * editBookmarksAct;
+
+        MyAction * prevBookmarkAct;
+        MyAction * nextBookmarkAct;
+#endif
 
 #if DVDNAV_SUPPORT
@@ -722 +773 @@
 
         QMenu * disc_menu;
-        QMenu * subtitlestrack_menu;
+        QMenu * subtitles_track_menu;
+#ifdef MPV_SUPPORT
+        QMenu * secondary_subtitles_track_menu;
+#endif
 #if PROGRAM_SWITCH
         QMenu * programtrack_menu;
@@ -731 +785 @@
         QMenu * chapters_menu;
         QMenu * angles_menu;
+#ifdef BOOKMARKS
+        QMenu * bookmark_menu;
+#endif
         QMenu * aspect_menu;
         QMenu * osd_menu;
@@ -795 +852 @@
 #endif
 
+#ifdef SHARE_WIDGET
+        ShareWidget * sharewidget;
+#endif
+
         QStringList actions_list;
 
@@ -802 +863 @@
         int arg_close_on_finish; // -1 = not set, 1 = true, 0 = false
         int arg_start_in_fullscreen; // -1 = not set, 1 = true, 0 = false
+
+#ifdef MG_DELAYED_SEEK
+        QTimer * delayed_seek_timer;
+        int delayed_seek_value;
+#endif
 
 private: