--- infoscreen/MainView.cpp 2010/06/24 12:14:33 886 +++ infoscreen/mainview.cpp 2011/01/03 20:56:54 1210 @@ -1,4 +1,4 @@ -#include "MainView.h" +#include "mainview.h" #include #include #include @@ -43,7 +43,7 @@ readLocalFiles(); } - this->resize(400,400); + this->resize(640,480); this->setWindowState( Qt::WindowFullScreen ); this->grabKeyboard(); @@ -68,9 +68,11 @@ layout->setContentsMargins(0,0,0,0); setLayout(layout); - clockOverlay = new ClockOverlay(this); - clockOverlay->move(10,10); - clockOverlay->resize(150,75); + if (showClock == true) { + clockOverlay = new ClockOverlay(this); + clockOverlay->move(10,10); + clockOverlay->resize(150,75); + } @@ -117,6 +119,8 @@ screenManagerOff = settings->value("screenmanager_off").toTime(); } + showClock = settings->value("showclock").toBool(); + xmlInterval = settings->value("xmlinterval", 30).toInt(); xmlInterval = (xmlInterval * 60 * 1000); //convert to milliseconds @@ -153,6 +157,16 @@ if (key == ' ' || key == Qt::Key_Return || key == Qt::Key_Enter) { close(); } + + if (key == 'f' || key == 'F') { + Qt::WindowStates current = this->windowState(); + if (current == Qt::WindowFullScreen) { + this->setWindowState(Qt::WindowActive); + } else { + this->setWindowState(Qt::WindowFullScreen); + } + } + } void MainView::onTimer() @@ -168,7 +182,9 @@ if (currentMode == ModeXml || currentMode == ModeLocal) { switchScreens(); } - clockOverlay->timerTick(); + if (showClock == true) { + clockOverlay->timerTick(); + } } @@ -306,11 +322,12 @@ void MainView::errorInfoScreen(QString msg) { - ensureVisible(web); - web->setHtml("\ - \ -

" + msg+ "

\ - "); + ensureVisible(web); + QString html(""); + html.append("

") + .append(msg) + .append("

"); + web->setHtml(html); } void MainView::ensureVisible(QWidget* widget)