--- infoscreen/MyWebView.cpp 2010/01/07 19:42:12 534 +++ infoscreen/webview.cpp 2010/06/24 09:44:57 884 @@ -2,40 +2,32 @@ #include #include -#include "MyWebView.h" +#include "webview.h" -MyWebView::MyWebView(QWidget* parent) : QWebView(parent) { - connect(this, SIGNAL( loadFinished(bool) ), this, SLOT( onChange(bool) ) ); +WebView::WebView(QWidget* parent) : QWebView(parent) { QWebSettings* settings = QWebSettings::globalSettings(); settings->setAttribute( QWebSettings::JavascriptEnabled, true); settings->setAttribute( QWebSettings::PluginsEnabled, true); - - - - QTimer* timer = new QTimer(this); - connect(timer, SIGNAL(timeout()), this, SLOT(onTimer())); - timer->start(1000); - } -void MyWebView::start() { +void WebView::start(QString url, QString screenid) { try { - this->load( QUrl( generateUrl() ) ); + this->load( QUrl( generateUrl(url, screenid) ) ); } catch (std::exception& e) { showError(e.what() ); } } -void MyWebView::showError(const char* msg) { +void WebView::showError(const char* msg) { QString str("

"); str.append(msg).append("

"); this->setHtml( str ); } -QString MyWebView::generateUrl() { +QString WebView::generateUrl(QString url, QString screenid) { QDesktopWidget* desktop = QApplication::desktop(); QRect rect = desktop->screenGeometry(); @@ -45,12 +37,6 @@ height.setNum( rect.height() ); - QSettings settings("Caddi", "infoscreen"); - qDebug() << "Settings: " << settings.fileName(); - - QString url = settings.value("url").toString(); - QString screenid = settings.value("screenid").toString(); - if (url.length() == 0) { throw std::runtime_error("No url in config file"); } @@ -66,11 +52,3 @@ return url; } -//public slots: -void MyWebView::onChange(bool success) { - //qDebug() << "html" << this->page()->mainFrame()->toHtml(); -} - - -void MyWebView::onTimer() { -}