--- infoscreen/MainView.cpp	2010/06/24 07:52:59	881
+++ infoscreen/MainView.cpp	2010/06/24 12:14:33	886
@@ -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,6 +68,12 @@
     layout->setContentsMargins(0,0,0,0);
     setLayout(layout);
 
+    clockOverlay = new ClockOverlay(this);
+    clockOverlay->move(10,10);
+    clockOverlay->resize(150,75);
+
+    
+
     if (currentMode == ModeSimpleWeb) {
         web->setVisible(true);
         web->start(url,screenid);
@@ -161,6 +168,7 @@
     if (currentMode == ModeXml || currentMode == ModeLocal) {
         switchScreens();
     }
+    clockOverlay->timerTick();
 }
 
 
@@ -241,7 +249,6 @@
     }
 
     if (lastScreenSwitch.isNull() || lastScreenSwitch.elapsed() > (currentItem.runtime*1000)) {
-
         QTime now = QTime::currentTime();
         if (lastScreenSwitch.isNull())
             currentItemIdx = -1;
@@ -289,6 +296,8 @@
 
         } else {
             errorInfoScreen("Der er ingen information at vise");
+            currentItem = ScreenItem();
+            currentItem.runtime = 60; //switch screens again in 1 minute
         }
         lastScreenSwitch = QTime::currentTime();