--- infoscreen/MainView.cpp 2010/01/08 21:53:23 537 +++ infoscreen/MainView.cpp 2010/01/10 10:56:34 543 @@ -110,7 +110,6 @@ bool res = xmlHandler.readXml( xmlUrl ); - if (res == false) lastXml = QTime::currentTime(); @@ -159,32 +158,31 @@ picture->loadFromUrl( currentItem.url ); - } - if (currentItem.module == "info_web") { + } else if (currentItem.module == "info_web") { ensureVisible(web); web->load(currentItem.url); - } - if (currentItem.module == "info_video") { + } else if (currentItem.module == "info_video") { ensureVisible(video); video->loadUrl(currentItem.url); + } else { + errorInfoScreen("Unknown module: " + currentItem.module ); } - } else { qDebug() << "no screen"; - noInfoScreen(); + errorInfoScreen("Der er ingen information at vise"); } lastScreenSwitch = QTime::currentTime(); } } -void MainView::noInfoScreen() +void MainView::errorInfoScreen(QString msg) { ensureVisible(web); web->setHtml("\ \ -

Der er ingen information at vise

\ +

" + msg+ "

\ "); }