aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am2
-rw-r--r--src/ephy-spinner-action.c220
-rw-r--r--src/ephy-spinner-action.h48
-rwxr-xr-xsrc/toolbar.c25
4 files changed, 5 insertions, 290 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 7703b6b4c..cbe0fcb79 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -59,7 +59,6 @@ NOINST_H_FILES = \
ephy-location-action.h \
ephy-navigation-action.h \
ephy-plugin.h \
- ephy-spinner-action.h \
ephy-tabs-menu.h \
ephy-toolbars-model.h \
language-editor.h \
@@ -96,7 +95,6 @@ epiphany_bin_SOURCES = \
ephy-notebook.c \
ephy-plugin.c \
ephy-shell.c \
- ephy-spinner-action.c \
ephy-tab.c \
ephy-tab.h \
ephy-tabs-menu.c \
diff --git a/src/ephy-spinner-action.c b/src/ephy-spinner-action.c
deleted file mode 100644
index be69ce9b5..000000000
--- a/src/ephy-spinner-action.c
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
- * Copyright (C) 2003 Marco Pesenti Gritti
- *
- * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * $Id$
- */
-
-#include "ephy-spinner-action.h"
-#include "ephy-spinner.h"
-
-#include <gtk/gtktoolitem.h>
-#include <gtk/gtktoolbar.h>
-
-static void ephy_spinner_action_init (EphySpinnerAction *action);
-static void ephy_spinner_action_class_init (EphySpinnerActionClass *class);
-
-#define EPHY_SPINNER_ACTION_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_SPINNER_ACTION, EphySpinnerActionPrivate))
-
-struct EphySpinnerActionPrivate
-{
- gboolean throbbing;
-};
-
-enum
-{
- PROP_0,
- PROP_THROBBING
-};
-
-static GObjectClass *parent_class = NULL;
-
-GType
-ephy_spinner_action_get_type (void)
-{
- static GType type = 0;
-
- if (!type)
- {
- static const GTypeInfo type_info =
- {
- sizeof (EphySpinnerActionClass),
- (GBaseInitFunc) NULL,
- (GBaseFinalizeFunc) NULL,
- (GClassInitFunc) ephy_spinner_action_class_init,
- (GClassFinalizeFunc) NULL,
- NULL,
- sizeof (EphySpinnerAction),
- 0, /* n_preallocs */
- (GInstanceInitFunc) ephy_spinner_action_init,
- };
-
- type = g_type_register_static (GTK_TYPE_ACTION,
- "EphySpinnerAction",
- &type_info, 0);
- }
- return type;
-}
-
-static void
-ephy_spinner_action_sync_throbbing (GtkAction *action, GParamSpec *pspec,
- GtkWidget *proxy)
-{
- EphySpinner *spinner;
-
- spinner = EPHY_SPINNER (g_object_get_data (G_OBJECT (proxy), "spinner"));
-
- if (EPHY_SPINNER_ACTION (action)->priv->throbbing)
- {
- ephy_spinner_start (spinner);
- }
- else
- {
- ephy_spinner_stop (spinner);
- }
-}
-
-static GtkWidget *
-create_tool_item (GtkAction *action)
-{
- GtkWidget *item;
- GtkWidget *spinner;
-
- item = GTK_WIDGET (gtk_tool_item_new ());
-
- spinner = ephy_spinner_new ();
- gtk_widget_show (spinner);
- gtk_container_add (GTK_CONTAINER (item), spinner);
- gtk_tool_item_set_pack_end (GTK_TOOL_ITEM (item), TRUE);
- gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (item), FALSE);
- g_object_set_data (G_OBJECT (item), "spinner", spinner);
-
- return item;
-}
-
-static void
-toolbar_style_sync (GtkToolbar *toolbar,
- GtkToolbarStyle style,
- GtkWidget *proxy)
-{
- gboolean small;
- EphySpinner *spinner;
-
- spinner = EPHY_SPINNER (g_object_get_data (G_OBJECT (proxy), "spinner"));
-
- small = (style != GTK_TOOLBAR_BOTH);
- ephy_spinner_set_small_mode (EPHY_SPINNER (spinner), small);
-}
-
-static void
-item_parent_set_cb (GtkWidget *item, GtkWidget *previous_parent)
-{
- GtkToolbar *toolbar;
- GtkToolbarStyle style;
-
- if (item->parent == NULL) return;
-
- toolbar = GTK_TOOLBAR (item->parent);
-
- g_signal_connect_object (toolbar, "style_changed",
- G_CALLBACK (toolbar_style_sync),
- item, 0);
-
- style = gtk_toolbar_get_style (toolbar);
- toolbar_style_sync (toolbar, style, item);
-}
-
-static void
-connect_proxy (GtkAction *action, GtkWidget *proxy)
-{
- g_signal_connect_object (action, "notify::throbbing",
- G_CALLBACK (ephy_spinner_action_sync_throbbing),
- proxy, 0);
- g_signal_connect_object (proxy, "parent_set",
- G_CALLBACK (item_parent_set_cb),
- proxy, 0);
-
- (* GTK_ACTION_CLASS (parent_class)->connect_proxy) (action, proxy);
-}
-
-static void
-ephy_spinner_action_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec)
-{
- EphySpinnerAction *spin;
-
- spin = EPHY_SPINNER_ACTION (object);
-
- switch (prop_id)
- {
- case PROP_THROBBING:
- spin->priv->throbbing = g_value_get_boolean (value);
- g_object_notify(object, "throbbing");
- break;
- }
-}
-
-static void
-ephy_spinner_action_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec)
-{
- EphySpinnerAction *spin;
-
- spin = EPHY_SPINNER_ACTION (object);
-
- switch (prop_id)
- {
- case PROP_THROBBING:
- g_value_set_boolean (value, spin->priv->throbbing);
- break;
- }
-}
-
-static void
-ephy_spinner_action_class_init (EphySpinnerActionClass *class)
-{
- GObjectClass *object_class = G_OBJECT_CLASS (class);
- GtkActionClass *action_class = GTK_ACTION_CLASS (class);
-
- parent_class = g_type_class_peek_parent (class);
-
- action_class->toolbar_item_type = EPHY_TYPE_SPINNER;
- action_class->create_tool_item = create_tool_item;
- action_class->connect_proxy = connect_proxy;
-
- object_class->set_property = ephy_spinner_action_set_property;
- object_class->get_property = ephy_spinner_action_get_property;
-
- g_object_class_install_property (object_class,
- PROP_THROBBING,
- g_param_spec_boolean ("throbbing",
- "Throbbing",
- "Throbbing",
- FALSE,
- G_PARAM_READWRITE));
-
- g_type_class_add_private (object_class, sizeof(EphySpinnerActionPrivate));
-}
-
-static void
-ephy_spinner_action_init (EphySpinnerAction *action)
-{
- action->priv = EPHY_SPINNER_ACTION_GET_PRIVATE (action);
-}
diff --git a/src/ephy-spinner-action.h b/src/ephy-spinner-action.h
deleted file mode 100644
index 339596c66..000000000
--- a/src/ephy-spinner-action.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2003 Marco Pesenti Gritti
- *
- * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef EPHY_SPINNER_ACTION_H
-#define EPHY_SPINNER_ACTION_H
-
-#include <gtk/gtkaction.h>
-
-#define EPHY_TYPE_SPINNER_ACTION (ephy_spinner_action_get_type ())
-#define EPHY_SPINNER_ACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EPHY_TYPE_SPINNER_ACTION, EphySpinnerAction))
-#define EPHY_SPINNER_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EPHY_TYPE_SPINNER_ACTION, EphySpinnerActionClass))
-#define EPHY_IS_SPINNER_ACTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EPHY_TYPE_SPINNER_ACTION))
-#define EPHY_IS_SPINNER_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), EPHY_TYPE_SPINNER_ACTION))
-#define EPHY_SPINNER_ACTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), EPHY_TYPE_SPINNER_ACTION, EphySpinnerActionClass))
-
-typedef struct _EphySpinnerAction EphySpinnerAction;
-typedef struct _EphySpinnerActionClass EphySpinnerActionClass;
-typedef struct EphySpinnerActionPrivate EphySpinnerActionPrivate;
-
-struct _EphySpinnerAction
-{
- GtkAction parent;
- EphySpinnerActionPrivate *priv;
-};
-
-struct _EphySpinnerActionClass
-{
- GtkActionClass parent_class;
-};
-
-GType ephy_spinner_action_get_type (void);
-
-#endif
diff --git a/src/toolbar.c b/src/toolbar.c
index 025938e34..bcb5a5611 100755
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -29,7 +29,6 @@
#include "ephy-location-entry.h"
#include "ephy-dnd.h"
#include "ephy-spinner.h"
-#include "ephy-spinner-action.h"
#include "ephy-location-action.h"
#include "ephy-favicon-action.h"
#include "ephy-topic-action.h"
@@ -326,13 +325,6 @@ toolbar_setup_actions (Toolbar *t)
gtk_action_group_add_action (t->priv->action_group, action);
g_object_unref (action);
- action = g_object_new (EPHY_TYPE_SPINNER_ACTION,
- "name", "Spinner",
- "label", _("Spinner"),
- NULL);
- gtk_action_group_add_action (t->priv->action_group, action);
- g_object_unref (action);
-
/* FIXME: I'm still waiting for the exact term to
* user here from the docs team.
*/
@@ -539,6 +531,11 @@ toolbar_init (Toolbar *t)
t->priv->ui_merge = NULL;
t->priv->visibility = TRUE;
t->priv->updating_address = FALSE;
+
+ t->priv->spinner = ephy_spinner_new ();
+ gtk_widget_show (t->priv->spinner);
+ egg_editable_toolbar_set_fixed (EGG_EDITABLE_TOOLBAR (t),
+ t->priv->spinner);
}
static void
@@ -577,23 +574,11 @@ toolbar_activate_location (Toolbar *t)
void
toolbar_spinner_start (Toolbar *t)
{
- GtkActionGroup *action_group;
- GtkAction *action;
-
- action_group = t->priv->action_group;
- action = gtk_action_group_get_action (action_group, "Spinner");
- g_object_set (action, "throbbing", TRUE, NULL);
}
void
toolbar_spinner_stop (Toolbar *t)
{
- GtkActionGroup *action_group;
- GtkAction *action;
-
- action_group = t->priv->action_group;
- action = gtk_action_group_get_action (action_group, "Spinner");
- g_object_set (action, "throbbing", FALSE, NULL);
}
void
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 17:59:05 +0800