Blame SOURCES/0173-lokdocview-handle-LOK_CALLBACK_SEARCH_RESULT_COUNT.patch

f325b2
From 31ae1232bbde5ca3d74481dad1c9d70bab999c73 Mon Sep 17 00:00:00 2001
f325b2
From: Miklos Vajna <vmiklos@collabora.co.uk>
f325b2
Date: Mon, 5 Oct 2015 11:30:15 +0200
f325b2
Subject: [PATCH 173/398] lokdocview: handle LOK_CALLBACK_SEARCH_RESULT_COUNT
f325b2
f325b2
Change-Id: I0d1b641654e0de65169e19bb5843ea11b43a90a3
f325b2
(cherry picked from commit 22d342a82f225381057b5b8b941be8583de87a63)
f325b2
---
f325b2
 .../qa/gtktiledviewer/gtktiledviewer.cxx           |  9 +++++++
f325b2
 libreofficekit/source/gtk/lokdocview.cxx           | 28 ++++++++++++++++++++++
f325b2
 2 files changed, 37 insertions(+)
f325b2
f325b2
diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
f325b2
index 46264eb0126b..852bee584dfb 100644
f325b2
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
f325b2
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
f325b2
@@ -386,6 +386,14 @@ static void signalSearch(LOKDocView* pLOKDocView, char* /*pPayload*/, gpointer /
f325b2
     gtk_label_set_text(GTK_LABEL(rWindow.m_pFindbarLabel), "Search key not found");
f325b2
 }
f325b2
 
f325b2
+/// LOKDocView found some search matches -> set the search label accordingly.
f325b2
+static void signalSearchResultCount(LOKDocView* pLOKDocView, char* pPayload, gpointer /*pData*/)
f325b2
+{
f325b2
+    TiledWindow& rWindow = lcl_getTiledWindow(GTK_WIDGET(pLOKDocView));
f325b2
+    std::stringstream ss;
f325b2
+    ss << pPayload << " match(es)";
f325b2
+    gtk_label_set_text(GTK_LABEL(rWindow.m_pFindbarLabel), ss.str().c_str());
f325b2
+}
f325b2
 
f325b2
 static void signalPart(LOKDocView* pLOKDocView, int nPart, gpointer /*pData*/)
f325b2
 {
f325b2
@@ -763,6 +771,7 @@ static void setupDocView(GtkWidget* pDocView)
f325b2
     g_signal_connect(pDocView, "edit-changed", G_CALLBACK(signalEdit), NULL);
f325b2
     g_signal_connect(pDocView, "command-changed", G_CALLBACK(signalCommand), NULL);
f325b2
     g_signal_connect(pDocView, "search-not-found", G_CALLBACK(signalSearch), NULL);
f325b2
+    g_signal_connect(pDocView, "search-result-count", G_CALLBACK(signalSearchResultCount), NULL);
f325b2
     g_signal_connect(pDocView, "part-changed", G_CALLBACK(signalPart), NULL);
f325b2
     g_signal_connect(pDocView, "size-changed", G_CALLBACK(signalSize), NULL);
f325b2
     g_signal_connect(pDocView, "hyperlink-clicked", G_CALLBACK(signalHyperlink), NULL);
f325b2
diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx
f325b2
index 99476764e69d..3aa4cabeb76c 100644
f325b2
--- a/libreofficekit/source/gtk/lokdocview.cxx
f325b2
+++ b/libreofficekit/source/gtk/lokdocview.cxx
f325b2
@@ -121,6 +121,7 @@ enum
f325b2
     SIZE_CHANGED,
f325b2
     HYPERLINK_CLICKED,
f325b2
     CURSOR_CHANGED,
f325b2
+    SEARCH_RESULT_COUNT,
f325b2
 
f325b2
     LAST_SIGNAL
f325b2
 };
f325b2
@@ -221,6 +222,8 @@ callbackTypeToString (int nType)
f325b2
         return "LOK_CALLBACK_STATUS_INDICATOR_FINISH";
f325b2
     case LOK_CALLBACK_SEARCH_NOT_FOUND:
f325b2
         return "LOK_CALLBACK_SEARCH_NOT_FOUND";
f325b2
+    case LOK_CALLBACK_SEARCH_RESULT_COUNT:
f325b2
+        return "LOK_CALLBACK_SEARCH_RESULT_COUNT";
f325b2
     case LOK_CALLBACK_DOCUMENT_SIZE_CHANGED:
f325b2
         return "LOK_CALLBACK_DOCUMENT_SIZE_CHANGED";
f325b2
     case LOK_CALLBACK_SET_PART:
f325b2
@@ -363,6 +366,11 @@ searchNotFound(LOKDocView* pDocView, const std::string& rString)
f325b2
     g_signal_emit(pDocView, doc_view_signals[SEARCH_NOT_FOUND], 0, rString.c_str());
f325b2
 }
f325b2
 
f325b2
+static void searchResultCount(LOKDocView* pDocView, const std::string& rString)
f325b2
+{
f325b2
+    g_signal_emit(pDocView, doc_view_signals[SEARCH_RESULT_COUNT], 0, rString.c_str());
f325b2
+}
f325b2
+
f325b2
 static void
f325b2
 setPart(LOKDocView* pDocView, const std::string& rString)
f325b2
 {
f325b2
@@ -645,6 +653,11 @@ callback (gpointer pData)
f325b2
         setPart(pDocView, pCallback->m_aPayload);
f325b2
     }
f325b2
     break;
f325b2
+    case LOK_CALLBACK_SEARCH_RESULT_COUNT:
f325b2
+    {
f325b2
+        searchResultCount(pDocView, pCallback->m_aPayload);
f325b2
+    }
f325b2
+    break;
f325b2
     default:
f325b2
         g_assert(false);
f325b2
         break;
f325b2
@@ -1841,6 +1854,21 @@ static void lok_doc_view_class_init (LOKDocViewClass* pClass)
f325b2
                      G_TYPE_NONE, 4,
f325b2
                      G_TYPE_INT, G_TYPE_INT,
f325b2
                      G_TYPE_INT, G_TYPE_INT);
f325b2
+    /**
f325b2
+     * LOKDocView::search-result-count:
f325b2
+     * @pDocView: the #LOKDocView on which the signal is emitted
f325b2
+     * @aCommand: number of matches.
f325b2
+     */
f325b2
+    doc_view_signals[SEARCH_RESULT_COUNT] =
f325b2
+        g_signal_new("search-result_count",
f325b2
+                     G_TYPE_FROM_CLASS(pGObjectClass),
f325b2
+                     G_SIGNAL_RUN_FIRST,
f325b2
+                     0,
f325b2
+                     NULL, NULL,
f325b2
+                     g_cclosure_marshal_VOID__STRING,
f325b2
+                     G_TYPE_NONE, 1,
f325b2
+                     G_TYPE_STRING);
f325b2
+
f325b2
 }
f325b2
 
f325b2
 SAL_DLLPUBLIC_EXPORT GtkWidget*
f325b2
-- 
f325b2
2.12.0
f325b2