/[projects]/infoscreen/MainView.cpp
ViewVC logotype

Diff of /infoscreen/MainView.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 882 by torben, Thu Jun 24 07:57:56 2010 UTC revision 883 by torben, Thu Jun 24 08:59:43 2010 UTC
# Line 14  Line 14 
14  #include "clientsiderender.h"  #include "clientsiderender.h"
15  #include "pictureview.h"  #include "pictureview.h"
16  #include "videoview.h"  #include "videoview.h"
17    #include "clockoverlay.h"
18  #include "httpwrapper.h"  #include "httpwrapper.h"
19  #include "screenmanager.h"  #include "screenmanager.h"
20    
# Line 68  MainView::MainView(QWidget* parent) Line 68  MainView::MainView(QWidget* parent)
68      layout->setContentsMargins(0,0,0,0);      layout->setContentsMargins(0,0,0,0);
69      setLayout(layout);      setLayout(layout);
70    
71        clockOverlay = new ClockOverlay(this);
72        clockOverlay->move(10,10);
73        clockOverlay->resize(100,50);
74    
75        
76    
77      if (currentMode == ModeSimpleWeb) {      if (currentMode == ModeSimpleWeb) {
78          web->setVisible(true);          web->setVisible(true);
79          web->start(url,screenid);          web->start(url,screenid);
# Line 162  void MainView::onTimer() Line 168  void MainView::onTimer()
168      if (currentMode == ModeXml || currentMode == ModeLocal) {      if (currentMode == ModeXml || currentMode == ModeLocal) {
169          switchScreens();          switchScreens();
170      }      }
171        clockOverlay->timerTick();
172  }  }
173    
174    
Legend:
Removed from v.882  
changed lines
  Added in v.883
  ViewVC Help
Powered by ViewVC 1.1.20