--- infoscreen/MainView.h 2010/01/07 19:42:12 534 +++ infoscreen/MainView.h 2010/01/10 09:12:55 542 @@ -13,6 +13,8 @@ class ClientSideRender; class PictureView; +class QSettings; + class MainView : public QWidget { @@ -25,12 +27,13 @@ protected: virtual void keyPressEvent ( QKeyEvent * event ); + virtual void closeEvent ( QCloseEvent * event ); private: bool readXml(); void switchScreens(); void hideAll(); void ensureVisible(QWidget* widget); - + void errorInfoScreen(QString msg); MyWebView* web; ClientSideRender* render; @@ -39,6 +42,7 @@ QWidget* current; ScreenManager screenManager; + QTimer* timer ; QTime lastXml; QTime lastScreenSwitch; ScreenItem currentItem; @@ -47,7 +51,10 @@ ScreenXmlHandler xmlHandler; - + QSettings* settings; + QString url; + QString screenid; + QString xmlUrl; }; #endif //MAINVIEW_H