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

Diff of /infoscreen/mainview.cpp

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

revision 875 by torben, Tue Jun 22 20:43:13 2010 UTC revision 881 by torben, Thu Jun 24 07:52:59 2010 UTC
# Line 73  MainView::MainView(QWidget* parent) Line 73  MainView::MainView(QWidget* parent)
73      }      }
74    
75      if (enableScreenManager) {      if (enableScreenManager) {
76          screenManager = new ScreenManager();          screenManager = new ScreenManager(screenManagerOn, screenManagerOff);
77      } else {      } else {
78          qDebug() << "ScreenManager is disabled";          qDebug() << "ScreenManager is disabled";
79      }      }
# Line 104  void MainView::loadSettings() Line 104  void MainView::loadSettings()
104          exit(1);          exit(1);
105      }      }
106    
107      enableScreenManager = settings->value("enableScreenManager").toBool();      enableScreenManager = settings->value("enablescreenmanager").toBool();
108        if (enableScreenManager) {
109            screenManagerOn = settings->value("screenmanager_on").toTime();
110            screenManagerOff = settings->value("screenmanager_off").toTime();
111        }
112    
113        xmlInterval = settings->value("xmlinterval", 30).toInt();
114        xmlInterval = (xmlInterval * 60 * 1000); //convert to milliseconds
115    
116    
117      if (currentMode == ModeSimpleWeb || currentMode == ModeXml) {      if (currentMode == ModeSimpleWeb || currentMode == ModeXml) {
# Line 207  void MainView::readLocalFiles() Line 214  void MainView::readLocalFiles()
214    
215  bool MainView::readXml()  bool MainView::readXml()
216  {  {
217      const int TIMEOUT = 30*60*1000; // 30 minutter      if ( lastXml.isNull() || lastXml.elapsed() > xmlInterval) {
218      if ( lastXml.isNull() || lastXml.elapsed() > TIMEOUT) {          qDebug() << "Reading XML";
219    
220    
221          bool res = xmlHandler.readXml( xmlUrl );          bool res = xmlHandler.readXml( xmlUrl );

Legend:
Removed from v.875  
changed lines
  Added in v.881

  ViewVC Help
Powered by ViewVC 1.1.20