--- infoscreen/MainView.h 2010/06/22 21:01:37 876 +++ infoscreen/mainview.h 2010/06/25 07:17:40 902 @@ -9,11 +9,12 @@ class QStackedLayout; class VideoView; -class MyWebView; +class WebView; class ClientSideRender; class PictureView; class QSvgWidget; class ScreenManager; +class ClockOverlay; class QSettings; enum Mode { @@ -46,10 +47,11 @@ Mode currentMode; bool enableScreenManager; + bool showClock; QStackedLayout* layout; - MyWebView* web; + WebView* web; ClientSideRender* render; PictureView* picture; VideoView* video; @@ -58,6 +60,7 @@ ScreenManager* screenManager; QTime screenManagerOn; QTime screenManagerOff; + int xmlInterval; QTimer* timer ; QTime lastXml; @@ -73,6 +76,8 @@ QString screenid; QString xmlUrl; QString path; + + ClockOverlay* clockOverlay; }; #endif //MAINVIEW_H