GNOME.org
 

[epiphany] floating-bar: import NautilisFloatingBar into Epiphany

commit 3e258526ca38fc6dd1c8a8c96f4925531f5031c8
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Mon Jan 16 17:07:27 2012 -0500

    floating-bar: import NautilisFloatingBar into Epiphany
    
    Yay for sharing code. It also helps theming.

 embed/ephy-embed.c          |   47 +----
 src/Makefile.am             |    2 +
 src/nautilus-floating-bar.c |  389 +++++++++++++++++++++++++++++++++++++++++++
 src/nautilus-floating-bar.h |   75 +++++++++
 4 files changed, 476 insertions(+), 37 deletions(-)
---
diff --git a/embed/ephy-embed.c b/embed/ephy-embed.c
index 62f2558..c4e9ac5 100644
--- a/embed/ephy-embed.c
+++ b/embed/ephy-embed.c
@@ -74,7 +74,7 @@ struct _EphyEmbedPrivate
   gboolean inspector_attached;
   guint is_setting_zoom : 1;
   GSList *destroy_on_transition_list;
-  GtkWidget *statusbar_label;
+  GtkWidget *floating_bar;
   GtkWidget *progress;
 
   GSList *messages;
@@ -435,17 +435,13 @@ _ephy_embed_set_statusbar_label (EphyEmbed *embed, const char *label)
   EphyEmbedPrivate *priv = embed->priv;
   GtkWidget *parent;
 
-  gtk_label_set_label (GTK_LABEL (priv->statusbar_label), label);
-
-  parent = gtk_widget_get_parent (priv->statusbar_label);
-  if (parent == NULL)
-    return;
+  nautilus_floating_bar_set_label (NAUTILUS_FLOATING_BAR (priv->floating_bar), label);
 
   if (label == NULL || label[0] == '\0') {
-    gtk_widget_hide (parent);
-    gtk_widget_set_halign (gtk_widget_get_parent (parent), GTK_ALIGN_START);
+    gtk_widget_hide (priv->floating_bar);
+    gtk_widget_set_halign (priv->floating_bar, GTK_ALIGN_START);
   } else
-    gtk_widget_show (parent);
+    gtk_widget_show (priv->floating_bar);
 }
 
 static gboolean
@@ -514,21 +510,6 @@ window_resize_requested (WebKitWebWindowFeatures *features, GParamSpec *pspec, E
 }
 
 static gboolean
