--- infoscreen/MainView.cpp	2010/04/07 17:00:07	638
+++ infoscreen/MainView.cpp	2010/06/22 20:43:13	875
@@ -2,7 +2,8 @@
 #include <QApplication>
 #include <QPushButton>
 #include <QLabel>
-#include <QVBoxLayout>
+#include <QStackedLayout>
+#include <QSvgWidget>
 
 #include <QTimer>
 #include <QKeyEvent>
@@ -15,6 +16,8 @@
 #include "videoview.h"
 
 #include "httpwrapper.h"
+#include "screenmanager.h"
+
 
 
 MainView::MainView(QWidget* parent)
@@ -30,8 +33,6 @@
 
     if (currentMode == ModeSimpleWeb){
         qDebug() << "Starting plain browser mode";
-        web->setVisible(true);
-        web->start(url,screenid);
     }
 
     if (currentMode == ModeLocal ) {
@@ -48,33 +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);
 
-    QVBoxLayout* layout = new QVBoxLayout();
-    layout->addWidget(web,1);
-    layout->addWidget(render,1);
-    layout->addWidget(picture,1);
-    layout->addWidget(video,1);
-    layout->addStretch();
+    svg = new QSvgWidget(this);
+
+    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();
+    } 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();
+    }
 }
 
 
@@ -161,16 +175,26 @@
         item.module = ModuleUnknown;
 
         QString ext = file.suffix().toLower();
-        if (ext == "avi") {
+        if (ext == "avi" || ext == "mpg" || ext == "mpeg") {
             item.module = ModuleVideo;
             item.runtime = 1;
         }
 
-        if (ext == "jpg" || ext == "jpeg") {
+        if (ext == "jpg" || ext == "jpeg" || ext == "png" ) {
             item.module = ModuleImage;
             item.runtime = 10;
         }
 
+        if (ext == "svg") {
+            item.module = ModuleSvg;
+            item.runtime = 10;
+        }
+        
+        if (ext == "htm" || ext == "html") {
+            item.module = ModuleWeb;
+            item.runtime = 10;
+        }
+
         if (item.module != ModuleUnknown) { //no need to enqueue unknown modules
             screenItems.push_back( item );
         }
@@ -234,24 +258,29 @@
         }
 
         if (found) {
-
-            if (currentItem.module == ModuleImage) {
+            switch(currentItem.module) {
+            case ModuleImage:
                 ensureVisible(picture);
-
                 picture->loadFromUrl( currentItem.url );
-
-            } else if (currentItem.module == ModuleWeb) {
+                break;
+            case ModuleWeb:
                 ensureVisible(web);
                 web->load(currentItem.url);
-            } else if (currentItem.module == ModuleVideo) {
+                break;
+            case ModuleVideo:
                 ensureVisible(video);
                 video->loadUrl(currentItem.url);
-            } else {
+                break;
+            case ModuleSvg:
+                ensureVisible(svg);
+                svg->load(currentItem.url);
+                break;
+            default:
                 // ModuleUnknown - what should we do??
+                break;
             }
 
         } else {
-            qDebug() << "no screen";
             errorInfoScreen("Der er ingen information at vise");
         }
         lastScreenSwitch = QTime::currentTime();
@@ -270,16 +299,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);
-}