--- infoscreen/MainView.cpp	2010/06/21 13:53:17	870
+++ infoscreen/MainView.cpp	2010/06/22 20:43:13	875
@@ -16,6 +16,7 @@
 #include "videoview.h"
 
 #include "httpwrapper.h"
+#include "screenmanager.h"
 
 
 
@@ -32,8 +33,6 @@
 
     if (currentMode == ModeSimpleWeb){
         qDebug() << "Starting plain browser mode";
-        web->setVisible(true);
-        web->start(url,screenid);
     }
 
     if (currentMode == ModeLocal ) {
@@ -68,13 +67,22 @@
     layout->setContentsMargins(0,0,0,0);
     setLayout(layout);
 
+    if (currentMode == ModeSimpleWeb) {
+        web->setVisible(true);
+        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();
+    } 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()
@@ -96,6 +104,8 @@
         exit(1);
     }
 
+    enableScreenManager = settings->value("enableScreenManager").toBool();
+
 
     if (currentMode == ModeSimpleWeb || currentMode == ModeXml) {
         url = settings->value("url").toString();
@@ -133,13 +143,17 @@
 
 void MainView::onTimer()
 {
-    screenManager.timerTick();
+    if (enableScreenManager == true) {
+        screenManager->timerTick();
+    }
 
     if (currentMode == ModeXml) {
         readXml();
     }
 
-    switchScreens();
+    if (currentMode == ModeXml || currentMode == ModeLocal) {
+        switchScreens();
+    }
 }
 
 
@@ -267,7 +281,6 @@
             }
 
         } else {
-            qDebug() << "no screen";
             errorInfoScreen("Der er ingen information at vise");
         }
         lastScreenSwitch = QTime::currentTime();