| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2005-01-21 Jorn Baayen <jbaayen@gnome.org>
* lib/widgets/ephy-node-view.c: (ephy_node_view_add_column),
(ephy_node_view_enable_drag_source):
* lib/widgets/ephy-node-view.h:
* lib/widgets/ephy-tree-model-sort.c: (ephy_tree_model_sort_init),
(ephy_tree_model_sort_multi_row_draggable),
(ephy_tree_model_sort_set_base_drag_column_id),
(ephy_tree_model_sort_set_extra_drag_column_id),
(each_property_get_data_binder):
* lib/widgets/ephy-tree-model-sort.h:
* src/bookmarks/ephy-bookmark-action.c: (drag_data_get_cb):
* src/bookmarks/ephy-bookmarks-editor.c:
(ephy_bookmarks_editor_construct):
* src/bookmarks/ephy-topics-selector.c:
(ephy_topics_selector_constructor):
* src/ephy-encoding-dialog.c: (ephy_encoding_dialog_init):
* src/ephy-history-window.c: (ephy_history_window_construct):
Add proper _NETSCAPE_URL drag support, supplying the URL as well as
the title. As a side effect most data_columns in NodeViews have been
obsoleted. Fixes #163937.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2005-01-14 Jorn Baayen <jbaayen@gnome.org>
* lib/widgets/ephy-location-entry.c:
(ephy_location_entry_construct_contents):
* lib/widgets/ephy-node-view.c: (motion_notify_cb):
* src/bookmarks/ephy-bookmark-action.c: (drag_motion_cb):
* src/bookmarks/ephy-bookmarks-editor.c:
* src/ephy-history-window.c:
Add GDK_ACTION_ASK, and prefer _NETSCAPE_URL over uri-list drag types.
This is to match the new Nautilus _NETSCAPE_URL DnD behaviour.
Fixes #163937.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2005-01-08 Christian Persch <chpe@cvs.gnome.org>
* embed/ephy-cookie-manager.h:
* embed/ephy-download.c:
* embed/ephy-download.h:
* embed/ephy-embed-dialog.c:
* embed/ephy-embed-dialog.h:
* embed/ephy-embed-persist.c:
* embed/ephy-embed-persist.h:
* embed/ephy-encodings.c:
* embed/ephy-encodings.h:
* embed/ephy-favicon-cache.c:
* embed/ephy-favicon-cache.h:
* embed/ephy-history.c:
* embed/ephy-history.h:
* embed/ephy-password-manager.h:
* embed/ephy-permission-manager.h:
* lib/ephy-file-chooser.c:
* lib/ephy-file-chooser.h:
* lib/ephy-node-db.c:
* lib/ephy-node-db.h:
* lib/ephy-node-filter.c:
* lib/ephy-node-filter.h:
* lib/ephy-node.c:
* lib/ephy-node.h:
* lib/widgets/ephy-node-view.c:
* lib/widgets/ephy-node-view.h:
* lib/widgets/ephy-search-entry.c:
* lib/widgets/ephy-search-entry.h:
* lib/widgets/ephy-spinner.c:
* lib/widgets/ephy-spinner.h:
* lib/widgets/ephy-tree-model-node.c:
* lib/widgets/ephy-tree-model-node.h:
* lib/widgets/ephy-tree-model-sort.c:
* lib/widgets/ephy-tree-model-sort.h:
* lib/widgets/ephy-zoom-action.c:
* lib/widgets/ephy-zoom-action.h:
* src/bookmarks/ephy-bookmark-properties.c:
* src/bookmarks/ephy-bookmark-properties.h:
* src/bookmarks/ephy-bookmarks-editor.c:
* src/bookmarks/ephy-bookmarks-editor.h:
* src/bookmarks/ephy-bookmarks.c:
* src/bookmarks/ephy-bookmarks.h:
* src/bookmarks/ephy-bookmarksbar-model.c:
* src/bookmarks/ephy-bookmarksbar-model.h:
* src/bookmarks/ephy-bookmarksbar.c:
* src/bookmarks/ephy-bookmarksbar.h:
* src/bookmarks/ephy-new-bookmark.c:
* src/bookmarks/ephy-new-bookmark.h:
* src/bookmarks/ephy-topics-selector.c:
* src/bookmarks/ephy-topics-selector.h:
* src/ephy-completion-model.c:
* src/ephy-completion-model.h:
* src/ephy-encoding-dialog.c:
* src/ephy-encoding-dialog.h:
* src/ephy-history-window.c:
* src/ephy-history-window.h:
Make all structs prefixed by _.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2005-01-04 Christian Persch <chpe@cvs.gnome.org>
* lib/widgets/ephy-node-view.c:
* lib/widgets/ephy-node-view.h:
* src/bookmarks/ephy-bookmarks-editor.c:
(ephy_bookmarks_editor_update_menu):
* src/ephy-history-window.c: (ephy_history_window_update_menu):
Use ngettext to get the Open in New Tab[s]/Window[s] label.
2005-01-04 Christian Persch <chpe@cvs.gnome.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2004-12-13 Christian Persch <chpe@cvs.gnome.org>
* embed/ephy-encodings.c: (elide_underscores), (add_encoding):
* embed/mozilla/FilePicker.cpp:
* lib/ephy-dnd.c:
* lib/ephy-node.c:
* lib/ephy-string.c: (ephy_string_blank_chr):
* lib/ephy-string.h:
* lib/widgets/ephy-node-view.c:
* src/ephy-encoding-menu.c:
* src/ephy-notebook.c:
* src/ephy-session.c:
* src/ephy-statusbar.c:
* src/ephy-tab.c: (ephy_tab_set_title):
* src/ephy-tabs-menu.c: (connect_proxy_cb):
* src/ppview-toolbar.c:
Get rid of ephy_string_[elide|double]_underscores().
Remove unnecessary ephy-string.h includes.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2004-11-07 Christian Persch <chpe@cvs.gnome.org>
* lib/widgets/ephy-node-view.c: (ephy_node_view_popup):
* src/bookmarks/ephy-bookmark-action.c: (show_context_menu),
(popup_menu_cb), (button_press_cb):
* src/bookmarks/ephy-topic-action.c: (button_toggled_cb),
(show_context_menu), (popup_menu_cb), (button_press_cb):
* src/ephy-window.c: (show_embed_popup):
When popping up the context menu with keyboard, select the first
menu item. Fixes bug #154907.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2004-11-02 Christian Persch <chpe@cvs.gnome.org>
* embed/downloader-view.c:
* embed/ephy-command-manager.c:
* embed/ephy-cookie-manager.c:
* embed/ephy-download.c:
* embed/ephy-embed-dialog.c:
* embed/ephy-embed-event.c:
* embed/ephy-embed-factory.c:
* embed/ephy-embed-persist.c:
* embed/ephy-embed-shell.c:
* embed/ephy-embed-single.c:
* embed/ephy-embed.c:
* embed/ephy-encodings.c:
* embed/ephy-favicon-cache.c:
* embed/ephy-history.c:
* embed/ephy-password-manager.c:
* embed/ephy-permission-manager.c:
* embed/find-dialog.c:
* embed/mozilla/ContentHandler.cpp:
* embed/mozilla/ContentHandler.h:
* embed/mozilla/EphyAboutRedirector.cpp:
* embed/mozilla/EphyBrowser.cpp:
* embed/mozilla/EphyBrowser.h:
* embed/mozilla/EphyContentPolicy.cpp:
* embed/mozilla/EphyHeaderSniffer.cpp:
* embed/mozilla/EphySingle.cpp:
* embed/mozilla/EphyUtils.cpp:
* embed/mozilla/EventContext.cpp:
* embed/mozilla/FilePicker.cpp:
* embed/mozilla/GlobalHistory.cpp:
* embed/mozilla/GtkNSSClientAuthDialogs.cpp:
* embed/mozilla/GtkNSSDialogs.cpp:
* embed/mozilla/GtkNSSKeyPairDialogs.cpp:
* embed/mozilla/MozDownload.cpp:
* embed/mozilla/MozDownload.h:
* embed/mozilla/MozRegisterComponents.cpp:
* embed/mozilla/PrintingPromptService.cpp:
* embed/mozilla/mozilla-download.cpp:
* embed/mozilla/mozilla-embed-event.cpp:
* embed/mozilla/mozilla-embed-persist.cpp:
* embed/mozilla/mozilla-embed-single.cpp:
* embed/mozilla/mozilla-embed.cpp:
* embed/mozilla/mozilla-notifiers.cpp:
* embed/print-dialog.c:
* lib/eel-gconf-extensions.c:
* lib/egg/egg-editable-toolbar.c:
* lib/egg/egg-toolbars-model.c:
* lib/ephy-debug.c:
* lib/ephy-debug.h:
* lib/ephy-dialog.c:
* lib/ephy-dnd.c:
* lib/ephy-file-chooser.c:
* lib/ephy-file-helpers.c:
* lib/ephy-glade.c:
* lib/ephy-gui.c:
* lib/ephy-langs.c:
* lib/ephy-loader.c:
* lib/ephy-module.c:
* lib/ephy-node-db.c:
* lib/ephy-node-filter.c:
* lib/ephy-node.c:
* lib/ephy-shlib-loader.c:
* lib/ephy-state.c:
* lib/ephy-stock-icons.c:
* lib/ephy-string.c:
* lib/ephy-zoom.c:
* lib/widgets/ephy-location-entry.c:
* lib/widgets/ephy-node-view.c:
* lib/widgets/ephy-search-entry.c:
* lib/widgets/ephy-spinner.c:
* lib/widgets/ephy-tree-model-node.c:
* lib/widgets/ephy-tree-model-sort.c:
* lib/widgets/ephy-zoom-action.c:
* lib/widgets/ephy-zoom-control.c:
* src/bookmarks/ephy-bookmark-action.c:
* src/bookmarks/ephy-bookmark-properties.c:
* src/bookmarks/ephy-bookmarks-editor.c:
* src/bookmarks/ephy-bookmarks-export.c:
* src/bookmarks/ephy-bookmarks-import.c:
* src/bookmarks/ephy-bookmarks-menu.c:
* src/bookmarks/ephy-bookmarks.c:
* src/bookmarks/ephy-bookmarksbar-model.c:
* src/bookmarks/ephy-bookmarksbar.c:
* src/bookmarks/ephy-favorites-menu.c:
* src/bookmarks/ephy-new-bookmark.c:
* src/bookmarks/ephy-topic-action.c:
* src/bookmarks/ephy-topics-selector.c:
* src/ephy-automation.c:
* src/ephy-completion-model.c:
* src/ephy-encoding-dialog.c:
* src/ephy-encoding-menu.c:
* src/ephy-extension.c:
* src/ephy-extensions-manager.c:
* src/ephy-favicon-action.c:
* src/ephy-go-action.c:
* src/ephy-history-window.c:
* src/ephy-location-action.c:
* src/ephy-main.c:
* src/ephy-navigation-action.c:
* src/ephy-notebook.c:
* src/ephy-session.c:
* src/ephy-shell.c:
* src/ephy-statusbar.c:
* src/ephy-tab.c:
* src/ephy-tabs-menu.c:
* src/ephy-toolbars-model.c:
* src/ephy-window.c:
* src/pdm-dialog.c:
* src/popup-commands.c:
* src/ppview-toolbar.c:
* src/prefs-dialog.c:
* src/toolbar.c:
* src/window-commands.c:
We always have config.h, no need to guard its inclusion.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2004-10-27 Christian Persch <chpe@cvs.gnome.org>
* embed/ephy-embed-dialog.c: (ephy_embed_dialog_init):
* embed/ephy-embed-persist.c: (ephy_embed_persist_init),
(ephy_embed_persist_to_string):
* embed/ephy-embed-shell.c: (ephy_embed_shell_init):
* embed/find-dialog.c: (find_dialog_init):
* embed/mozilla/mozilla-embed-persist.cpp:
* embed/mozilla/mozilla-embed-single.cpp:
* lib/ephy-dialog.c: (ephy_dialog_set_modal), (ephy_dialog_init):
* lib/ephy-file-chooser.c: (ephy_file_chooser_init):
* lib/ephy-node-db.c: (ephy_node_db_init):
* lib/widgets/ephy-node-view.c: (ephy_node_view_init):
* lib/widgets/ephy-search-entry.c: (ephy_search_entry_init):
* src/bookmarks/ephy-bookmark-action.c:
(ephy_bookmark_action_init):
* src/bookmarks/ephy-bookmark-properties.c:
(ephy_bookmark_properties_init):
* src/bookmarks/ephy-bookmarks.c: (ephy_bookmarks_init):
* src/bookmarks/ephy-favorites-menu.c: (ephy_favorites_menu_init):
* src/bookmarks/ephy-new-bookmark.c: (ephy_new_bookmark_init):
* src/bookmarks/ephy-topics-selector.c:
(ephy_topics_selector_init):
* src/ephy-encoding-dialog.c: (ephy_encoding_dialog_init):
* src/ephy-encoding-menu.c: (ephy_encoding_menu_init):
* src/ephy-favicon-action.c: (ephy_favicon_action_init):
* src/ephy-location-action.c: (ephy_location_action_init):
* src/ephy-notebook.c: (ephy_notebook_init):
* src/ephy-session.c: (ephy_session_init):
* src/ephy-shell.c: (ephy_shell_init):
* src/ephy-tab.c: (ephy_tab_init):
* src/ephy-tabs-menu.c: (ephy_tabs_menu_init):
* src/ephy-window.c: (ephy_window_init):
* src/pdm-dialog.c: (pdm_dialog_init):
* src/ppview-toolbar.c: (ppview_toolbar_init):
Private data is 0-initialised, no need to set members to NULL, 0,
or FALSE.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2004-10-23 Christian Persch <chpe@cvs.gnome.org>
* embed/downloader-view.c: (downloader_view_get_type):
* embed/ephy-command-manager.c: (ephy_command_manager_get_type):
* embed/ephy-cookie-manager.c: (ephy_cookie_get_type),
(ephy_cookie_manager_get_type):
* embed/ephy-download.c: (ephy_download_get_type):
* embed/ephy-embed-dialog.c: (ephy_embed_dialog_get_type):
* embed/ephy-embed-event.c: (ephy_embed_event_get_type):
* embed/ephy-embed-persist.c: (ephy_embed_persist_get_type):
* embed/ephy-embed-shell.c: (ephy_embed_shell_get_type):
* embed/ephy-embed-single.c: (ephy_embed_single_get_type):
* embed/ephy-embed.c: (ephy_embed_get_type):
* embed/ephy-encodings.c: (ephy_encodings_get_type):
* embed/ephy-favicon-cache.c: (ephy_favicon_cache_get_type):
* embed/ephy-history.c: (ephy_history_get_type):
* embed/ephy-password-manager.c: (ephy_password_info_get_type),
(ephy_password_manager_get_type):
* embed/ephy-permission-manager.c: (ephy_permission_info_get_type),
(ephy_permission_manager_get_type):
* embed/find-dialog.c: (find_dialog_get_type):
* embed/mozilla/mozilla-download.cpp:
* embed/mozilla/mozilla-embed-event.cpp:
* embed/mozilla/mozilla-embed-persist.cpp:
* embed/mozilla/mozilla-embed-single.cpp:
* embed/mozilla/mozilla-embed.cpp:
* lib/egg/egg-editable-toolbar.c: (egg_editable_toolbar_get_type):
* lib/egg/egg-toolbar-editor.c: (egg_toolbar_editor_get_type):
* lib/egg/egg-toolbars-model.c: (egg_toolbars_model_get_type):
* lib/ephy-dialog.c: (ephy_dialog_get_type):
* lib/ephy-file-chooser.c: (ephy_file_chooser_get_type):
* lib/ephy-loader.c: (ephy_loader_get_type):
* lib/ephy-module.c: (ephy_module_get_type):
* lib/ephy-node-db.c: (ephy_node_db_get_type):
* lib/ephy-node-filter.c: (ephy_node_filter_get_type):
* lib/ephy-shlib-loader.c: (ephy_shlib_loader_get_type):
* lib/widgets/ephy-location-entry.c:
(ephy_location_entry_get_type):
* lib/widgets/ephy-node-view.c: (ephy_node_view_get_type):
* lib/widgets/ephy-search-entry.c: (ephy_search_entry_get_type):
* lib/widgets/ephy-spinner.c: (ephy_spinner_cache_get_type),
(ephy_spinner_get_type):
* lib/widgets/ephy-tree-model-node.c:
(ephy_tree_model_node_get_type):
* lib/widgets/ephy-tree-model-sort.c:
(ephy_tree_model_sort_get_type):
* lib/widgets/ephy-zoom-action.c: (ephy_zoom_action_get_type):
* lib/widgets/ephy-zoom-control.c: (ephy_zoom_control_get_type):
* src/bookmarks/ephy-bookmark-action.c:
(ephy_bookmark_action_get_type):
* src/bookmarks/ephy-bookmark-properties.c:
(ephy_bookmark_properties_get_type):
* src/bookmarks/ephy-bookmarks-editor.c:
(ephy_bookmarks_editor_get_type):
* src/bookmarks/ephy-bookmarks-menu.c:
(ephy_bookmarks_menu_get_type):
* src/bookmarks/ephy-bookmarks.c: (ephy_bookmarks_get_type):
* src/bookmarks/ephy-bookmarksbar-model.c:
(ephy_bookmarksbar_model_get_type):
* src/bookmarks/ephy-bookmarksbar.c: (ephy_bookmarksbar_get_type):
* src/bookmarks/ephy-favorites-menu.c:
(ephy_favorites_menu_get_type):
* src/bookmarks/ephy-new-bookmark.c: (ephy_new_bookmark_get_type):
* src/bookmarks/ephy-topic-action.c: (ephy_topic_action_get_type):
* src/bookmarks/ephy-topics-selector.c:
(ephy_topics_selector_get_type):
* src/ephy-completion-model.c: (ephy_completion_model_get_type):
* src/ephy-encoding-dialog.c: (ephy_encoding_dialog_get_type):
* src/ephy-encoding-menu.c: (ephy_encoding_menu_get_type):
* src/ephy-extension.c: (ephy_extension_get_type):
* src/ephy-extensions-manager.c:
(ephy_extensions_manager_get_type):
* src/ephy-favicon-action.c: (ephy_favicon_action_get_type):
* src/ephy-go-action.c: (ephy_go_action_get_type):
* src/ephy-history-window.c: (ephy_history_window_get_type):
* src/ephy-location-action.c: (ephy_location_action_get_type):
* src/ephy-navigation-action.c: (ephy_navigation_action_get_type):
* src/ephy-notebook.c: (ephy_notebook_get_type):
* src/ephy-session.c: (ephy_session_get_type):
* src/ephy-shell.c: (ephy_shell_get_type):
* src/ephy-statusbar.c: (ephy_statusbar_get_type):
* src/ephy-tab.c: (ephy_tab_get_type):
* src/ephy-tabs-menu.c: (ephy_tabs_menu_get_type):
* src/ephy-toolbars-model.c: (ephy_toolbars_model_get_type):
* src/ephy-window.c: (ephy_window_get_type):
* src/pdm-dialog.c: (pdm_dialog_get_type):
* src/ppview-toolbar.c: (ppview_toolbar_get_type):
* src/prefs-dialog.c: (prefs_dialog_get_type):
* src/toolbar.c: (toolbar_get_type):
Annotate "if (type == 0)" in get_type functions with G_UNLIKELY,
like the G_TYPE_DEFINE macros do.
|
|
|
|
|
|
|
|
|
| |
2004-10-23 Christian Persch <chpe@cvs.gnome.org>
* lib/widgets/ephy-node-view.c: (drag_data_received_cb):
* src/ephy-notebook.c: (notebook_drag_data_received_cb):
Use gtk_selection_data_get_uris().
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2004-10-22 Christian Persch <chpe@cvs.gnome.org>
* lib/ephy-string.c: (ephy_string_double_underscores):
* lib/ephy-string.h:
* lib/widgets/ephy-node-view.c: (drag_data_received_cb):
* src/bookmarks/ephy-bookmarks-editor.c: (node_dropped_cb):
* src/ephy-notebook.c: (notebook_drag_data_received_cb):
* src/ephy-window.c: (ephy_window_load_in_tabs):
* src/ephy-window.h:
Remove ephy_string_parse_uri_list, and use new glib function
g_uri_list_extract_uris() instead.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2004-09-15 Marco Pesenti Gritti <marco@gnome.org>
* lib/widgets/ephy-node-view.c: (ephy_node_view_add_toggle),
(ephy_node_view_popup):
* lib/widgets/ephy-node-view.h:
Add api to show a context menu. Useful to make distinction
between key and mouse events.
* src/bookmarks/ephy-bookmarks-editor.c:
(ephy_bookmarks_editor_show_popup_cb),
(keyword_node_show_popup_cb):
* src/ephy-history-window.c: (ephy_history_window_show_popup_cb):
Use it. Fix #152431
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2004-08-23 Christian Persch <chpe@cvs.gnome.org>
* lib/widgets/ephy-node-view.c: (ephy_node_view_key_press_cb),
(ephy_node_view_button_press_cb), (ephy_node_view_class_init):
* src/bookmarks/ephy-bookmarks-editor.c:
(ephy_bookmarks_editor_show_popup_cb),
(keyword_node_show_popup_cb), (ephy_bookmarks_editor_construct):
* src/ephy-history-window.c: (ephy_history_window_show_popup_cb),
(ephy_history_window_construct), (ephy_history_window_dispose):
Just use the popup_menu signal. Fixes bug #150830.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2004-08-06 Christian Persch <chpe@cvs.gnome.org>
* lib/ephy-string.c: (ephy_string_parse_uri_list):
* lib/ephy-string.h:
* lib/widgets/ephy-node-view.c: (drag_data_received_cb),
(ephy_node_view_class_init):
* src/bookmarks/ephy-bookmarks-editor.c:
* src/ephy-notebook.c: (notebook_drag_data_received_cb):
* src/ephy-notebook.h:
* src/ephy-session.c:
* src/ephy-shell.c: (ephy_shell_new_tab):
* src/ephy-tab.c: (ephy_tab_new_window_cb):
* src/ephy-window.c: (ephy_window_load_in_tabs):
Fix dragging of urls which gnome-vfs can't handle.
Fix new tab positioning when opening tabs from drags.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2004-07-23 Marco Pesenti Gritti <marco@gnome.org>
* lib/widgets/ephy-node-view.c: (cell_renderer_edited),
(renderer_editing_canceled_cb), (ephy_node_view_init),
(ephy_node_view_edit):
* lib/widgets/ephy-node-view.h:
* src/bookmarks/ephy-bookmarks-editor.c: (cmd_add_topic),
(cmd_rename):
* src/bookmarks/ephy-topics-selector.c:
(ephy_topics_selector_new_topic):
Do not remove the topic when rename is cancelled.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2004-07-23 Marco Pesenti Gritti <marco@gnome.org>
* lib/ephy-marshal.list:
* lib/widgets/ephy-node-view.c: (path_toggled),
(ephy_node_view_key_press_cb), (get_selection_refs),
(ephy_node_view_button_press_cb), (cell_renderer_edited),
(renderer_editing_canceled_cb), (ephy_node_view_add_column),
(ephy_node_view_init), (ephy_node_view_edit),
(ephy_node_view_constructor), (ephy_node_view_add_toggle),
(ephy_node_view_class_init):
* lib/widgets/ephy-node-view.h:
Add support for toggles. When editing is canceled remove
the node.
* src/bookmarks/ephy-new-bookmark.c: (ephy_new_bookmark_add):
* src/bookmarks/ephy-topics-selector.c:
(ephy_topics_selector_get_type),
(ephy_topics_selector_set_bookmarks),
(ephy_topics_selector_set_property), (ephy_topics_selector_apply),
(provide_toggle), (ephy_topics_selector_constructor),
(topic_destroy_cb), (node_toggled_cb), (ephy_topics_selector_init),
(ephy_topics_selector_new), (ephy_topics_selector_new_topic),
(ephy_topics_selector_class_init):
* src/bookmarks/ephy-topics-selector.h:
Use EphyNodeView instead of a list store. Share a lot of code
and we get updating for free. Fix bug #144770
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2004-07-23 Marco Pesenti Gritti <marco@gnome.org>
* lib/widgets/ephy-node-view.c: (filter_changed_cb),
(ephy_node_view_set_filter), (ephy_node_view_set_property),
(ephy_node_view_init), (ephy_node_view_select_node),
(filter_visible_func), (ephy_node_view_constructor),
(ephy_node_view_class_init):
* lib/widgets/ephy-tree-model-node.c:
(ephy_tree_model_node_set_property),
(ephy_tree_model_node_get_property),
(ephy_tree_model_node_class_init), (ephy_tree_model_node_init),
(ephy_tree_model_node_new), (ephy_tree_model_node_get_column_type),
(ephy_tree_model_node_get_value):
* lib/widgets/ephy-tree-model-node.h:
* src/prefs-dialog.c: (create_node_combo):
Simplify node view filtering code and make it a normal
property (no more constructor only)
|
|
|
|
|
|
|
|
|
| |
2004-07-23 Marco Pesenti Gritti <marco@gnome.org>
* lib/widgets/ephy-node-view.c: (ephy_node_view_new),
(ephy_node_view_constructor), (ephy_node_view_class_init):
Use gobject constructor
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2004-07-14 Marco Pesenti Gritti <marco@gnome.org>
* lib/widgets/ephy-node-view.c: (compare_string_values),
(ephy_node_view_sort_func), (ephy_node_view_add_data_column),
(ephy_node_view_add_column), (ephy_node_view_set_priority),
(ephy_node_view_set_sort), (ephy_node_view_init):
* lib/widgets/ephy-node-view.h:
Improve sort/priority API.
* src/bookmarks/ephy-bookmarks-editor.c:
(ephy_bookmarks_editor_construct):
* src/ephy-encoding-dialog.c: (ephy_encoding_dialog_init):
* src/ephy-history-window.c: (ephy_history_window_construct):
Sort history items by last visit
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2004-06-21 Marco Pesenti Gritti <marco@gnome.org>
* lib/ephy-gui.c: (ephy_gui_help), (ephy_gui_select_row_by_key):
* lib/widgets/ephy-node-view.c: (ephy_node_view_key_press_cb):
* src/bookmarks/ephy-topics-selector.c: (topic_key_pressed):
Factor out the helper to select a treeview row by column and
use it also in the topic selector.
* lib/ephy-gui.h:
* src/bookmarks/ephy-bookmarks-editor.c:
* src/bookmarks/ephy-new-bookmark.c:
* src/ephy-history-window.c:
* src/pdm-dialog.c:
* src/ppview-toolbar.c:
* src/prefs-dialog.c:
* src/window-commands.c:
* embed/downloader-view.c:
Remove braindead gtk.h inclusion and deal with
fallout headers.
|
|
|
|
|
|
|
|
| |
* lib/widgets/ephy-node-view.c:
(ephy_node_view_select_node_by_key):
Make select-by-key support unsorted lists. Fuzzy matching is gone
though. Oh well ... :) (bug #137054)
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2004-03-03 Christian Persch <chpe@cvs.gnome.org>
* lib/widgets/ephy-node-view.c: (uri_list_parse),
(drag_data_received_cb):
Copy and modify gnome_vfs_uri_list_parse() so that we get a list
of string uris instead of GnomeVFSURIs. Change signature of
::node-dropped accordingly. Fixes bug #120231.
* src/bookmarks/ephy-bookmarks-editor.c: (node_dropped_cb):
Adapt to the changed ::node-dropped signal signature.
|
|
|
|
|
|
|
|
| |
2004-01-25 Christian Persch <chpe@cvs.gnome.org>
* lib/widgets/ephy-node-view.c: (ephy_node_view_finalize):
Fix mem leak.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2003-10-06 Marco Pesenti Gritti <marco@gnome.org>
* lib/widgets/ephy-node-view.c: (did_not_drag):
Do not unselect all on single selection mode, to not generate
useless node selection changes.
* src/ephy-history-window.c: (site_node_selected_cb):
Do not refilter if the new selected node is the same
as the old one.
|
|
|
|
|
|
|
|
|
|
|
|
| |
2003-09-21 Marco Pesenti Gritti <marco@gnome.org>
* data/ui/epiphany-bookmark-editor-ui.xml:
* lib/widgets/ephy-node-view.c: (ephy_node_view_add_column):
* src/bookmarks/ephy-bookmarks-editor.c: (cmd_view_columns),
(ephy_bookmarks_editor_construct):
Implement a way to choose visible column in a menu. Not finished
I need to persist state in a gconf key.
|
| |
|
|
|
|
|
|
|
|
|
| |
2003-09-04 Marco Pesenti Gritti <marco@gnome.org>
* lib/widgets/ephy-node-view.c: (drag_data_received_cb):
Use x,y only on drop, otherwise they are invalid. Damn
that api suck.
|
|
|
|
|
|
|
|
|
| |
2003-09-04 Marco Pesenti Gritti <marco@gnome.org>
* lib/widgets/ephy-node-view.c: (drag_motion_cb):
Check if the target type match before highlighting
the row and return success status.
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2003-08-31 Marco Pesenti Gritti <marco@gnome.org>
* data/ui/epiphany-history-window-ui.xml.in:
* data/ui/epiphany-ui.xml.in:
* lib/widgets/ephy-node-view.c: (get_selection):
* src/bookmarks/ephy-bookmarks-editor.c: (add_widget),
(ephy_bookmarks_editor_construct):
* src/bookmarks/ephy-bookmarks-menu.c: (add_bookmarks_menu),
(ephy_bookmarks_menu_rebuild):
* src/ephy-encoding-menu.c: (build_group), (build_encoding),
(ephy_encoding_menu_rebuild):
* src/ephy-favorites-menu.c: (ephy_favorites_menu_rebuild):
* src/ephy-history-window.c: (add_widget),
(ephy_history_window_construct):
* src/ephy-tabs-menu.c: (ephy_tabs_menu_clean),
(ephy_tabs_menu_update):
* src/ephy-window.c: (setup_window), (ephy_window_init):
Fix problems with EphyNodeView, bookmarks and history
dialogs and update dynamic menus to the new xml format.
|
| |
|
|
|
|
|
|
|
|
| |
2003-08-24 Christian Persch <chpe@cvs.gnome.org>
* lib/widgets/ephy-node-view.c: (ephy_node_view_remove):
Convert erroneous g_return_if_fail into a simple conditional return.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2003-08-22 Marco Pesenti Gritti <marco@gnome.org>
* lib/widgets/ephy-node-view.c: (compare_string_values),
(ephy_node_view_sort_func):
* src/bookmarks/ephy-bookmarks-menu.c: (sort_topics),
(sort_bookmarks):
* src/bookmarks/ephy-topic-action.c: (sort_bookmarks),
(sort_topics):
Make it NULL safe
* src/ephy-toolbars-model.c: (impl_get_item_id):
When creating bookmark, if the title is unknown, use untitled.
|
|
|
|
|
|
|
|
|
| |
2003-08-21 Christian Persch <chpe@cvs.gnome.org>
* lib/widgets/ephy-node-view.c: (drag_data_received_cb):
Fix function signature, it's void instead of gboolean.
Fix a logic error.
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2003-08-20 Marco Pesenti Gritti <marco@gnome.org>
* lib/widgets/ephy-node-view.c: (get_node_from_path),
(gtk_tree_view_vertical_autoscroll), (scroll_timeout),
(remove_scroll_timeout), (set_drag_dest_row),
(clear_drag_dest_row), (get_drag_data), (free_drag_data),
(drag_motion_cb), (drag_leave_cb), (drag_data_received_cb),
(drag_drop_cb), (ephy_node_view_enable_drag_dest):
Fix drag dest implementation getting some code from nautilus.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2003-08-19 Marco Pesenti Gritti <marco@gnome.org>
* lib/widgets/ephy-node-view.c: (drag_motion_cb), (drag_drop_cb),
(drag_data_received_cb), (button_event_modifies_selection),
(did_not_drag), (button_release_cb), (motion_notify_cb),
(ephy_node_view_button_press_cb):
Stop signals only when necessary on drag dest custom
implementation.
Make click on multiple selection deselect all but the
clicked element.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2003-08-11 Marco Pesenti Gritti <marco@it.gnome.org>
* lib/widgets/ephy-node-view.c: (ephy_node_view_finalize),
(ephy_node_view_enable_drag_dest), (selection_foreach),
(get_selection_refs), (ref_list_free), (stop_drag_check),
(drag_data_get_cb), (button_release_cb), (motion_notify_cb),
(button_event_modifies_selection),
(ephy_node_view_button_press_cb), (ephy_node_view_init),
(ephy_node_view_enable_drag_source):
Fix multiple rows dnd problems stealing some Nautilus code.
|
|
|
|
|
|
|
|
| |
2003-08-08 Christian Persch <chp@cvs.gnome.org>
* lib/widgets/ephy-node-view.c: (cell_renderer_edited):
Fix mem leak.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* data/ui/epiphany-toolbar.xml.in:
* lib/egg/egg-editable-toolbar.c: (drag_data_received_cb):
* lib/egg/egg-editable-toolbar.h:
* lib/egg/egg-toolbar-editor.c: (parse_item_list):
* lib/egg/egg-toolbars-model.c: (egg_toolbars_model_to_xml),
(safe_save_xml), (egg_toolbars_model_save), (toolbars_item_new),
(free_item_node), (egg_toolbars_model_add_separator),
(egg_toolbars_model_add_item), (parse_item_list),
(impl_get_item_id), (impl_get_item_name), (impl_get_item_type),
(egg_toolbars_model_class_init), (egg_toolbars_model_item_nth),
(egg_toolbars_model_toolbar_nth), (egg_toolbars_model_get_item_id),
(egg_toolbars_model_get_item_name),
(egg_toolbars_model_get_item_type):
* lib/egg/egg-toolbars-model.h:
* lib/egg/eggtoolbar.c: (egg_toolbar_finalize):
* lib/ephy-dnd.c: (add_one_topic), (ephy_dnd_drag_data_get):
* lib/ephy-dnd.h:
* lib/widgets/ephy-node-view.c: (drag_data_received_cb),
(ephy_node_view_select_node_by_key), (ephy_node_view_construct),
(ephy_node_view_add_data_column),
(ephy_node_view_enable_drag_source):
* lib/widgets/ephy-node-view.h:
* lib/widgets/ephy-tree-model-sort.c:
(ephy_tree_model_sort_class_init), (ephy_tree_model_sort_init),
(ephy_tree_model_sort_multi_row_draggable),
(ephy_tree_model_sort_set_column_id),
(each_property_get_data_binder),
(ephy_tree_model_sort_multi_drag_data_get):
* lib/widgets/ephy-tree-model-sort.h:
* src/bookmarks/ephy-bookmark-properties.c:
(toolbar_checkbox_changed_cb), (build_ui):
* src/bookmarks/ephy-bookmarks-editor.c:
(cmd_show_in_bookmarks_bar), (ephy_bookmarks_editor_update_menu),
(node_dropped_cb), (provide_keyword_uri),
(ephy_bookmarks_editor_construct):
* src/bookmarks/ephy-bookmarks.c: (ephy_bookmarks_init_defaults),
(ephy_bookmarks_remove_keyword), (ephy_bookmarks_get_topic_uri),
(ephy_bookmarks_find_keyword):
* src/bookmarks/ephy-bookmarks.h:
* src/ephy-history-window.c: (ephy_history_window_construct):
* src/ephy-toolbars-model.c: (ephy_toolbars_model_get_action_name),
(ephy_toolbars_model_get_node), (bookmark_destroy_cb),
(impl_get_item_name), (impl_get_item_id), (impl_get_item_type),
(connect_item), (ephy_toolbars_model_set_bookmarks),
(ephy_toolbars_model_class_init), (save_changes), (item_added),
(item_removed), (toolbar_added), (toolbar_removed),
(ephy_toolbars_model_init), (ephy_toolbars_model_finalize),
(ephy_toolbars_model_remove_bookmark),
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2003-07-27 Christian Persch <chpe@cvs.gnome.org>
* lib/widgets/ephy-node-view.c: (ephy_node_view_remove):
Fix mem leak.
* lib/widgets/ephy-node-view.c: (ephy_node_view_remove):
* src/pdm-dialog.c: (pdm_cmd_delete_selection):
If we've just deleted every row in the tree view, the row ref
contains an empty path. Check for that; possibly fixing bug #118398.
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2003-07-23 Marco Pesenti Gritti <marco@it.gnome.org>
* lib/widgets/ephy-node-view.c:
(ephy_node_view_selection_changed_cb),
(ephy_node_view_button_press_cb), (ephy_node_view_init),
(ephy_node_view_get_selection), (ephy_node_view_is_target),
(ephy_node_view_has_selection):
Yet another try to get context menu and selection beahviors
right.
|
|
|
|
|
|
|
| |
We use g_list_prepend to create selections now (in ephy_node_view_get_selection()
and inside pdm_cmd_delete_selection), so the last element selected is the first in
the list and we need to use g_list_first instead of _last to make intelligent
selection after removal work on multiple selections.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* lib/widgets/ephy-node-view.c:
(ephy_node_view_select_node_by_key), (ephy_node_view_remove):
Don't use event->string, is deprecated (#117346).
Also improve intelligent selection.
* src/pdm-dialog.c: (pdm_dialog_remove_button_clicked_cb),
(pdm_cmd_delete_selection), (pdm_key_pressed_cb),
(setup_action):
Connect del keys to delete action, also implement intelligent selection
after deletion (I want to be known as Mr. Intelligent Selection
from now, spread the word).
|
|
|
|
|
|
|
|
|
| |
2003-07-13 Christian Persch <chpe@cvs.gnome.org>
* lib/widgets/ephy-node-view.c: (drag_motion_cb),
(drag_data_received_cb):
Fix mem leaks.
|
|
|
|
|
|
|
| |
A "fast search" implementation for all node views. Pressing any valid
unicode character will make ephy select the first entry begining
with that key, or the nearest match (with previous or posterior letters).
Fixes bug #116744 (http://bugzilla.gnome.org/show_bug.cgi?id=116744).
|
|
|
|
|
|
|
|
|
|
|
| |
2003-07-06 Christian Persch <chpe@cvs.gnome.org>
* lib/widgets/ephy-node-view.c: (ephy_node_view_button_press_cb),
(ephy_node_view_sort_func):
* src/bookmarks/ephy-topics-selector.c: (topic_clicked),
(topic_key_pressed):
Fix mem leaks and a conditional.
|
|
|
|
|
|
|
|
| |
2003-06-16 Marco Pesenti Gritti <marco@it.gnome.org>
* lib/widgets/ephy-node-view.c: (ephy_node_view_init):
disable treeview interactive search
|
|
|
|
| |
Fix warning.
|
|
|
|
| |
Use gtk_tree_selection_select_iter to make selection, fixes #114965.
|
|
|
|
| |
Remove unused gtk_tree_view_get_selection.
|
|
|
|
| |
Try to fix dereferencing type-punned warning.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* lib/Makefile.am:
* lib/ephy-dnd.c: (ephy_dnd_node_list_extract_nodes):
* lib/ephy-node.c: (write_lock_to_read_lock),
(read_lock_to_write_lock), (lock_gdk), (unlock_gdk), (callback),
(ephy_node_emit_signal), (ephy_node_finalize), (real_remove_child),
(remove_child), (signal_object_weak_notify),
(unref_signal_objects), (ephy_node_dispose), (ephy_node_new),
(ephy_node_new_with_id), (ephy_node_get_id), (ephy_node_ref),
(ephy_node_unref), (ephy_node_freeze), (ephy_node_thaw),
(child_changed), (real_set_property), (ephy_node_set_property),
(ephy_node_get_property), (ephy_node_get_property_string),
(ephy_node_get_property_boolean), (ephy_node_get_property_long),
(ephy_node_get_property_int), (ephy_node_get_property_double),
(ephy_node_get_property_float), (ephy_node_get_property_node),
(save_parent), (ephy_node_save_to_xml), (real_add_child),
(ephy_node_new_from_xml), (ephy_node_add_child),
(ephy_node_remove_child), (ephy_node_has_child),
(ephy_node_real_get_child_index), (ephy_node_sort_children),
(ephy_node_reorder_children), (ephy_node_get_children),
(ephy_node_get_n_children), (ephy_node_get_nth_child),
(get_child_index_real), (ephy_node_get_child_index),
(ephy_node_get_next_child), (ephy_node_get_previous_child),
(ephy_node_signal_connect_object), (ephy_node_signal_disconnect):
* lib/ephy-node.h:
* lib/ephy-state.c: (ephy_states_load), (ensure_states),
(ephy_state_add_window), (ephy_state_add_paned), (ephy_state_save):
* lib/widgets/ephy-node-view.c: (ephy_node_view_class_init),
(ephy_node_view_selection_changed_cb),
(ephy_node_view_set_property), (ephy_node_view_get_property),
(ephy_node_view_remove):
* lib/widgets/ephy-tree-model-node.c:
(ephy_tree_model_node_class_init),
(ephy_tree_model_node_set_property),
(ephy_tree_model_node_get_property),
(ephy_tree_model_node_get_value), (ephy_tree_model_node_get_path),
(ephy_tree_model_node_iter_next),
(ephy_tree_model_node_node_from_iter):
* src/bookmarks/ephy-bookmark-action.c:
(ephy_bookmark_action_init), (ephy_bookmark_action_new):
* src/bookmarks/ephy-bookmark-properties.c:
(ephy_bookmark_properties_class_init),
(ephy_bookmark_properties_set_property):
* src/bookmarks/ephy-bookmarks-editor.c:
(cmd_show_in_bookmarks_bar), (cmd_open_bookmarks_in_tabs),
(cmd_open_bookmarks_in_browser), (cmd_delete),
(cmd_bookmark_properties), (cmd_copy),
(ephy_bookmarks_editor_node_activated_cb),
(ephy_bookmarks_editor_update_menu),
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2003-04-29 Marco Pesenti Gritti <marco@it.gnome.org>
* lib/widgets/ephy-node-view.c: (ephy_node_view_add_column):
* lib/widgets/ephy-node-view.h:
Remove add_icon_column func and add the functionality to the
normal add_column. The icon will be packed in the same column.
* src/bookmarks/ephy-bookmarks-editor.c:
(entry_selection_changed_cb), (add_entry_monitor),
(add_text_renderer_monitor), (cmd_add_topic), (cmd_rename),
(build_search_box), (ephy_bookmarks_editor_construct),
(toolbar_items_changed_cb), (ephy_bookmarks_editor_init):
Fix for api change.
Deal with 2 more sensitivity cases:
bookmarks added by dnd to the toolbar and treeview text
renderers.
Remove hints until we have more columns.
* src/ephy-history-window.c: (ephy_history_window_construct):
Fix for new api
* src/ephy-toolbars-model.c: (impl_add_item):
Dont check if normal items are already in the toolbar:
fix warnings.
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2003-04-19 Marco Pesenti Gritti <marco@it.gnome.org>
* lib/widgets/ephy-node-view.c: (ephy_node_view_add_column),
(ephy_node_view_remove), (ephy_node_view_edit):
Fix bookmarks editing and warnings when openining the dialog.
* lib/widgets/ephy-node-view.h:
Remove unused api.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2003-04-18 Marco Pesenti Gritti <marco@it.gnome.org>
* data/art/Makefile.am:
Do not install two copies of epiphany.png
* embed/ephy-history.c: (ephy_history_save),
(ephy_history_set_page_title):
Use host name as title for sites, not the real
title.
* lib/ephy-state.c: (ephy_state_add_window),
(paned_size_allocate_cb), (ephy_state_add_paned):
* lib/ephy-state.h:
Add a way to persist paned.
* lib/widgets/ephy-node-view.h:
* lib/widgets/ephy-node-view.c: (ephy_node_view_sort_func),
(provide_text_weight), (ephy_node_view_add_column),
(ephy_node_view_has_selection):
Improve add_column api a bit to support both auto sorting
and user sorting.
* src/bookmarks/ephy-bookmarks-editor.c:
(ephy_bookmarks_editor_construct):
Updates for changed api.
* src/ephy-history-window.c: (ephy_history_window_construct):
Set a max size for title/location. Not very good, but the
best we can do with current treeview api prolly.
Persist the paned size.
Make columns user sortable.
|
|
2003-04-17 Marco Pesenti Gritti <marco@it.gnome.org>
* lib/widgets/Makefile.am:
* lib/widgets/ephy-node-view.c:
* lib/widgets/ephy-node-view.h:
* lib/widgets/ephy-tree-model-node.c:
* lib/widgets/ephy-tree-model-node.h:
New abstracted implementations.
Nicer and will be useful for
history dialog interface rehash to make
it more consistent with bookmarks (this
was the hard part of the work).
* src/bookmarks/Makefile.am:
* src/bookmarks/ephy-bookmarks-editor.c:
Use them.
* src/history-dialog.c:
Temp hack to keep the thing building until
I actually rewrite history dialog.
2
|