--- infoscreen/MainView.h 2010/01/07 19:42:12 534 +++ infoscreen/MainView.h 2010/04/07 17:00:07 638 @@ -13,6 +13,15 @@ class ClientSideRender; class PictureView; +class QSettings; + +enum Mode { + ModeNone, + ModeSimpleWeb, + ModeXml, + ModeLocal +}; + class MainView : public QWidget { @@ -25,12 +34,17 @@ protected: virtual void keyPressEvent ( QKeyEvent * event ); + virtual void closeEvent ( QCloseEvent * event ); private: + void loadSettings(); bool readXml(); + void readLocalFiles(); void switchScreens(); void hideAll(); void ensureVisible(QWidget* widget); + void errorInfoScreen(QString msg); + Mode currentMode; MyWebView* web; ClientSideRender* render; @@ -39,6 +53,7 @@ QWidget* current; ScreenManager screenManager; + QTimer* timer ; QTime lastXml; QTime lastScreenSwitch; ScreenItem currentItem; @@ -47,7 +62,11 @@ ScreenXmlHandler xmlHandler; - + QSettings* settings; + QString url; + QString screenid; + QString xmlUrl; + QString path; }; #endif //MAINVIEW_H