Remove toolbar editor

The UI is gone, but the infrastructure still persists
(EggToolbarModel, etc). Further cleanups are possible.

https://bugzilla.gnome.org/show_bug.cgi?id=664260

6 files changed, 0 insertions, 474 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index f4914505b..49463d6fa 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -32,7 +32,6 @@ NOINST_H_FILES = \
 	ephy-tabs-menu.h			\
 	ephy-toolbars-model.h			\
 	ephy-toolbar.h				\
-	ephy-toolbar-editor.h			\
 	languages.h				\
 	pdm-dialog.h				\
 	popup-commands.h			\
@@ -77,7 +76,6 @@ libephymain_la_SOURCES = \
 	ephy-tabs-menu.c			\
 	ephy-toolbars-model.c			\
 	ephy-toolbar.c				\
-	ephy-toolbar-editor.c			\
 	ephy-window.c				\
 	pdm-dialog.c				\
 	popup-commands.c			\
diff --git a/src/ephy-lockdown.c b/src/ephy-lockdown.c
index 61aec8d86..54eb58a29 100644
--- a/src/ephy-lockdown.c
+++ b/src/ephy-lockdown.c
@@ -111,8 +111,6 @@ static const BindAction window_actions[] = {
 	{ EPHY_PREFS_LOCKDOWN_PRINT_SETUP, "FilePrintSetup", "sensitive" },
 	{ EPHY_PREFS_LOCKDOWN_COMMAND_LINE, "FilePrintSetup", "sensitive" },
 
-	{ EPHY_PREFS_LOCKDOWN_TOOLBAR_EDITING, "ViewToolbarEditor", "sensitive" },
-
 	{ EPHY_PREFS_LOCKDOWN_BOOKMARK_EDITING, "GoBookmarks", "sensitive" },
 	{ EPHY_PREFS_LOCKDOWN_BOOKMARK_EDITING, "FileBookmarkPage", "sensitive" },
 
@@ -144,12 +142,6 @@ static const BindAction special_toolbar_actions[] = {
 	{ EPHY_PREFS_LOCKDOWN_FULLSCREEN, "FileNewWindow", "sensitive" }
 };
 
-static const BindAction toolbar_actions[] = {
-	{ EPHY_PREFS_LOCKDOWN_TOOLBAR_EDITING, "MoveToolItem", "sensitive" },
-	{ EPHY_PREFS_LOCKDOWN_TOOLBAR_EDITING, "RemoveToolItem", "sensitive" },
-	{ EPHY_PREFS_LOCKDOWN_TOOLBAR_EDITING, "RemoveToolbar", "sensitive" }
-};
-
 static gboolean
 sensitive_get_mapping (GValue *value,
 		       GVariant *variant,
@@ -259,11 +251,6 @@ impl_attach_window (EphyExtension *extension,
 	bind_settings_and_actions (EPHY_SETTINGS_LOCKDOWN,
 				   action_group, special_toolbar_actions,
 				   G_N_ELEMENTS (special_toolbar_actions));
-
-	action_group = find_action_group (manager, "ToolbarActions");
-	bind_settings_and_actions (EPHY_SETTINGS_LOCKDOWN,
-				   action_group, toolbar_actions,
-				   G_N_ELEMENTS (toolbar_actions));
 }
 
 static void
diff --git a/src/ephy-toolbar-editor.c b/src/ephy-toolbar-editor.c
deleted file mode 100644
index 366ff38ae..000000000
--- a/src/ephy-toolbar-editor.c
+++ /dev/null
@@ -1,371 +0,0 @@
-/* 
- *  Copyright © 2000-2004 Marco Pesenti Gritti
- *  Copyright © 2003-2005 Christian Persch
- *
- *  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 of the License, 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-debug.h"
-#include "ephy-gui.h"
-#include "ephy-prefs.h"
-#include "ephy-settings.h"
-#include "ephy-state.h"
-#include "ephy-file-helpers.h"
-#include "ephy-shell.h"
-#include "ephy-stock-icons.h"
-#include "ephy-toolbar-editor.h"
-#include "eggtypebuiltins.h"
-#include "egg-toolbars-model.h"
-#include "egg-editable-toolbar.h"
-#include "egg-toolbar-editor.h"
-
-#include <glib/gi18n.h>
-#include <gtk/gtk.h>
-#include <string.h>
-
-#define DATA_KEY		"EphyToolbarEditor"
-
-#define EPHY_TOOLBAR_EDITOR_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_TOOLBAR_EDITOR, EphyToolbarEditorPrivate))
-
-struct _EphyToolbarEditorPrivate
-{
-	EggToolbarsModel *model;
-	EphyWindow *window;
-};
-
-enum
-{
-	RESPONSE_ADD_TOOLBAR = 1
-};
-
-enum
-{
-	COL_TEXT,
-	COL_FLAGS,
-	COL_IS_SEP
-};
-
-static const struct
-{
-	const char *text;
-	EggTbModelFlags flags;
-	gboolean cc_domain;
-}
-toolbar_styles [] =
-{
-	{ NC_("toolbar style", "Default"), 0, FALSE },
-	{ NULL /* separator row */, 0, FALSE },
-	{ NC_("toolbar style", "Text below icons"), EGG_TB_MODEL_BOTH, TRUE },
-	{ NC_("toolbar style", "Text beside icons"), EGG_TB_MODEL_BOTH_HORIZ, TRUE },
-	{ NC_("toolbar style", "Icons only"), EGG_TB_MODEL_ICONS, TRUE },
-	{ NC_("toolbar style", "Text only"), EGG_TB_MODEL_TEXT, TRUE }
-};
-
-enum
-{
-	PROP_0,
-	PROP_WINDOW
-};
-
-G_DEFINE_TYPE (EphyToolbarEditor, ephy_toolbar_editor, GTK_TYPE_DIALOG)
-
-static gboolean
-row_is_separator (GtkTreeModel *model,
-		  GtkTreeIter *iter,
-		  gpointer data)
-{
-	gboolean is_sep;
-	gtk_tree_model_get (model, iter, COL_IS_SEP, &is_sep, -1);
-	return is_sep;
-}
-
-static void
-combo_changed_cb (GtkComboBox *combo,
-		  GtkListStore *store)
-{
-	GtkTreeIter iter;
-	EggTbModelFlags flags;
-	GFlagsClass *flags_class;
-	const GFlagsValue *value;
-	const char *pref = "";
-
-	if  (!gtk_combo_box_get_active_iter (combo, &iter)) return;
-
-	gtk_tree_model_get (GTK_TREE_MODEL (store), &iter, COL_FLAGS, &flags, -1);
-
-	flags_class = g_type_class_ref (EGG_TYPE_TB_MODEL_FLAGS);
-	value = g_flags_get_first_value (flags_class, flags);
-	if (value != NULL)
-	{
-		pref = value->value_nick;
-	}
-
-	g_settings_set_string (EPHY_SETTINGS_UI,
-			       EPHY_PREFS_UI_TOOLBAR_STYLE, pref);
-
-	g_type_class_unref (flags_class);
-}
-
-
-static void
-ephy_toolbar_editor_response (GtkDialog *dialog,
-			      gint response)
-{
-	EphyToolbarEditorPrivate *priv = EPHY_TOOLBAR_EDITOR (dialog)->priv;
-
-	if (response == RESPONSE_ADD_TOOLBAR)
-	{
-		egg_toolbars_model_add_toolbar (priv->model, -1, "UserCreated");
-		return;
-	}
-	else if (response == GTK_RESPONSE_HELP)
-	{
-		ephy_gui_help (GTK_WIDGET (dialog), "to-edit-toolbars");
-		return;
-	}
-
-	gtk_widget_destroy (GTK_WIDGET (dialog));
-}
-
-static void
-ephy_toolbar_editor_init (EphyToolbarEditor *editor)
-{
-	editor->priv = EPHY_TOOLBAR_EDITOR_GET_PRIVATE (editor);
-	
-	editor->priv->model = EGG_TOOLBARS_MODEL
-		(ephy_shell_get_toolbars_model (ephy_shell, FALSE));
-}
-
-static GObject *
-ephy_toolbar_editor_constructor (GType type,
-				 guint n_construct_properties,
-				 GObjectConstructParam *construct_params)
-
-{
-	GObject *object;
-	EphyToolbarEditorPrivate *priv;
-	GtkWidget *dialog, *editor, *toolbar, *vbox, *hbox, *label, *combo;
-	GtkUIManager *manager;
-	GtkListStore *store;
-	GtkTreeIter iter;
-	GtkCellRenderer *renderer;
-	GFlagsClass *flags_class;
-	const GFlagsValue *value;
-	EggTbModelFlags flags = 0;
-	char *pref;
-	int i;
-
-	object = G_OBJECT_CLASS (ephy_toolbar_editor_parent_class)->constructor (type,
-                                                                                 n_construct_properties,
-                                                                                 construct_params);
-
-	dialog = GTK_WIDGET (object);
-	priv = EPHY_TOOLBAR_EDITOR (object)->priv;
-
-	toolbar = ephy_window_get_toolbar (priv->window);
-
-	vbox = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
-	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)), 5);
-	gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), 2);
-	gtk_window_set_title (GTK_WINDOW (dialog), _("Toolbar Editor"));
-	gtk_window_set_icon_name (GTK_WINDOW (dialog), EPHY_STOCK_EPHY);
-
-	gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (priv->window));
-	gtk_window_group_add_window (ephy_gui_ensure_window_group (GTK_WINDOW (priv->window)),
-				     GTK_WINDOW (dialog));
-	gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), TRUE);
-
-	manager = GTK_UI_MANAGER (ephy_window_get_ui_manager (priv->window));
-	editor = egg_toolbar_editor_new (manager, priv->model);
-	gtk_container_set_border_width (GTK_CONTAINER (EGG_TOOLBAR_EDITOR (editor)), 5);
-	gtk_box_set_spacing (GTK_BOX (EGG_TOOLBAR_EDITOR (editor)), 5);
-	gtk_box_pack_start (GTK_BOX (vbox), editor, TRUE, TRUE, 0);
-
-	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
-	gtk_box_set_spacing (GTK_BOX (editor), 18);
-	gtk_box_pack_start (GTK_BOX (editor), hbox, FALSE, FALSE, 0);
-
-	/* translators: translate the same as in gnome-control-center */
-	label = gtk_label_new_with_mnemonic (_("Toolbar _button labels:"));
-	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0);
-
-	store = gtk_list_store_new (3, G_TYPE_STRING, EGG_TYPE_TB_MODEL_FLAGS,
-				    G_TYPE_BOOLEAN);
-
-	for (i = 0; i < G_N_ELEMENTS (toolbar_styles); i++)
-	{
-		const char *text = toolbar_styles[i].text;
-		const char *tr_text = NULL;
-
-		if (text != NULL)
-		{
-			tr_text = g_dpgettext2 (NULL, "toolbar style", text);
-		}
-
-		gtk_list_store_append (store, &iter);
-		gtk_list_store_set (store, &iter,
-				    COL_TEXT, tr_text,
-				    COL_FLAGS, toolbar_styles[i].flags,
-				    COL_IS_SEP, toolbar_styles[i].text == NULL,
-				    -1);
-	}
-
-	combo = gtk_combo_box_new_with_model (GTK_TREE_MODEL (store));
-	g_object_unref (store);
-
-	renderer = gtk_cell_renderer_text_new ();
-	gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), renderer, TRUE);
-	gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo), renderer,
-					"text", COL_TEXT, NULL);
-	gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (combo),
-					      (GtkTreeViewRowSeparatorFunc) row_is_separator,
-					      NULL, NULL);
-
-	gtk_box_pack_start (GTK_BOX (hbox), combo, FALSE, FALSE, 0);
-	gtk_label_set_mnemonic_widget (GTK_LABEL (label), combo);
-	gtk_widget_show_all (hbox);
-
-	/* get active from pref */
-	pref = g_settings_get_string (EPHY_SETTINGS_UI,
-				      EPHY_PREFS_UI_TOOLBAR_STYLE);
-	if (pref != NULL)
-	{
-		flags_class = g_type_class_ref (EGG_TYPE_TB_MODEL_FLAGS);
-		value = g_flags_get_value_by_nick (flags_class, pref);
-		if (value != NULL)
-		{
-			flags = value->value;
-		}
-		g_type_class_unref (flags_class);
-	}
-	g_free (pref);
-
-	/* this will set i to 0 if the style is unknown or default */
-	for (i = G_N_ELEMENTS (toolbar_styles) - 1; i > 0; i--)
-	{
-		if (flags & toolbar_styles[i].flags) break;
-	}
-
-	gtk_combo_box_set_active (GTK_COMBO_BOX (combo), i);
-	g_signal_connect (combo, "changed",
-			G_CALLBACK (combo_changed_cb), store);
-
-	gtk_dialog_add_button (GTK_DIALOG (dialog),
-			       _("_Add a New Toolbar"), RESPONSE_ADD_TOOLBAR);
-	gtk_dialog_add_button (GTK_DIALOG (dialog),
-			       GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
-	gtk_dialog_add_button (GTK_DIALOG (dialog),
-			       GTK_STOCK_HELP, GTK_RESPONSE_HELP);
-	gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE);
-
-	gtk_widget_show (editor);
-	
-	ephy_state_add_window (dialog, "toolbar_editor",
-			       500, 330, FALSE,
-			       EPHY_STATE_WINDOW_SAVE_SIZE);
-	gtk_widget_show (dialog);
-
-	egg_editable_toolbar_set_edit_mode (EGG_EDITABLE_TOOLBAR (toolbar), TRUE);
-
-	return object;
-}
-
-static void
-ephy_toolbar_editor_finalize (GObject *object)
-{
-	EphyToolbarEditor *editor = EPHY_TOOLBAR_EDITOR (object);
-	EphyToolbarEditorPrivate *priv = editor->priv;
-
-	egg_editable_toolbar_set_edit_mode (EGG_EDITABLE_TOOLBAR
-		(ephy_window_get_toolbar (priv->window)), FALSE);
-
-	g_object_set_data (G_OBJECT (priv->window), DATA_KEY, NULL);
-
-	G_OBJECT_CLASS (ephy_toolbar_editor_parent_class)->finalize (object);
-}
-
-static void
-ephy_toolbar_editor_get_property (GObject *object,
-				  guint prop_id,
-				  GValue *value,
-				  GParamSpec *pspec)
-{
-	/* no readable properties */
-	g_assert_not_reached ();
-}
-
-static void
-ephy_toolbar_editor_set_property (GObject *object,
-				  guint prop_id,
-				  const GValue *value,
-				  GParamSpec *pspec)
-{
-	EphyToolbarEditorPrivate *priv = EPHY_TOOLBAR_EDITOR (object)->priv;
-
-	switch (prop_id)
-	{
-		case PROP_WINDOW:
-			priv->window = g_value_get_object (value);
-			break;
-	}
-}
-
-static void
-ephy_toolbar_editor_class_init (EphyToolbarEditorClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-	GtkDialogClass *dialog_class = GTK_DIALOG_CLASS (klass);
-
-	object_class->constructor = ephy_toolbar_editor_constructor;
-	object_class->finalize = ephy_toolbar_editor_finalize;
-	object_class->get_property = ephy_toolbar_editor_get_property;
-	object_class->set_property = ephy_toolbar_editor_set_property;
-
-	dialog_class->response = ephy_toolbar_editor_response;
-
-	g_object_class_install_property (object_class,
-					 PROP_WINDOW,
-					 g_param_spec_object ("window",
-							      "Window",
-							      "Parent window",
-							      EPHY_TYPE_WINDOW,
-							      G_PARAM_WRITABLE | G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB |
-							      G_PARAM_CONSTRUCT_ONLY));
-
-	g_type_class_add_private (object_class, sizeof (EphyToolbarEditorPrivate));
-}
-
-GtkWidget *
-ephy_toolbar_editor_show (EphyWindow *window)
-{
-	GtkWidget *dialog;
-
-	dialog = GTK_WIDGET (g_object_get_data (G_OBJECT (window), DATA_KEY));
-	if (dialog == NULL)
-	{
-		dialog = g_object_new (EPHY_TYPE_TOOLBAR_EDITOR,
-				       "window", window,
-				       NULL);
-
-		g_object_set_data (G_OBJECT (window), DATA_KEY, dialog);
-	}
-		
-	gtk_window_present (GTK_WINDOW (dialog));
-
-	return dialog;
-}
diff --git a/src/ephy-toolbar-editor.h b/src/ephy-toolbar-editor.h
deleted file mode 100644
index 59a425ec5..000000000
--- a/src/ephy-toolbar-editor.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- *  Copyright © 2000-2004 Marco Pesenti Gritti
- *  Copyright © 2003-2005 Christian Persch
- *
- *  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 of the License, 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.
- *
- */
-
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
-#ifndef EPHY_TOOLBAR_EDITOR_H
-#define EPHY_TOOLBAR_EDITOR_H
-
-#include <gtk/gtk.h>
-#include "ephy-window.h"
-
-G_BEGIN_DECLS
-
-#define EPHY_TYPE_TOOLBAR_EDITOR         (ephy_toolbar_editor_get_type ())
-#define EPHY_TOOLBAR_EDITOR(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_TOOLBAR_EDITOR, EphyToolbarEditor))
-#define EPHY_TOOLBAR_EDITOR_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_TOOLBAR_EDITOR, EphyToolbarEditorClass))
-#define EPHY_IS_TOOLBAR_EDITOR(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_TOOLBAR_EDITOR))
-#define EPHY_IS_TOOLBAR_EDITOR_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_TOOLBAR_EDITOR))
-#define EPHY_TOOLBAR_EDITOR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_TOOLBAR_EDITOR, EphyToolbarEditorClass))
-
-typedef struct _EphyToolbarEditor		EphyToolbarEditor;
-typedef struct _EphyToolbarEditorPrivate	EphyToolbarEditorPrivate;
-typedef struct _EphyToolbarEditorClass		EphyToolbarEditorClass;
-
-struct _EphyToolbarEditor
-{
-	GtkDialog parent_instance;
-
-	/*< private >*/
-	EphyToolbarEditorPrivate *priv;
-};
-
-struct _EphyToolbarEditorClass
-{
-	GtkDialogClass parent_class;
-};
-
-GType		ephy_toolbar_editor_get_type	(void);
-
-GtkWidget      *ephy_toolbar_editor_show	(EphyWindow *window);
-
-G_END_DECLS
-
-#endif /* !EPHY_TOOLBAR_EDITOR_H */
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 151862439..3dcf58f47 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -189,9 +189,6 @@ static const GtkActionEntry ephy_menu_entries [] = {
 
 	/* View menu */
 
-	{ "ViewToolbarEditor", NULL, N_("_Customize Toolbars…"), NULL,
-	  N_("Customize toolbars"),
-	  G_CALLBACK (window_cmd_edit_toolbar) },
 	{ "ViewStop", GTK_STOCK_STOP, N_("_Stop"), "Escape",
 	  N_("Stop current data transfer"),
 	  G_CALLBACK (window_cmd_view_stop) },
@@ -810,7 +807,6 @@ sync_chromes_visibility (EphyWindow *window)
 {
 	EphyWindowPrivate *priv = window->priv;
 	GtkWidget *menubar;
-	GtkAction *action;
 	gboolean show_menubar, show_toolbar, show_tabsbar;
 
 	if (priv->closing) return;
@@ -826,19 +822,6 @@ sync_chromes_visibility (EphyWindow *window)
 	g_object_set (priv->toolbar, "visible", show_toolbar, NULL);
 
 	ephy_notebook_set_show_tabs (EPHY_NOTEBOOK (priv->notebook), show_tabsbar);
-
-	action = gtk_action_group_get_action (priv->action_group, "ViewToolbarEditor");
-
-	if (priv->fullscreen_popup != NULL)
-	{
-		g_object_set (priv->fullscreen_popup, "visible", !show_toolbar, NULL);
-
-		ephy_action_change_sensitivity_flags (action, SENS_FLAG_CHROME, TRUE);
-	}
-	else
-	{
-		ephy_action_change_sensitivity_flags (action, SENS_FLAG_CHROME, !show_toolbar);
-	}
 }
 
 static void
diff --git a/src/window-commands.c b/src/window-commands.c
index 04a115e77..e066997d1 100644
--- a/src/window-commands.c
+++ b/src/window-commands.c
@@ -43,7 +43,6 @@
 #include "ephy-gui.h"
 #include "ephy-zoom.h"
 #include "ephy-notebook.h"
-#include "ephy-toolbar-editor.h"
 #include "ephy-find-toolbar.h"
 #include "ephy-location-entry.h"
 #include "ephy-bookmarks-ui.h"
@@ -1223,13 +1222,6 @@ window_cmd_edit_prefs (GtkAction *action,
 }
 
 void
-window_cmd_edit_toolbar (GtkAction *action,
-			 EphyWindow *window)
-{
-	ephy_toolbar_editor_show (window);
-}
-
-void
 window_cmd_help_contents (GtkAction *action,
 			 EphyWindow *window)
 {