diff options
| author | Mateusz Łukasik <mati75@linuxmint.pl> | 2016-04-08 10:03:05 +0200 |
|---|---|---|
| committer | Mateusz Łukasik <mati75@linuxmint.pl> | 2016-04-08 10:03:05 +0200 |
| commit | 1a2f0c9c1087899a00298db8fa70518d3c1e69f8 (patch) | |
| tree | 7efa117e122fbe21eb6a832540007aeeef377fcb /src/basegui.h | |
| parent | ba0162e8cb8a12c90ef9775f5a20a6da095a0b35 (diff) | |
Imported Upstream version 16.4.0~ds0
Diffstat (limited to 'src/basegui.h')
| -rw-r--r-- | src/basegui.h | 32 |
1 files changed, 21 insertions, 11 deletions
diff --git a/src/basegui.h b/src/basegui.h index d40e8b7..34af4c6 100644 --- a/src/basegui.h +++ b/src/basegui.h @@ -16,8 +16,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _BASEGUI_H_ -#define _BASEGUI_H_ +#ifndef BASEGUI_H +#define BASEGUI_H #include <QMainWindow> #include <QNetworkProxy> @@ -35,6 +35,10 @@ #endif #endif +#ifdef MOUSE_GESTURES + #define MG_DELAYED_SEEK +#endif + //#define SHARE_MENU class QWidget; @@ -62,7 +66,7 @@ class Favorites; class TVList; class UpdateChecker; -#ifdef SHAREWIDGET +#ifdef SHARE_WIDGET class ShareWidget; #endif @@ -118,7 +122,7 @@ public slots: virtual void helpFAQ(); virtual void helpCLOptions(); virtual void helpCheckUpdates(); -#ifdef REMINDER_ACTIONS +#ifdef SHARE_ACTIONS virtual void helpDonate(); #endif virtual void helpShowConfig(); @@ -180,9 +184,6 @@ public slots: void setStayOnTop(bool b); virtual void changeStayOnTop(int); virtual void checkStayOnTop(Core::State); -#if QT_VERSION >= 0x050000 - void updateStayOnTop(); -#endif void toggleStayOnTop(); void setForceCloseOnFinish(int n) { arg_close_on_finish = n; }; @@ -235,7 +236,7 @@ protected slots: void checkIfUpgraded(); #endif -#if defined(REMINDER_ACTIONS) && !defined(SHAREWIDGET) +#if defined(SHARE_ACTIONS) && !defined(SHARE_WIDGET) void checkReminder(); #endif @@ -293,7 +294,11 @@ protected slots: virtual void loadActions(); virtual void saveActions(); + virtual void processMouseMovedDiff(QPoint diff); virtual void moveWindowDiff(QPoint diff); +#ifdef MG_DELAYED_SEEK + virtual void delayedSeek(); +#endif // Single instance stuff #ifdef SINGLE_INSTANCE @@ -490,8 +495,8 @@ protected: MyAction * decAudioDelayAct; MyAction * incAudioDelayAct; MyAction * audioDelayAct; // Ask for delay -#ifdef MPLAYER_SUPPORT MyAction * extrastereoAct; +#ifdef MPLAYER_SUPPORT MyAction * karaokeAct; #endif MyAction * volnormAct; @@ -545,7 +550,7 @@ protected: MyAction * updateYTAct; #endif MyAction * showConfigAct; -#ifdef REMINDER_ACTIONS +#ifdef SHARE_ACTIONS MyAction * donateAct; #endif MyAction * aboutThisAct; @@ -846,7 +851,7 @@ protected: UpdateChecker * update_checker; #endif -#ifdef SHAREWIDGET +#ifdef SHARE_WIDGET ShareWidget * sharewidget; #endif @@ -858,6 +863,11 @@ protected: 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: QString default_style; |