--- infoscreen/MainView.h	2010/06/21 12:23:07	867
+++ infoscreen/MainView.h	2010/06/24 09:44:57	884
@@ -4,16 +4,17 @@
 
 #include <QVector>
 #include <QWidget>
-#include "screenmanager.h"
 #include "screenitem.h"
 #include "screenxmlhandler.h"
 
+class QStackedLayout;
 class VideoView;
-class MyWebView;
+class WebView;
 class ClientSideRender;
 class PictureView;
 class QSvgWidget;
-
+class ScreenManager;
+class ClockOverlay;
 class QSettings;
 
 enum Mode {
@@ -41,19 +42,24 @@
     bool readXml();
     void readLocalFiles();
     void switchScreens();
-    void hideAll();
     void ensureVisible(QWidget* widget);
     void errorInfoScreen(QString msg);
 
     Mode currentMode;
+    bool enableScreenManager;
+
+    QStackedLayout* layout;
 
-    MyWebView* web;
+    WebView* web;
     ClientSideRender* render;
     PictureView* picture;
     VideoView* video;
     QSvgWidget* svg;
     QWidget* current;
-    ScreenManager screenManager;
+    ScreenManager* screenManager;
+    QTime screenManagerOn;
+    QTime screenManagerOff;
+    int xmlInterval;
 
     QTimer* timer ;
     QTime lastXml;
@@ -69,6 +75,8 @@
     QString screenid;
     QString xmlUrl;
     QString path;
+
+    ClockOverlay* clockOverlay;
 };
 
 #endif //MAINVIEW_H