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

Diff of /infoscreen/MainView.cpp

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

revision 872 by torben, Tue Jun 22 07:24:14 2010 UTC revision 873 by torben, Tue Jun 22 20:29:40 2010 UTC
# Line 71  MainView::MainView(QWidget* parent) Line 71  MainView::MainView(QWidget* parent)
71          web->start(url,screenid);          web->start(url,screenid);
72      }      }
73    
74      if (currentMode == ModeXml || currentMode == ModeLocal) {  
75          qDebug() << "Starting timer...";      qDebug() << "Starting timer...";
76          timer = new QTimer(this);      timer = new QTimer(this);
77          connect(timer, SIGNAL(timeout() ), this, SLOT(onTimer() ));      connect(timer, SIGNAL(timeout() ), this, SLOT(onTimer() ));
78          timer->start(100);      timer->start(100);
     }  
79  }  }
80    
81  void MainView::loadSettings()  void MainView::loadSettings()
# Line 135  void MainView::keyPressEvent ( QKeyEvent Line 134  void MainView::keyPressEvent ( QKeyEvent
134    
135  void MainView::onTimer()  void MainView::onTimer()
136  {  {
137        qDebug() << "onTimer()";
138      screenManager.timerTick();      screenManager.timerTick();
139    
140      if (currentMode == ModeXml) {      if (currentMode == ModeXml) {
141          readXml();          readXml();
142      }      }
143    
144      switchScreens();      if (currentMode == ModeXml || currentMode == ModeLocal) {
145            switchScreens();
146        }
147  }  }
148    
149    

Legend:
Removed from v.872  
changed lines
  Added in v.873

  ViewVC Help
Powered by ViewVC 1.1.20