--- infoscreen/MainView.h 2010/01/07 16:44:17 532 +++ infoscreen/MainView.h 2010/01/07 19:42:12 534 @@ -16,36 +16,36 @@ 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 keyPressEvent ( QKeyEvent * event ); private: - 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 screenItems; + 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 screenItems; - ScreenXmlHandler xmlHandler; + ScreenXmlHandler xmlHandler; };