--- infoscreen/MainView.cpp	2010/06/22 07:24:14	872
+++ infoscreen/MainView.cpp	2010/06/24 07:57:56	882
@@ -16,6 +16,7 @@
 #include "videoview.h"
 
 #include "httpwrapper.h"
+#include "screenmanager.h"
 
 
 
@@ -28,6 +29,7 @@
         xmlUrl = url + "?screen_id=" + screenid;
         qDebug() << "Starting XML mode";
         qDebug() << "xmlUrl" << xmlUrl;
+        qDebug() << "xmlInterval" << xmlInterval/(60*1000);
     }
 
     if (currentMode == ModeSimpleWeb){
@@ -71,12 +73,17 @@
         web->start(url,screenid);
     }
 
-    if (currentMode == ModeXml || currentMode == ModeLocal) {
-        qDebug() << "Starting timer...";
-        timer = new QTimer(this);
-        connect(timer, SIGNAL(timeout() ), this, SLOT(onTimer() ));
-        timer->start(100);
+    if (enableScreenManager) {
+        screenManager = new ScreenManager(screenManagerOn, screenManagerOff);
+    } else {
+        qDebug() << "ScreenManager is disabled";
     }
+
+
+    qDebug() << "Starting timer...";
+    timer = new QTimer(this);
+    connect(timer, SIGNAL(timeout() ), this, SLOT(onTimer() ));
+    timer->start(100);
 }
 
 void MainView::loadSettings()
@@ -98,6 +105,15 @@
         exit(1);
     }
 
+    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) {
         url = settings->value("url").toString();
@@ -135,13 +151,17 @@
 
 void MainView::onTimer()
 {
-    screenManager.timerTick();
+    if (enableScreenManager == true) {
+        screenManager->timerTick();
+    }
 
     if (currentMode == ModeXml) {
         readXml();
     }
 
-    switchScreens();
+    if (currentMode == ModeXml || currentMode == ModeLocal) {
+        switchScreens();
+    }
 }
 
 
@@ -195,8 +215,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 );
@@ -269,7 +289,6 @@
             }
 
         } else {
-            qDebug() << "no screen";
             errorInfoScreen("Der er ingen information at vise");
         }
         lastScreenSwitch = QTime::currentTime();