--- infoscreen/MainView.cpp	2009/12/12 19:27:56	510
+++ infoscreen/MainView.cpp	2010/01/05 20:14:22	527
@@ -1,49 +1,71 @@
 #include "MainView.h"
+#include <QApplication>
 #include <QPushButton>
+#include <QLabel>
 #include <QVBoxLayout>
 
 #include <QTimer>
 
+#include "MyWebView.h"
+#include "clientsiderender.h"
+#include "pictureview.h"
+#include "videoview.h"
+
 MainView::MainView(QWidget* parent)
  : QWidget(parent)
 {
-	this->resize(400,400);
-	this->setPalette( QPalette( Qt::blue ) );
+        this->resize(400,400);
+        this->setWindowState( Qt::WindowFullScreen );
+
+	qApp->setOverrideCursor( QCursor( Qt::BlankCursor) );
 
+        render = new ClientSideRender(this);
+        render->setVisible( false );
 
-	red = new QWidget(this);
-	red->setStyleSheet("QWidget { background-color: red; }");
+        web = new MyWebView(this);
+        web->setVisible( false);
 
-	green = new QWidget(this);
-	green->setStyleSheet("QWidget { background-color: green; }");
-	green->setVisible(false);
+        picture = new PictureView(this);
+        picture->setVisible( true );
 
-	current = red;
+        video = new VideoView(this);
+        video->setVisible(false);
 
 	QVBoxLayout* layout = new QVBoxLayout();
-	layout->addWidget(red,1 );
-	layout->addWidget(green,1);
+        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);
-
-
+        setLayout(layout);
 
 	QTimer* timer = new QTimer(this);
 	connect(timer, SIGNAL(timeout() ), this, SLOT(onTimer() ));
-	timer->start(5000);
+	timer->start(1000);
+
+        web->start();
 }
 
 
 void MainView::onTimer()
 {
-	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 == 0)
+    //    video->loadUrl("");
+
+
+    if ( (count%10) == 0) {
+
+        int t = count / 10;
+
+        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++;
 }