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

List:       kde-commits
Subject:    [kdepim] /: When we select a text put it as search string
From:       Montel Laurent <montel () kde ! org>
Date:       2015-08-31 19:39:03
Message-ID: E1ZWUv1-0005vM-CR () scm ! kde ! org
[Download RAW message or body]

Git commit fed76108487874bd22ca82bc4621bd6f9c5a831b by Montel Laurent.
Committed on 31/08/2015 at 19:38.
Pushed by mlaurent into branch 'master'.

When we select a text put it as search string

M  +4    -0    libksieve/ksieveui/editor/sievetexteditwidget.cpp
M  +3    -0    pimcommon/texteditor/plaintexteditor/plaintexteditorwidget.c=
pp
M  +3    -0    pimcommon/texteditor/richtexteditor/richtexteditorwidget.cpp

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

diff --git a/libksieve/ksieveui/editor/sievetexteditwidget.cpp b/libksieve/=
ksieveui/editor/sievetexteditwidget.cpp
index 537be36..4c5be90 100644
--- a/libksieve/ksieveui/editor/sievetexteditwidget.cpp
+++ b/libksieve/ksieveui/editor/sievetexteditwidget.cpp
@@ -21,6 +21,7 @@
 =

 #include "pimcommon/texteditor/plaintexteditor/plaintexteditfindbar.h"
 #include "pimcommon/widgets/slidecontainer.h"
+#include <QDebug>
 using namespace KSieveUi;
 =

 class KSieveUi::SieveTextEditWidgetPrivate
@@ -91,6 +92,9 @@ void SieveTextEditWidget::setReadOnly(bool readOnly)
 =

 void SieveTextEditWidget::slotReplace()
 {
+    if (d->mTextEdit->textCursor().hasSelection()) {
+        d->mFindBar->setText(d->mTextEdit->textCursor().selectedText());
+    }
     d->mFindBar->showReplace();
     d->mSliderContainer->slideIn();
     d->mFindBar->focusAndSetCursor();
diff --git a/pimcommon/texteditor/plaintexteditor/plaintexteditorwidget.cpp=
 b/pimcommon/texteditor/plaintexteditor/plaintexteditorwidget.cpp
index 23fab57..c949422 100644
--- a/pimcommon/texteditor/plaintexteditor/plaintexteditorwidget.cpp
+++ b/pimcommon/texteditor/plaintexteditor/plaintexteditorwidget.cpp
@@ -119,6 +119,9 @@ void PlainTextEditorWidget::setReadOnly(bool readOnly)
 void PlainTextEditorWidget::slotReplace()
 {
     if (mEditor->searchSupport()) {
+        if (mEditor->textCursor().hasSelection()) {
+            mFindBar->setText(mEditor->textCursor().selectedText());
+        }
         mFindBar->showReplace();
         mSliderContainer->slideIn();
         mFindBar->focusAndSetCursor();
diff --git a/pimcommon/texteditor/richtexteditor/richtexteditorwidget.cpp b=
/pimcommon/texteditor/richtexteditor/richtexteditorwidget.cpp
index 4e58d4d..899e10b 100644
--- a/pimcommon/texteditor/richtexteditor/richtexteditorwidget.cpp
+++ b/pimcommon/texteditor/richtexteditor/richtexteditorwidget.cpp
@@ -140,6 +140,9 @@ void RichTextEditorWidget::setReadOnly(bool readOnly)
 void RichTextEditorWidget::slotReplace()
 {
     if (mEditor->searchSupport()) {
+        if (mEditor->textCursor().hasSelection()) {
+            mFindBar->setText(mEditor->textCursor().selectedText());
+        }
         mFindBar->showReplace();
         mSliderContainer->slideIn();
         mFindBar->focusAndSetCursor();

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