Ignore:
Timestamp:
Feb 21, 2014, 4:44:11 PM (11 years ago)
Author:
Silvan Scherrer
Message:

SMPlayer: update vendor to 0.8.6

File:
1 edited

Legend:

Unmodified
Added
Removed
  • smplayer/vendor/current/src/basegui.h

    r140 r154  
    3434#endif
    3535
    36 #ifdef Q_OS_WIN
    37   #ifdef PORTABLE_APP
    38      #define TEST_UPDATE
    39   #endif
    40 #else
    41   #define TEST_UPDATE
    42 #endif
    43 
    4436class QWidget;
    4537class QMenu;
     
    6052#endif
    6153
    62 
    6354class MyAction;
    6455class MyActionGroup;
    65 
    6656class PreferencesDialog;
    67 
    6857class Favorites;
    6958class TVList;
    70 
    7159class UpdateChecker;
     60
     61#if !defined(Q_OS_WIN) || defined(PORTABLE_APP)
     62#define REMINDER_ACTIONS 1
     63#endif
    7264
    7365class BaseGui : public QMainWindow
     
    115107        virtual void helpCLOptions();
    116108        virtual void helpCheckUpdates();
     109#ifdef REMINDER_ACTIONS
     110        virtual void helpDonate();
     111#endif
    117112        virtual void helpShowConfig();
    118113        virtual void helpAbout();
     
    135130#endif
    136131
     132#ifdef YOUTUBE_SUPPORT
    137133        virtual void showTubeBrowser();
     134#endif
    138135
    139136        virtual void showPlaylist();
     
    191188
    192189        virtual void displayState(Core::State state);
     190        virtual void displayMessage(QString message, int time);
    193191        virtual void displayMessage(QString message);
    194192        virtual void gotCurrentTime(double);
     
    215213#endif
    216214
    217 #ifdef TEST_UPDATE
    218         void testUpdate();
     215#ifdef CHECK_UPGRADED
     216        void checkIfUpgraded();
     217#endif
     218
     219#ifdef REMINDER_ACTIONS
     220        void checkReminder();
     221#endif
     222
     223#ifdef YOUTUBE_SUPPORT
     224        void YTNoSignature(const QString &);
     225        #ifdef YT_USE_SCRIPT
     226        void YTUpdateScript();
     227        #endif
    219228#endif
    220229
     
    323332        //! Sent when the user wants to close the main window
    324333        void quitSolicited();
     334
     335        //! Sent when another instance requested to play a file
     336        void openFileRequested();
    325337
    326338#ifdef GUI_CHANGE_ON_RUNTIME
     
    469481        MyAction * showPropertiesAct;
    470482        MyAction * showPreferencesAct;
     483#ifdef YOUTUBE_SUPPORT
    471484        MyAction * showTubeBrowserAct;
     485#endif
    472486#ifdef LOG_MPLAYER
    473487        MyAction * showLogMplayerAct;
     
    482496        MyAction * showCLOptionsAct; // Command line options
    483497        MyAction * showCheckUpdatesAct;
     498#if defined(YOUTUBE_SUPPORT) && defined(YT_USE_SCRIPT)
     499        MyAction * updateYTAct;
     500#endif
    484501        MyAction * showConfigAct;
     502#ifdef REMINDER_ACTIONS
     503        MyAction * donateAct;
     504#endif
    485505        MyAction * aboutQtAct;
    486506        MyAction * aboutThisAct;
Note: See TracChangeset for help on using the changeset viewer.