--- infoscreen/MainView.h 2010/06/21 12:23:07 867 +++ infoscreen/MainView.h 2010/06/22 21:01:37 876 @@ -4,16 +4,16 @@ #include #include -#include "screenmanager.h" #include "screenitem.h" #include "screenxmlhandler.h" +class QStackedLayout; class VideoView; class MyWebView; class ClientSideRender; class PictureView; class QSvgWidget; - +class ScreenManager; class QSettings; enum Mode { @@ -41,11 +41,13 @@ bool readXml(); void readLocalFiles(); void switchScreens(); - void hideAll(); void ensureVisible(QWidget* widget); void errorInfoScreen(QString msg); Mode currentMode; + bool enableScreenManager; + + QStackedLayout* layout; MyWebView* web; ClientSideRender* render; @@ -53,7 +55,9 @@ VideoView* video; QSvgWidget* svg; QWidget* current; - ScreenManager screenManager; + ScreenManager* screenManager; + QTime screenManagerOn; + QTime screenManagerOff; QTimer* timer ; QTime lastXml;