Differential D698 Diff 1627 src/lib/marble/MarbleLegendBrowser.cpp

Changeset View

Standalone View

View Options

src/lib/marble/MarbleLegendBrowser.cpp

Context not available.
29#include <QRegExp> 29​#include <QRegExp>
30 30​
31#ifndef MARBLE_NO_WEBKIT 31​#ifndef MARBLE_NO_WEBKIT
32#include <QWebFrame> 32​ //TODO
33#include <QWebElement> 33​ #include <QtWebChannel/QtWebChannel>
34​ #include <QWebEnginePage>
34#endif 35​#endif
35 36​
36#include <QTextDocument> 37​#include <QTextDocument>
Context not available.
77#endif // Q_WS_MAEMO_5 78​#endif // Q_WS_MAEMO_5
78 79​
79#ifndef MARBLE_NO_WEBKIT 80​#ifndef MARBLE_NO_WEBKIT
80 QWebFrame *frame = page()->mainFrame(); 81​//TODO: not yet tested
81 connect(frame, SIGNAL(javaScriptWindowObjectCleared()), 82​ QWebChannel *channel = new QWebChannel();
82 this, SLOT(injectCheckBoxChecker())); 83​ channel->registerObject("Marble", this);
83 page()->setLinkDelegationPolicy( QWebPage::DelegateAllLinks ); 84​ page()->setWebChannel(channel);
84 connect( this, SIGNAL(linkClicked(QUrl)), this, SLOT(openLinkExternally(QUrl)) ); 85​
86​//TODO: no easy way to delegate links
87​// page()->setLinkDelegationPolicy( QWebEnginePage::DelegateAllLinks );
88​// connect( this, SIGNAL(linkClicked(QUrl)), this, SLOT(openLinkExternally(QUrl)) );
anthonyfieroniUnsubmitted
Not Done

Docs says it will be overridden QWebEnginePage::acceptNavigationRequest

anthonyfieroni: [[ https://doc.qt.io/qt-5/qtwebenginewidgets-qtwebkitportingguide.html | Docs ]] says it will…
85#endif 89​#endif
86} 90​}
87 91​
Context not available.
177 setHtml(finalHtml, baseUrl); 181​ setHtml(finalHtml, baseUrl);
178 182​
179 if ( d->m_marbleModel ) { 183​ if ( d->m_marbleModel ) {
180 QTextDocument *document = new QTextDocument(page()->mainFrame()->toHtml()); 184​ page()->toHtml([=]( QString document ) {
181 d->m_marbleModel->setLegend( document ); 185​ d->m_marbleModel->setLegend( new QTextDocument(document) );
186​ });
182 } 187​ }
183#endif 188​#endif
184} 189​}
185 190​
186void MarbleLegendBrowser::injectCheckBoxChecker() ​
187{ ​
188#ifndef MARBLE_NO_WEBKIT ​
189 QWebFrame *frame = page()->mainFrame(); ​
190 frame->addToJavaScriptWindowObject( "Marble", this ); ​
191#endif ​
192} ​
193 ​
194void MarbleLegendBrowser::openLinkExternally( const QUrl &url ) 191​void MarbleLegendBrowser::openLinkExternally( const QUrl &url )
195{ 192​{
196 if ( url.scheme() == "tour" ) { 193​ if ( url.scheme() == "tour" ) {
Context not available.
385void MarbleLegendBrowser::setCheckedProperty( const QString& name, bool checked ) 382​void MarbleLegendBrowser::setCheckedProperty( const QString& name, bool checked )
386{ 383​{
387#ifndef MARBLE_NO_WEBKIT 384​#ifndef MARBLE_NO_WEBKIT
388 QWebElement box = page()->mainFrame()->findFirstElement("input[name="+name+']'); ​
389 if (!box.isNull()) { ​
390 if (checked != d->m_checkBoxMap[name]) { ​
391 d->m_checkBoxMap[name] = checked; ​
392 emit toggledShowProperty( name, checked ); ​
393 } ​
394 } ​
395 385​
396 update(); 386​//TODO: No api to support extracting DOM elements.
387​// QWebElement box = page()->mainFrame()->findFirstElement("input[name="+name+']');
388​// if (!box.isNull()) {
389​// if (checked != d->m_checkBoxMap[name]) {
390​// d->m_checkBoxMap[name] = checked;
391​// emit toggledShowProperty( name, checked );
392​// }
393​// }
394​//
395​// update();
397#endif 396​#endif
398} 397​}
399 398​
anthonyfieroniUnsubmitted
Not Done

http://doc.qt.io/archives/qt-5.5/qwebframe.html#findFirstElement ?

anthonyfieroni: http://doc.qt.io/archives/qt-5.5/qwebframe.html#findFirstElement ?
400void MarbleLegendBrowser::setRadioCheckedProperty( const QString& value, const QString& name , bool checked ) 399​void MarbleLegendBrowser::setRadioCheckedProperty( const QString& value, const QString& name , bool checked )
401{ 400​{
402#ifndef MARBLE_NO_WEBKIT 401​#ifndef MARBLE_NO_WEBKIT
403 QWebElement box = page()->mainFrame()->findFirstElement("input[value="+value+']'); ​
404 QWebElementCollection boxes = page()->mainFrame()->findAllElements("input[name="+name+']'); ​
405 QString currentValue=""; ​
406 for(int i=0; i<boxes.count(); ++i) { ​
407 currentValue = boxes.at(i).attribute("value"); ​
408 d->m_checkBoxMap[currentValue]=false; ​
409 emit toggledShowProperty( currentValue, false ); ​
410 } ​
411 if (!box.isNull()) { ​
412 if (checked != d->m_checkBoxMap[value]) { ​
413 d->m_checkBoxMap[value] = checked; ​
414 emit toggledShowProperty( value, checked ); ​
415 } ​
416 } ​
417 402​
418 update(); 403​//TODO: No api to support extracting DOM elements.
404​// QWebElement box = page()->mainFrame()->findFirstElement("input[value="+value+']');
405​// QWebElementCollection boxes = page()->mainFrame()->findAllElements("input[name="+name+']');
406​// QString currentValue="";
407​// for(int i=0; i<boxes.count(); ++i) {
408​// currentValue = boxes.at(i).attribute("value");
409​// d->m_checkBoxMap[currentValue]=false;
410​// emit toggledShowProperty( currentValue, false );
411​// }
412​// if (!box.isNull()) {
413​// if (checked != d->m_checkBoxMap[value]) {
414​// d->m_checkBoxMap[value] = checked;
415​// emit toggledShowProperty( value, checked );
416​// }
417​// }
418​
419​// update();
419#endif 420​#endif
420} 421​}
421 422​
Context not available.