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

Diff of /infoscreen/mainview.cpp

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

revision 884 by torben, Thu Jun 24 09:44:57 2010 UTC revision 886 by torben, Thu Jun 24 12:14:33 2010 UTC
# Line 70  MainView::MainView(QWidget* parent) Line 70  MainView::MainView(QWidget* parent)
70    
71      clockOverlay = new ClockOverlay(this);      clockOverlay = new ClockOverlay(this);
72      clockOverlay->move(10,10);      clockOverlay->move(10,10);
73      clockOverlay->resize(100,50);      clockOverlay->resize(150,75);
74    
75            
76    
# Line 249  void MainView::switchScreens() Line 249  void MainView::switchScreens()
249      }      }
250    
251      if (lastScreenSwitch.isNull() || lastScreenSwitch.elapsed() > (currentItem.runtime*1000)) {      if (lastScreenSwitch.isNull() || lastScreenSwitch.elapsed() > (currentItem.runtime*1000)) {
   
252          QTime now = QTime::currentTime();          QTime now = QTime::currentTime();
253          if (lastScreenSwitch.isNull())          if (lastScreenSwitch.isNull())
254              currentItemIdx = -1;              currentItemIdx = -1;
# Line 297  void MainView::switchScreens() Line 296  void MainView::switchScreens()
296    
297          } else {          } else {
298              errorInfoScreen("Der er ingen information at vise");              errorInfoScreen("Der er ingen information at vise");
299                currentItem = ScreenItem();
300                currentItem.runtime = 60; //switch screens again in 1 minute
301          }          }
302          lastScreenSwitch = QTime::currentTime();          lastScreenSwitch = QTime::currentTime();
303    

Legend:
Removed from v.884  
changed lines
  Added in v.886

  ViewVC Help
Powered by ViewVC 1.1.20