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

Diff of /infoscreen/mainview.cpp

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

revision 870 by torben, Mon Jun 21 13:53:17 2010 UTC revision 873 by torben, Tue Jun 22 20:29:40 2010 UTC
# Line 32  MainView::MainView(QWidget* parent) Line 32  MainView::MainView(QWidget* parent)
32    
33      if (currentMode == ModeSimpleWeb){      if (currentMode == ModeSimpleWeb){
34          qDebug() << "Starting plain browser mode";          qDebug() << "Starting plain browser mode";
         web->setVisible(true);  
         web->start(url,screenid);  
35      }      }
36    
37      if (currentMode == ModeLocal ) {      if (currentMode == ModeLocal ) {
# Line 68  MainView::MainView(QWidget* parent) Line 66  MainView::MainView(QWidget* parent)
66      layout->setContentsMargins(0,0,0,0);      layout->setContentsMargins(0,0,0,0);
67      setLayout(layout);      setLayout(layout);
68    
69        if (currentMode == ModeSimpleWeb) {
70      if (currentMode == ModeXml || currentMode == ModeLocal) {          web->setVisible(true);
71          qDebug() << "Starting timer...";          web->start(url,screenid);
         timer = new QTimer(this);  
         connect(timer, SIGNAL(timeout() ), this, SLOT(onTimer() ));  
         timer->start(100);  
72      }      }
73    
74    
75        qDebug() << "Starting timer...";
76        timer = new QTimer(this);
77        connect(timer, SIGNAL(timeout() ), this, SLOT(onTimer() ));
78        timer->start(100);
79  }  }
80    
81  void MainView::loadSettings()  void MainView::loadSettings()
# Line 133  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.870  
changed lines
  Added in v.873
  ViewVC Help
Powered by ViewVC 1.1.20