[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdepim] blogilo/src/composer: Reactivate code
From:       Montel Laurent <montel () kde ! org>
Date:       2016-03-31 19:22:19
Message-ID: E1aliAd-0007Ky-AY () scm ! kde ! org
[Download RAW message or body]

Git commit eedb3a65d95da396dd51eef28c5f4471e188bc1d by Montel Laurent.
Committed on 31/03/2016 at 19:22.
Pushed by mlaurent into branch 'master'.

Reactivate code

M  +6    -0    blogilo/src/composer/bilbobrowser.cpp
M  +2    -8    blogilo/src/composer/webengine/blogilocomposerwebengineeditor.cpp

http://commits.kde.org/kdepim/eedb3a65d95da396dd51eef28c5f4471e188bc1d

diff --git a/blogilo/src/composer/bilbobrowser.cpp \
b/blogilo/src/composer/bilbobrowser.cpp index f5682a4..7060739 100644
--- a/blogilo/src/composer/bilbobrowser.cpp
+++ b/blogilo/src/composer/bilbobrowser.cpp
@@ -56,6 +56,12 @@ BilboBrowser::BilboBrowser(QWidget *parent)
 
     createUi(parent);
 #ifdef QTWEBENGINE_SUPPORT_OPTION
+    connect(mWebView, &QWebEngineView::loadProgress,
+            browserProgress, &QProgressBar::setValue);
+    connect(mWebView, &QWebEngineView::loadFinished, this, \
&BilboBrowser::slotCompleted); +    //connect(mWebView, &QWebView::statusBarMessage, \
this, +    //        &BilboBrowser::slotSetStatusBarText);
+
     //TODO
 #else
     connect(mWebView, &QWebView::loadProgress,
diff --git a/blogilo/src/composer/webengine/blogilocomposerwebengineeditor.cpp \
b/blogilo/src/composer/webengine/blogilocomposerwebengineeditor.cpp index \
                00b1464..21d2b9e 100644
--- a/blogilo/src/composer/webengine/blogilocomposerwebengineeditor.cpp
+++ b/blogilo/src/composer/webengine/blogilocomposerwebengineeditor.cpp
@@ -157,20 +157,14 @@ void BlogiloComposerWebEngineEditor::startEditing()
 
 void BlogiloComposerWebEngineEditor::execCommand(const QString &cmd)
 {
-#if 0
-    QWebFrame *frame = view()->page()->mainFrame();
     const QString js = QStringLiteral("document.execCommand(\"%1\", false, \
                null)").arg(cmd);
-    frame->evaluateJavaScript(js);
-#endif
+    view()->page()->runJavaScript(js);
 }
 
 void BlogiloComposerWebEngineEditor::execCommand(const QString &cmd, const QString \
&arg)  {
-#if 0
-    QWebFrame *frame = view()->page()->mainFrame();
     const QString js = QStringLiteral("document.execCommand(\"%1\", false, \
                \"%2\")").arg(cmd).arg(arg);
-    frame->evaluateJavaScript(js);
-#endif
+    view()->page()->runJavaScript(js);
 }
 
 void BlogiloComposerWebEngineEditor::insertShortUrl(const QString &url)


[prev in list] [next in list] [prev in thread] [next in thread]