diff options
| author | Alessio Treglia <alessio@debian.org> | 2012-02-16 11:08:45 +0100 |
|---|---|---|
| committer | Alessio Treglia <alessio@debian.org> | 2012-02-16 11:08:45 +0100 |
| commit | 65a64d260e05c7bf8d3bdf82e796637dc820e574 (patch) | |
| tree | 600c2becea7f28fdefff51200bb3ed33514e4cc7 /src/basegui.h | |
| parent | 1d323e54ee434609cf035598486075c9a918a2d3 (diff) | |
Imported Upstream version 0.7.0
Diffstat (limited to 'src/basegui.h')
| -rw-r--r-- | src/basegui.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/basegui.h b/src/basegui.h index 936e67c..b8a2c0f 100644 --- a/src/basegui.h +++ b/src/basegui.h @@ -1,5 +1,5 @@ /* smplayer, GUI front-end for mplayer. - Copyright (C) 2006-2011 Ricardo Villalba <rvm@escomposlinux.org> + Copyright (C) 2006-2012 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 @@ -52,6 +52,7 @@ class MyActionGroup; class PreferencesDialog; class MyServer; +class Favorites; class TVList; class BaseGui : public QMainWindow @@ -59,7 +60,7 @@ class BaseGui : public QMainWindow Q_OBJECT public: - BaseGui( QWidget* parent = 0, Qt::WindowFlags flags = 0 ); + BaseGui( bool use_server, QWidget* parent = 0, Qt::WindowFlags flags = 0 ); ~BaseGui(); /* Return true if the window shouldn't show on startup */ @@ -81,6 +82,7 @@ public slots: virtual void openFile(); virtual void openFile(QString file); virtual void openFiles(QStringList files); + virtual void openFavorite(QString file); virtual void openURL(); virtual void openURL(QString url); virtual void openVCD(); @@ -93,7 +95,7 @@ public slots: virtual void helpFAQ(); virtual void helpCLOptions(); - virtual void helpTips(); + virtual void helpCheckUpdates(); virtual void helpDonate(); virtual void helpAbout(); virtual void helpAboutQt(); @@ -428,7 +430,7 @@ protected: // Menu Help MyAction * showFAQAct; MyAction * showCLOptionsAct; // Command line options - MyAction * showTipsAct; + MyAction * showCheckUpdatesAct; MyAction * donateAct; MyAction * aboutQtAct; MyAction * aboutThisAct; @@ -609,6 +611,7 @@ protected: QMenu *optionsMenu; QMenu *helpMenu; + QMenu * disc_menu; QMenu * subtitlestrack_menu; #if PROGRAM_SWITCH QMenu * programtrack_menu; @@ -659,6 +662,8 @@ protected: MyServer * server; + Favorites * favorites; + TVList * tvlist; TVList * radiolist; @@ -669,6 +674,7 @@ protected: // Force settings from command line int arg_close_on_finish; // -1 = not set, 1 = true, 0 = false int arg_start_in_fullscreen; // -1 = not set, 1 = true, 0 = false + bool use_control_server; private: QString default_style; |