--- infoscreen/MainView.cpp	2010/06/21 13:32:45	869
+++ infoscreen/MainView.cpp	2010/06/22 21:01:37	876
@@ -2,7 +2,7 @@
 #include <QApplication>
 #include <QPushButton>
 #include <QLabel>
-#include <QVBoxLayout>
+#include <QStackedLayout>
 #include <QSvgWidget>
 
 #include <QTimer>
@@ -16,6 +16,8 @@
 #include "videoview.h"
 
 #include "httpwrapper.h"
+#include "screenmanager.h"
+
 
 
 MainView::MainView(QWidget* parent)
@@ -31,8 +33,6 @@
 
     if (currentMode == ModeSimpleWeb){
         qDebug() << "Starting plain browser mode";
-        web->setVisible(true);
-        web->start(url,screenid);
     }
 
     if (currentMode == ModeLocal ) {
@@ -49,37 +49,40 @@
     qApp->setOverrideCursor( QCursor( Qt::BlankCursor) );
 
     render = new ClientSideRender(this);
-    render->setVisible( false );
 
     web = new MyWebView(this);
-    web->setVisible( false);
 
     picture = new PictureView(this);
-    picture->setVisible( false );
 
     video = new VideoView(this);
-    video->setVisible(false);
 
     svg = new QSvgWidget(this);
-    svg->setVisible(false);
 
-    QVBoxLayout* layout = new QVBoxLayout();
-    layout->addWidget(web,1);
-    layout->addWidget(render,1);
-    layout->addWidget(picture,1);
-    layout->addWidget(video,1);
-    layout->addWidget(svg,1);
-    layout->addStretch();
+    layout = new QStackedLayout();
+    layout->addWidget(web);
+    layout->addWidget(render);
+    layout->addWidget(picture);
+    layout->addWidget(video);
+    layout->addWidget(svg);
     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(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()
@@ -101,6 +104,12 @@
         exit(1);
     }
 
+    enableScreenManager = settings->value("enablescreenmanager").toBool();
+    if (enableScreenManager) {
+        screenManagerOn = settings->value("screenmanager_on").toTime();
+        screenManagerOff = settings->value("screenmanager_off").toTime();
+    }
+
 
     if (currentMode == ModeSimpleWeb || currentMode == ModeXml) {
         url = settings->value("url").toString();
@@ -138,13 +147,17 @@
 
 void MainView::onTimer()
 {
-    screenManager.timerTick();
+    if (enableScreenManager == true) {
+        screenManager->timerTick();
+    }
 
     if (currentMode == ModeXml) {
         readXml();
     }
 
-    switchScreens();
+    if (currentMode == ModeXml || currentMode == ModeLocal) {
+        switchScreens();
+    }
 }
 
 
@@ -272,7 +285,6 @@
             }
 
         } else {
-            qDebug() << "no screen";
             errorInfoScreen("Der er ingen information at vise");
         }
         lastScreenSwitch = QTime::currentTime();
@@ -291,17 +303,6 @@
 
 void MainView::ensureVisible(QWidget* widget)
 {
-    if (! widget->isVisible()) {
-        hideAll();
-        widget->setVisible(true);
-    }
+    layout->setCurrentWidget(widget);    
 }
 
-void MainView::hideAll()
-{
-    render->setVisible( false );
-    web->setVisible( false);
-    picture->setVisible( false );
-    video->setVisible(false);
-    svg->setVisible(false);
-}