--- infoscreen/MainView.cpp	2010/01/06 22:18:52	528
+++ infoscreen/MainView.cpp	2010/01/07 19:31:07	533
@@ -5,6 +5,7 @@
 #include <QVBoxLayout>
 
 #include <QTimer>
+#include <QKeyEvent>
 
 #include "MyWebView.h"
 #include "clientsiderender.h"
@@ -19,6 +20,7 @@
 {
         this->resize(400,400);
         this->setWindowState( Qt::WindowFullScreen );
+		this->grabKeyboard();
 
 	qApp->setOverrideCursor( QCursor( Qt::BlankCursor) );
 
@@ -29,7 +31,7 @@
         web->setVisible( false);
 
         picture = new PictureView(this);
-        picture->setVisible( true );
+        picture->setVisible( false );
 
         video = new VideoView(this);
         video->setVisible(false);
@@ -51,6 +53,13 @@
 
 }
 
+void MainView::keyPressEvent ( QKeyEvent* event )
+{
+    int key = event->key();
+    if (key == ' ' || key == Qt::Key_Return || key == Qt::Key_Enter) {
+        qApp->quit();
+    }
+}  
 
 void MainView::onTimer()
 {
@@ -66,7 +75,7 @@
 {
     const int TIMEOUT = 30*60*1000; // 30 minutter
     if ( lastXml.isNull() || lastXml.elapsed() > TIMEOUT) {
-        qDebug() << "reread";
+
         xmlHandler.readXml( "http://infoscreen.sundhedhorsens.dk/infoscreen/screen_xml.php?screen_id=1" );
 
         lastXml = QTime::currentTime();
@@ -88,13 +97,55 @@
 
     if (lastScreenSwitch.isNull() || lastScreenSwitch.elapsed() > (currentItem.runtime*1000)) {
 
+        QTime now = QTime::currentTime();
         if (lastScreenSwitch.isNull())
-            currentItemIdx = 0;
-        else
-            currentItemIdx = (currentItemIdx+1) % screenItems.size();
-        currentItem = screenItems.at(currentItemIdx);
-        picture->loadFromUrl( currentItem.url );
+            currentItemIdx = -1;
+
+        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);
+
+            	if (currentItem.start <= now && now <= currentItem.stop )
+                	found = true;
+			}
+        }
+
+        if (found) {
+
+            if (currentItem.module == "info_image") {
+                ensureVisible(picture);
+
+                picture->loadFromUrl( currentItem.url );
+
+            }
 
+
+        } else {
+            qDebug() << "no screen";
+            hideAll();
+        }
         lastScreenSwitch = QTime::currentTime();
+
     }
 }
+
+void MainView::ensureVisible(QWidget* widget)
+{
+    if (! widget->isVisible()) {
+        hideAll();
+        widget->setVisible(true);
+    }
+}
+
+void MainView::hideAll()
+{
+    render->setVisible( false );
+    web->setVisible( false);
+    picture->setVisible( false );
+    video->setVisible(false);
+}