diff options
| author | Mateusz Łukasik <mati75@linuxmint.pl> | 2015-04-25 16:17:41 +0200 |
|---|---|---|
| committer | Mateusz Łukasik <mati75@linuxmint.pl> | 2015-04-25 16:17:41 +0200 |
| commit | 45ee5ac6dc2159352596ce8e8ec744e0c864d492 (patch) | |
| tree | 55ca90fd4a0d5c0eae188c5919510b6b0d2e3c5d /src/basegui.h | |
| parent | a35c74c509f107094fd81cee8df109b652063969 (diff) | |
Imported Upstream version 14.9.0.6690~ds0
Diffstat (limited to 'src/basegui.h')
| -rw-r--r-- | src/basegui.h | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/src/basegui.h b/src/basegui.h index 7d8fe08..699ff56 100644 --- a/src/basegui.h +++ b/src/basegui.h @@ -1,5 +1,5 @@ /* smplayer, GUI front-end for mplayer. - Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net> + Copyright (C) 2006-2015 Ricardo Villalba <rvm@users.sourceforge.net> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -230,6 +230,7 @@ protected slots: #endif #ifdef YOUTUBE_SUPPORT + void YTNoSslSupport(); void YTNoSignature(const QString &); #ifdef YT_USE_SCRIPT void YTUpdateScript(); @@ -348,8 +349,13 @@ signals: protected: 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 /* Disable screensaver by event */ @@ -380,6 +386,7 @@ protected: void createMenus(); void updateRecents(); void configureDiscDevices(); + void setupNetworkProxy(); /* virtual void closeEvent( QCloseEvent * e ); */ protected: @@ -411,6 +418,7 @@ protected: MyAction * pauseAndStepAct; MyAction * stopAct; MyAction * frameStepAct; + MyAction * frameBackStepAct; MyAction * rewind1Act; MyAction * rewind2Act; MyAction * rewind3Act; @@ -480,7 +488,7 @@ protected: MyAction * decSubStepAct; MyAction * incSubScaleAct; MyAction * decSubScaleAct; - MyAction * useAssAct; + MyAction * useCustomSubStyleAct; MyAction * useForcedSubsOnlyAct; MyAction * subVisibilityAct; #ifdef FIND_SUBTITLES @@ -524,6 +532,10 @@ protected: MyAction * yahooAct; #endif + // OSD + MyAction * incOSDScaleAct; + MyAction * decOSDScaleAct; + // Playlist MyAction * playPrevAct; MyAction * playNextAct; @@ -572,10 +584,6 @@ protected: MyAction * autoZoom169Act; MyAction * autoZoom235Act; -#if USE_MPLAYER_PANSCAN - MyAction * incPanscanAct; - MyAction * decPanscanAct; -#endif // OSD Action Group MyActionGroup * osdGroup; @@ -695,6 +703,7 @@ protected: MyActionGroup * videoTrackGroup; MyActionGroup * audioTrackGroup; MyActionGroup * subtitleTrackGroup; + MyActionGroup * secondarySubtitleTrackGroup; MyActionGroup * titleGroup; MyActionGroup * angleGroup; MyActionGroup * chapterGroup; @@ -721,7 +730,8 @@ protected: QMenu *helpMenu; QMenu * disc_menu; - QMenu * subtitlestrack_menu; + QMenu * subtitles_track_menu; + QMenu * secondary_subtitles_track_menu; #if PROGRAM_SWITCH QMenu * programtrack_menu; #endif |