aboutsummaryrefslogtreecommitdiffstats
path: root/src/bookmarks
diff options
context:
space:
mode:
Diffstat (limited to 'src/bookmarks')
-rw-r--r--src/bookmarks/Makefile.am2
-rw-r--r--src/bookmarks/ephy-bookmarks-editor.c13
-rw-r--r--src/bookmarks/ephy-bookmarks.c95
-rw-r--r--src/bookmarks/ephy-node-view.c27
-rw-r--r--src/bookmarks/ephy-node-view.h5
-rw-r--r--src/bookmarks/ephy-topic-action.c273
-rw-r--r--src/bookmarks/ephy-topic-action.h54
7 files changed, 388 insertions, 81 deletions
diff --git a/src/bookmarks/Makefile.am b/src/bookmarks/Makefile.am
index b0410e184..563329335 100644
--- a/src/bookmarks/Makefile.am
+++ b/src/bookmarks/Makefile.am
@@ -34,6 +34,8 @@ libephybookmarks_la_SOURCES = \
ephy-new-bookmark.h \
ephy-node-view.c \
ephy-node-view.h \
+ ephy-topic-action.c \
+ ephy-topic-action.h \
ephy-topics-selector.c \
ephy-topics-selector.h \
ephy-tree-model-node.c \
diff --git a/src/bookmarks/ephy-bookmarks-editor.c b/src/bookmarks/ephy-bookmarks-editor.c
index b4cc80a16..fdbba76c9 100644
--- a/src/bookmarks/ephy-bookmarks-editor.c
+++ b/src/bookmarks/ephy-bookmarks-editor.c
@@ -98,6 +98,12 @@ enum
RESPONSE_GO
};
+static GtkTargetEntry topic_drag_types [] =
+{
+ { EPHY_DND_TOPIC_TYPE, 0, 0 }
+};
+static int n_topic_drag_types = G_N_ELEMENTS (topic_drag_types);
+
static GObjectClass *parent_class = NULL;
static EggActionGroupEntry ephy_bookmark_popup_entries [] = {
@@ -618,7 +624,10 @@ ephy_bookmarks_editor_construct (EphyBookmarksEditor *editor)
/* Keywords View */
key_view = ephy_node_view_new (node, NULL);
- ephy_node_view_enable_drag_source (key_view);
+ ephy_node_view_enable_drag_source (key_view,
+ topic_drag_types,
+ n_topic_drag_types,
+ -1);
ephy_node_view_set_browse_mode (key_view);
ephy_node_view_add_column (key_view, _("Topics"),
EPHY_TREE_MODEL_NODE_COL_KEYWORD, TRUE, TRUE);
@@ -646,7 +655,7 @@ ephy_bookmarks_editor_construct (EphyBookmarksEditor *editor)
/* Bookmarks View */
bm_view = ephy_node_view_new (node, editor->priv->bookmarks_filter);
ephy_node_view_set_hinted (bm_view, TRUE);
- ephy_node_view_enable_drag_source (bm_view);
+ ephy_node_view_enable_drag_source (bm_view, NULL, 0, EPHY_NODE_BMK_PROP_LOCATION);
ephy_node_view_add_icon_column (bm_view, EPHY_TREE_MODEL_NODE_COL_ICON);
ephy_node_view_add_column (bm_view, _("Bookmarks"),
EPHY_TREE_MODEL_NODE_COL_BOOKMARK, TRUE, TRUE);
diff --git a/src/bookmarks/ephy-bookmarks.c b/src/bookmarks/ephy-bookmarks.c
index a5d978de4..7441057d3 100644
--- a/src/bookmarks/ephy-bookmarks.c
+++ b/src/bookmarks/ephy-bookmarks.c
@@ -38,8 +38,6 @@ struct EphyBookmarksPrivate
EphyNode *favorites;
EphyNode *lower_fav;
double lower_score;
- GHashTable *keywords_hash;
- GStaticRWLock *keywords_hash_lock;
};
static void
@@ -364,33 +362,6 @@ ephy_setup_history_notifiers (EphyBookmarks *eb)
}
static void
-keywords_added_cb (EphyNode *node,
- EphyNode *child,
- EphyBookmarks *eb)
-{
- g_static_rw_lock_writer_lock (eb->priv->keywords_hash_lock);
-
- g_hash_table_insert (eb->priv->keywords_hash,
- (char *) ephy_node_get_property_string (child, EPHY_NODE_KEYWORD_PROP_NAME),
- child);
-
- g_static_rw_lock_writer_unlock (eb->priv->keywords_hash_lock);
-}
-
-static void
-keywords_removed_cb (EphyNode *node,
- EphyNode *child,
- EphyBookmarks *eb)
-{
- g_static_rw_lock_writer_lock (eb->priv->keywords_hash_lock);
-
- g_hash_table_remove (eb->priv->keywords_hash,
- ephy_node_get_property_string (child, EPHY_NODE_KEYWORD_PROP_NAME));
-
- g_static_rw_lock_writer_unlock (eb->priv->keywords_hash_lock);
-}
-
-static void
bookmarks_changed_cb (EphyNode *node,
EphyNode *child,
EphyBookmarks *eb)
@@ -417,11 +388,6 @@ ephy_bookmarks_init (EphyBookmarks *eb)
"bookmarks.xml",
NULL);
- eb->priv->keywords_hash = g_hash_table_new (g_str_hash,
- g_str_equal);
- eb->priv->keywords_hash_lock = g_new0 (GStaticRWLock, 1);
- g_static_rw_lock_init (eb->priv->keywords_hash_lock);
-
/* Bookmarks */
eb->priv->bookmarks = ephy_node_new_with_id (BOOKMARKS_NODE_ID);
ephy_node_ref (eb->priv->bookmarks);
@@ -454,16 +420,6 @@ ephy_bookmarks_init (EphyBookmarks *eb)
ephy_node_add_child (eb->priv->keywords,
eb->priv->bookmarks);
- g_signal_connect_object (G_OBJECT (eb->priv->keywords),
- "child_added",
- G_CALLBACK (keywords_added_cb),
- G_OBJECT (eb),
- 0);
- g_signal_connect_object (G_OBJECT (eb->priv->keywords),
- "child_removed",
- G_CALLBACK (keywords_removed_cb),
- G_OBJECT (eb),
- 0);
/* Favorites */
eb->priv->favorites = ephy_node_new_with_id (FAVORITES_NODE_ID);
@@ -506,9 +462,6 @@ ephy_bookmarks_finalize (GObject *object)
ephy_node_unref (eb->priv->keywords);
ephy_node_unref (eb->priv->favorites);
- g_hash_table_destroy (eb->priv->keywords_hash);
- g_static_rw_lock_free (eb->priv->keywords_hash_lock);
-
g_free (eb->priv);
LOG ("Bookmarks finalized")
@@ -797,43 +750,35 @@ ephy_bookmarks_find_keyword (EphyBookmarks *eb,
gboolean partial_match)
{
EphyNode *node;
+ GPtrArray *children;
+ int i;
g_return_val_if_fail (name != NULL, NULL);
- if (!partial_match)
+
+ if (g_utf8_strlen (name, -1) == 0)
{
- g_static_rw_lock_reader_lock (eb->priv->keywords_hash_lock);
- node = g_hash_table_lookup (eb->priv->keywords_hash, name);
- g_static_rw_lock_reader_unlock (eb->priv->keywords_hash_lock);
+ LOG ("Empty name, no keyword matches.")
+ return NULL;
}
- else
- {
- GPtrArray *children;
- int i;
-
- if (g_utf8_strlen (name, -1) == 0)
- {
- LOG ("Empty name, no keyword matches.")
- return NULL;
- }
- children = ephy_node_get_children (eb->priv->keywords);
- node = NULL;
- for (i = 0; i < children->len; i++)
- {
- EphyNode *kid;
- const char *key;
+ children = ephy_node_get_children (eb->priv->keywords);
+ node = NULL;
+ for (i = 0; i < children->len; i++)
+ {
+ EphyNode *kid;
+ const char *key;
- kid = g_ptr_array_index (children, i);
- key = ephy_node_get_property_string (kid, EPHY_NODE_KEYWORD_PROP_NAME);
+ kid = g_ptr_array_index (children, i);
+ key = ephy_node_get_property_string (kid, EPHY_NODE_KEYWORD_PROP_NAME);
- if (g_str_has_prefix (key, name) > 0)
- {
- node = kid;
- }
- }
- ephy_node_thaw (eb->priv->keywords);
+ if ((partial_match && g_str_has_prefix (key, name) > 0) ||
+ (!partial_match && strcmp (key, name) == 0))
+ {
+ node = kid;
+ }
}
+ ephy_node_thaw (eb->priv->keywords);
return node;
}
diff --git a/src/bookmarks/ephy-node-view.c b/src/bookmarks/ephy-node-view.c
index 8d75d8a41..4270d58f2 100644
--- a/src/bookmarks/ephy-node-view.c
+++ b/src/bookmarks/ephy-node-view.c
@@ -718,12 +718,33 @@ ephy_node_view_select_node (EphyNodeView *view,
}
void
-ephy_node_view_enable_drag_source (EphyNodeView *view)
+ephy_node_view_enable_drag_source (EphyNodeView *view,
+ GtkTargetEntry *types,
+ int n_types,
+ guint prop_id)
{
+ GtkWidget *treeview;
+
g_return_if_fail (view != NULL);
- egg_tree_multi_drag_add_drag_support (GTK_TREE_VIEW (view->priv->treeview));
- ephy_dnd_enable_model_drag_source (GTK_WIDGET (view->priv->treeview));
+ treeview = view->priv->treeview;
+
+ egg_tree_multi_drag_add_drag_support (GTK_TREE_VIEW (treeview));
+
+ if (types == NULL)
+ {
+ ephy_dnd_enable_model_drag_source (GTK_WIDGET (treeview));
+ }
+ else
+ {
+ gtk_tree_view_enable_model_drag_source (GTK_TREE_VIEW (treeview),
+ GDK_BUTTON1_MASK,
+ types, n_types,
+ GDK_ACTION_COPY);
+ }
+
+ ephy_tree_model_sort_set_drag_property (EPHY_TREE_MODEL_SORT (view->priv->sortmodel),
+ prop_id);
}
void
diff --git a/src/bookmarks/ephy-node-view.h b/src/bookmarks/ephy-node-view.h
index 9055b914e..47b429cd7 100644
--- a/src/bookmarks/ephy-node-view.h
+++ b/src/bookmarks/ephy-node-view.h
@@ -79,7 +79,10 @@ void ephy_node_view_set_browse_mode (EphyNodeView *view);
void ephy_node_view_select_node (EphyNodeView *view,
EphyNode *node);
-void ephy_node_view_enable_drag_source (EphyNodeView *view);
+void ephy_node_view_enable_drag_source (EphyNodeView *view,
+ GtkTargetEntry *types,
+ int n_types,
+ guint prop_id);
void ephy_node_view_set_hinted (EphyNodeView *view,
gboolean hinted);
diff --git a/src/bookmarks/ephy-topic-action.c b/src/bookmarks/ephy-topic-action.c
new file mode 100644
index 000000000..a560817e4
--- /dev/null
+++ b/src/bookmarks/ephy-topic-action.c
@@ -0,0 +1,273 @@
+/*
+ * 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.
+ */
+
+#include "ephy-topic-action.h"
+#include "ephy-bookmarks.h"
+#include "ephy-shell.h"
+#include "eggtoolitem.h"
+#include "ephy-debug.h"
+
+static void ephy_topic_action_init (EphyTopicAction *action);
+static void ephy_topic_action_class_init (EphyTopicActionClass *class);
+
+struct EphyTopicActionPrivate
+{
+ int bookmark_id;
+};
+
+enum
+{
+ PROP_0,
+ PROP_BOOKMARK_ID
+};
+
+enum
+{
+ GO_LOCATION,
+ LAST_SIGNAL
+};
+
+static GObjectClass *parent_class = NULL;
+
+static guint ephy_topic_action_signals[LAST_SIGNAL] = { 0 };
+
+GType
+ephy_topic_action_get_type (void)
+{
+ static GType type = 0;
+
+ if (!type)
+ {
+ static const GTypeInfo type_info =
+ {
+ sizeof (EphyTopicActionClass),
+ (GBaseInitFunc) NULL,
+ (GBaseFinalizeFunc) NULL,
+ (GClassInitFunc) ephy_topic_action_class_init,
+ (GClassFinalizeFunc) NULL,
+ NULL,
+ sizeof (EphyTopicAction),
+ 0, /* n_preallocs */
+ (GInstanceInitFunc) ephy_topic_action_init,
+ };
+
+ type = g_type_register_static (EGG_TYPE_ACTION,
+ "EphyTopicAction",
+ &type_info, 0);
+ }
+ return type;
+}
+
+static GtkWidget *
+create_tool_item (EggAction *action)
+{
+ GtkWidget *item;
+ GtkWidget *button;
+ GtkWidget *hbox;
+ GtkWidget *label;
+
+ item = (* EGG_ACTION_CLASS (parent_class)->create_tool_item) (action);
+
+ hbox = gtk_hbox_new (FALSE, 0);
+ gtk_widget_show (hbox);
+ gtk_container_add (GTK_CONTAINER (item), hbox);
+
+ button = gtk_button_new ();
+ gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
+ gtk_widget_show (button);
+ gtk_container_add (GTK_CONTAINER (hbox), button);
+ g_object_set_data (G_OBJECT (item), "button", button);
+
+ hbox = gtk_hbox_new (FALSE, 0);
+ gtk_widget_show (hbox);
+ gtk_container_add (GTK_CONTAINER (button), hbox);
+
+ label = gtk_label_new (NULL);
+ gtk_widget_show (label);
+ gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
+ g_object_set_data (G_OBJECT (item), "label", label);
+
+ return item;
+}
+
+static void
+ephy_topic_action_sync_label (EggAction *action, GParamSpec *pspec, GtkWidget *proxy)
+{
+ GtkLabel *label;
+
+ LOG ("Set bookmark action proxy label to %s", action->label)
+
+ label = GTK_LABEL (g_object_get_data (G_OBJECT (proxy), "label"));
+ g_return_if_fail (label != NULL);
+
+ gtk_label_set_label (label, action->label);
+}
+
+static void
+button_press_cb (GtkWidget *button,
+ GdkEventButton *event,
+ EphyTopicAction *action)
+{
+/*
+ if (event->button == 3)
+ {
+ GtkWidget *menu;
+
+ menu = build_topics_menu (action);
+ gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, 1,
+ gtk_get_current_event_time ());
+ }
+*/
+}
+
+static void
+connect_proxy (EggAction *action, GtkWidget *proxy)
+{
+ GtkWidget *button;
+
+ (* EGG_ACTION_CLASS (parent_class)->connect_proxy) (action, proxy);
+
+ ephy_topic_action_sync_label (action, NULL, proxy);
+ g_signal_connect_object (action, "notify::label",
+ G_CALLBACK (ephy_topic_action_sync_label), proxy, 0);
+
+ button = GTK_WIDGET (g_object_get_data (G_OBJECT (proxy), "button"));
+ g_signal_connect (button, "button_press_event",
+ G_CALLBACK (button_press_cb), action);
+}
+
+static void
+ephy_topic_action_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ EphyTopicAction *bmk;
+
+ bmk = EPHY_TOPIC_ACTION (object);
+
+ switch (prop_id)
+ {
+ case PROP_BOOKMARK_ID:
+ bmk->priv->bookmark_id = g_value_get_int (value);
+ break;
+ }
+}
+
+static void
+ephy_topic_action_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ EphyTopicAction *bmk;
+
+ bmk = EPHY_TOPIC_ACTION (object);
+
+ switch (prop_id)
+ {
+ case PROP_BOOKMARK_ID:
+ g_value_set_boolean (value, bmk->priv->bookmark_id);
+ break;
+ }
+}
+
+static void
+ephy_topic_action_finalize (GObject *object)
+{
+ EphyTopicAction *eba;
+
+ g_return_if_fail (EPHY_IS_TOPIC_ACTION (object));
+
+ eba = EPHY_TOPIC_ACTION (object);
+
+ g_return_if_fail (eba->priv != NULL);
+
+ g_free (eba->priv);
+
+ LOG ("Bookmark action finalized")
+
+ G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+ephy_topic_action_class_init (EphyTopicActionClass *class)
+{
+ EggActionClass *action_class;
+ GObjectClass *object_class = G_OBJECT_CLASS (class);
+
+ parent_class = g_type_class_peek_parent (class);
+ action_class = EGG_ACTION_CLASS (class);
+
+ action_class->toolbar_item_type = EGG_TYPE_TOOL_ITEM;
+ action_class->create_tool_item = create_tool_item;
+ action_class->connect_proxy = connect_proxy;
+
+ object_class->finalize = ephy_topic_action_finalize;
+ object_class->set_property = ephy_topic_action_set_property;
+ object_class->get_property = ephy_topic_action_get_property;
+
+ ephy_topic_action_signals[GO_LOCATION] =
+ g_signal_new ("go_location",
+ G_OBJECT_CLASS_TYPE (object_class),
+ G_SIGNAL_RUN_FIRST,
+ G_STRUCT_OFFSET (EphyTopicActionClass, go_location),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__STRING,
+ G_TYPE_NONE,
+ 1,
+ G_TYPE_STRING);
+
+ g_object_class_install_property (object_class,
+ PROP_BOOKMARK_ID,
+ g_param_spec_int ("bookmark_id",
+ "bookmark_id",
+ "bookmark_id",
+ 0,
+ G_MAXINT,
+ 0,
+ G_PARAM_READWRITE));
+}
+
+static void
+ephy_topic_action_init (EphyTopicAction *action)
+{
+ action->priv = g_new0 (EphyTopicActionPrivate, 1);
+}
+
+EggAction *
+ephy_topic_action_new (const char *name, guint id)
+{
+ EphyNode *bmk;
+ const char *title;
+ EphyBookmarks *bookmarks;
+
+ bookmarks = ephy_shell_get_bookmarks (ephy_shell);
+
+ bmk = ephy_node_get_from_id (id);
+ g_return_val_if_fail (bmk != NULL, NULL);
+
+ title = ephy_node_get_property_string
+ (bmk, EPHY_NODE_KEYWORD_PROP_NAME);
+
+ return EGG_ACTION (g_object_new (EPHY_TYPE_TOPIC_ACTION,
+ "name", name,
+ "label", title,
+ NULL));
+}
+
diff --git a/src/bookmarks/ephy-topic-action.h b/src/bookmarks/ephy-topic-action.h
new file mode 100644
index 000000000..b85954873
--- /dev/null
+++ b/src/bookmarks/ephy-topic-action.h
@@ -0,0 +1,54 @@
+/*
+ * 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_TOPIC_ACTION_H
+#define EPHY_TOPIC_ACTION_H
+
+#include <gtk/gtk.h>
+#include <egg-action.h>
+
+#define EPHY_TYPE_TOPIC_ACTION (ephy_topic_action_get_type ())
+#define EPHY_TOPIC_ACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EPHY_TYPE_TOPIC_ACTION, EphyTopicAction))
+#define EPHY_TOPIC_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EPHY_TYPE_TOPIC_ACTION, EphyTopicActionClass))
+#define EPHY_IS_TOPIC_ACTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EPHY_TYPE_TOPIC_ACTION))
+#define EPHY_IS_TOPIC_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), EPHY_TYPE_TOPIC_ACTION))
+#define EPHY_TOPIC_ACTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), EPHY_TYPE_TOPIC_ACTION, EphyTopicActionClass))
+
+typedef struct _EphyTopicAction EphyTopicAction;
+typedef struct _EphyTopicActionClass EphyTopicActionClass;
+typedef struct EphyTopicActionPrivate EphyTopicActionPrivate;
+
+struct _EphyTopicAction
+{
+ EggAction parent;
+ EphyTopicActionPrivate *priv;
+};
+
+struct _EphyTopicActionClass
+{
+ EggActionClass parent_class;
+
+ void (*go_location) (EphyTopicAction *action, char *location);
+};
+
+GType ephy_topic_action_get_type (void);
+
+EggAction *ephy_topic_action_new (const char *name,
+ guint id);
+
+#endif
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-20 23:43:25 +0800