addresbar and formulabar sig handlers

and hide in text and presentations

Change-Id: I11f99f39247b396fecc8f80d3c28d205e2c75aa0

3 files changed, 15 insertions, 3 deletions

diff --git a/gtv.ui b/gtv.ui
index 4bc5830f43d8..6cc34ca398a0 100644
--- a/gtv.ui
+++ b/gtv.ui
@@ -34,6 +34,9 @@
                 <property name="position">0</property>
               </packing>
             </child>
+            <child>
+              <placeholder/>
+            </child>
           </object>
           <packing>
             <property name="left_attach">1</property>
@@ -705,7 +708,8 @@
         <child>
           <object class="GtkEntry" id="addressbar_entry">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can_focus">True</property>
+            <signal name="key-press-event" handler="signalAddressbar" swapped="no"/>
           </object>
         </child>
       </object>
@@ -721,7 +725,8 @@
         <child>
           <object class="GtkEntry" id="formulabar_entry">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can_focus">True</property>
+            <signal name="key-press-event" handler="signalFormulabar" swapped="no"/>
           </object>
         </child>
       </object>
diff --git a/libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx b/libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx
index fb0a9c62d606..d0e4611d16cf 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx
@@ -85,6 +85,7 @@ gtv_main_toolbar_init(GtvMainToolbar* toolbar)
     toolbar->m_pAddressbar = GTK_WIDGET(gtk_builder_get_object(builder, "addressbar_entry"));
     toolbar->m_pFormulabar = GTK_WIDGET(gtk_builder_get_object(builder, "formulabar_entry"));
 
+    // TODO: compile with -rdynamic and get rid of it
     gtk_builder_add_callback_symbol(builder, "btn_clicked", G_CALLBACK(btn_clicked));
     gtk_builder_add_callback_symbol(builder, "doCopy", G_CALLBACK(doCopy));
     gtk_builder_add_callback_symbol(builder, "doPaste", G_CALLBACK(doPaste));
@@ -97,6 +98,8 @@ gtv_main_toolbar_init(GtvMainToolbar* toolbar)
     gtk_builder_add_callback_symbol(builder, "toggleFindbar", G_CALLBACK(toggleFindbar));
     gtk_builder_add_callback_symbol(builder, "documentRedline", G_CALLBACK(documentRedline));
     gtk_builder_add_callback_symbol(builder, "documentRepair", G_CALLBACK(documentRepair));
+    gtk_builder_add_callback_symbol(builder, "signalAddressbar", G_CALLBACK(signalAddressbar));
+    gtk_builder_add_callback_symbol(builder, "signalFormulabar", G_CALLBACK(signalFormulabar));
 
     gtk_builder_connect_signals(builder, nullptr);
 
@@ -129,6 +132,8 @@ void
 gtv_main_toolbar_doc_loaded(GtvMainToolbar* toolbar, LibreOfficeKitDocumentType eDocType, bool bEditMode)
 {
     GtvMainToolbarPrivate& priv = getPrivate(toolbar);
+    gtk_widget_set_visible(toolbar->m_pAddressbar, false);
+    gtk_widget_set_visible(toolbar->m_pFormulabar, false);
     if (eDocType == LOK_DOCTYPE_SPREADSHEET)
     {
         gtk_tool_button_set_label(GTK_TOOL_BUTTON(priv->m_pLeftpara), ".uno:AlignLeft");
@@ -136,6 +141,9 @@ gtv_main_toolbar_doc_loaded(GtvMainToolbar* toolbar, LibreOfficeKitDocumentType
         gtk_tool_button_set_label(GTK_TOOL_BUTTON(priv->m_pRightpara), ".uno:AlignRight");
         gtk_widget_hide(priv->m_pJustifypara);
         gtk_tool_button_set_label(GTK_TOOL_BUTTON(priv->m_pDeleteComment), ".uno:DeleteNote");
+
+        gtk_widget_set_visible(toolbar->m_pAddressbar, true);
+        gtk_widget_set_visible(toolbar->m_pFormulabar, true);
     }
     else if (eDocType == LOK_DOCTYPE_PRESENTATION)
     {
diff --git a/libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.cxx b/libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.cxx
index e51f24149e96..9ea38b790b0b 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.cxx
@@ -526,7 +526,6 @@ void toggleFindbar(GtkWidget* pButton, gpointer /*pItem*/)
 void docAdjustmentChanged(GtkAdjustment*, gpointer pData)
 {
     GtvApplicationWindow* window = GTV_APPLICATION_WINDOW(pData);
-    printf("doc adjust ch : %p", window->lokdocview);
     if (window->lokdocview)
         LOKDocViewSigHandlers::configureEvent(window->lokdocview, nullptr, nullptr);
 }