--- infoscreen/MainView.h	2009/12/12 18:59:28	509
+++ infoscreen/MainView.h	2010/01/06 23:13:21	529
@@ -2,8 +2,16 @@
 #ifndef MAINVIEW_H
 #define MAINVIEW_H
 
+#include <QVector>
 #include <QWidget>
-
+#include "screenmanager.h"
+#include "screenitem.h"
+#include "screenxmlhandler.h"
+
+class VideoView;
+class MyWebView;
+class ClientSideRender;
+class PictureView;
 
 class MainView : public QWidget
 {
@@ -12,14 +20,32 @@
 public:
 	MainView(QWidget* parent);
 
+public slots:
+        void onTimer();
 
 private:
-	QWidget* red;
-	QWidget* green;
+        bool readXml();
+        void switchScreens();
+        void hideAll();
+        void ensureVisible(QWidget* widget);
+
+
+	MyWebView* web;
+        ClientSideRender* render;
+        PictureView* picture;
+        VideoView* video;
 	QWidget* current;
+        ScreenManager screenManager;
+
+        QTime lastXml;
+        QTime lastScreenSwitch;
+        ScreenItem currentItem;
+        int currentItemIdx;
+        QVector<ScreenItem> screenItems;
+
+        ScreenXmlHandler xmlHandler;
+
 
-public slots:
-	void onTimer();
 };
 
 #endif //MAINVIEW_H