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

Diff of /infoscreen/mainview.cpp

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

revision 876 by torben, Tue Jun 22 21:01:37 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 29  MainView::MainView(QWidget* parent) Line 29  MainView::MainView(QWidget* parent)
29          xmlUrl = url + "?screen_id=" + screenid;          xmlUrl = url + "?screen_id=" + screenid;
30          qDebug() << "Starting XML mode";          qDebug() << "Starting XML mode";
31          qDebug() << "xmlUrl" << xmlUrl;          qDebug() << "xmlUrl" << xmlUrl;
32            qDebug() << "xmlInterval" << xmlInterval/(60*1000);
33      }      }
34    
35      if (currentMode == ModeSimpleWeb){      if (currentMode == ModeSimpleWeb){
# Line 67  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 110  void MainView::loadSettings() Line 117  void MainView::loadSettings()
117          screenManagerOff = settings->value("screenmanager_off").toTime();          screenManagerOff = settings->value("screenmanager_off").toTime();
118      }      }
119    
120        xmlInterval = settings->value("xmlinterval", 30).toInt();
121        xmlInterval = (xmlInterval * 60 * 1000); //convert to milliseconds
122    
123    
124      if (currentMode == ModeSimpleWeb || currentMode == ModeXml) {      if (currentMode == ModeSimpleWeb || currentMode == ModeXml) {
125          url = settings->value("url").toString();          url = settings->value("url").toString();
# Line 158  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    
# Line 211  void MainView::readLocalFiles() Line 222  void MainView::readLocalFiles()
222    
223  bool MainView::readXml()  bool MainView::readXml()
224  {  {
225      const int TIMEOUT = 30*60*1000; // 30 minutter      if ( lastXml.isNull() || lastXml.elapsed() > xmlInterval) {
226      if ( lastXml.isNull() || lastXml.elapsed() > TIMEOUT) {          qDebug() << "Reading XML";
227    
228    
229          bool res = xmlHandler.readXml( xmlUrl );          bool res = xmlHandler.readXml( xmlUrl );
Legend:
Removed from v.876  
changed lines
  Added in v.883
  ViewVC Help
Powered by ViewVC 1.1.20