--- infoscreen/MainView.h 2010/06/21 13:53:17 870 +++ infoscreen/MainView.h 2010/06/24 08:59:43 883 @@ -4,7 +4,6 @@ #include #include -#include "screenmanager.h" #include "screenitem.h" #include "screenxmlhandler.h" @@ -14,7 +13,8 @@ class ClientSideRender; class PictureView; class QSvgWidget; - +class ScreenManager; +class ClockOverlay; class QSettings; enum Mode { @@ -46,6 +46,7 @@ void errorInfoScreen(QString msg); Mode currentMode; + bool enableScreenManager; QStackedLayout* layout; @@ -55,7 +56,10 @@ VideoView* video; QSvgWidget* svg; QWidget* current; - ScreenManager screenManager; + ScreenManager* screenManager; + QTime screenManagerOn; + QTime screenManagerOff; + int xmlInterval; QTimer* timer ; QTime lastXml; @@ -71,6 +75,8 @@ QString screenid; QString xmlUrl; QString path; + + ClockOverlay* clockOverlay; }; #endif //MAINVIEW_H