--- infoscreen/MainView.cpp	2009/12/14 13:38:55	511
+++ infoscreen/MainView.cpp	2010/01/05 17:19:02	526
@@ -1,73 +1,75 @@
 #include "MainView.h"
+#include <QApplication>
 #include <QPushButton>
+#include <QLabel>
 #include <QVBoxLayout>
 
 #include <QTimer>
 
-#include <VideoPlayer> //Phonon
-#include <MediaObject> //Phonon
-#include <MediaSource> //Phonon
+//#include <VideoPlayer> //Phonon
+//#include <MediaSource> //Phonon
+
+#include "MyWebView.h"
+#include "clientsiderender.h"
+#include "pictureview.h"
 
-#include <iostream>
-using namespace std;
 
-Phonon::VideoPlayer* video = 0;
 MainView::MainView(QWidget* parent)
  : QWidget(parent)
 {
-	this->resize(400,400);
-	//this->setWindowState( Qt::WindowFullScreen );
+        this->resize(400,400);
+        this->setWindowState( Qt::WindowFullScreen );
 
+	qApp->setOverrideCursor( QCursor( Qt::BlankCursor) );
 
-/*	red = new QWidget(this);
-	red->setStyleSheet("QWidget { background-color: red; }");
+	
+	//Phonon::VideoPlayer* video;
+	//video = new Phonon::VideoPlayer(Phonon::VideoCategory, this);	
+	//video->load( Phonon::MediaSource("http://todic.dk/ps3cache/Inglourious_Basterds_2009.avi") );
+	//layout->addWidget(video,1);
+	//video->play();
 
-	green = new QWidget(this);
-	green->setStyleSheet("QWidget { background-color: green; }");
-	green->setVisible(false);
+        render = new ClientSideRender(this);
+        render->setVisible( false );
+
+        web = new MyWebView(this);
+        web->setVisible( false);
+
+        picture = new PictureView(this);
+        picture->setVisible( true );
 
-	current = red;*/
-	
-	video = new Phonon::VideoPlayer(Phonon::VideoCategory, this);
-	Phonon::MediaSource* source = new Phonon::MediaSource("http://todic.dk/ps3cache/Inglourious_Basterds_2009.avi");
-	
-	video->load( *source );
-	
 
 
 	QVBoxLayout* layout = new QVBoxLayout();
-	//layout->addWidget(red,1 );
-	//layout->addWidget(green,1);
-	layout->addWidget(video,1);
+        layout->addWidget(web,1);
+        layout->addWidget(render,1);
+        layout->addWidget(picture,1);
 	layout->addStretch();
 	layout->setContentsMargins(0,0,0,0);
-	setLayout(layout);
-
-	
-
+        setLayout(layout);
 
 	QTimer* timer = new QTimer(this);
 	connect(timer, SIGNAL(timeout() ), this, SLOT(onTimer() ));
 	timer->start(1000);
+
+        web->start();
 }
 
 
 void MainView::onTimer()
 {
-	cout << "timer" << endl;
-	if (!video->isPlaying() ) {
-		video->play();
-		cout << "starting" << endl;
-	}
-		
-	/*
-	if( current == red) {
-		red->setVisible(false);
-		green->setVisible(true);
-		current = green;
-	} else {
-		red->setVisible(true);
-		green->setVisible(false);
-		current = red;
-	}*/
+    static int count = 0;
+    screenManager.timerTick();
+
+    if ( (count%10) == 0) {
+
+        int t = count / 10;
+        qDebug() << t;
+        if ( (t%2) == 0) {
+            picture->loadFromUrl("http://87.104.25.138/infoscreens/data/images/image1.jpg");
+        } else {
+            picture->loadFromUrl("http://87.104.25.138/infoscreens/data/images/image2.jpg");
+        }
+    }
+    count++;
 }