/[projects]/infoscreen/webview.cpp
ViewVC logotype

Diff of /infoscreen/webview.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 884 by torben, Thu Jun 24 09:44:57 2010 UTC revision 2103 by torben, Tue Feb 4 14:16:40 2014 UTC
# Line 1  Line 1 
1  #include <QApplication>  #include <QApplication>
2  #include <QDesktopWidget>  #include <QDesktopWidget>
3    #include <QtDebug>
4    
5    
6  #include <stdexcept>  #include <stdexcept>
7    
8  #include "webview.h"  #include "webview.h"
# Line 12  WebView::WebView(QWidget* parent) : QWeb Line 15  WebView::WebView(QWidget* parent) : QWeb
15      settings->setAttribute( QWebSettings::PluginsEnabled, true);      settings->setAttribute( QWebSettings::PluginsEnabled, true);
16  }  }
17    
18  void WebView::start(QString url, QString screenid) {  void WebView::start(QString& url, QString& screenid) {
19      try {      try {
20          this->load( QUrl( generateUrl(url, screenid) ) );          this->load( QUrl( generateUrl(url, screenid) ) );
21      } catch (std::exception& e) {      } catch (std::exception& e) {
# Line 27  void WebView::showError(const char* msg) Line 30  void WebView::showError(const char* msg)
30      this->setHtml( str );      this->setHtml( str );
31  }  }
32    
33  QString WebView::generateUrl(QString url, QString screenid) {  QString WebView::generateUrl(QString& url, QString& screenid) {
34      QDesktopWidget* desktop = QApplication::desktop();      QDesktopWidget* desktop = QApplication::desktop();
35      QRect rect = desktop->screenGeometry();      QRect rect = desktop->screenGeometry();
36    

Legend:
Removed from v.884  
changed lines
  Added in v.2103

  ViewVC Help
Powered by ViewVC 1.1.20