--- infoscreen/MainView.h	2010/06/21 13:53:17	870
+++ infoscreen/mainview.h	2010/06/25 07:17:40	902
@@ -4,17 +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 {
@@ -46,16 +46,21 @@
     void errorInfoScreen(QString msg);
 
     Mode currentMode;
+    bool enableScreenManager;
+    bool showClock;
 
     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;
@@ -71,6 +76,8 @@
     QString screenid;
     QString xmlUrl;
     QString path;
+
+    ClockOverlay* clockOverlay;
 };
 
 #endif //MAINVIEW_H