--- infoscreen/MainView.h	2010/01/06 22:18:52	528
+++ infoscreen/MainView.h	2010/01/08 21:53:23	537
@@ -13,37 +13,48 @@
 class ClientSideRender;
 class PictureView;
 
+class QSettings;
+
 class MainView : public QWidget
 {
 
-	Q_OBJECT
+    Q_OBJECT
 public:
-	MainView(QWidget* parent);
+    MainView(QWidget* parent);
 
 public slots:
-        void onTimer();
+    void onTimer();
 
+protected:
+    virtual void keyPressEvent ( QKeyEvent * event );
+    virtual void closeEvent ( QCloseEvent * event );
 private:
-        bool readXml();
-        void switchScreens();
-
-
-	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;
-
-
+    bool readXml();
+    void switchScreens();
+    void hideAll();
+    void ensureVisible(QWidget* widget);
+	void noInfoScreen();
+
+    MyWebView* web;
+    ClientSideRender* render;
+    PictureView* picture;
+    VideoView* video;
+    QWidget* current;
+    ScreenManager screenManager;
+
+    QTimer* timer ;
+    QTime lastXml;
+    QTime lastScreenSwitch;
+    ScreenItem currentItem;
+    int currentItemIdx;
+    QVector<ScreenItem> screenItems;
+
+    ScreenXmlHandler xmlHandler;
+
+    QSettings* settings;
+    QString url;
+    QString screenid;
+    QString xmlUrl;
 };
 
 #endif //MAINVIEW_H