--- infoscreen/MainView.h 2010/01/10 09:12:55 542 +++ infoscreen/MainView.h 2010/06/21 13:53:17 870 @@ -8,13 +8,22 @@ #include "screenitem.h" #include "screenxmlhandler.h" +class QStackedLayout; class VideoView; class MyWebView; class ClientSideRender; class PictureView; +class QSvgWidget; class QSettings; +enum Mode { + ModeNone, + ModeSimpleWeb, + ModeXml, + ModeLocal +}; + class MainView : public QWidget { @@ -29,16 +38,22 @@ 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; + + QStackedLayout* layout; + MyWebView* web; ClientSideRender* render; PictureView* picture; VideoView* video; + QSvgWidget* svg; QWidget* current; ScreenManager screenManager; @@ -55,6 +70,7 @@ QString url; QString screenid; QString xmlUrl; + QString path; }; #endif //MAINVIEW_H