aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/bookmarks/ephy-bookmark-properties.c42
-rw-r--r--src/bookmarks/ephy-bookmarks-editor.c56
-rw-r--r--src/bookmarks/ephy-bookmarks.h3
-rwxr-xr-xsrc/ephy-toolbars-model.c130
-rwxr-xr-xsrc/ephy-toolbars-model.h16
5 files changed, 207 insertions, 40 deletions
diff --git a/src/bookmarks/ephy-bookmark-properties.c b/src/bookmarks/ephy-bookmark-properties.c
index 9d6fde632..fe2b2df76 100644
--- a/src/bookmarks/ephy-bookmark-properties.c
+++ b/src/bookmarks/ephy-bookmark-properties.c
@@ -54,6 +54,8 @@ struct EphyBookmarkPropertiesPrivate
GtkWidget *title_entry;
GtkWidget *location_entry;
GtkWidget *topics_selector;
+
+ EphyToolbarsModel *tb_model;
};
enum
@@ -215,22 +217,6 @@ bookmark_properties_response_cb (GtkDialog *dialog,
}
static void
-update_checkbox (EphyBookmarkProperties *props, GtkWidget *checkbox, gulong prop)
-{
- GValue value = { 0, };
- gboolean state;
-
- state = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (checkbox));
-
- g_value_init (&value, G_TYPE_BOOLEAN);
- g_value_set_boolean (&value, state);
- ephy_node_set_property (props->priv->bookmark,
- prop,
- &value);
- g_value_unset (&value);
-}
-
-static void
update_entry (EphyBookmarkProperties *props, GtkWidget *entry, guint prop)
{
GValue value = { 0, };
@@ -276,7 +262,23 @@ location_entry_changed_cb (GtkWidget *entry, EphyBookmarkProperties *props)
static void
toolbar_checkbox_changed_cb (GtkWidget *checkbox, EphyBookmarkProperties *props)
{
- update_checkbox (props, checkbox, EPHY_NODE_BMK_PROP_SHOW_IN_TOOLBAR);
+ gboolean state;
+ gulong id;
+
+ state = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (checkbox));
+
+ id = ephy_node_get_id (props->priv->bookmark);
+
+ if (state)
+ {
+ ephy_toolbars_model_add_bookmark
+ (props->priv->tb_model, FALSE, id);
+ }
+ else
+ {
+ ephy_toolbars_model_remove_bookmark
+ (props->priv->tb_model, FALSE, id);
+ }
}
static void
@@ -317,6 +319,7 @@ build_ui (EphyBookmarkProperties *editor)
char *str;
const char *tmp;
gboolean state;
+ gulong id;
g_signal_connect (G_OBJECT (editor),
"response",
@@ -403,8 +406,8 @@ build_ui (EphyBookmarkProperties *editor)
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
checkbox = gtk_check_button_new_with_mnemonic (_("_Show in the bookmarks toolbar"));
- state = ephy_node_get_property_boolean (editor->priv->bookmark,
- EPHY_NODE_BMK_PROP_SHOW_IN_TOOLBAR);
+ id = ephy_node_get_id (editor->priv->bookmark);
+ state = ephy_toolbars_model_has_bookmark (editor->priv->tb_model, FALSE, id);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbox), state);
g_signal_connect (checkbox, "toggled",
G_CALLBACK (toolbar_checkbox_changed_cb), editor);
@@ -429,6 +432,7 @@ ephy_bookmark_properties_init (EphyBookmarkProperties *editor)
editor->priv = g_new0 (EphyBookmarkPropertiesPrivate, 1);
editor->priv->bookmark = NULL;
+ editor->priv->tb_model = ephy_shell_get_toolbars_model (ephy_shell);
}
GtkWidget *
diff --git a/src/bookmarks/ephy-bookmarks-editor.c b/src/bookmarks/ephy-bookmarks-editor.c
index 2e6302430..9ec953774 100644
--- a/src/bookmarks/ephy-bookmarks-editor.c
+++ b/src/bookmarks/ephy-bookmarks-editor.c
@@ -123,6 +123,7 @@ struct EphyBookmarksEditorPrivate
EggMenuMerge *ui_merge;
EggActionGroup *action_group;
int priority_col;
+ EphyToolbarsModel *tb_model;
};
enum
@@ -253,18 +254,20 @@ cmd_show_in_the_toolbar (EggAction *action,
{
EphyNode *node;
GList *selection;
- GValue value = { 0, };
- gboolean state;
+ gboolean state, topic;
+ gulong id;
if (ephy_node_view_is_target (EPHY_NODE_VIEW (editor->priv->bm_view)))
{
selection = ephy_node_view_get_selection
(EPHY_NODE_VIEW (editor->priv->bm_view));
+ topic = FALSE;
}
else if (ephy_node_view_is_target (EPHY_NODE_VIEW (editor->priv->key_view)))
{
selection = ephy_node_view_get_selection
(EPHY_NODE_VIEW (editor->priv->key_view));
+ topic = TRUE;
}
else
{
@@ -272,15 +275,19 @@ cmd_show_in_the_toolbar (EggAction *action,
}
node = EPHY_NODE (selection->data);
-
+ id = ephy_node_get_id (node);
state = EGG_TOGGLE_ACTION (action)->active;
- g_value_init (&value, G_TYPE_BOOLEAN);
- g_value_set_boolean (&value, state);
- ephy_node_set_property (node,
- EPHY_NODE_BMK_PROP_SHOW_IN_TOOLBAR,
- &value);
- g_value_unset (&value);
+ if (state)
+ {
+ ephy_toolbars_model_add_bookmark
+ (editor->priv->tb_model, topic, id);
+ }
+ else
+ {
+ ephy_toolbars_model_remove_bookmark
+ (editor->priv->tb_model, topic, id);
+ }
g_list_free (selection);
}
@@ -349,14 +356,14 @@ cmd_delete (EggAction *action,
{
EphyNodeViewPriority priority;
GList *selected;
- EphyNode *node;
-
+ EphyNode *node;
+
selected = ephy_node_view_get_selection (EPHY_NODE_VIEW (editor->priv->key_view));
node = EPHY_NODE (selected->data);
priority = ephy_node_get_property_int (node, EPHY_NODE_KEYWORD_PROP_PRIORITY);
if (priority == -1) priority = EPHY_NODE_VIEW_NORMAL_PRIORITY;
-
+
if (priority == EPHY_NODE_VIEW_NORMAL_PRIORITY)
{
ephy_node_view_remove (EPHY_NODE_VIEW (editor->priv->key_view));
@@ -629,15 +636,17 @@ ephy_bookmarks_editor_update_menu (EphyBookmarksEditor *editor)
{
EphyNode *node = EPHY_NODE (selected->data);
EphyNodeViewPriority priority;
+ gulong id;
+
+ id = ephy_node_get_id (node);
+ show_in_toolbar = ephy_toolbars_model_has_bookmark
+ (editor->priv->tb_model, TRUE, id);
priority = ephy_node_get_property_int
(node, EPHY_NODE_KEYWORD_PROP_PRIORITY);
if (priority == -1) priority = EPHY_NODE_VIEW_NORMAL_PRIORITY;
key_normal = (priority == EPHY_NODE_VIEW_NORMAL_PRIORITY);
- show_in_toolbar = ephy_node_get_property_boolean
- (node, EPHY_NODE_BMK_PROP_SHOW_IN_TOOLBAR);
-
g_list_free (selected);
}
@@ -645,9 +654,11 @@ ephy_bookmarks_editor_update_menu (EphyBookmarksEditor *editor)
if (bmk_focus && selected)
{
EphyNode *node = EPHY_NODE (selected->data);
+ gulong id;
- show_in_toolbar = ephy_node_get_property_boolean
- (node, EPHY_NODE_BMK_PROP_SHOW_IN_TOOLBAR);
+ id = ephy_node_get_id (node);
+ show_in_toolbar = ephy_toolbars_model_has_bookmark
+ (editor->priv->tb_model, FALSE, id);
g_list_free (selected);
}
@@ -706,7 +717,16 @@ ephy_bookmarks_editor_update_menu (EphyBookmarksEditor *editor)
g_object_set (action, "sensitive", select_all, NULL);
action = egg_action_group_get_action (action_group, "ShowInToolbar");
g_object_set (action, "sensitive", can_show_in_toolbar, NULL);
+
+ g_signal_handlers_block_by_func
+ (G_OBJECT (EGG_TOGGLE_ACTION (action)),
+ G_CALLBACK (cmd_show_in_the_toolbar),
+ editor);
egg_toggle_action_set_active (EGG_TOGGLE_ACTION (action), show_in_toolbar);
+ g_signal_handlers_unblock_by_func
+ (G_OBJECT (EGG_TOGGLE_ACTION (action)),
+ G_CALLBACK (cmd_show_in_the_toolbar),
+ editor);
}
static void
@@ -1242,4 +1262,6 @@ static void
ephy_bookmarks_editor_init (EphyBookmarksEditor *editor)
{
editor->priv = g_new0 (EphyBookmarksEditorPrivate, 1);
+
+ editor->priv->tb_model = ephy_shell_get_toolbars_model (ephy_shell);
}
diff --git a/src/bookmarks/ephy-bookmarks.h b/src/bookmarks/ephy-bookmarks.h
index bb22e1a5c..0ab70af8e 100644
--- a/src/bookmarks/ephy-bookmarks.h
+++ b/src/bookmarks/ephy-bookmarks.h
@@ -44,8 +44,7 @@ enum
EPHY_NODE_KEYWORD_PROP_NAME = 5,
EPHY_NODE_BMK_PROP_SMART_LOCATION = 6,
EPHY_NODE_BMK_PROP_ICON = 7,
- EPHY_NODE_KEYWORD_PROP_PRIORITY = 8,
- EPHY_NODE_BMK_PROP_SHOW_IN_TOOLBAR = 9
+ EPHY_NODE_KEYWORD_PROP_PRIORITY = 8
};
struct EphyBookmarks
diff --git a/src/ephy-toolbars-model.c b/src/ephy-toolbars-model.c
index c67d427e3..99d55c295 100755
--- a/src/ephy-toolbars-model.c
+++ b/src/ephy-toolbars-model.c
@@ -22,6 +22,8 @@
#include "ephy-shell.h"
#include "ephy-debug.h"
+#include <string.h>
+
static void ephy_toolbars_model_class_init (EphyToolbarsModelClass *klass);
static void ephy_toolbars_model_init (EphyToolbarsModel *t);
static void ephy_toolbars_model_finalize (GObject *object);
@@ -168,3 +170,131 @@ ephy_toolbars_model_new (void)
return t;
}
+
+static int
+get_item_pos (EphyToolbarsModel *model,
+ int toolbar_pos,
+ const char *name)
+{
+ int i, n_items;
+
+ n_items = egg_toolbars_model_n_items
+ (EGG_TOOLBARS_MODEL (model), toolbar_pos);
+
+ for (i = 0; i < n_items; i++)
+ {
+ const char *i_name;
+ gboolean is_separator;
+
+ i_name = egg_toolbars_model_item_nth
+ (EGG_TOOLBARS_MODEL (model), toolbar_pos, i,
+ &is_separator);
+ if (!is_separator && strcmp (name, i_name) == 0)
+ {
+ return i;
+ }
+ }
+
+ return -1;
+}
+
+static char *
+get_action_name (gboolean topic, gulong id)
+{
+ char *action_name;
+
+ if (topic)
+ {
+ action_name = g_strdup_printf ("GoTopicId%ld", id);
+ }
+ else
+ {
+ action_name = g_strdup_printf ("GoBookmarkId%ld", id);
+ }
+
+ return action_name;
+}
+
+static int
+get_toolbar_pos (EphyToolbarsModel *model,
+ const char *name)
+{
+ int i, n_toolbars;
+
+ n_toolbars = egg_toolbars_model_n_toolbars
+ (EGG_TOOLBARS_MODEL (model));
+
+ for (i = 0; i < n_toolbars; i++)
+ {
+ const char *t_name;
+
+ t_name = egg_toolbars_model_toolbar_nth
+ (EGG_TOOLBARS_MODEL (model), i);
+ if (strcmp (name, t_name) == 0)
+ {
+ return i;
+ }
+ }
+
+ return -1;
+}
+
+void
+ephy_toolbars_model_remove_bookmark (EphyToolbarsModel *model,
+ gboolean topic,
+ gulong id)
+{
+ char *action_name;
+ int toolbar_position, position;
+
+ action_name = get_action_name (topic, id);
+
+ toolbar_position = get_toolbar_pos (model, "BookmarksToolbar");
+ g_return_if_fail (toolbar_position != -1);
+
+ position = get_item_pos (model, toolbar_position, action_name);
+
+ egg_toolbars_model_remove_item (EGG_TOOLBARS_MODEL (model),
+ toolbar_position, position);
+
+ g_free (action_name);
+}
+
+void
+ephy_toolbars_model_add_bookmark (EphyToolbarsModel *model,
+ gboolean topic,
+ gulong id)
+{
+ char *action_name;
+ int toolbar_position;
+
+ action_name = get_action_name (topic, id);
+
+ toolbar_position = get_toolbar_pos (model, "BookmarksToolbar");
+ g_return_if_fail (toolbar_position != -1);
+
+ egg_toolbars_model_add_item (EGG_TOOLBARS_MODEL (model),
+ toolbar_position, -1,
+ 0, action_name);
+
+ g_free (action_name);
+}
+
+gboolean
+ephy_toolbars_model_has_bookmark (EphyToolbarsModel *model,
+ gboolean topic,
+ gulong id)
+{
+ char *action_name;
+ int toolbar_position, position;
+
+ action_name = get_action_name (topic, id);
+
+ toolbar_position = get_toolbar_pos (model, "BookmarksToolbar");
+ g_return_val_if_fail (toolbar_position != -1, FALSE);
+ position = get_item_pos (model, toolbar_position, action_name);
+
+ g_free (action_name);
+
+ return (position != -1);
+}
diff --git a/src/ephy-toolbars-model.h b/src/ephy-toolbars-model.h
index f01230494..dd84859f2 100755
--- a/src/ephy-toolbars-model.h
+++ b/src/ephy-toolbars-model.h
@@ -49,9 +49,21 @@ struct EphyToolbarsModelClass
char *action_name);
};
-GType ephy_toolbars_model_get_type (void);
+GType ephy_toolbars_model_get_type (void);
-EphyToolbarsModel *ephy_toolbars_model_new (void);
+EphyToolbarsModel *ephy_toolbars_model_new (void);
+
+void ephy_toolbars_model_add_bookmark (EphyToolbarsModel *model,
+ gboolean topic,
+ gulong id);
+
+gboolean ephy_toolbars_model_has_bookmark (EphyToolbarsModel *model,
+ gboolean topic,
+ gulong id);
+
+void ephy_toolbars_model_remove_bookmark (EphyToolbarsModel *model,
+ gboolean topic,
+ gulong id);
G_END_DECLS
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 01:38:42 +0800