[gthumb] export tools: removed from the toolbar

[Paolo Bacchilega <paobac src gnome org>]

commit 4f5be139112c68ca6e41c1a715ee712cac485ac2
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Sat Feb 1 10:10:51 2020 +0100

    export tools: removed from the toolbar
    
    Some tools moved to the tools menu, others as a submenu in the
    gears menu.

 extensions/contact_sheet/callbacks.c                     |  4 ++--
 .../contact_sheet/contact_sheet.extension.desktop.in.in  |  2 +-
 extensions/contact_sheet/main.c                          |  2 +-
 extensions/export_tools/callbacks.c                      | 16 ++++++----------
 extensions/list_tools/callbacks.c                        |  1 +
 extensions/list_tools/data/ui/tools-menu.ui              |  2 ++
 extensions/list_tools/list-tools.h                       |  1 +
 extensions/webalbums/callbacks.c                         |  4 ++--
 extensions/webalbums/webalbums.extension.desktop.in.in   |  2 +-
 9 files changed, 17 insertions(+), 17 deletions(-)
---
diff --git a/extensions/contact_sheet/callbacks.c b/extensions/contact_sheet/callbacks.c
index 24873d7f..dfbc3ae8 100644
--- a/extensions/contact_sheet/callbacks.c
+++ b/extensions/contact_sheet/callbacks.c
@@ -24,7 +24,7 @@
 #include <glib/gi18n.h>
 #include <glib-object.h>
 #include <gthumb.h>
-#include <extensions/export_tools/export-tools.h>
+#include <extensions/list_tools/list-tools.h>
 #include "actions.h"
 #include "callbacks.h"
 
@@ -49,7 +49,7 @@ cs__gth_browser_construct_cb (GthBrowser *browser)
                                         actions,
                                         G_N_ELEMENTS (actions),
                                         browser);
-       gth_menu_manager_append_entries (gth_browser_get_menu_manager (browser, 
GTH_BROWSER_MENU_MANAGER_OTHER_EXPORTERS),
+       gth_menu_manager_append_entries (gth_browser_get_menu_manager (browser, 
GTH_BROWSER_MENU_MANAGER_TOOLS4),
                                         action_entries,
                                         G_N_ELEMENTS (action_entries));
 }
diff --git a/extensions/contact_sheet/contact_sheet.extension.desktop.in.in 
b/extensions/contact_sheet/contact_sheet.extension.desktop.in.in
index 92a3494f..76e1d5ca 100644
--- a/extensions/contact_sheet/contact_sheet.extension.desktop.in.in
+++ b/extensions/contact_sheet/contact_sheet.extension.desktop.in.in
@@ -9,4 +9,4 @@ Category=Exporter
 [Loader]
 Type=module
 API=@GTHUMB_API_VERSION@
-Requires=export_tools
+Requires=list_tools
diff --git a/extensions/contact_sheet/main.c b/extensions/contact_sheet/main.c
index 285ad0ff..a26931d6 100644
--- a/extensions/contact_sheet/main.c
+++ b/extensions/contact_sheet/main.c
@@ -29,7 +29,7 @@
 G_MODULE_EXPORT void
 gthumb_extension_activate (void)
 {
-       gth_hook_add_callback ("gth-browser-construct", 10, G_CALLBACK (cs__gth_browser_construct_cb), NULL);
+       gth_hook_add_callback ("gth-browser-construct", 60, G_CALLBACK (cs__gth_browser_construct_cb), NULL);
 }
 
 
diff --git a/extensions/export_tools/callbacks.c b/extensions/export_tools/callbacks.c
index 082f64a6..71bcfc39 100644
--- a/extensions/export_tools/callbacks.c
+++ b/extensions/export_tools/callbacks.c
@@ -32,20 +32,16 @@ void
 export_tools__gth_browser_construct_cb (GthBrowser *browser)
 {
        GtkBuilder *builder;
-       GMenuModel *menu;
-       GtkWidget  *button;
+       GMenuModel *export_menu;
+       GMenu      *other_actions;
 
        g_return_if_fail (GTH_IS_BROWSER (browser));
 
        builder = gtk_builder_new_from_resource ("/org/gnome/gThumb/export_tools/data/ui/export-menu.ui");
        gth_browser_add_menu_manager_for_menu (browser, GTH_BROWSER_MENU_MANAGER_WEB_EXPORTERS, G_MENU 
(gtk_builder_get_object (builder, "web-exporters")));
        gth_browser_add_menu_manager_for_menu (browser, GTH_BROWSER_MENU_MANAGER_OTHER_EXPORTERS, G_MENU 
(gtk_builder_get_object (builder, "other-exporters")));
-       menu = G_MENU_MODEL (gtk_builder_get_object (builder, "export-menu"));
-
-       button = _gtk_menu_button_new_for_header_bar ("export-symbolic");
-       gtk_widget_set_tooltip_text (button, _("Export"));
-       gtk_menu_button_set_menu_model (GTK_MENU_BUTTON (button), menu);
-       gtk_widget_set_halign (GTK_WIDGET (gtk_menu_button_get_popup (GTK_MENU_BUTTON (button))), 
GTK_ALIGN_CENTER);
-       gtk_widget_show (button);
-       gtk_box_pack_start (GTK_BOX (gth_browser_get_headerbar_section (browser, 
GTH_BROWSER_HEADER_SECTION_BROWSER_TOOLS)), button, FALSE, FALSE, 0);
+       export_menu = G_MENU_MODEL (gtk_builder_get_object (builder, "export-menu"));
+
+       other_actions = gth_menu_manager_get_menu (gth_browser_get_menu_manager (browser, 
GTH_BROWSER_MENU_MANAGER_GEARS_OTHER_ACTIONS));
+       g_menu_append_submenu (other_actions, _("_Export To"), export_menu);
 }
