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

List:       kde-commits
Subject:    [kdepim] libksieve/ksieveui: Add support for searching
From:       Montel Laurent <montel () kde ! org>
Date:       2013-03-24 11:19:34
Message-ID: 20130324111934.BFEAFA604F () git ! kde ! org
[Download RAW message or body]

Git commit d8881ea0c62e69e35b75051b5ae158c1c99795ab by Montel Laurent.
Committed on 24/03/2013 at 12:19.
Pushed by mlaurent into branch 'master'.

Add support for searching

M  +1    -1    libksieve/ksieveui/editor/sievetextedit.cpp
M  +20   -0    libksieve/ksieveui/templates/sievetemplateeditdialog.cpp
M  +3    -0    libksieve/ksieveui/templates/sievetemplateeditdialog.h

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

diff --git a/libksieve/ksieveui/editor/sievetextedit.cpp \
b/libksieve/ksieveui/editor/sievetextedit.cpp index c411c38..45ffff3 100644
--- a/libksieve/ksieveui/editor/sievetextedit.cpp
+++ b/libksieve/ksieveui/editor/sievetextedit.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011, 2012 Laurent Montel <montel@kde.org>
+/* Copyright (C) 2011, 2012, 2013 Laurent Montel <montel@kde.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
diff --git a/libksieve/ksieveui/templates/sievetemplateeditdialog.cpp \
b/libksieve/ksieveui/templates/sievetemplateeditdialog.cpp index 1ca4f7b..517276d \
                100644
--- a/libksieve/ksieveui/templates/sievetemplateeditdialog.cpp
+++ b/libksieve/ksieveui/templates/sievetemplateeditdialog.cpp
@@ -16,6 +16,7 @@
 */
 
 #include "sievetemplateeditdialog.h"
+#include "widgets/sievefindbar.h"
 #include "editor/sievetextedit.h"
 
 #include <KLocale>
@@ -24,6 +25,7 @@
 #include <QVBoxLayout>
 #include <QHBoxLayout>
 #include <QLabel>
+#include <QShortcut>
 
 
 using namespace KSieveUi;
@@ -54,6 +56,14 @@ SieveTemplateEditDialog::SieveTemplateEditDialog(QWidget *parent, \
bool defaultTe  mTextEdit->setReadOnly(defaultTemplate);
     vbox->addWidget(mTextEdit);
 
+    mFindBar = new SieveFindBar( mTextEdit, this );
+    vbox->addWidget(mFindBar);
+
+    QShortcut *shortcut = new QShortcut( this );
+    shortcut->setKey( Qt::Key_F+Qt::CTRL );
+    connect( shortcut, SIGNAL(activated()), SLOT(slotFind()) );
+    connect( mTextEdit, SIGNAL(findText()), SLOT(slotFind()) );
+
     w->setLayout(vbox);
     setMainWidget(w);
     if (!defaultTemplate) {
@@ -68,6 +78,16 @@ SieveTemplateEditDialog::~SieveTemplateEditDialog()
     writeConfig();
 }
 
+void SieveTemplateEditDialog::slotFind()
+{
+    if ( mTextEdit->textCursor().hasSelection() )
+        mFindBar->setText( mTextEdit->textCursor().selectedText() );
+    mTextEdit->moveCursor(QTextCursor::Start);
+    mFindBar->show();
+    mFindBar->focusAndSetCursor();
+}
+
+
 void SieveTemplateEditDialog::writeConfig()
 {
     KConfigGroup group( KGlobal::config(), "SieveTemplateEditDialog" );
diff --git a/libksieve/ksieveui/templates/sievetemplateeditdialog.h \
b/libksieve/ksieveui/templates/sievetemplateeditdialog.h index 3ac36e6..e535551 \
                100644
--- a/libksieve/ksieveui/templates/sievetemplateeditdialog.h
+++ b/libksieve/ksieveui/templates/sievetemplateeditdialog.h
@@ -24,6 +24,7 @@ class KLineEdit;
 
 namespace KSieveUi {
 class SieveTextEdit;
+class SieveFindBar;
 class SieveTemplateEditDialog : public KDialog
 {
     Q_OBJECT
@@ -39,11 +40,13 @@ public:
 
 private Q_SLOTS:
     void slotTemplateNameChanged(const QString &);
+    void slotFind();
 
 private:
     void readConfig();
     void writeConfig();
     SieveTextEdit *mTextEdit;
+    SieveFindBar *mFindBar;
     KLineEdit *mTemplateNameEdit;
 };
 }


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