[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=0748fe7

The following commit has been merged in the master branch:
commit 0748fe799666065e47121807a464b4d5465c54e9
Author: Aleix Pol <aleixpol at kde.org>
Date:   Mon Feb 11 19:07:35 2013 +0100

    Add some actions to ktp-debugger
    
    makes it possible to:
    - search in the current log
    - add a mark at any moment
    
    REVIEW: 108900
---
 tools/debugger/debug-message-view.cpp | 35 +++++++++++++++++++++++++++++++++++
 tools/debugger/debug-message-view.h   |  5 +++++
 tools/debugger/main-window.cpp        |  6 ++++++
 3 files changed, 46 insertions(+)

diff --git a/tools/debugger/debug-message-view.cpp b/tools/debugger/debug-message-view.cpp
index d31f0c2..b581f4f 100644
--- a/tools/debugger/debug-message-view.cpp
+++ b/tools/debugger/debug-message-view.cpp
@@ -25,14 +25,28 @@
 #include <KDebug>
 #include <KIcon>
 #include <KColorScheme>
+#include <KStandardAction>
+#include <KAction>
+#include <KLocalizedString>
+#include <KFindDialog>
+#include <kfind.h>
 
 #include <ctime>
+#include <QDate>
+#include <QPointer>
 
 DebugMessageView::DebugMessageView(QWidget *parent)
     : QTextEdit(parent),
       m_ready(false)
 {
     setReadOnly(true);
+    setContextMenuPolicy(Qt::ActionsContextMenu);
+    KAction* addMark = new KAction(i18n("Add Mark"), this);
+    connect(addMark, SIGNAL(triggered(bool)), SLOT(onAddMark()));
+    addAction(KStandardAction::find(this, SLOT(openFindDialog()), this));
+    addAction(addMark);
+    addAction(KStandardAction::copy(this, SLOT(copy()), this));
+    addAction(KStandardAction::selectAll(this, SLOT(selectAll()), this));
 }
 
 
@@ -176,3 +190,24 @@ void DebugMessageView::appendMessage(const Tp::DebugMessage &msg)
     append(message);
 }
 
+void DebugMessageView::onAddMark()
+{
+    append(QString(QLatin1String("%1 -----------------------------")).arg(QDate::currentDate().toString()));
+}
+
+void DebugMessageView::openFindDialog()
+{
+    QPointer<KFindDialog> dialog(new KFindDialog(this));
+    dialog->setPattern(textCursor().selectedText());
+    if(dialog->exec()==QDialog::Accepted) {
+        QTextDocument::FindFlags flags=0;
+        if(dialog->options() & KFind::FindBackwards) flags |= QTextDocument::FindBackward;
+        if(dialog->options() & KFind::WholeWordsOnly) flags |= QTextDocument::FindWholeWords;
+        if(dialog->options() & KFind::CaseSensitive) flags |= QTextDocument::FindCaseSensitively;
+        bool ret = find(dialog->pattern(), flags);
+        if(!ret) {
+            Q_EMIT statusMessage(i18n("Could not find '%1'", dialog->pattern()));
+        }
+    }
+    delete dialog;
+}
diff --git a/tools/debugger/debug-message-view.h b/tools/debugger/debug-message-view.h
index 837b6bf..38728cd 100644
--- a/tools/debugger/debug-message-view.h
+++ b/tools/debugger/debug-message-view.h
@@ -39,6 +39,11 @@ private Q_SLOTS:
     void onDebugReceiverMonitoringEnabled(Tp::PendingOperation *op);
     void onFetchMessagesFinished(Tp::PendingOperation *op);
     void onNewDebugMessage(const Tp::DebugMessage &msg);
+    void onAddMark();
+    void openFindDialog();
+
+Q_SIGNALS:
+    void statusMessage(const QString& msg);
 
 private:
     void appendMessage(const Tp::DebugMessage &msg);
diff --git a/tools/debugger/main-window.cpp b/tools/debugger/main-window.cpp
index 7b95cd9..faf7c22 100644
--- a/tools/debugger/main-window.cpp
+++ b/tools/debugger/main-window.cpp
@@ -17,6 +17,7 @@
 */
 #include "main-window.h"
 #include "debug-message-view.h"
+#include <KStatusBar>
 
 MainWindow::MainWindow(QWidget *parent)
     : KXmlGuiWindow(parent)
@@ -30,6 +31,11 @@ MainWindow::MainWindow(QWidget *parent)
     m_ui.hazeLogsView->setService(QLatin1String("org.freedesktop.Telepathy.ConnectionManager.haze"));
     m_ui.salutLogsView->setService(QLatin1String("org.freedesktop.Telepathy.ConnectionManager.salut"));
     m_ui.rakiaLogsView->setService(QLatin1String("org.freedesktop.Telepathy.ConnectionManager.rakia"));
+    connect(m_ui.mcLogsView, SIGNAL(statusMessage(QString)), statusBar(), SLOT(showMessage(QString)));
+    connect(m_ui.gabbleLogsView, SIGNAL(statusMessage(QString)), statusBar(), SLOT(showMessage(QString)));
+    connect(m_ui.hazeLogsView, SIGNAL(statusMessage(QString)), statusBar(), SLOT(showMessage(QString)));
+    connect(m_ui.salutLogsView, SIGNAL(statusMessage(QString)), statusBar(), SLOT(showMessage(QString)));
+    connect(m_ui.rakiaLogsView, SIGNAL(statusMessage(QString)), statusBar(), SLOT(showMessage(QString)));
 }
 
 MainWindow::~MainWindow()

-- 
ktp-common-internals packaging