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

Diff of /infoscreen/MyWebView.cpp

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

revision 534 by torben, Thu Jan 7 19:42:12 2010 UTC revision 535 by torben, Fri Jan 8 09:20:37 2010 UTC
# Line 20  MyWebView::MyWebView(QWidget* parent) : Line 20  MyWebView::MyWebView(QWidget* parent) :
20    
21  }  }
22    
23  void MyWebView::start() {  void MyWebView::start(QString url, QString screenid) {
24      try {      try {
25          this->load( QUrl( generateUrl() ) );          this->load( QUrl( generateUrl(url, screenid) ) );
26      } catch (std::exception& e) {      } catch (std::exception& e) {
27          showError(e.what() );          showError(e.what() );
28      }      }
# Line 35  void MyWebView::showError(const char* ms Line 35  void MyWebView::showError(const char* ms
35      this->setHtml( str );      this->setHtml( str );
36  }  }
37    
38  QString MyWebView::generateUrl() {  QString MyWebView::generateUrl(QString url, QString screenid) {
39      QDesktopWidget* desktop = QApplication::desktop();      QDesktopWidget* desktop = QApplication::desktop();
40      QRect rect = desktop->screenGeometry();      QRect rect = desktop->screenGeometry();
41    
# Line 45  QString MyWebView::generateUrl() { Line 45  QString MyWebView::generateUrl() {
45      height.setNum( rect.height() );      height.setNum( rect.height() );
46    
47    
     QSettings settings("Caddi", "infoscreen");  
     qDebug() << "Settings: " << settings.fileName();  
   
     QString url = settings.value("url").toString();  
     QString screenid = settings.value("screenid").toString();  
   
48      if (url.length() == 0) {      if (url.length() == 0) {
49          throw std::runtime_error("No url in config file");          throw std::runtime_error("No url in config file");
50      }      }
Legend:
Removed from v.534  
changed lines
  Added in v.535
  ViewVC Help
Powered by ViewVC 1.1.20