--- infoscreen/MainView.cpp	2010/01/06 23:13:21	529
+++ infoscreen/MainView.cpp	2010/01/09 12:25:07	539
@@ -5,6 +5,9 @@
 #include <QVBoxLayout>
 
 #include <QTimer>
+#include <QKeyEvent>
+#include <QSettings>
+#include <QMessageBox>
 
 #include "MyWebView.h"
 #include "clientsiderender.h"
@@ -15,42 +18,80 @@
 
 
 MainView::MainView(QWidget* parent)
- : QWidget(parent)
+    : QWidget(parent), timer(0)
 {
-        this->resize(400,400);
-        this->setWindowState( Qt::WindowFullScreen );
 
-	qApp->setOverrideCursor( QCursor( Qt::BlankCursor) );
+    settings = new QSettings("Caddi", "infoscreen");
+    url = settings->value("url").toString();
+    bool xmlMode = settings->value("xml").toBool();
+    screenid = settings->value("screenid").toString();
 
-        render = new ClientSideRender(this);
-        render->setVisible( false );
+    if (url == "" || screenid == "") {
+        QMessageBox::warning(this,"infoscreen","Could not find url or screenid in config file " + settings->fileName());
 
-        web = new MyWebView(this);
-        web->setVisible( false);
+        exit(1); //Normal qApp->exit() doesn't terminate the init sequence so use std C exit function
+    }
+
+
+
+    this->resize(400,400);
+    this->setWindowState( Qt::WindowFullScreen );
+    this->grabKeyboard();
+
+    qApp->setOverrideCursor( QCursor( Qt::BlankCursor) );
+
+    render = new ClientSideRender(this);
+    render->setVisible( false );
 
-        picture = new PictureView(this);
-        picture->setVisible( false );
+    web = new MyWebView(this);
+    web->setVisible( false);
 
-        video = new VideoView(this);
-        video->setVisible(false);
+    picture = new PictureView(this);
+    picture->setVisible( false );
 
-	QVBoxLayout* layout = new QVBoxLayout();
-        layout->addWidget(web,1);
-        layout->addWidget(render,1);
-        layout->addWidget(picture,1);
-        layout->addWidget(video,1);
-	layout->addStretch();
-	layout->setContentsMargins(0,0,0,0);
-        setLayout(layout);
+    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();
+    layout->setContentsMargins(0,0,0,0);
+    setLayout(layout);
 
 
-	QTimer* timer = new QTimer(this);
-	connect(timer, SIGNAL(timeout() ), this, SLOT(onTimer() ));
+
+
+    if (xmlMode == true) {
+        xmlUrl = url + "?screen_id=" + screenid;
+        qDebug() << "Starting XML mode";
+        qDebug() << "xmlUrl" << xmlUrl;
+
+        timer = new QTimer(this);
+        connect(timer, SIGNAL(timeout() ), this, SLOT(onTimer() ));
         timer->start(100);
+    } else {
+        qDebug() << "Starting plain browser mode";
+        web->setVisible(true);
+        web->start(url,screenid);
+    }
+}
 
+void MainView::closeEvent ( QCloseEvent * event )
+{
+    Q_UNUSED(event);
+    exit(0); //force application shutdown
 }
 
+void MainView::keyPressEvent ( QKeyEvent* event )
+{
+    int key = event->key();
+    if (key == ' ' || key == Qt::Key_Return || key == Qt::Key_Enter) {
+        close();
+    }
+}  
 
 void MainView::onTimer()
 {
@@ -67,7 +108,8 @@
     const int TIMEOUT = 30*60*1000; // 30 minutter
     if ( lastXml.isNull() || lastXml.elapsed() > TIMEOUT) {
 
-        xmlHandler.readXml( "http://infoscreen.sundhedhorsens.dk/infoscreen/screen_xml.php?screen_id=1" );
+
+        bool res = xmlHandler.readXml( xmlUrl );
 
         lastXml = QTime::currentTime();
 
@@ -85,6 +127,9 @@
 
 void MainView::switchScreens()
 {
+    if (video->isVisible() && video->isPlaying() ) {
+        return; //wait until current clip has finished
+    }
 
     if (lastScreenSwitch.isNull() || lastScreenSwitch.elapsed() > (currentItem.runtime*1000)) {
 
@@ -95,14 +140,15 @@
         bool found = false;
         int tries = 0;
 
+        if (screenItems.size() > 0) { //only try if we have a any screens
+            while (found == false && tries <= screenItems.size()) { //find next with valid display time
+                tries++;
+                currentItemIdx = (currentItemIdx+1) % screenItems.size();
+                currentItem = screenItems.at(currentItemIdx);
 
-        while (found == false && tries <= screenItems.size()) { //find next with valid display time
-            tries++;
-            currentItemIdx = (currentItemIdx+1) % screenItems.size();
-            currentItem = screenItems.at(currentItemIdx);
-
-            if (currentItem.start <= now && now <= currentItem.stop )
-                found = true;
+                if (currentItem.start <= now && now <= currentItem.stop )
+                    found = true;
+            }
         }
 
         if (found) {
@@ -113,17 +159,34 @@
                 picture->loadFromUrl( currentItem.url );
 
             }
+            if (currentItem.module == "info_web") {
+                ensureVisible(web);
+                web->load(currentItem.url);
+            }
+            if (currentItem.module == "info_video") {
+                ensureVisible(video);
+                video->loadUrl(currentItem.url);
+            }
 
 
         } else {
             qDebug() << "no screen";
-            hideAll();
+			noInfoScreen();
         }
         lastScreenSwitch = QTime::currentTime();
 
     }
 }
 
+void MainView::noInfoScreen()
+{
+	ensureVisible(web);
+	web->setHtml("<html>\
+		<body text='#505050' bgcolor='#000000'>\
+		<table width='100%' height='100%'><tr><td align='center' valign='middel'><h1>Der er ingen information at vise</h1></td></tr></table>\
+		</body></html>");
+}
+
 void MainView::ensureVisible(QWidget* widget)
 {
     if (! widget->isVisible()) {