--- infoscreen/MyWebView.cpp 2009/12/15 13:53:02 512
+++ infoscreen/MyWebView.cpp 2010/01/09 16:12:33 541
@@ -6,71 +6,49 @@
MyWebView::MyWebView(QWidget* parent) : QWebView(parent) {
- connect(this, SIGNAL( loadFinished(bool) ), this, SLOT( onChange(bool) ) );
- 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);
-
+ QWebSettings* settings = QWebSettings::globalSettings();
+ settings->setAttribute( QWebSettings::JavascriptEnabled, true);
+ settings->setAttribute( QWebSettings::PluginsEnabled, true);
}
-void MyWebView::start() {
- try {
- this->load( QUrl( generateUrl() ) );
- } catch (std::exception& e) {
- showError(e.what() );
- }
+void MyWebView::start(QString url, QString screenid) {
+ try {
+ this->load( QUrl( generateUrl(url, screenid) ) );
+ } catch (std::exception& e) {
+ showError(e.what() );
+ }
}
void MyWebView::showError(const char* msg) {
- QString str("");
- str.append(msg).append("
");
- this->setHtml( str );
+ QString str("");
+ str.append(msg).append("
");
+ this->setHtml( str );
}
-QString MyWebView::generateUrl() {
- QDesktopWidget* desktop = QApplication::desktop();
- QRect rect = desktop->screenGeometry();
-
+QString MyWebView::generateUrl(QString url, QString screenid) {
+ QDesktopWidget* desktop = QApplication::desktop();
+ QRect rect = desktop->screenGeometry();
- QString width, height;
- width.setNum( rect.width() );
- height.setNum( rect.height() );
-
- QSettings settings("Caddi", "infoscreen");
- qDebug() << "Settings: " << settings.fileName();
+ QString width, height;
+ width.setNum( rect.width() );
+ height.setNum( rect.height() );
- 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");
- }
+ if (url.length() == 0) {
+ throw std::runtime_error("No url in config file");
+ }
- url.append("?screen_id=").append(screenid);
- url.append("&width=").append(width);
- url.append("&height=").append(height);
+ url.append("?screen_id=").append(screenid);
+ url.append("&width=").append(width);
+ url.append("&height=").append(height);
- qDebug() << "URL:" << url;
+ qDebug() << "URL:" << url;
- return url;
+ return url;
}
-//public slots:
-void MyWebView::onChange(bool success) {
- //qDebug() << "html" << this->page()->mainFrame()->toHtml();
-}
-
-
-void MyWebView::onTimer() {
-}