--- infoscreen/MainView.h	2010/01/08 09:20:37	535
+++ infoscreen/MainView.h	2010/06/24 08:59:43	883
@@ -4,17 +4,26 @@
 
 #include <QVector>
 #include <QWidget>
-#include "screenmanager.h"
 #include "screenitem.h"
 #include "screenxmlhandler.h"
 
+class QStackedLayout;
 class VideoView;
 class MyWebView;
 class ClientSideRender;
 class PictureView;
-
+class QSvgWidget;
+class ScreenManager;
+class ClockOverlay;
 class QSettings;
 
+enum Mode {
+    ModeNone,
+    ModeSimpleWeb,
+    ModeXml,
+    ModeLocal
+};
+
 class MainView : public QWidget
 {
 
@@ -27,20 +36,32 @@
 
 protected:
     virtual void keyPressEvent ( QKeyEvent * event );
+    virtual void closeEvent ( QCloseEvent * event );
 private:
+    void loadSettings();
     bool readXml();
+    void readLocalFiles();
     void switchScreens();
-    void hideAll();
     void ensureVisible(QWidget* widget);
+    void errorInfoScreen(QString msg);
 
+    Mode currentMode;
+    bool enableScreenManager;
+
+    QStackedLayout* layout;
 
     MyWebView* web;
     ClientSideRender* render;
     PictureView* picture;
     VideoView* video;
+    QSvgWidget* svg;
     QWidget* current;
-    ScreenManager screenManager;
+    ScreenManager* screenManager;
+    QTime screenManagerOn;
+    QTime screenManagerOff;
+    int xmlInterval;
 
+    QTimer* timer ;
     QTime lastXml;
     QTime lastScreenSwitch;
     ScreenItem currentItem;
@@ -53,6 +74,9 @@
     QString url;
     QString screenid;
     QString xmlUrl;
+    QString path;
+
+    ClockOverlay* clockOverlay;
 };
 
 #endif //MAINVIEW_H