Stop using GtkUIManager to create the toolbar

Otherwise it's difficult to get the right layout for theming.

1 files changed, 199 insertions, 0 deletions

diff --git a/src/ephy-toolbar.c b/src/ephy-toolbar.c
new file mode 100644
index 000000000..d3d8c3f1f
--- /dev/null
+++ b/src/ephy-toolbar.c
@@ -0,0 +1,199 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ *  Copyright © 2012 Igalia S.L.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "config.h"
+#include "ephy-toolbar.h"
+
+G_DEFINE_TYPE (EphyToolbar, ephy_toolbar, GTK_TYPE_TOOLBAR)
+
+#define EPHY_TOOLBAR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), EPHY_TYPE_TOOLBAR, EphyToolbarPrivate))
+
+enum {
+  PROP_0,
+  PROP_WINDOW,
+  N_PROPERTIES
+};
+
+static GParamSpec *object_properties[N_PROPERTIES] = { NULL, };
+
+struct _EphyToolbarPrivate {
+    EphyWindow *window;
+};
+
+static void
+ephy_toolbar_set_property (GObject *object,
+                           guint property_id,
+                           const GValue *value,
+                           GParamSpec *pspec)
+{
+  EphyToolbarPrivate *priv = EPHY_TOOLBAR (object)->priv;
+
+  switch (property_id) {
+  case PROP_WINDOW:
+    priv->window = EPHY_WINDOW (g_value_get_object (value));
+    g_object_notify_by_pspec (object, object_properties[PROP_WINDOW]);
+    break;
+  default:
+    G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+  }
+}
+
+static void
+ephy_toolbar_get_property (GObject *object,
+                           guint property_id,
+                           GValue *value,
+                           GParamSpec *pspec)
+{
+  EphyToolbarPrivate *priv = EPHY_TOOLBAR (object)->priv;
+
+  switch (property_id) {
+  case PROP_WINDOW:
+    g_value_set_object (value, priv->window);
+    break;
+  default:
+    G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+  }
+}
+
+static gboolean
+create_menu_proxy_cb (GtkToolItem *item, gpointer user_data)
+{
+  return TRUE;
+}
+
+static void
+ephy_toolbar_constructed (GObject *object)
+{
+  EphyToolbarPrivate *priv = EPHY_TOOLBAR (object)->priv;
+  GtkActionGroup *action_group;
+  GtkAction *action;
+  GtkToolItem *tool_button, *back_forward, *location_stop_reload;
+  GtkWidget *box, *location, *toolbar;
+
+  G_OBJECT_CLASS (ephy_toolbar_parent_class)->constructed (object);
+
+  toolbar = GTK_WIDGET (object);
+
+  /* Back and Forward */
+  back_forward = gtk_tool_item_new ();
+  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+
+  /* Back */
+  tool_button = gtk_tool_button_new (NULL, NULL);
+  action_group = ephy_window_get_toolbar_action_group (priv->window);
+  action = gtk_action_group_get_action (action_group, "NavigationBack");
+  gtk_activatable_set_related_action (GTK_ACTIVATABLE (tool_button),
+                                      action);
+  gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (tool_button));
+
+  /* Forward */
+  tool_button = gtk_tool_button_new (NULL, NULL);
+  action = gtk_action_group_get_action (action_group, "NavigationForward");
+  gtk_activatable_set_related_action (GTK_ACTIVATABLE (tool_button),
+                                      action);
+  gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (tool_button));
+
+  gtk_style_context_add_class (gtk_widget_get_style_context (box),
+                               "raised");
+  gtk_style_context_add_class (gtk_widget_get_style_context (box),
+                               "linked");
+
+  gtk_container_add (GTK_CONTAINER (back_forward), box);
+  gtk_container_add (GTK_CONTAINER (toolbar), GTK_WIDGET (back_forward));
+  gtk_widget_show_all (GTK_WIDGET (back_forward));
+  gtk_widget_set_margin_right (GTK_WIDGET (back_forward), 12);
+
+  /* Location and Reload/Stop */
+  location_stop_reload = gtk_tool_item_new ();
+  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+
+  /* Location */
+  action = gtk_action_group_get_action (action_group, "Location");
+  location = gtk_action_create_tool_item (action);
+  gtk_box_pack_start (GTK_BOX (box), location,
+                      TRUE, TRUE, 0);
+
+  /* Reload/Stop */
+  tool_button = gtk_tool_button_new (NULL, NULL);
+  action = gtk_action_group_get_action (action_group, "ViewCombinedStopReload");
+  gtk_activatable_set_related_action (GTK_ACTIVATABLE (tool_button),
+                                      action);
+  gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (tool_button));
+
+  gtk_container_add (GTK_CONTAINER (location_stop_reload), box);
+  gtk_container_child_set (GTK_CONTAINER (toolbar),
+                           GTK_WIDGET (location_stop_reload),
+                           "expand", TRUE,
+                           NULL);
+                           
+  gtk_container_add (GTK_CONTAINER (toolbar), GTK_WIDGET (location_stop_reload));
+  gtk_widget_set_margin_right (GTK_WIDGET (location_stop_reload), 12);
+  gtk_widget_show_all (GTK_WIDGET (location_stop_reload));
+
+  /* Page Menu */
+  tool_button = gtk_tool_button_new (NULL, NULL);
+  action = gtk_action_group_get_action (action_group, "PageMenu");
+  gtk_activatable_set_related_action (GTK_ACTIVATABLE (tool_button),
+                                      action);
+  gtk_container_add (GTK_CONTAINER (toolbar), GTK_WIDGET (tool_button));
+  /* FIXME: why is this needed?! GTK+ wants to create an overflow menu
+   * for this, no idea why. Connect to the signal to cancel it. */
+  g_signal_connect (tool_button, "create-menu-proxy",
+                    G_CALLBACK (create_menu_proxy_cb), NULL);
+}
+
+static void
+ephy_toolbar_class_init (EphyToolbarClass *klass)
+{
+    GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+
+    gobject_class->set_property = ephy_toolbar_set_property;
+    gobject_class->get_property = ephy_toolbar_get_property;
+    gobject_class->constructed = ephy_toolbar_constructed;
+
+    object_properties[PROP_WINDOW] =
+      g_param_spec_object ("window",
+                           "Window",
+                           "The toolbar's EphyWindow",
+                           EPHY_TYPE_WINDOW,
+                           G_PARAM_READWRITE | G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_CONSTRUCT_ONLY);
+
+    g_object_class_install_properties (gobject_class,
+                                       N_PROPERTIES,
+                                       object_properties);
+
+    g_type_class_add_private (klass, sizeof (EphyToolbarPrivate));
+}
+
+static void
+ephy_toolbar_init (EphyToolbar *toolbar)
+{
+  toolbar->priv = EPHY_TOOLBAR_GET_PRIVATE (toolbar);
+}
+
+GtkWidget*
+ephy_toolbar_new (EphyWindow *window)
+{
+    g_return_val_if_fail (EPHY_IS_WINDOW (window), NULL);
+
+    return GTK_WIDGET (g_object_new (EPHY_TYPE_TOOLBAR,
+                                     "window", window,
+                                     NULL));
+}