diff --git a/extensions/list_tools/callbacks.c b/extensions/list_tools/callbacks.c
index 9d49c43e..4b330e07 100644
--- a/extensions/list_tools/callbacks.c
+++ b/extensions/list_tools/callbacks.c
@@ -139,6 +139,7 @@ list_tools__gth_browser_construct_cb (GthBrowser *browser)
        gth_browser_add_menu_manager_for_menu (browser, GTH_BROWSER_MENU_MANAGER_TOOLS, G_MENU 
(gtk_builder_get_object (builder, "tools1")));
        gth_browser_add_menu_manager_for_menu (browser, GTH_BROWSER_MENU_MANAGER_MORE_TOOLS, G_MENU 
(gtk_builder_get_object (builder, "tools2")));
        gth_browser_add_menu_manager_for_menu (browser, GTH_BROWSER_MENU_MANAGER_TOOLS3, G_MENU 
(gtk_builder_get_object (builder, "tools3")));
+       gth_browser_add_menu_manager_for_menu (browser, GTH_BROWSER_MENU_MANAGER_TOOLS4, G_MENU 
(gtk_builder_get_object (builder, "tools4")));
        menu = G_MENU_MODEL (gtk_builder_get_object (builder, "tools-menu"));
 
        /* browser tools */
diff --git a/extensions/list_tools/data/ui/tools-menu.ui b/extensions/list_tools/data/ui/tools-menu.ui
index c1335dc5..46959ef9 100644
--- a/extensions/list_tools/data/ui/tools-menu.ui
+++ b/extensions/list_tools/data/ui/tools-menu.ui
@@ -4,6 +4,8 @@
   <menu id="tools-menu">
     <section id="tools1">
     </section>
+    <section id="tools4">
+    </section>
     <section id="tools2">
     </section>
     <section id="tools3">
diff --git a/extensions/list_tools/list-tools.h b/extensions/list_tools/list-tools.h
index d92a5fdc..8a0a4d90 100644
--- a/extensions/list_tools/list-tools.h
+++ b/extensions/list_tools/list-tools.h
@@ -25,5 +25,6 @@
 #define GTH_BROWSER_MENU_MANAGER_TOOLS "tools.tools1"
 #define GTH_BROWSER_MENU_MANAGER_MORE_TOOLS "tools.tools2"
 #define GTH_BROWSER_MENU_MANAGER_TOOLS3 "tools.tools3"
+#define GTH_BROWSER_MENU_MANAGER_TOOLS4 "tools.tools4"
 
 #endif /* LIST_TOOLS_H */
diff --git a/extensions/webalbums/callbacks.c b/extensions/webalbums/callbacks.c
index c1b59a32..8305d280 100644
--- a/extensions/webalbums/callbacks.c
+++ b/extensions/webalbums/callbacks.c
@@ -24,7 +24,7 @@
 #include <glib/gi18n.h>
 #include <glib-object.h>
 #include <gthumb.h>
-#include <extensions/export_tools/export-tools.h>
+#include <extensions/list_tools/list-tools.h>
 #include "actions.h"
 #include "callbacks.h"
 
@@ -43,7 +43,7 @@ wa__gth_browser_construct_cb (GthBrowser *browser)
                                         actions,
                                         G_N_ELEMENTS (actions),
                                         browser);
-       gth_menu_manager_append_entry (gth_browser_get_menu_manager (browser, 
GTH_BROWSER_MENU_MANAGER_OTHER_EXPORTERS),
+       gth_menu_manager_append_entry (gth_browser_get_menu_manager (browser, 
GTH_BROWSER_MENU_MANAGER_TOOLS4),
                                       GTH_MENU_MANAGER_NEW_MERGE_ID,
                                       _("_Web Album…"),
                                       "win.create-web-album",
diff --git a/extensions/webalbums/webalbums.extension.desktop.in.in 
b/extensions/webalbums/webalbums.extension.desktop.in.in
index a1d6511d..3bd5aee2 100644
--- a/extensions/webalbums/webalbums.extension.desktop.in.in
+++ b/extensions/webalbums/webalbums.extension.desktop.in.in
@@ -9,4 +9,4 @@ Category=Exporter
 [Loader]
 Type=module
 API=@GTHUMB_API_VERSION@
-Requires=export_tools
+Requires=list_tools