--- infoscreen/MainView.cpp	2010/06/22 20:43:13	875
+++ infoscreen/MainView.cpp	2010/06/24 09:44:57	884
@@ -10,11 +10,11 @@
 #include <QSettings>
 #include <QMessageBox>
 
-#include "MyWebView.h"
+#include "webview.h"
 #include "clientsiderender.h"
 #include "pictureview.h"
 #include "videoview.h"
-
+#include "clockoverlay.h"
 #include "httpwrapper.h"
 #include "screenmanager.h"
 
@@ -29,6 +29,7 @@
         xmlUrl = url + "?screen_id=" + screenid;
         qDebug() << "Starting XML mode";
         qDebug() << "xmlUrl" << xmlUrl;
+        qDebug() << "xmlInterval" << xmlInterval/(60*1000);
     }
 
     if (currentMode == ModeSimpleWeb){
@@ -50,7 +51,7 @@
 
     render = new ClientSideRender(this);
 
-    web = new MyWebView(this);
+    web = new WebView(this);
 
     picture = new PictureView(this);
 
@@ -67,13 +68,19 @@
     layout->setContentsMargins(0,0,0,0);
     setLayout(layout);
 
+    clockOverlay = new ClockOverlay(this);
+    clockOverlay->move(10,10);
+    clockOverlay->resize(100,50);
+
+    
+
     if (currentMode == ModeSimpleWeb) {
         web->setVisible(true);
         web->start(url,screenid);
     }
 
     if (enableScreenManager) {
-        screenManager = new ScreenManager();
+        screenManager = new ScreenManager(screenManagerOn, screenManagerOff);
     } else {
         qDebug() << "ScreenManager is disabled";
     }
@@ -104,7 +111,14 @@
         exit(1);
     }
 
-    enableScreenManager = settings->value("enableScreenManager").toBool();
+    enableScreenManager = settings->value("enablescreenmanager").toBool();
+    if (enableScreenManager) {
+        screenManagerOn = settings->value("screenmanager_on").toTime();
+        screenManagerOff = settings->value("screenmanager_off").toTime();
+    }
+
+    xmlInterval = settings->value("xmlinterval", 30).toInt();
+    xmlInterval = (xmlInterval * 60 * 1000); //convert to milliseconds
 
 
     if (currentMode == ModeSimpleWeb || currentMode == ModeXml) {
@@ -154,6 +168,7 @@
     if (currentMode == ModeXml || currentMode == ModeLocal) {
         switchScreens();
     }
+    clockOverlay->timerTick();
 }
 
 
@@ -207,8 +222,8 @@
 
 bool MainView::readXml()
 {
-    const int TIMEOUT = 30*60*1000; // 30 minutter
-    if ( lastXml.isNull() || lastXml.elapsed() > TIMEOUT) {
+    if ( lastXml.isNull() || lastXml.elapsed() > xmlInterval) {
+	qDebug() << "Reading XML";
 
 
         bool res = xmlHandler.readXml( xmlUrl );