--- infoscreen/MainView.cpp 2010/01/07 19:31:07 533 +++ infoscreen/MainView.cpp 2010/01/07 19:42:12 534 @@ -16,40 +16,40 @@ MainView::MainView(QWidget* parent) - : QWidget(parent) + : QWidget(parent) { - this->resize(400,400); - this->setWindowState( Qt::WindowFullScreen ); - this->grabKeyboard(); + this->resize(400,400); + this->setWindowState( Qt::WindowFullScreen ); + this->grabKeyboard(); - qApp->setOverrideCursor( QCursor( Qt::BlankCursor) ); + qApp->setOverrideCursor( QCursor( Qt::BlankCursor) ); - render = new ClientSideRender(this); - render->setVisible( false ); + render = new ClientSideRender(this); + render->setVisible( false ); - web = new MyWebView(this); - web->setVisible( false); + web = new MyWebView(this); + web->setVisible( false); - picture = new PictureView(this); - picture->setVisible( false ); + picture = new PictureView(this); + picture->setVisible( false ); - video = new VideoView(this); - video->setVisible(false); + video = new VideoView(this); + video->setVisible(false); - QVBoxLayout* layout = new QVBoxLayout(); - layout->addWidget(web,1); - layout->addWidget(render,1); - layout->addWidget(picture,1); - layout->addWidget(video,1); - layout->addStretch(); - layout->setContentsMargins(0,0,0,0); - setLayout(layout); + QVBoxLayout* layout = new QVBoxLayout(); + layout->addWidget(web,1); + layout->addWidget(render,1); + layout->addWidget(picture,1); + layout->addWidget(video,1); + layout->addStretch(); + layout->setContentsMargins(0,0,0,0); + setLayout(layout); - QTimer* timer = new QTimer(this); - connect(timer, SIGNAL(timeout() ), this, SLOT(onTimer() )); - timer->start(100); + QTimer* timer = new QTimer(this); + connect(timer, SIGNAL(timeout() ), this, SLOT(onTimer() )); + timer->start(100); } @@ -104,15 +104,15 @@ bool found = false; int tries = 0; - if (screenItems.size() > 0) { //only try if we have a any screens - while (found == false && tries <= screenItems.size()) { //find next with valid display time - tries++; - currentItemIdx = (currentItemIdx+1) % screenItems.size(); - currentItem = screenItems.at(currentItemIdx); - - if (currentItem.start <= now && now <= currentItem.stop ) - found = true; - } + if (screenItems.size() > 0) { //only try if we have a any screens + while (found == false && tries <= screenItems.size()) { //find next with valid display time + tries++; + currentItemIdx = (currentItemIdx+1) % screenItems.size(); + currentItem = screenItems.at(currentItemIdx); + + if (currentItem.start <= now && now <= currentItem.stop ) + found = true; + } } if (found) {