--- infoscreen/MainView.cpp 2010/06/24 08:59:43 883 +++ infoscreen/MainView.cpp 2010/06/24 12:14:33 886 @@ -10,7 +10,7 @@ #include #include -#include "MyWebView.h" +#include "webview.h" #include "clientsiderender.h" #include "pictureview.h" #include "videoview.h" @@ -51,7 +51,7 @@ render = new ClientSideRender(this); - web = new MyWebView(this); + web = new WebView(this); picture = new PictureView(this); @@ -70,7 +70,7 @@ clockOverlay = new ClockOverlay(this); clockOverlay->move(10,10); - clockOverlay->resize(100,50); + clockOverlay->resize(150,75); @@ -249,7 +249,6 @@ } if (lastScreenSwitch.isNull() || lastScreenSwitch.elapsed() > (currentItem.runtime*1000)) { - QTime now = QTime::currentTime(); if (lastScreenSwitch.isNull()) currentItemIdx = -1; @@ -297,6 +296,8 @@ } else { errorInfoScreen("Der er ingen information at vise"); + currentItem = ScreenItem(); + currentItem.runtime = 60; //switch screens again in 1 minute } lastScreenSwitch = QTime::currentTime();