formula and address bar into toolbar

Change-Id: I623d6bf7d76a7d8cb3937899b5c53822140b81c1

4 files changed, 42 insertions, 5 deletions

diff --git a/gtv.ui b/gtv.ui
index facd6f579f4e..7da1f4112f5c 100644
--- a/gtv.ui
+++ b/gtv.ui
@@ -708,5 +708,37 @@
         <property name="homogeneous">True</property>
       </packing>
     </child>
+    <child>
+      <object class="GtkToolItem" id="addressbar_toolitem">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <child>
+          <object class="GtkEntry" id="addressbar_entry">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+          </object>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="homogeneous">True</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkToolItem" id="formulabar_toolitem">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <child>
+          <object class="GtkEntry" id="formulabar_entry">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+          </object>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="homogeneous">True</property>
+      </packing>
+    </child>
   </object>
 </interface>
diff --git a/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx b/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx
index 0742f99f36ec..d3135d624970 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx
@@ -66,6 +66,9 @@ gtv_application_window_init(GtvApplicationWindow* win)
     win->findbarlabel = GTK_WIDGET(gtk_builder_get_object(builder, "findbar_label"));
     priv->toolbarBroadcast = false;
 
+    win->addressbarentry = GTK_WIDGET(gtk_builder_get_object(builder, "addressbar_entry"));
+    win->formulabarentry = GTK_WIDGET(gtk_builder_get_object(builder, "formulabar_entry"));
+
     gtk_container_add(GTK_CONTAINER(win), priv->container);
 
     g_object_unref(builder);
@@ -219,7 +222,7 @@ static void setupDocView(LOKDocView* pDocView)
     g_signal_connect(pDocView, "edit-changed", G_CALLBACK(lokdocview_signalEdit), nullptr);
     g_signal_connect(pDocView, "command-changed", G_CALLBACK(lokdocview_signalCommand), nullptr);
     g_signal_connect(pDocView, "command-result", G_CALLBACK(lokdocview_signalCommandResult), nullptr);
-/*    g_signal_connect(pDocView, "search-not-found", G_CALLBACK(lokdocview_signalSearch), nullptr);
+    g_signal_connect(pDocView, "search-not-found", G_CALLBACK(lokdocview_signalSearch), nullptr);
     g_signal_connect(pDocView, "search-result-count", G_CALLBACK(lokdocview_signalSearchResultCount), nullptr);
     g_signal_connect(pDocView, "part-changed", G_CALLBACK(lokdocview_signalPart), nullptr);
     g_signal_connect(pDocView, "hyperlink-clicked", G_CALLBACK(lokdocview_signalHyperlink), nullptr);
@@ -227,8 +230,7 @@ static void setupDocView(LOKDocView* pDocView)
     g_signal_connect(pDocView, "address-changed", G_CALLBACK(lokdocview_addressChanged), nullptr);
     g_signal_connect(pDocView, "formula-changed", G_CALLBACK(lokdocview_formulaChanged), nullptr);
     g_signal_connect(pDocView, "password-required", G_CALLBACK(lokdocview_passwordRequired), nullptr);
-    g_signal_connect(pDocView, "comment", G_CALLBACK(lokdocview_commentCallback), nullptr);
-*/
+//    g_signal_connect(pDocView, "comment", G_CALLBACK(lokdocview_commentCallback), nullptr);
 }
 
 void
diff --git a/libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx b/libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx
index db17f9c17037..2d4ee78d0e6d 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx
@@ -31,6 +31,9 @@ struct _GtvApplicationWindow
     GtkWidget* redlinelabel;
     GtkWidget* findbarlabel;
 
+    GtkWidget* addressbarentry;
+    GtkWidget* formulabarentry;
+
     GtkWidget* findtoolbar;
 };
 
diff --git a/libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.cxx b/libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.cxx
index c408b9b983ab..87db4fdcadab 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.cxx
@@ -168,13 +168,13 @@ void lokdocview_cursorChanged(LOKDocView* pDocView, gint nX, gint nY, gint nWidt
 void lokdocview_addressChanged(LOKDocView* pDocView, char* pPayload, gpointer)
 {
     GtvApplicationWindow* window = GTV_APPLICATION_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(pDocView)));
-//    gtk_label_set_text(GTK_LABEL(window->addressbarentry), pPayload);
+    gtk_entry_set_text(GTK_ENTRY(window->addressbarentry), pPayload);
 }
 
 void lokdocview_formulaChanged(LOKDocView* pDocView, char* pPayload, gpointer)
 {
     GtvApplicationWindow* window = GTV_APPLICATION_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(pDocView)));
-//    gtk_label_set_text(GTK_LABEL(window->formulabarentry), pPayload);
+    gtk_entry_set_text(GTK_ENTRY(window->formulabarentry), pPayload);
 }
 
 void lokdocview_passwordRequired(LOKDocView* pDocView, char* pUrl, gboolean bModify, gpointer)