--- infoscreen/MainView.h 2010/03/29 09:34:16 637 +++ infoscreen/MainView.h 2010/04/07 17:00:07 638 @@ -15,6 +15,13 @@ class QSettings; +enum Mode { + ModeNone, + ModeSimpleWeb, + ModeXml, + ModeLocal +}; + class MainView : public QWidget { @@ -29,12 +36,16 @@ 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; PictureView* picture; @@ -55,6 +66,7 @@ QString url; QString screenid; QString xmlUrl; + QString path; }; #endif //MAINVIEW_H