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

List:       kde-commits
Subject:    [kdepim-apps-libs] composereditorwebengine/src: Reactivate more code
From:       Montel Laurent <montel () kde ! org>
Date:       2016-03-31 19:23:40
Message-ID: E1aliBw-0000AF-Cr () scm ! kde ! org
[Download RAW message or body]

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

Reactivate more code

M  +8    -8    composereditorwebengine/src/composerwebenginewidget.cpp

http://commits.kde.org/kdepim-apps-libs/d711e3aae307f764f6e588981f599e4776d3284d

diff --git a/composereditorwebengine/src/composerwebenginewidget.cpp \
b/composereditorwebengine/src/composerwebenginewidget.cpp index 954b380..2766c6c \
                100644
--- a/composereditorwebengine/src/composerwebenginewidget.cpp
+++ b/composereditorwebengine/src/composerwebenginewidget.cpp
@@ -69,8 +69,8 @@ void ComposerWebEngineWidgetPrivate::initialize()
     findReplace = new FindReplaceBar(webEngine);
     findReplace->setObjectName(QStringLiteral("findbar"));
     vbox->addWidget(findReplace);
+    q->connect(webEngine, &ComposerWebEngine::showFindBar, findReplace, \
&FindReplaceBar::showAndFocus);  #if 0
-    q->connect(view, &ComposerView::showFindBar, findReplaceBar, \
                &FindReplaceBar::showAndFocus);
     q->connect(view, &ComposerView::openLink, q, &ComposerEditor::openLink);
     q->connect(view->page(), &QWebPage::contentsChanged, q, \
&ComposerEditor::textChanged);  #endif
@@ -139,32 +139,32 @@ bool ComposerWebEngineWidget::enableRichText() const
 
 bool ComposerWebEngineWidget::isModified() const
 {
-    return false; //FIXME d->webEngine->page()->isModified();
+    return true; //FIXME d->webEngine->page()->isModified();
 }
 
 void ComposerWebEngineWidget::paste()
 {
-    //TODO d->webEngine->page()->triggerAction(QWebPage::Paste);
+    d->webEngine->page()->triggerAction(QWebEnginePage::Paste);
 }
 
 void ComposerWebEngineWidget::cut()
 {
-    //TODO d->webEngine->page()->triggerAction(QWebPage::Cut);
+    d->webEngine->page()->triggerAction(QWebEnginePage::Cut);
 }
 
 void ComposerWebEngineWidget::copy()
 {
-    //TODO d->webEngine->page()->triggerAction(QWebPage::Copy);
+    d->webEngine->page()->triggerAction(QWebEnginePage::Copy);
 }
 
 void ComposerWebEngineWidget::undo()
 {
-    //TODO d->webEngine->page()->triggerAction(QWebPage::Undo);
+    d->webEngine->page()->triggerAction(QWebEnginePage::Undo);
 }
 
 void ComposerWebEngineWidget::redo()
 {
-    //TODO d->webEngine->page()->triggerAction(QWebPage::Redo);
+    d->webEngine->page()->triggerAction(QWebEnginePage::Redo);
 }
 
 QAction *ComposerWebEngineWidget::action(ComposerWebEngine::ComposerWebEngineAction \
action) const @@ -179,7 +179,7 @@ ComposerWebEngine *ComposerWebEngineWidget::view() \
const  
 void ComposerWebEngineWidget::setHtmlContent(const QString &html)
 {
-    //TODO d->webEngine->setHtmlContent(html);
+    d->webEngine->setHtmlContent(html);
 }
 
 QString ComposerWebEngineWidget::htmlContent() const


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