Add a Toolbar Editor extension
This commit is contained in:
Enrico Tröger
Christian Dywan
parent
313e0f9e35
commit
4df46b1266
2 changed files with 544 additions and 0 deletions
543
extensions/toolbar-editor.c
Normal file
543
extensions/toolbar-editor.c
Normal file
|
|
@ -0,0 +1,543 @@
|
||||||
|
/*
|
||||||
|
Copyright (C) 2009 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
|
||||||
|
|
||||||
|
This library is free software; you can redistribute it and/or
|
||||||
|
modify it under the terms of the GNU Lesser General Public
|
||||||
|
License as published by the Free Software Foundation; either
|
||||||
|
version 2.1 of the License, or (at your option) any later version.
|
||||||
|
|
||||||
|
See the file COPYING for the full license text.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <midori/midori.h>
|
||||||
|
|
||||||
|
#include "config.h"
|
||||||
|
|
||||||
|
#if !HAVE_HILDON
|
||||||
|
|
||||||
|
typedef struct
|
||||||
|
{
|
||||||
|
GtkWidget *dialog;
|
||||||
|
|
||||||
|
GtkTreeView *tree_available;
|
||||||
|
GtkTreeView *tree_used;
|
||||||
|
|
||||||
|
GtkListStore *store_available;
|
||||||
|
GtkListStore *store_used;
|
||||||
|
|
||||||
|
GtkTreePath *last_drag_path;
|
||||||
|
GtkTreeViewDropPosition last_drag_pos;
|
||||||
|
|
||||||
|
GtkWidget *drag_source;
|
||||||
|
} TBEditorWidget;
|
||||||
|
|
||||||
|
static const GtkTargetEntry tb_editor_dnd_targets[] =
|
||||||
|
{
|
||||||
|
{ "MIDORI_TB_EDITOR_ROW", 0, 0 }
|
||||||
|
};
|
||||||
|
static const gint tb_editor_dnd_targets_len = G_N_ELEMENTS(tb_editor_dnd_targets);
|
||||||
|
|
||||||
|
|
||||||
|
static void tb_editor_app_add_browser_cb(MidoriApp *app, MidoriBrowser *browser, MidoriExtension *ext);
|
||||||
|
|
||||||
|
|
||||||
|
static void tb_editor_deactivate_cb(MidoriExtension *extension, GtkWidget *menuitem)
|
||||||
|
{
|
||||||
|
MidoriApp *app = midori_extension_get_app(extension);
|
||||||
|
|
||||||
|
gtk_widget_destroy(menuitem);
|
||||||
|
g_signal_handlers_disconnect_by_func(extension, tb_editor_deactivate_cb, menuitem);
|
||||||
|
g_signal_handlers_disconnect_by_func(app, tb_editor_app_add_browser_cb, extension);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static GSList *tb_editor_array_to_list(const gchar **items)
|
||||||
|
{
|
||||||
|
const gchar **name;
|
||||||
|
GSList *list = NULL;
|
||||||
|
|
||||||
|
name = items;
|
||||||
|
while (*name != NULL)
|
||||||
|
{
|
||||||
|
if (*name[0] != '\0')
|
||||||
|
list = g_slist_append(list, g_strdup(*name));
|
||||||
|
name++;
|
||||||
|
}
|
||||||
|
|
||||||
|
return list;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static GSList *tb_editor_parse_active_items(MidoriBrowser *browser)
|
||||||
|
{
|
||||||
|
gchar *items;
|
||||||
|
gchar **names;
|
||||||
|
GSList *list = NULL;
|
||||||
|
MidoriWebSettings *settings;
|
||||||
|
|
||||||
|
settings = katze_object_get_object(browser, "settings");
|
||||||
|
g_object_get(settings, "toolbar-items", &items, NULL);
|
||||||
|
g_object_unref(settings);
|
||||||
|
|
||||||
|
names = g_strsplit(items ? items : "", ",", 0);
|
||||||
|
list = tb_editor_array_to_list((const gchar **) names);
|
||||||
|
|
||||||
|
g_strfreev(names);
|
||||||
|
g_free(items);
|
||||||
|
|
||||||
|
return list;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static GSList *tb_editor_get_available_actions(MidoriBrowser *browser)
|
||||||
|
{
|
||||||
|
GSList *list = NULL;
|
||||||
|
|
||||||
|
list = tb_editor_array_to_list(midori_browser_get_toolbar_actions(browser));
|
||||||
|
|
||||||
|
return list;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static void tb_editor_scroll_to_iter(GtkTreeView *treeview, GtkTreeIter *iter)
|
||||||
|
{
|
||||||
|
GtkTreePath *path = gtk_tree_model_get_path(gtk_tree_view_get_model(treeview), iter);
|
||||||
|
gtk_tree_view_scroll_to_cell(treeview, path, NULL, TRUE, 0.5, 0.0);
|
||||||
|
gtk_tree_path_free(path);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static void tb_editor_free_path(TBEditorWidget *tbw)
|
||||||
|
{
|
||||||
|
if (tbw->last_drag_path != NULL)
|
||||||
|
{
|
||||||
|
gtk_tree_path_free(tbw->last_drag_path);
|
||||||
|
tbw->last_drag_path = NULL;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static void tb_editor_btn_remove_clicked_cb(GtkWidget *button, TBEditorWidget *tbw)
|
||||||
|
{
|
||||||
|
GtkTreeModel *model_used;
|
||||||
|
GtkTreeSelection *selection_used;
|
||||||
|
GtkTreeIter iter_used, iter_new;
|
||||||
|
gchar *action_name;
|
||||||
|
|
||||||
|
selection_used = gtk_tree_view_get_selection(tbw->tree_used);
|
||||||
|
if (gtk_tree_selection_get_selected(selection_used, &model_used, &iter_used))
|
||||||
|
{
|
||||||
|
gtk_tree_model_get(model_used, &iter_used, 0, &action_name, -1);
|
||||||
|
if (g_strcmp0(action_name, "Location") != 0)
|
||||||
|
{
|
||||||
|
if (gtk_list_store_remove(tbw->store_used, &iter_used))
|
||||||
|
gtk_tree_selection_select_iter(selection_used, &iter_used);
|
||||||
|
|
||||||
|
if (g_strcmp0(action_name, "Separator") != 0)
|
||||||
|
{
|
||||||
|
gtk_list_store_insert_with_values(tbw->store_available, &iter_new,
|
||||||
|
-1, 0, action_name, -1);
|
||||||
|
tb_editor_scroll_to_iter(tbw->tree_available, &iter_new);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
g_free(action_name);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static void tb_editor_btn_add_clicked_cb(GtkWidget *button, TBEditorWidget *tbw)
|
||||||
|
{
|
||||||
|
GtkTreeModel *model_available;
|
||||||
|
GtkTreeSelection *selection_available, *selection_used;
|
||||||
|
GtkTreeIter iter_available, iter_new, iter_selected;
|
||||||
|
gchar *action_name;
|
||||||
|
|
||||||
|
selection_available = gtk_tree_view_get_selection(tbw->tree_available);
|
||||||
|
if (gtk_tree_selection_get_selected(selection_available, &model_available, &iter_available))
|
||||||
|
{
|
||||||
|
gtk_tree_model_get(model_available, &iter_available, 0, &action_name, -1);
|
||||||
|
if (g_strcmp0(action_name, "Separator") != 0)
|
||||||
|
{
|
||||||
|
if (gtk_list_store_remove(tbw->store_available, &iter_available))
|
||||||
|
gtk_tree_selection_select_iter(selection_available, &iter_available);
|
||||||
|
}
|
||||||
|
|
||||||
|
selection_used = gtk_tree_view_get_selection(tbw->tree_used);
|
||||||
|
if (gtk_tree_selection_get_selected(selection_used, NULL, &iter_selected))
|
||||||
|
{
|
||||||
|
gtk_list_store_insert_before(tbw->store_used, &iter_new, &iter_selected);
|
||||||
|
gtk_list_store_set(tbw->store_used, &iter_new, 0, action_name, -1);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
gtk_list_store_insert_with_values(tbw->store_used, &iter_new, -1, 0, action_name, -1);
|
||||||
|
|
||||||
|
tb_editor_scroll_to_iter(tbw->tree_used, &iter_new);
|
||||||
|
|
||||||
|
g_free(action_name);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static gboolean tb_editor_drag_motion_cb(GtkWidget *widget, GdkDragContext *drag_context,
|
||||||
|
gint x, gint y, guint ltime, TBEditorWidget *tbw)
|
||||||
|
{
|
||||||
|
if (tbw->last_drag_path != NULL)
|
||||||
|
gtk_tree_path_free(tbw->last_drag_path);
|
||||||
|
gtk_tree_view_get_drag_dest_row(GTK_TREE_VIEW(widget),
|
||||||
|
&(tbw->last_drag_path), &(tbw->last_drag_pos));
|
||||||
|
|
||||||
|
return FALSE;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static void tb_editor_drag_data_get_cb(GtkWidget *widget, GdkDragContext *context,
|
||||||
|
GtkSelectionData *data, guint info, guint ltime,
|
||||||
|
TBEditorWidget *tbw)
|
||||||
|
{
|
||||||
|
GtkTreeIter iter;
|
||||||
|
GtkTreeSelection *selection;
|
||||||
|
GtkTreeModel *model;
|
||||||
|
GdkAtom atom;
|
||||||
|
gchar *name;
|
||||||
|
|
||||||
|
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(widget));
|
||||||
|
if (! gtk_tree_selection_get_selected(selection, &model, &iter))
|
||||||
|
return;
|
||||||
|
|
||||||
|
gtk_tree_model_get(model, &iter, 0, &name, -1);
|
||||||
|
if (name == NULL || *name == '\0')
|
||||||
|
{
|
||||||
|
g_free(name);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
atom = gdk_atom_intern(tb_editor_dnd_targets[0].target, FALSE);
|
||||||
|
gtk_selection_data_set(data, atom, 8, (guchar*) name, strlen(name));
|
||||||
|
|
||||||
|
g_free(name);
|
||||||
|
|
||||||
|
tbw->drag_source = widget;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static void tb_editor_drag_data_rcvd_cb(GtkWidget *widget, GdkDragContext *context,
|
||||||
|
gint x, gint y, GtkSelectionData *data, guint info,
|
||||||
|
guint ltime, TBEditorWidget *tbw)
|
||||||
|
{
|
||||||
|
GtkTreeView *tree = GTK_TREE_VIEW(widget);
|
||||||
|
gboolean del = FALSE;
|
||||||
|
|
||||||
|
if (data->length >= 0 && data->format == 8)
|
||||||
|
{
|
||||||
|
gboolean is_sep;
|
||||||
|
gchar *text = NULL;
|
||||||
|
|
||||||
|
text = (gchar*) data->data;
|
||||||
|
|
||||||
|
/* We allow re-ordering the Location item but not removing it from the list. */
|
||||||
|
if (g_strcmp0(text, "Location") == 0 && widget != tbw->drag_source)
|
||||||
|
return;
|
||||||
|
|
||||||
|
is_sep = (g_strcmp0(text, "Separator") == 0);
|
||||||
|
/* If the source of the action is equal to the target, we do just re-order and so need
|
||||||
|
* to delete the separator to get it moved, not just copied. */
|
||||||
|
if (is_sep && widget == tbw->drag_source)
|
||||||
|
is_sep = FALSE;
|
||||||
|
|
||||||
|
if (tree != tbw->tree_available || ! is_sep)
|
||||||
|
{
|
||||||
|
GtkTreeIter iter, iter_before, *iter_before_ptr;
|
||||||
|
GtkListStore *store = GTK_LIST_STORE(gtk_tree_view_get_model(tree));
|
||||||
|
|
||||||
|
if (tbw->last_drag_path != NULL)
|
||||||
|
{
|
||||||
|
gtk_tree_model_get_iter(GTK_TREE_MODEL(store), &iter_before, tbw->last_drag_path);
|
||||||
|
|
||||||
|
if (gtk_list_store_iter_is_valid(store, &iter_before))
|
||||||
|
iter_before_ptr = &iter_before;
|
||||||
|
else
|
||||||
|
iter_before_ptr = NULL;
|
||||||
|
|
||||||
|
if (tbw->last_drag_pos == GTK_TREE_VIEW_DROP_BEFORE ||
|
||||||
|
tbw->last_drag_pos == GTK_TREE_VIEW_DROP_INTO_OR_BEFORE)
|
||||||
|
gtk_list_store_insert_before(store, &iter, iter_before_ptr);
|
||||||
|
else
|
||||||
|
gtk_list_store_insert_after(store, &iter, iter_before_ptr);
|
||||||
|
|
||||||
|
gtk_list_store_set(store, &iter, 0, text, -1);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
gtk_list_store_insert_with_values(store, &iter, -1, 0, text, -1);
|
||||||
|
|
||||||
|
tb_editor_scroll_to_iter(tree, &iter);
|
||||||
|
}
|
||||||
|
if (tree != tbw->tree_used || ! is_sep)
|
||||||
|
del = TRUE;
|
||||||
|
}
|
||||||
|
|
||||||
|
tbw->drag_source = NULL; /* reset the value just to be sure */
|
||||||
|
tb_editor_free_path(tbw);
|
||||||
|
gtk_drag_finish(context, TRUE, del, ltime);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static TBEditorWidget *tb_editor_create_dialog(MidoriBrowser *parent)
|
||||||
|
{
|
||||||
|
GtkWidget *dialog, *vbox, *hbox, *vbox_buttons, *button_add, *button_remove;
|
||||||
|
GtkWidget *swin_available, *swin_used, *tree_available, *tree_used, *label;
|
||||||
|
GtkCellRenderer *text_renderer;
|
||||||
|
GtkTreeViewColumn *column;
|
||||||
|
TBEditorWidget *tbw = g_new(TBEditorWidget, 1);
|
||||||
|
|
||||||
|
dialog = gtk_dialog_new_with_buttons(_("Customize Toolbar"),
|
||||||
|
GTK_WINDOW(parent),
|
||||||
|
GTK_DIALOG_DESTROY_WITH_PARENT,
|
||||||
|
GTK_STOCK_APPLY, GTK_RESPONSE_APPLY,
|
||||||
|
GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL);
|
||||||
|
vbox = (GTK_DIALOG(dialog))->vbox;
|
||||||
|
gtk_box_set_spacing(GTK_BOX(vbox), 6);
|
||||||
|
gtk_widget_set_name(dialog, "GeanyDialog");
|
||||||
|
gtk_window_set_default_size(GTK_WINDOW(dialog), -1, 400);
|
||||||
|
gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_CLOSE);
|
||||||
|
|
||||||
|
/* TODO display labels instead of action names in the treeviews */
|
||||||
|
tbw->store_available = gtk_list_store_new(1, G_TYPE_STRING);
|
||||||
|
tbw->store_used = gtk_list_store_new(1, G_TYPE_STRING);
|
||||||
|
|
||||||
|
label = gtk_label_new(
|
||||||
|
_("Select items to be displayed on the toolbar. Items can be reodered by drag and drop."));
|
||||||
|
gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
|
||||||
|
|
||||||
|
tree_available = gtk_tree_view_new();
|
||||||
|
gtk_tree_view_set_model(GTK_TREE_VIEW(tree_available), GTK_TREE_MODEL(tbw->store_available));
|
||||||
|
gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(tree_available), TRUE);
|
||||||
|
gtk_tree_sortable_set_sort_column_id(
|
||||||
|
GTK_TREE_SORTABLE(tbw->store_available), 0, GTK_SORT_ASCENDING);
|
||||||
|
|
||||||
|
text_renderer = gtk_cell_renderer_text_new();
|
||||||
|
column = gtk_tree_view_column_new_with_attributes(
|
||||||
|
_("Available Items"), text_renderer, "text", 0, NULL);
|
||||||
|
gtk_tree_view_append_column(GTK_TREE_VIEW(tree_available), column);
|
||||||
|
|
||||||
|
swin_available = gtk_scrolled_window_new(NULL, NULL);
|
||||||
|
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(swin_available),
|
||||||
|
GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
|
||||||
|
gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(swin_available), GTK_SHADOW_ETCHED_IN);
|
||||||
|
gtk_container_add(GTK_CONTAINER(swin_available), tree_available);
|
||||||
|
|
||||||
|
tree_used = gtk_tree_view_new();
|
||||||
|
gtk_tree_view_set_model(GTK_TREE_VIEW(tree_used), GTK_TREE_MODEL(tbw->store_used));
|
||||||
|
gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(tree_used), TRUE);
|
||||||
|
gtk_tree_view_set_reorderable(GTK_TREE_VIEW(tree_used), TRUE);
|
||||||
|
|
||||||
|
text_renderer = gtk_cell_renderer_text_new();
|
||||||
|
column = gtk_tree_view_column_new_with_attributes(
|
||||||
|
_("Displayed Items"), text_renderer, "text", 0, NULL);
|
||||||
|
gtk_tree_view_append_column(GTK_TREE_VIEW(tree_used), column);
|
||||||
|
|
||||||
|
swin_used = gtk_scrolled_window_new(NULL, NULL);
|
||||||
|
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(swin_used),
|
||||||
|
GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
|
||||||
|
gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(swin_used), GTK_SHADOW_ETCHED_IN);
|
||||||
|
gtk_container_add(GTK_CONTAINER(swin_used), tree_used);
|
||||||
|
|
||||||
|
/* drag'n'drop */
|
||||||
|
gtk_tree_view_enable_model_drag_source(GTK_TREE_VIEW(tree_available), GDK_BUTTON1_MASK,
|
||||||
|
tb_editor_dnd_targets, tb_editor_dnd_targets_len, GDK_ACTION_MOVE);
|
||||||
|
gtk_tree_view_enable_model_drag_dest(GTK_TREE_VIEW(tree_available),
|
||||||
|
tb_editor_dnd_targets, tb_editor_dnd_targets_len, GDK_ACTION_MOVE);
|
||||||
|
g_signal_connect(tree_available, "drag-data-get",
|
||||||
|
G_CALLBACK(tb_editor_drag_data_get_cb), tbw);
|
||||||
|
g_signal_connect(tree_available, "drag-data-received",
|
||||||
|
G_CALLBACK(tb_editor_drag_data_rcvd_cb), tbw);
|
||||||
|
g_signal_connect(tree_available, "drag-motion",
|
||||||
|
G_CALLBACK(tb_editor_drag_motion_cb), tbw);
|
||||||
|
|
||||||
|
gtk_tree_view_enable_model_drag_source(GTK_TREE_VIEW(tree_used), GDK_BUTTON1_MASK,
|
||||||
|
tb_editor_dnd_targets, tb_editor_dnd_targets_len, GDK_ACTION_MOVE);
|
||||||
|
gtk_tree_view_enable_model_drag_dest(GTK_TREE_VIEW(tree_used),
|
||||||
|
tb_editor_dnd_targets, tb_editor_dnd_targets_len, GDK_ACTION_MOVE);
|
||||||
|
g_signal_connect(tree_used, "drag-data-get",
|
||||||
|
G_CALLBACK(tb_editor_drag_data_get_cb), tbw);
|
||||||
|
g_signal_connect(tree_used, "drag-data-received",
|
||||||
|
G_CALLBACK(tb_editor_drag_data_rcvd_cb), tbw);
|
||||||
|
g_signal_connect(tree_used, "drag-motion",
|
||||||
|
G_CALLBACK(tb_editor_drag_motion_cb), tbw);
|
||||||
|
|
||||||
|
|
||||||
|
button_add = gtk_button_new();
|
||||||
|
gtk_button_set_image(GTK_BUTTON(button_add),
|
||||||
|
gtk_image_new_from_stock(GTK_STOCK_GO_FORWARD, GTK_ICON_SIZE_BUTTON));
|
||||||
|
button_remove = gtk_button_new();
|
||||||
|
g_signal_connect(button_add, "clicked", G_CALLBACK(tb_editor_btn_add_clicked_cb), tbw);
|
||||||
|
gtk_button_set_image(GTK_BUTTON(button_remove),
|
||||||
|
gtk_image_new_from_stock(GTK_STOCK_GO_BACK, GTK_ICON_SIZE_BUTTON));
|
||||||
|
g_signal_connect(button_remove, "clicked", G_CALLBACK(tb_editor_btn_remove_clicked_cb), tbw);
|
||||||
|
|
||||||
|
vbox_buttons = gtk_vbox_new(FALSE, 6);
|
||||||
|
/* FIXME this is a little hack'ish, any better ideas? */
|
||||||
|
gtk_box_pack_start(GTK_BOX(vbox_buttons), gtk_label_new(""), TRUE, TRUE, 0);
|
||||||
|
gtk_box_pack_start(GTK_BOX(vbox_buttons), button_add, FALSE, FALSE, 0);
|
||||||
|
gtk_box_pack_start(GTK_BOX(vbox_buttons), button_remove, FALSE, FALSE, 0);
|
||||||
|
gtk_box_pack_start(GTK_BOX(vbox_buttons), gtk_label_new(""), TRUE, TRUE, 0);
|
||||||
|
|
||||||
|
hbox = gtk_hbox_new(FALSE, 6);
|
||||||
|
gtk_box_pack_start(GTK_BOX(hbox), swin_available, TRUE, TRUE, 0);
|
||||||
|
gtk_box_pack_start(GTK_BOX(hbox), vbox_buttons, FALSE, FALSE, 0);
|
||||||
|
gtk_box_pack_start(GTK_BOX(hbox), swin_used, TRUE, TRUE, 0);
|
||||||
|
|
||||||
|
gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 6);
|
||||||
|
gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0);
|
||||||
|
|
||||||
|
gtk_widget_show_all(vbox);
|
||||||
|
|
||||||
|
g_object_unref(tbw->store_available);
|
||||||
|
g_object_unref(tbw->store_used);
|
||||||
|
|
||||||
|
tbw->dialog = dialog;
|
||||||
|
tbw->tree_available = GTK_TREE_VIEW(tree_available);
|
||||||
|
tbw->tree_used = GTK_TREE_VIEW(tree_used);
|
||||||
|
|
||||||
|
tbw->last_drag_path = NULL;
|
||||||
|
|
||||||
|
return tbw;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static gboolean tb_editor_foreach_used(GtkTreeModel *model, GtkTreePath *path,
|
||||||
|
GtkTreeIter *iter, gpointer data)
|
||||||
|
{
|
||||||
|
gchar *action_name;
|
||||||
|
|
||||||
|
gtk_tree_model_get(model, iter, 0, &action_name, -1);
|
||||||
|
|
||||||
|
if (action_name != NULL && *action_name != '\0')
|
||||||
|
{
|
||||||
|
g_string_append(data, action_name);
|
||||||
|
g_string_append_c(data, ',');
|
||||||
|
}
|
||||||
|
|
||||||
|
g_free(action_name);
|
||||||
|
return FALSE;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static void tb_editor_update_toolbar(TBEditorWidget *tbw, MidoriBrowser *browser)
|
||||||
|
{
|
||||||
|
MidoriWebSettings *settings;
|
||||||
|
GString *str = g_string_new(NULL);
|
||||||
|
|
||||||
|
gtk_tree_model_foreach(GTK_TREE_MODEL(tbw->store_used), tb_editor_foreach_used, str);
|
||||||
|
|
||||||
|
settings = katze_object_get_object(browser, "settings");
|
||||||
|
g_object_set(settings, "toolbar-items", str->str, NULL);
|
||||||
|
g_object_unref(settings);
|
||||||
|
|
||||||
|
g_string_free(str, TRUE);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static void tb_editor_menu_configure_toolbar_activate_cb(GtkWidget *menuitem, MidoriBrowser *browser)
|
||||||
|
{
|
||||||
|
GSList *node, *used_items, *all_items;
|
||||||
|
GtkTreePath *path;
|
||||||
|
gint response;
|
||||||
|
TBEditorWidget *tbw;
|
||||||
|
|
||||||
|
/* read the current active toolbar items */
|
||||||
|
used_items = tb_editor_parse_active_items(browser);
|
||||||
|
|
||||||
|
/* get all available actions */
|
||||||
|
all_items = tb_editor_get_available_actions(browser);
|
||||||
|
|
||||||
|
/* create the GUI */
|
||||||
|
tbw = tb_editor_create_dialog(browser);
|
||||||
|
|
||||||
|
/* fill the stores */
|
||||||
|
for (node = all_items; node != NULL; node = node->next)
|
||||||
|
{
|
||||||
|
if (strcmp(node->data, "Separator") == 0 ||
|
||||||
|
g_slist_find_custom(used_items, node->data, (GCompareFunc) strcmp) == NULL)
|
||||||
|
{
|
||||||
|
gtk_list_store_insert_with_values(tbw->store_available, NULL, -1, 0, node->data, -1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for (node = used_items; node != NULL; node = node->next)
|
||||||
|
{
|
||||||
|
gtk_list_store_insert_with_values(tbw->store_used, NULL, -1, 0, node->data, -1);
|
||||||
|
}
|
||||||
|
/* select first item */
|
||||||
|
path = gtk_tree_path_new_from_string("0");
|
||||||
|
gtk_tree_selection_select_path(gtk_tree_view_get_selection(tbw->tree_used), path);
|
||||||
|
gtk_tree_path_free(path);
|
||||||
|
|
||||||
|
/* run it */
|
||||||
|
while ((response = gtk_dialog_run(GTK_DIALOG(tbw->dialog))))
|
||||||
|
{
|
||||||
|
tb_editor_update_toolbar(tbw, browser);
|
||||||
|
|
||||||
|
if (response == GTK_RESPONSE_CLOSE || response == GTK_RESPONSE_DELETE_EVENT)
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
gtk_widget_destroy(tbw->dialog);
|
||||||
|
|
||||||
|
g_slist_foreach(used_items, (GFunc) g_free, NULL);
|
||||||
|
g_slist_foreach(all_items, (GFunc) g_free, NULL);
|
||||||
|
g_slist_free(used_items);
|
||||||
|
g_slist_free(all_items);
|
||||||
|
tb_editor_free_path(tbw);
|
||||||
|
g_free(tbw);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static void tb_editor_app_add_browser_cb(MidoriApp *app, MidoriBrowser *browser, MidoriExtension *ext)
|
||||||
|
{
|
||||||
|
GtkWidget *panel;
|
||||||
|
GtkWidget *menu;
|
||||||
|
GtkWidget *menuitem;
|
||||||
|
|
||||||
|
panel = katze_object_get_object(browser, "panel");
|
||||||
|
menu = katze_object_get_object(panel, "menu");
|
||||||
|
g_object_unref(panel);
|
||||||
|
menuitem = gtk_menu_item_new_with_mnemonic(_("Configure _Toolbar..."));
|
||||||
|
g_signal_connect(menuitem, "activate",
|
||||||
|
G_CALLBACK(tb_editor_menu_configure_toolbar_activate_cb), browser);
|
||||||
|
gtk_widget_show(menuitem);
|
||||||
|
gtk_menu_shell_insert(GTK_MENU_SHELL (menu), menuitem, 3);
|
||||||
|
g_object_unref(menu);
|
||||||
|
|
||||||
|
g_signal_connect(ext, "deactivate", G_CALLBACK(tb_editor_deactivate_cb), menuitem);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static void tb_editor_activate_cb(MidoriExtension *extension, MidoriApp *app)
|
||||||
|
{
|
||||||
|
KatzeArray *browsers;
|
||||||
|
MidoriBrowser *browser;
|
||||||
|
guint i;
|
||||||
|
|
||||||
|
browsers = katze_object_get_object(app, "browsers");
|
||||||
|
i = 0;
|
||||||
|
while ((browser = katze_array_get_nth_item(browsers, i++)))
|
||||||
|
tb_editor_app_add_browser_cb(app, browser, extension);
|
||||||
|
g_signal_connect(app, "add-browser", G_CALLBACK(tb_editor_app_add_browser_cb), extension);
|
||||||
|
g_object_unref(browsers);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
MidoriExtension *extension_init(void)
|
||||||
|
{
|
||||||
|
MidoriExtension* extension = g_object_new(MIDORI_TYPE_EXTENSION,
|
||||||
|
"name", _("Toolbar Editor"),
|
||||||
|
"description", _("Easily edit the toolbar layout"),
|
||||||
|
"version", "0.1",
|
||||||
|
"authors", "Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>",
|
||||||
|
NULL);
|
||||||
|
|
||||||
|
g_signal_connect(extension, "activate", G_CALLBACK(tb_editor_activate_cb), NULL);
|
||||||
|
|
||||||
|
return extension;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
@ -41,3 +41,4 @@ extensions/page-holder.c
|
||||||
extensions/shortcuts.c
|
extensions/shortcuts.c
|
||||||
extensions/statusbar-features.c
|
extensions/statusbar-features.c
|
||||||
extensions/tab-panel.c
|
extensions/tab-panel.c
|
||||||
|
extensions/toolbar-editor.c
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue