diff options
| author | Marco Pesenti Gritti <marco@it.gnome.org> | 2003-01-28 04:05:34 +0800 |
|---|---|---|
| committer | Marco Pesenti Gritti <mpeseng@src.gnome.org> | 2003-01-28 04:05:34 +0800 |
| commit | b4ccfc8ea4cf00327a44cb814997d8ede9cd1706 (patch) | |
| tree | 52eb66124190566e950ced94d34339fd37823e69 /src | |
| parent | fcdec6a2c1b3383b61d98ab6add8755fedc0a88a (diff) | |
| download | gsoc2013-epiphany-b4ccfc8ea4cf00327a44cb814997d8ede9cd1706.tar.gz gsoc2013-epiphany-b4ccfc8ea4cf00327a44cb814997d8ede9cd1706.tar.zst gsoc2013-epiphany-b4ccfc8ea4cf00327a44cb814997d8ede9cd1706.zip | |
Implement dragging from the editor. It's stilly buggy but I didnt expect
2003-01-27 Marco Pesenti Gritti <marco@it.gnome.org>
* configure.in:
* data/ui/epiphany-toolbar.xml.in:
* lib/widgets/ephy-editable-toolbar.c: (copy_toolbars),
(is_action_in_toolbars), (is_separator),
(find_toolbar_from_widget), (add_action_to_list),
(parse_item_list), (toolbar_list_to_xml), (toolbar_list_to_string),
(drag_data_received_cb), (drag_motion_cb), (drag_drop_cb),
(setup_toolbar_drag), (do_merge),
(ephy_editable_toolbar_set_merge), (ephy_editable_toolbar_init),
(ephy_editable_toolbar_finalize), (drag_data_get_cb),
(build_to_drag_actions_list), (setup_editor),
(set_all_actions_sensitive), (ephy_editable_toolbar_edit):
* src/ephy-favicon-action.c: (create_tool_item),
(ephy_favicon_action_class_init):
* src/ephy-location-action.c: (create_tool_item),
(ephy_location_action_class_init):
* src/ephy-spinner-action.c: (create_tool_item),
(ephy_spinner_action_class_init):
Implement dragging from the editor. It's stilly buggy
but I didnt expect to get that working so soon :)
Diffstat (limited to 'src')
| -rw-r--r-- | src/ephy-favicon-action.c | 4 | ||||
| -rw-r--r-- | src/ephy-location-action.c | 5 | ||||
| -rw-r--r-- | src/ephy-spinner-action.c | 4 |
3 files changed, 6 insertions, 7 deletions
diff --git a/src/ephy-favicon-action.c b/src/ephy-favicon-action.c index 87fddc8db..88103ac09 100644 --- a/src/ephy-favicon-action.c +++ b/src/ephy-favicon-action.c @@ -79,7 +79,7 @@ create_tool_item (EggAction *action) GtkWidget *ebox; GtkWidget *item; - item = (* EGG_ACTION_CLASS (parent_class)->create_tool_item) (action); + item = GTK_WIDGET (egg_tool_item_new ()); ebox = gtk_event_box_new (); image = gtk_image_new (); @@ -226,7 +226,7 @@ ephy_favicon_action_class_init (EphyFaviconActionClass *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->toolbar_item_type = GTK_TYPE_IMAGE; action_class->create_tool_item = create_tool_item; action_class->connect_proxy = connect_proxy; diff --git a/src/ephy-location-action.c b/src/ephy-location-action.c index 07f7e6c2b..5030c7b45 100644 --- a/src/ephy-location-action.c +++ b/src/ephy-location-action.c @@ -70,8 +70,7 @@ create_tool_item (EggAction *action) LOG ("Create location toolitem") - item = (* EGG_ACTION_CLASS (parent_class)->create_tool_item) (action); - + item = GTK_WIDGET (egg_tool_item_new ());//(* EGG_ACTION_CLASS (parent_class)->create_tool_item) (action); location = ephy_location_entry_new (); gtk_container_add (GTK_CONTAINER (item), location); egg_tool_item_set_expandable (EGG_TOOL_ITEM (item), TRUE); @@ -141,7 +140,7 @@ ephy_location_action_class_init (EphyLocationActionClass *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->toolbar_item_type = EPHY_TYPE_LOCATION_ENTRY; action_class->create_tool_item = create_tool_item; action_class->connect_proxy = connect_proxy; diff --git a/src/ephy-spinner-action.c b/src/ephy-spinner-action.c index 3e990f49b..295e88545 100644 --- a/src/ephy-spinner-action.c +++ b/src/ephy-spinner-action.c @@ -88,7 +88,7 @@ create_tool_item (EggAction *action) GtkWidget *spinner; GtkWidget *button; - item = (* EGG_ACTION_CLASS (parent_class)->create_tool_item) (action); + item = GTK_WIDGET (egg_tool_item_new ()); button = gtk_button_new (); gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE); @@ -160,7 +160,7 @@ ephy_spinner_action_class_init (EphySpinnerActionClass *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->toolbar_item_type = EPHY_SPINNER_TYPE; action_class->create_tool_item = create_tool_item; action_class->connect_proxy = connect_proxy; |