--- infoscreen/MainView.cpp	2010/06/22 20:43:13	875
+++ infoscreen/MainView.cpp	2010/06/24 07:57:56	882
@@ -29,6 +29,7 @@
         xmlUrl = url + "?screen_id=" + screenid;
         qDebug() << "Starting XML mode";
         qDebug() << "xmlUrl" << xmlUrl;
+        qDebug() << "xmlInterval" << xmlInterval/(60*1000);
     }
 
     if (currentMode == ModeSimpleWeb){
@@ -73,7 +74,7 @@
     }
 
     if (enableScreenManager) {
-        screenManager = new ScreenManager();
+        screenManager = new ScreenManager(screenManagerOn, screenManagerOff);
     } else {
         qDebug() << "ScreenManager is disabled";
     }
@@ -104,7 +105,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) {
@@ -207,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 );