-frame_enter_notify_cb (GtkWidget *widget,
-                       GdkEventCrossing *event,
-                       gpointer user_data)
-{
-	if (gtk_widget_get_halign (widget) == GTK_ALIGN_START)
-		gtk_widget_set_halign (widget, GTK_ALIGN_END);
-  else
-		gtk_widget_set_halign (widget, GTK_ALIGN_START);
-
-	gtk_widget_queue_resize (widget);
-
-  return FALSE;
-}
-
-static gboolean
 clear_progress_cb (EphyEmbed *embed)
 {
   gtk_widget_hide (embed->priv->progress);
@@ -591,19 +572,11 @@ ephy_embed_constructed (GObject *object)
   gtk_container_add (GTK_CONTAINER (overlay), scrolled_window);
 
   /* statusbar is hidden by default */
-  priv->statusbar_label = gtk_label_new (NULL);
-  eventbox = gtk_event_box_new ();
-  frame = gtk_frame_new (NULL);
-  gtk_widget_set_name (frame, "ephy-status-frame");
-  gtk_widget_set_halign (eventbox, GTK_ALIGN_START);
-  gtk_widget_set_valign (eventbox, GTK_ALIGN_END);
-  gtk_widget_show (eventbox);
-
-  gtk_container_add (GTK_CONTAINER (eventbox), frame);
-  gtk_container_add (GTK_CONTAINER (frame), priv->statusbar_label);
-  gtk_overlay_add_overlay (GTK_OVERLAY (overlay), eventbox);
-  g_signal_connect (eventbox, "enter-notify-event",
-                    G_CALLBACK (frame_enter_notify_cb), object);
+  priv->floating_bar = nautilus_floating_bar_new (NULL, FALSE);
+  gtk_widget_set_halign (priv->floating_bar, GTK_ALIGN_START);
+  gtk_widget_set_valign (priv->floating_bar, GTK_ALIGN_END);
+
+  gtk_overlay_add_overlay (GTK_OVERLAY (overlay), priv->floating_bar);
 
   embed->priv->progress = gtk_progress_bar_new ();
   gtk_widget_set_name (embed->priv->progress, "ephy-progress-bar");
diff --git a/src/Makefile.am b/src/Makefile.am
index 24d47ae..b6ca345 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -31,6 +31,7 @@ NOINST_H_FILES = \
 	ephy-toolbar.h				\
 	ephy-window-action.h			\
 	languages.h				\
+	nautilus-floating-bar.h			\
 	pdm-dialog.h				\
 	popup-commands.h			\
 	prefs-dialog.h				\
@@ -73,6 +74,7 @@ libephymain_la_SOURCES = \
 	ephy-toolbar.c				\
 	ephy-window.c				\
 	ephy-window-action.c			\
+	nautilus-floating-bar.c			\
 	pdm-dialog.c				\
 	popup-commands.c			\
 	prefs-dialog.c				\
diff --git a/src/nautilus-floating-bar.c b/src/nautilus-floating-bar.c
new file mode 100644
index 0000000..e37a81a
--- /dev/null
+++ b/src/nautilus-floating-bar.c
@@ -0,0 +1,389 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+
+/* Nautilus - Floating status bar.
+ *
+ * Copyright (C) 2011 Red Hat Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Authors: Cosimo Cecchi <cosimoc redhat com>
+ *
+ */
+
+#include <config.h>
+
+#include "nautilus-floating-bar.h"
+
+struct _NautilusFloatingBarDetails {
+	gchar *label;
+
+	GtkWidget *label_widget;
+	GtkWidget *spinner;
+	gboolean show_spinner;
+	gboolean is_interactive;
+};
+
+enum {
+	PROP_LABEL = 1,
+	PROP_SHOW_SPINNER,
+	NUM_PROPERTIES
+};
+
+enum {
+	ACTION,
+	NUM_SIGNALS
+};
+
+static GParamSpec *properties[NUM_PROPERTIES] = { NULL, };
+static guint signals[NUM_SIGNALS] = { 0, };
+
+G_DEFINE_TYPE (NautilusFloatingBar, nautilus_floating_bar,
+               GTK_TYPE_BOX);
+
+static void
+action_button_clicked_cb (GtkButton *button,
+			  NautilusFloatingBar *self)
+{
+	gint action_id;
+
+	action_id = GPOINTER_TO_INT
+		(g_object_get_data (G_OBJECT (button), "action-id"));
+	
+	g_signal_emit (self, signals[ACTION], 0, action_id);
+}
+
+static void
+nautilus_floating_bar_finalize (GObject *obj)
+{
+	NautilusFloatingBar *self = NAUTILUS_FLOATING_BAR (obj);
+
+	g_free (self->priv->label);
+
+	G_OBJECT_CLASS (nautilus_floating_bar_parent_class)->finalize (obj);
+}
+
+static void
+nautilus_floating_bar_get_property (GObject *object,
+				    guint property_id,
+				    GValue *value,
+				    GParamSpec *pspec)
+{
+	NautilusFloatingBar *self = NAUTILUS_FLOATING_BAR (object);
+
+	switch (property_id) {
+	case PROP_LABEL:
+		g_value_set_string (value, self->priv->label);
+		break;
+	case PROP_SHOW_SPINNER:
+		g_value_set_boolean (value, self->priv->show_spinner);
+		break;
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+		break;
+	}
+}
+
+static void
+nautilus_floating_bar_set_property (GObject *object,
+				    guint property_id,
+				    const GValue *value,
+				    GParamSpec *pspec)
+{
+	NautilusFloatingBar *self = NAUTILUS_FLOATING_BAR (object);
+
+	switch (property_id) {
+	case PROP_LABEL:
+		nautilus_floating_bar_set_label (self, g_value_get_string (value));
+		break;
+	case PROP_SHOW_SPINNER:
+		nautilus_floating_bar_set_show_spinner (self, g_value_get_boolean (value));
+		break;
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+		break;
+	}
+}
+
+static void
+update_label (NautilusFloatingBar *self)
+{
+	gtk_label_set_text (GTK_LABEL (self->priv->label_widget), self->priv->label);
+}
+
+static gboolean
+overlay_enter_notify_cb (GtkWidget        *parent,
+			 GdkEventCrossing *event,
+			 gpointer          user_data)
+{
+	GtkWidget *widget = user_data;
+
+	if (event->window != gtk_widget_get_window (widget)) {
+		return FALSE;
+	}
+
+	if (NAUTILUS_FLOATING_BAR (widget)->priv->is_interactive) {
+		return FALSE;
+	}
+
+	if (gtk_widget_get_halign (widget) == GTK_ALIGN_START) {
+		gtk_widget_set_halign (widget, GTK_ALIGN_END);
+	} else {
+		gtk_widget_set_halign (widget, GTK_ALIGN_START);
+	}
+
+	gtk_widget_queue_resize (widget);
+
+	return FALSE;
+}
+
+static void
+nautilus_floating_bar_parent_set (GtkWidget *widget,
+				  GtkWidget *old_parent)
+{
+	GtkWidget *parent;
+
+	parent = gtk_widget_get_parent (widget);
+
+	if (old_parent != NULL) {
+		g_signal_handlers_disconnect_by_func (old_parent,
+						      overlay_enter_notify_cb, widget);
+	}
+
+	if (parent != NULL) {
+		g_signal_connect (parent, "enter-notify-event",
+				  G_CALLBACK (overlay_enter_notify_cb), widget);
+	}
+}
+
+static void
+nautilus_floating_bar_show (GtkWidget *widget)
+{
+	NautilusFloatingBar *self = NAUTILUS_FLOATING_BAR (widget);
+
+	GTK_WIDGET_CLASS (nautilus_floating_bar_parent_class)->show (widget);
+
+	if (self->priv->show_spinner) {
+		gtk_spinner_start (GTK_SPINNER (self->priv->spinner));
+	}
+}
+
+static void
+nautilus_floating_bar_hide (GtkWidget *widget)
+{
+	NautilusFloatingBar *self = NAUTILUS_FLOATING_BAR (widget);
+
+	GTK_WIDGET_CLASS (nautilus_floating_bar_parent_class)->hide (widget);
+
+	gtk_spinner_stop (GTK_SPINNER (self->priv->spinner));
+}
+
+static gboolean
+nautilus_floating_bar_draw (GtkWidget *widget,
+			    cairo_t *cr)
+{
+	GtkStyleContext *context;
+
+	context = gtk_widget_get_style_context (widget);
+
+	gtk_style_context_save (context);
+	gtk_style_context_set_state (context, gtk_widget_get_state_flags (widget));
+
+	gtk_render_background (context, cr, 0, 0,
+			       gtk_widget_get_allocated_width (widget),
+			       gtk_widget_get_allocated_height (widget));
+
+	gtk_render_frame (context, cr, 0, 0,
+			  gtk_widget_get_allocated_width (widget),
+			  gtk_widget_get_allocated_height (widget));
+
+	gtk_style_context_restore (context);
+
+	return GTK_WIDGET_CLASS (nautilus_floating_bar_parent_class)->draw (widget, cr);;
+}
+
+static void
+nautilus_floating_bar_constructed (GObject *obj)
+{
+	NautilusFloatingBar *self = NAUTILUS_FLOATING_BAR (obj);
+	GtkWidget *w, *box;
+
+	G_OBJECT_CLASS (nautilus_floating_bar_parent_class)->constructed (obj);
+
+	box = GTK_WIDGET (obj);
+
+	w = gtk_spinner_new ();
+	gtk_box_pack_start (GTK_BOX (box), w, FALSE, FALSE, 0);
+	gtk_widget_set_visible (w, self->priv->show_spinner);
+	self->priv->spinner = w;
+
+	gtk_widget_set_size_request (w, 16, 16);
+	gtk_widget_set_margin_left (w, 8);
+
+	w = gtk_label_new (NULL);
+	gtk_label_set_ellipsize (GTK_LABEL (w), PANGO_ELLIPSIZE_END);
+	gtk_box_pack_start (GTK_BOX (box), w, FALSE, FALSE, 0);
+	g_object_set (w,
+		      "margin-top", 2,
+		      "margin-bottom", 2,
+		      "margin-left", 12,
+		      "margin-right", 12,
+		      NULL);
+	self->priv->label_widget = w;
+	gtk_widget_show (w);
+}
+
+static void
+nautilus_floating_bar_init (NautilusFloatingBar *self)
+{
+	GtkStyleContext *context;
+
+	self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, NAUTILUS_TYPE_FLOATING_BAR,
+						  NautilusFloatingBarDetails);
+
+	context = gtk_widget_get_style_context (GTK_WIDGET (self));
+	gtk_style_context_add_class (context, "floating-bar");
+}
+
+static void
+nautilus_floating_bar_class_init (NautilusFloatingBarClass *klass)
+{
+	GObjectClass *oclass = G_OBJECT_CLASS (klass);
+	GtkWidgetClass *wclass = GTK_WIDGET_CLASS (klass);
+
+	oclass->constructed = nautilus_floating_bar_constructed;
+	oclass->set_property = nautilus_floating_bar_set_property;
+	oclass->get_property = nautilus_floating_bar_get_property;
+	oclass->finalize = nautilus_floating_bar_finalize;
+
+	wclass->draw = nautilus_floating_bar_draw;
+	wclass->show = nautilus_floating_bar_show;
+	wclass->hide = nautilus_floating_bar_hide;
+	wclass->parent_set = nautilus_floating_bar_parent_set;
+
+	properties[PROP_LABEL] =
+		g_param_spec_string ("label",
+				     "Bar's label",
+				     "Label displayed by the bar",
+				     NULL,
+				     G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS);
+	properties[PROP_SHOW_SPINNER] =
+		g_param_spec_boolean ("show-spinner",
+				      "Show spinner",
+				      "Whether a spinner should be shown in the floating bar",
+				      FALSE,
+				      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+
+	signals[ACTION] =
+		g_signal_new ("action",
+			      G_TYPE_FROM_CLASS (klass),
+			      G_SIGNAL_RUN_LAST,
+			      0, NULL, NULL,
+			      g_cclosure_marshal_VOID__INT,
+			      G_TYPE_NONE, 1,
+			      G_TYPE_INT);
+
+	g_type_class_add_private (klass, sizeof (NautilusFloatingBarDetails));
+	g_object_class_install_properties (oclass, NUM_PROPERTIES, properties);
+}
+
+void
+nautilus_floating_bar_set_label (NautilusFloatingBar *self,
+				 const gchar *label)
+{
+	if (g_strcmp0 (self->priv->label, label) != 0) {
+		g_free (self->priv->label);
+		self->priv->label = g_strdup (label);
+
+		g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_LABEL]);
+
+		update_label (self);
+	}
+}
+
+void
+nautilus_floating_bar_set_show_spinner (NautilusFloatingBar *self,
+					gboolean show_spinner)
+{
+	if (self->priv->show_spinner != show_spinner) {
+		self->priv->show_spinner = show_spinner;
+		gtk_widget_set_visible (self->priv->spinner,
+					show_spinner);
+
+		g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_SHOW_SPINNER]);
+	}
+}
+
+GtkWidget *
+nautilus_floating_bar_new (const gchar *label,
+			   gboolean show_spinner)
+{
+	return g_object_new (NAUTILUS_TYPE_FLOATING_BAR,
+			     "label", label,
+			     "show-spinner", show_spinner,
+			     "orientation", GTK_ORIENTATION_HORIZONTAL,
+			     "spacing", 8,
+			     NULL);
+}
+
+void
+nautilus_floating_bar_add_action (NautilusFloatingBar *self,
+				  const gchar *stock_id,
+				  gint action_id)
+{
+	GtkWidget *w, *button;
+
+	w = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_MENU);
+	gtk_widget_show (w);
+
+	button = gtk_button_new ();
+	gtk_button_set_image (GTK_BUTTON (button), w);
+	gtk_box_pack_end (GTK_BOX (self), button, FALSE, FALSE, 0);
+	gtk_widget_show (button);
+
+	g_object_set_data (G_OBJECT (button), "action-id",
+			   GINT_TO_POINTER (action_id));
+
+	g_signal_connect (button, "clicked",
+			  G_CALLBACK (action_button_clicked_cb), self);
+
+	self->priv->is_interactive = TRUE;
+}
+
+void
+nautilus_floating_bar_cleanup_actions (NautilusFloatingBar *self)
+{
+	GtkWidget *widget;
+	GList *children, *l;
+	gpointer data;
+
+	children = gtk_container_get_children (GTK_CONTAINER (self));
+	l = children;
+
+	while (l != NULL) {
+		widget = l->data;
+		data = g_object_get_data (G_OBJECT (widget), "action-id");
+		l = l->next;
+
+		if (data != NULL) {
+			/* destroy this */
+			gtk_widget_destroy (widget);
+		}
+	}
+
+	g_list_free (children);
+
+	self->priv->is_interactive = FALSE;
+}
diff --git a/src/nautilus-floating-bar.h b/src/nautilus-floating-bar.h
new file mode 100644
index 0000000..03ea0f9
--- /dev/null
+++ b/src/nautilus-floating-bar.h
@@ -0,0 +1,75 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+
+/* Nautilus - Floating status bar.
+ *
+ * Copyright (C) 2011 Red Hat Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Authors: Cosimo Cecchi <cosimoc redhat com>
+ *
+ */
+
+#ifndef __NAUTILUS_FLOATING_BAR_H__
+#define __NAUTILUS_FLOATING_BAR_H__
+
+#include <gtk/gtk.h>
+
+#define NAUTILUS_FLOATING_BAR_ACTION_ID_STOP 1
+
+#define NAUTILUS_TYPE_FLOATING_BAR nautilus_floating_bar_get_type()
+#define NAUTILUS_FLOATING_BAR(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST ((obj), NAUTILUS_TYPE_FLOATING_BAR, NautilusFloatingBar))
+#define NAUTILUS_FLOATING_BAR_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_FLOATING_BAR, NautilusFloatingBarClass))
+#define NAUTILUS_IS_FLOATING_BAR(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NAUTILUS_TYPE_FLOATING_BAR))
+#define NAUTILUS_IS_FLOATING_BAR_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_FLOATING_BAR))
+#define NAUTILUS_FLOATING_BAR_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_CLASS ((obj), NAUTILUS_TYPE_FLOATING_BAR, NautilusFloatingBarClass))
+
+typedef struct _NautilusFloatingBar NautilusFloatingBar;
+typedef struct _NautilusFloatingBarClass NautilusFloatingBarClass;
+typedef struct _NautilusFloatingBarDetails NautilusFloatingBarDetails;
+
+struct _NautilusFloatingBar {
+	GtkBox parent;
+	NautilusFloatingBarDetails *priv;
+};
+
+struct _NautilusFloatingBarClass {
+	GtkBoxClass parent_class;
+};
+
+/* GObject */
+GType       nautilus_floating_bar_get_type  (void);
+
+GtkWidget * nautilus_floating_bar_new              (const gchar *label,
+						    gboolean show_spinner);
+
+void        nautilus_floating_bar_set_label        (NautilusFloatingBar *self,
+						    const gchar *label);
+void        nautilus_floating_bar_set_show_spinner (NautilusFloatingBar *self,
+						    gboolean show_spinner);
+
+void        nautilus_floating_bar_add_action       (NautilusFloatingBar *self,
+						    const gchar *stock_id,
+						    gint action_id);
+void        nautilus_floating_bar_cleanup_actions  (NautilusFloatingBar *self);
+
+#endif /* __NAUTILUS_FLOATING_BAR_H__ */
+
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]