--- infoscreen/MainView.h 2010/01/05 20:14:22 527 +++ infoscreen/MainView.h 2010/01/07 16:44:17 532 @@ -2,8 +2,11 @@ #ifndef MAINVIEW_H #define MAINVIEW_H +#include #include #include "screenmanager.h" +#include "screenitem.h" +#include "screenxmlhandler.h" class VideoView; class MyWebView; @@ -17,8 +20,18 @@ public: MainView(QWidget* parent); +public slots: + void onTimer(); +protected: + virtual void keyPressEvent ( QKeyEvent * event ); private: + bool readXml(); + void switchScreens(); + void hideAll(); + void ensureVisible(QWidget* widget); + + MyWebView* web; ClientSideRender* render; PictureView* picture; @@ -26,8 +39,15 @@ QWidget* current; ScreenManager screenManager; -public slots: - void onTimer(); + QTime lastXml; + QTime lastScreenSwitch; + ScreenItem currentItem; + int currentItemIdx; + QVector screenItems; + + ScreenXmlHandler xmlHandler; + + }; #endif //MAINVIEW_H