aboutsummaryrefslogtreecommitdiffstats
path: root/widgets/text
Commit message (Collapse)AuthorAgeFilesLines
* lots of stuff, add 2 e-text widgets, 1 readonly, the other writable (thatChris Toshok2002-12-095-530/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | 2002-12-08 Chris Toshok <toshok@ximian.com> * tests/test-text.c: lots of stuff, add 2 e-text widgets, 1 readonly, the other writable (that uses the uri model..) * gal/e-text/e-text.[ch]: lots of pango changes. we don't do *anything* with gdk/e fonts now. everything is pango. There are still some issues while editting but display should more or less work properly now, and without all the performance problems. * gal/e-text/e-completion-view.c (e_completion_view_expose_event): use gtk_widget_send_expose instead of gtk_widget_event so we don't get the annoying gtk warning. * gal/e-text/e-entry.c (e_entry_dispose): make sure both the gdk and gtk grabs are removed. (e_entry_class_init): fill_color_gdk is a boxed type, not pointer. * gal/e-text/e-text-model-uri.h (E_TYPE_TEXT_MODEL_URI): oops, this should be e_text_model_uri_get_type, not e_text_model_get_type. svn path=/trunk/; revision=19054
* rework this from the gal-2 branch, clahey's patch, and the stuff i'd doneChris Toshok2002-11-301-107/+107
| | | | | | | | | | 2002-11-29 Chris Toshok <toshok@ximian.com> * gal/e-text/e-text.c: rework this from the gal-2 branch, clahey's patch, and the stuff i'd done since. it's working *MUCH* better now. svn path=/trunk/; revision=18957
* commit clahey's original pango work.Chris Toshok2002-11-202-916/+392
| | | | | | | | 2002-11-19 Chris Toshok <toshok@ximian.com> * gal/e-text/e-text.[ch]: commit clahey's original pango work. svn path=/trunk/; revision=18850
* fix c&p typo.Chris Toshok2002-11-173-37/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2002-11-16 Chris Toshok <toshok@ximian.com> * gal/widgets/e-reflow.c (e_reflow_class_init): fix c&p typo. * gal/widgets/e-categories-master-list-dialog.c: switch to GtkDialogism's. * gal/widgets/gal-categories.[ch]: same. * gal/widgets/e-categories-master-list-dialog.glade: libglade-convert. * gal/widgets/e-categories.glade: same. * gal/util/e-text-event-processor.[ch]: subclass this from GObject. * gal/util/e-text-event-processor-emacs-like.[ch]: clean up the gtk cruft a bit. * gal/e-text/e-text.c (_get_tep): remove the _sink call. (e_text_init): same. * gal/e-text/e-text-model.[ch]: subclass this from GObject instead of GtkObject. svn path=/trunk/; revision=18808
* Lots of GObject work.Chris Toshok2002-11-1717-1249/+1404
| | | | | | | | | | | | | | | | | | | | | | | | 2002-11-16 Chris Toshok <toshok@ximian.com> * gal/e-text/e-completion-test.c: Lots of GObject work. * gal/e-text/e-completion-view.[ch]: same. * gal/e-text/e-completion.[ch]: same. * gal/e-text/e-entry.[ch]: same. * gal/e-text/e-table-text-model.[ch]: same. * gal/e-text/e-text-model-uri.[ch]: same. * gal/e-text/e-text-model.[ch]: same. * gal/e-text/e-text-test.c: same. * gal/e-text/e-text.[ch]: same. svn path=/trunk/; revision=18800
* only clear choices if cv->choices != NULL. (e_completion_view_disconnect):Chris Toshok2002-11-121-3/+6
| | | | | | | | | | 2002-11-11 Chris Toshok <toshok@ximian.com> * gal/e-text/e-completion-view.c (e_completion_view_destroy): only clear choices if cv->choices != NULL. (e_completion_view_disconnect): zero out cancel_signal_id. svn path=/trunk/; revision=18718
* merging the gal-2 branch back to the trunk.Mike Kestner2002-11-0119-196/+195
| | | | | | merging the gal-2 branch back to the trunk. svn path=/trunk/; revision=18471
* take a clip_height and use it to set the maximum number of lines ifJP Rosevear2002-09-111-20/+15
| | | | | | | | | | 2002-09-10 JP Rosevear <jpr@ximian.com> * gal/e-text/e-text.c (line_splitter): take a clip_height and use it to set the maximum number of lines if necessary (split_into_lines): pass clip_height arg svn path=/trunk/; revision=18032
* Added debugging printfs. (e_text_request_paste): Fixed the order ofChristopher James Lahey2002-06-061-2/+14
| | | | | | | | | | | 2002-06-05 Christopher James Lahey <clahey@ximian.com> * gal/e-text/e-text.c: Added debugging printfs. (e_text_request_paste): Fixed the order of setting last_type_request before calling gtk_selection_convert due to a reentrancy bug. svn path=/trunk/; revision=17119
* Reflow and redraw when the style gets set.Christopher James Lahey2002-06-042-322/+330
| | | | | | | | | 2002-06-03 Christopher James Lahey <clahey@ximian.com> * gal/e-text/e-text.c, gal/e-text/e-text.h (e_text_style_set): Reflow and redraw when the style gets set. svn path=/trunk/; revision=17086
* Switch from gnome_canvas_item_grab to e_canvas_item_grab.Christopher James Lahey2002-05-101-5/+10
| | | | | | | | | | | | | | | | | | | 2002-05-09 Christopher James Lahey <clahey@ximian.com> * gal/e-text/e-text.c: Switch from gnome_canvas_item_grab to e_canvas_item_grab. * gal/widgets/e-canvas.c, gal/widgets/e-canvas.h (e_canvas_item_grab, e_canvas_item_ungrab): Added these functions. From gal/e-table/ChangeLog: 2002-05-09 Christopher James Lahey <clahey@ximian.com> * e-table-item.c, e-table-item.h: Switched from gnome_canvas_item_grab to e_canvas_item_grab. svn path=/trunk/; revision=16738
* Make the style here match the proper widget style to emulate a label or anChristopher James Lahey2002-05-031-1/+1
| | | | | | | | | 2002-05-02 Christopher James Lahey <clahey@ximian.com> * gal/e-text/e-text.c (e_text_draw): Make the style here match the proper widget style to emulate a label or an entry. svn path=/trunk/; revision=16670
* Set the gettext-domain here.Christopher James Lahey2002-05-021-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2002-05-01 Christopher James Lahey <clahey@ximian.com> * gal/e-text/e-completion-view.c (simple_spec), gal/widgets/e-categories-master-list-dialog.c (SPEC), gal/widgets/e-categories.c (INITIAL_SPEC): Set the gettext-domain here. * gal/util/e-i18n.h (E_I18N_DOMAIN): #define as makes sense in the different cases. From gal/e-table/ChangeLog: 2002-05-01 Christopher James Lahey <clahey@ximian.com> * e-table-config.c, e-table-config.h, e-table-specification.c, e-table-specification.h, e-table-utils.c, e-table-utils.h, e-table.c, e-table.h: Made these pay attention to the gettext-domain in the etspec. * e-table-config.c: Set the gettext-domain in the etspec here. From gal/menus/ChangeLog: 2002-05-01 Christopher James Lahey <clahey@ximian.com> * gal-define-views-dialog.c (SPEC), gal-view-instance-save-as-dialog.c (SPEC): Set the gettext-domain here. svn path=/trunk/; revision=16658
* Ansification patch from danw.Christopher James Lahey2002-04-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | 2002-04-25 Christopher James Lahey <clahey@ximian.com> * gal/e-paned/e-paned.c, gal/e-text/e-entry.c, gal/util/e-bit-array.c, gal/util/e-sorter-array.c, gal/util/e-sorter.c, gal/util/e-text-event-processor.c, gal/widgets/color-group.c, gal/widgets/color-palette.c, gal/widgets/e-canvas-vbox.c, gal/widgets/e-canvas.c, gal/widgets/e-canvas.h, gal/widgets/e-categories-master-list-array.c, gal/widgets/e-categories-master-list-combo.c, gal/widgets/e-categories-master-list-dialog-model.c, gal/widgets/e-categories-master-list-dialog.c, gal/widgets/e-categories.c, gal/widgets/e-reflow-model.c, gal/widgets/e-reflow.c, gal/widgets/e-selection-model-array.c, gal/widgets/e-selection-model-simple.c, gal/widgets/e-selection-model.c, gal/widgets/e-selection-model.h, gal/widgets/gtk-combo-box.c, gal/widgets/gtk-combo-stack.c, gal/widgets/widget-color-combo.c, gal/widgets/widget-pixmap-combo.c: Ansification patch from danw. svn path=/trunk/; revision=16589
* Don't show the popup if the entry->item doesn't have focus.Ettore Perazzoli2002-04-041-0/+5
| | | | | | | * gal/e-text/e-entry.c (e_entry_show_popup): Don't show the popup if the entry->item doesn't have focus. svn path=/trunk/; revision=16345
* If tab is hit and the cursor is still in the entry, move down into theJon Trowbridge2002-03-011-11/+36
| | | | | | | | | | | 2002-02-28 Jon Trowbridge <trow@ximian.com> * gal/e-text/e-completion-view.c (e_completion_view_key_press_handler): If tab is hit and the cursor is still in the entry, move down into the entry otherwise unbrowse. svn path=/trunk/; revision=15878
* Bumped the version number to 0.19.99.5.Christopher James Lahey2002-02-071-22/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2002-02-07 Christopher James Lahey <clahey@ximian.com> * configure.in: Bumped the version number to 0.19.99.5. * gal/Makefile.am (libgal_la_LIBADD): Added menus/gal-view-instance-save-as-dialog.lo. * gal/e-text/e-text.c (next_word): Contains refactored code from the E_TEP_FORWARD_WORD case of e_text_command. (e_text_command): Implemented E_TEP_CAPS. From gal/menus/ChangeLog: 2002-02-07 Christopher James Lahey <clahey@ximian.com> * Makefile.am (glade_DATA): Added gal-view-instance-save-as-dialog.glade. (libgalmenus_la_SOURCES): Added gal-view-instance-save-as-dialog.c. (libgalmenusinclude_HEADERS): Added gal-view-instance-save-as-dialog.h. * gal-view-collection.c, gal-view-collection.h (gal_view_collection_append_with_title): Added this new version of the append function that sets the title and returns the new id as well. (gal_view_collection_set_nth_view): Added this function to save over another view. (gal_view_collection_get_default_view, gal_view_collection_set_default_view): Added the concept of a default view for GalViewCollections. * gal-view-etable.c, gal-view-etable.h (gal_view_etable_attach_table, gal_view_etable_attach_tree, gal_view_etable_detach): Added functions to set the state of a table or tree and then send GalView "changed" signals whenever that state changes. (gal_view_etable_set_state): New function to set the ETableState of a GalViewETable. * gal-view-instance-save-as-dialog.c, gal-view-instance-save-as-dialog.glade, gal-view-instance-save-as-dialog.h: New dialog to save the current custom view as a named view. * gal-view-instance.c, gal-view-instance.h (gal_view_instance_set_custom_view): New function to set the state of an instance to custom view and set the custom view to a particular GalView. (gal_view_instance_exists): New function to check if this particular instance has ever been opened before. Use before gal_view_instance_load. (gal_view_instance_save_as): New function to open a save as dialog. (gal_view_instance_load): Added this function which used to be part of _construct. This function can be called multiple times, and those extra times will be ignored. This is so you can set a default view before loading. (gal_view_instance_get_default_view, gal_view_instance_set_default_view): Set the default view for this instance. If unset, this falls back to the default view for the corresponding GalViewCollection. svn path=/trunk/; revision=15590
* Request a reflow and an update when the text model changes. Fixes XimianChristopher James Lahey2002-01-211-3/+4
| | | | | | | | | | | | 2002-01-20 Christopher James Lahey <clahey@ximian.com> * gal/e-text/e-text.c (e_text_text_model_changed): Request a reflow and an update when the text model changes. Fixes Ximian bug #16459. (e_text_set_arg): (ARG_TEXT) Don't set the number of lines to one here. svn path=/trunk/; revision=15411
* Added #include <libgnome/gnome-defs.h>.Christopher James Lahey2002-01-174-0/+4
| | | | | | | | | | | | | 2002-01-16 Christopher James Lahey <clahey@ximian.com> * gal/e-text/e-entry.h, gal/e-text/e-table-text-model.h, gal/e-text/e-text-model-uri.h, gal/e-text/e-text.h, gal/util/e-i18n.h, gal/widgets/e-canvas-utils.h, gal/widgets/e-gui-utils.h, gal/widgets/e-printable.h, gal/widgets/gtk-combo-stack.h: Added #include <libgnome/gnome-defs.h>. svn path=/trunk/; revision=15340
* Handle the case of a 0 length string properly here.Christopher James Lahey2002-01-151-0/+6
| | | | | | | | | 2002-01-14 Christopher James Lahey <clahey@ximian.com> * gal/e-text/e-text.c (line_splitter): Handle the case of a 0 length string properly here. svn path=/trunk/; revision=15323
* Reworked to fix bugs related to breaking text on newlines. Some fairlyJon Trowbridge2001-12-281-169/+95
| | | | | | | | | | 2001-12-27 Jon Trowbridge <trow@ximian.com> * gal/e-text/e-text.c (split_into_lines): Reworked to fix bugs related to breaking text on newlines. Some fairly substantial code duplication was removed in the process. svn path=/trunk/; revision=15219
* Don't crash if the text string is NULL. (text_draw_with_objects): Don'tJon Trowbridge2001-12-111-1/+4
| | | | | | | | | | | 2001-12-10 Jon Trowbridge <trow@ximian.com> * gal/e-text/e-text.c (text_width_with_objects): Don't crash if the text string is NULL. (text_draw_with_objects): Don't crash if the text string is NULL. (Fixes #16359) svn path=/trunk/; revision=14954
* Only popup entries that have focus. Fixes the lingering completion popupJon Trowbridge2001-11-091-1/+3
| | | | | | | | | 2001-11-08 Jon Trowbridge <trow@ximian.com> * gal/e-text/e-entry.c (full_cb): Only popup entries that have focus. Fixes the lingering completion popup bug. svn path=/trunk/; revision=14626
* Calc height here if we need it to check the y position of the cursor.Christopher James Lahey2001-10-301-0/+7
| | | | | | | | | 2001-10-30 Christopher James Lahey <clahey@ximian.com> * gal/e-text/e-text.c (e_text_reflow): Calc height here if we need it to check the y position of the cursor. svn path=/trunk/; revision=14443
* Added. Makes our popup window a transient of the toplevel.Jon Trowbridge2001-10-301-0/+24
| | | | | | | | | | | | | | 2001-10-29 Jon Trowbridge <trow@ximian.com> * gal/e-text/e-entry.c (e_entry_make_completion_window_transient): Added. Makes our popup window a transient of the toplevel. (e_entry_enable_completion_full): Try to make our popup a transient. (e_entry_realize): Also try to make our popup a transient here, in case the entry wasn't packed before we enabled completion. This is all an attempt to fix bug #13791. svn path=/trunk/; revision=14390
* destroy our completion_view_popup... we've been leaking them all of thisJon Trowbridge2001-10-301-1/+3
| | | | | | | | | | 2001-10-29 Jon Trowbridge <trow@ximian.com> * gal/e-text/e-entry.c (e_entry_destroy): destroy our completion_view_popup... we've been leaking them all of this time. This should fix the mysterious bug #13900. svn path=/trunk/; revision=14381
* Silently drop match strings that contain invalid utf-8... not a good thingJon Trowbridge2001-10-301-18/+17
| | | | | | | | | | | 2001-10-29 Jon Trowbridge <trow@ximian.com> * gal/e-text/e-completion-match.c (e_completion_match_set_text): Silently drop match strings that contain invalid utf-8... not a good thing to do, but better than any of the currently available alternatives. svn path=/trunk/; revision=14364
* Set text->revert = NULL here. (e_text_cancel_editing): Only revert ifChristopher James Lahey2001-10-291-1/+4
| | | | | | | | | | 2001-10-29 Christopher James Lahey <clahey@ximian.com> * gal/e-text/e-text.c (e_text_stop_editing): Set text->revert = NULL here. (e_text_cancel_editing): Only revert if text->revert is non-null. svn path=/trunk/; revision=14334
* Bumped version number here to 0.15.99.7.Christopher James Lahey2001-10-292-4/+22
| | | | | | | | | | | | | 2001-10-29 Christopher James Lahey <clahey@ximian.com> * configure.in: Bumped version number here to 0.15.99.7. * gal/e-text/e-text.c, gal/e-text/e-text.h (e_text_stop_editing): Exported this function. (e_text_cancel_editing): New function. Allows you to revert edits. svn path=/trunk/; revision=14332
* Bumped the version number to 0.15.99.6 for emulate_label_resize.Christopher James Lahey2001-10-281-13/+88
| | | | | | | | | | | | 2001-10-27 Christopher James Lahey <clahey@ximian.com> * configure.in: Bumped the version number to 0.15.99.6 for emulate_label_resize. * gal/e-text/e-entry.c: Added "emulate_label_resize" argument to make EEntry act like a label for width resizing purposes. svn path=/trunk/; revision=14227
* Changed the license announcement at the top of these files.Christopher James Lahey2001-10-271-6/+22
| | | | | | | | | | 2001-10-26 Christopher James Lahey <clahey@ximian.com> * gal/e-text/e-text-test.c, gal/util/e-i18n.h, gal/widgets/e-hsv-utils.c, gal/widgets/e-hsv-utils.h: Changed the license announcement at the top of these files. svn path=/trunk/; revision=14169
* Changed the license announcement at the top of these files.Christopher James Lahey2001-10-2721-264/+379
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2001-10-26 Christopher James Lahey <clahey@ximian.com> * gal/e-paned/e-hpaned.c, gal/e-paned/e-hpaned.h, gal/e-paned/e-paned.c, gal/e-paned/e-paned.h, gal/e-paned/e-vpaned.c, gal/e-paned/e-vpaned.h, gal/e-text/e-completion-match.c, gal/e-text/e-completion-match.h, gal/e-text/e-completion-test.c, gal/e-text/e-completion-view.c, gal/e-text/e-completion-view.h, gal/e-text/e-completion.c, gal/e-text/e-completion.h, gal/e-text/e-entry-test.c, gal/e-text/e-entry.c, gal/e-text/e-entry.h, gal/e-text/e-table-text-model.c, gal/e-text/e-table-text-model.h, gal/e-text/e-text-model-repos.c, gal/e-text/e-text-model-repos.h, gal/e-text/e-text-model-test.c, gal/e-text/e-text-model-uri.c, gal/e-text/e-text-model-uri.h, gal/e-text/e-text-model.c, gal/e-text/e-text-model.h, gal/e-text/e-text.c, gal/e-text/e-text.h, gal/util/e-bit-array.c, gal/util/e-bit-array.h, gal/util/e-cache.c, gal/util/e-cache.h, gal/util/e-iconv.c, gal/util/e-iconv.h, gal/util/e-sorter-array.c, gal/util/e-sorter-array.h, gal/util/e-sorter.c, gal/util/e-sorter.h, gal/util/e-text-event-processor-emacs-like.c, gal/util/e-text-event-processor-emacs-like.h, gal/util/e-text-event-processor-types.h, gal/util/e-text-event-processor.c, gal/util/e-text-event-processor.h, gal/util/e-util.c, gal/util/e-util.h, gal/util/e-xml-utils.c, gal/util/e-xml-utils.h, gal/widgets/color-group.c, gal/widgets/color-group.h, gal/widgets/color-palette.c, gal/widgets/color-palette.h, gal/widgets/e-canvas-utils.c, gal/widgets/e-canvas-utils.h, gal/widgets/e-canvas-vbox.c, gal/widgets/e-canvas-vbox.h, gal/widgets/e-canvas.c, gal/widgets/e-canvas.h, gal/widgets/e-categories-master-list-array.c, gal/widgets/e-categories-master-list-array.h, gal/widgets/e-categories-master-list-combo.c, gal/widgets/e-categories-master-list-combo.h, gal/widgets/e-categories-master-list-dialog-model.c, gal/widgets/e-categories-master-list-dialog-model.h, gal/widgets/e-categories-master-list-dialog.c, gal/widgets/e-categories-master-list-dialog.h, gal/widgets/e-categories-master-list.c, gal/widgets/e-categories-master-list.h, gal/widgets/e-categories.c, gal/widgets/e-categories.h, gal/widgets/e-colors.c, gal/widgets/e-colors.h, gal/widgets/e-cursors.c, gal/widgets/e-cursors.h, gal/widgets/e-font.c, gal/widgets/e-font.h, gal/widgets/e-gui-utils.c, gal/widgets/e-gui-utils.h, gal/widgets/e-hscrollbar.c, gal/widgets/e-hscrollbar.h, gal/widgets/e-popup-menu.c, gal/widgets/e-popup-menu.h, gal/widgets/e-printable.c, gal/widgets/e-printable.h, gal/widgets/e-reflow-model.c, gal/widgets/e-reflow-model.h, gal/widgets/e-reflow-sorted.c, gal/widgets/e-reflow-sorted.h, gal/widgets/e-reflow.c, gal/widgets/e-reflow.h, gal/widgets/e-scroll-frame.c, gal/widgets/e-scroll-frame.h, gal/widgets/e-selection-model-array.c, gal/widgets/e-selection-model-array.h, gal/widgets/e-selection-model-simple.c, gal/widgets/e-selection-model-simple.h, gal/widgets/e-selection-model.c, gal/widgets/e-selection-model.h, gal/widgets/e-unicode.c, gal/widgets/e-unicode.h, gal/widgets/e-vscrollbar.c, gal/widgets/e-vscrollbar.h, gal/widgets/gtk-combo-box.c, gal/widgets/gtk-combo-box.h, gal/widgets/gtk-combo-stack.c, gal/widgets/gtk-combo-stack.h, gal/widgets/gtk-combo-text.c, gal/widgets/gtk-combo-text.h, gal/widgets/test-color.c, gal/widgets/test-e-font.c, gal/widgets/test-e-font.h, gal/widgets/test-font-loading.c, gal/widgets/widget-color-combo.c, gal/widgets/widget-color-combo.h, gal/widgets/widget-pixmap-combo.c, gal/widgets/widget-pixmap-combo.h, src/e-table/e-table-sorted-variable.c, tests/test-define-views.c, tests/test-shortcut-bar.c, tests/test-table-1.c, tests/test-tree-1.c, tests/test-tree-2.c, tests/test-tree-3.c, tests/test-unicode.c: Changed the license announcement at the top of these files. svn path=/trunk/; revision=14158
* Bumped version to 0.15.99.4 for e-iconv changes.52001-10-261-1/+3
| | | | | | | | | | | | | | | | | | | 2001-10-25 <NotZed@Ximian.com> * configure.in: Bumped version to 0.15.99.4 for e-iconv changes. * gal/widgets/e-unicode.c (e_utf8_from_iconv_string_sized): " (e_utf8_to_iconv_string_sized): " (e_utf8_from_gtk_string_sized): " (e_utf8_to_gtk_string_sized): " * gal/widgets/e-font.c (e_font_to_native): s/iconv/e_iconv/ * gal/util/e-iconv.c (e_iconv): Implement a wrapper for iconv() to make sure we link with and execute the right iconv to match the right iconv_open. (BLAH!) svn path=/trunk/; revision=14111
* Use the widget's style's text_gc for drawing text if eitherChristopher James Lahey2001-10-231-13/+18
| | | | | | | | | | 2001-10-23 Christopher James Lahey <clahey@ximian.com> * gal/e-text/e-text.c (e_text_draw): Use the widget's style's text_gc for drawing text if either draw_background or draw_button is on. svn path=/trunk/; revision=13937
* Bumped version to 0.15.99.3 for EText's "draw_button" argument.Christopher James Lahey2001-10-233-0/+124
| | | | | | | | | | | | | | | | | | | | | | | | | 2001-10-23 Christopher James Lahey <clahey@ximian.com> * configure.in: Bumped version to 0.15.99.3 for EText's "draw_button" argument. * gal/e-text/e-entry.c: Forward the "draw_button" argument to the contained EText. * gal/e-text/e-text.c, gal/e-text/e-text.h (e_text_draw): Added new "draw_button" argument. If this is turned on and the first widget that's a parent of the containing canvas with GTK_NO_WINDOW turned off above the current one is a button, EText draws a button underneath itself to match the containing button. From gal/shortcut-bar/ChangeLog: 2001-10-23 Christopher James Lahey <clahey@ximian.com> * e-shortcut-bar.c (e_shortcut_bar_add_group): Turn on "draw_button" argument to EEntry. svn path=/trunk/; revision=13934
* Accept UTF8_STRING, UTF-8, and STRING targets when getting the selection.Christopher James Lahey2001-10-222-12/+118
| | | | | | | | | | 2001-10-22 Christopher James Lahey <clahey@ximian.com> * gal/e-text/e-text.c, gal/e-text/e-text.h (e_text_get_selection): Accept UTF8_STRING, UTF-8, and STRING targets when getting the selection. svn path=/trunk/; revision=13864
* Offer UTF8_STRING, UTF-8, COMPOUND_TEXT, STRING, and TEXT targets when weChristopher James Lahey2001-10-211-21/+70
| | | | | | | | | | 2001-10-21 Christopher James Lahey <clahey@ximian.com> * gal/e-text/e-text.c (e_text_get_invisible): Offer UTF8_STRING, UTF-8, COMPOUND_TEXT, STRING, and TEXT targets when we offer the selection. svn path=/trunk/; revision=13847
* Changed some of these gbooleans to be guint : 1s.Christopher James Lahey2001-10-211-4/+5
| | | | | | | | | | | | 2001-10-20 Christopher James Lahey <clahey@ximian.com> * gal/e-text/e-text.h: Changed some of these gbooleans to be guint : 1s. * gal/widgets/e-canvas.c (e_canvas_item_grab_focus): Send the in event here to the new focused item instead of the old one. svn path=/trunk/; revision=13824
* Connect keys before we show the widget.Jon Trowbridge2001-10-192-5/+3
| | | | | | | | | 2001-10-18 Jon Trowbridge <trow@ximian.com> * gal/e-text/e-entry.c (e_entry_enable_completion_full): Connect keys before we show the widget. svn path=/trunk/; revision=13756
* Use e_strdup_append_strings here instead of g_strdup_printf becauseChristopher James Lahey2001-10-122-5/+30
| | | | | | | | | | | | | | | | 2001-10-11 Christopher James Lahey <clahey@ximian.com> * gal/e-text/e-table-text-model.c (e_table_text_model_insert, e_table_text_model_insert_length, e_table_text_model_delete), gal/e-text/e-text-model.c (e_text_model_real_insert, e_text_model_real_insert_length): Use e_strdup_append_strings here instead of g_strdup_printf because printf("%.*s") is locale dependent on some systems. * gal/util/e-util.c (e_strdup_append_strings): New function to append a bunch of strings with optional lengths. svn path=/trunk/; revision=13581
* Based on patches from Dan Nguyen <dnn@austin.ibm.com>.Christopher James Lahey2001-10-101-1/+1
| | | | | | | | | | | | | 2001-10-10 Christopher James Lahey <clahey@ximian.com> Based on patches from Dan Nguyen <dnn@austin.ibm.com>. * gal/Makefile.am (libgal_la_LDFLAGS): Added $(GTK_LIBS). * gal/e-text/e-text.c (e_text_event): Changed this from a C++ comment to a C comment. svn path=/trunk/; revision=13549
* add E_OBJECT_CLASS_ADD_SIGNALS and E_OBJECT_CLASS_TYPE to ease migrationMichael Meeks2001-10-055-31/+34
| | | | | | | | | | | | | | | 2001-10-05 Michael Meeks <michael@ximian.com> * gal/util/e-util.h: add E_OBJECT_CLASS_ADD_SIGNALS and E_OBJECT_CLASS_TYPE to ease migration to Gnome 2.0 from a single source base. * All C files: s/object_class->type,/E_OBJECT_CLASS_TYPE (object_class),/g; s/gtk_object_class_add_signals([^\(]*)\(([^,]*),([^,]*),([^\)]*)/ E_OBJECT_CLASS_ADD_SIGNALS\1(\2,\3,\4/; svn path=/trunk/; revision=13428
* Added a max length of 2047 to the standard ETextModel. Fixes Ximian bugChristopher James Lahey2001-10-021-7/+27
| | | | | | | | | 2001-10-02 Christopher James Lahey <clahey@ximian.com> * gal/e-text/e-text-model.c (MAX_LENGTH): Added a max length of 2047 to the standard ETextModel. Fixes Ximian bug #3021. svn path=/trunk/; revision=13298
* Allow ctrl-p and ctrl-n to be used to move up and down in the completionJon Trowbridge2001-09-272-5/+30
| | | | | | | | | | | | | 2001-09-26 Jon Trowbridge <trow@ximian.com> * gal/e-text/e-completion-view.c (e_completion_view_key_press_handler): Allow ctrl-p and ctrl-n to be used to move up and down in the completion list. (Bug #10500) * gal/e-text/e-completion-match.c (e_completion_match_set_text): Properly validate the utf8. svn path=/trunk/; revision=13159
* Made it so that if allow_newlines is FALSE, pasting into ETexts doesn'tChristopher James Lahey2001-09-262-62/+79
| | | | | | | | | | | 2001-09-26 Christopher James Lahey <clahey@ximian.com> * gal/e-text/e-text.c, gal/e-text/e-text.h (_insert): Made it so that if allow_newlines is FALSE, pasting into ETexts doesn't insert carriage returns. Fixes Ximian bug #5761 and Ximian bug #9067. svn path=/trunk/; revision=13143
* remove redundant NULL checks since g_free handles NULLs. (e_text_destroy):Larry Ewing2001-09-181-8/+5
| | | | | | | | | | | | 2001-09-17 Larry Ewing <lewing@ximian.com> * gal/e-text/e-text.c (e_text_supply_selection): remove redundant NULL checks since g_free handles NULLs. (e_text_destroy): free the selection. It does appear to be a guarantee that we get a selection-clear event before we are destroyed. svn path=/trunk/; revision=12934
* Bumped version number to 0.11.99.4.Christopher James Lahey2001-09-171-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2001-09-16 Christopher James Lahey <clahey@ximian.com> * configure.in: Bumped version number to 0.11.99.4. * gal/e-text/e-completion-view.c (e_completion_view_construct), tests/test-table-1.c (create_table): Changed the parameters to e_table_simple_new here to adjust to changes in the interface. * gal/widgets/e-categories-master-list-array.c (ecmla_default): Fixed a memory leak here. * gal/widgets/e-categories.c (e_categories_get_save_id): Added get_save_id here so that selection would be maintained across changes. From gal/e-table/ChangeLog: 2001-09-16 Christopher James Lahey <clahey@ximian.com> * e-table-model.c, e-table-model.h (e_table_model_class_init): Rearranged order of has_save_id and get_save_id to be more consistent with ETree. * e-table-selection-model.c, e-table-selection-model.h: Turned on the code to maintain selection and cursor across changes if the model supports get_save_id. * e-table-simple.c, e-table-simple.h: Changed this interface to take all of the ETableModel functions in the _new function. * e-table-subset.c (etss_has_save_id, etss_get_save_id): Added these to properly proxy the save_id functionality. * e-tree-memory-callbacks.c, e-tree-memory-callbacks.h, e-tree-model.c, e-tree-model.h, e-tree-sorted.c: Made the save_id parameter to get_node_by_id be const char * instead of char *. * e-tree-table-adapter.c (etta_class_init): Rearranged some assignments here to be more consistent. svn path=/trunk/; revision=12869
* Unref the model after creating the ETable, since the table will hold a refDan Winship2001-09-132-1/+2
| | | | | | | | | | | * gal/e-text/e-completion-view.c (e_completion_view_construct): Unref the model after creating the ETable, since the table will hold a ref on it until we destroy it when we're destroyed. * gal/e-text/e-entry.c (e_entry_destroy): Unref the popup window rather than destroying it. svn path=/trunk/; revision=12798
* If our text shrinks, make sure that the selection doesn't spill off overJon Trowbridge2001-09-101-0/+7
| | | | | | | | | | 2001-09-09 Jon Trowbridge <trow@ximian.com> * gal/e-text/e-text.c (e_text_text_model_changed): If our text shrinks, make sure that the selection doesn't spill off over the end of the reduced buffer. (Related to bug #8535) svn path=/trunk/; revision=12717
* Patch to fix few 64bit issuesGeorge Lebl2001-08-292-0/+2
| | | | | | | | | | | | | | | | | | | | | | Tue Aug 28 18:29:28 2001 George Lebl <jirka@5z.com> Patch to fix few 64bit issues * gal/e-table/e-table-header-item.c (ethi_draw) (ethi_start_drag) gal/widgets/e-categories.c (e_categories_value_at) (e_categories_value_to_string): Use GINT_TO_POINTER and GPOINTER_TO_INT to cast between pointers and ints to fix 64bit issues connected with that. * gal/e-table/e-table-sorting-utils.c (e_table_sorting_utils_tree_check_position) gal/util/e-sorter-array.c (e_sorter_array_append): Use size_t for size not ints to fix crashes * gal/e-text/e-completion-match.c, gal/e-text/e-completion.c: Include <string.h> svn path=/trunk/; revision=12507
* Added "hit_count" to ECompletionMatch. Used by searchJon Trowbridge2001-08-175-20/+232
| | | | | | | | | | | | | | | | | | | | | | 2001-08-16 Jon Trowbridge <trow@ximian.com> * gal/e-text/e-completion-match.h: Added "hit_count" to ECompletionMatch. Used by search refinement/unrefinement. * gal/e-text/e-completion.c (e_completion_refine_search): Added. Handle automatic search refinements. (e_completion_unrefine_search): Added. Handle automatic search "unrefinements", or reversions. (e_completion_begin_search): Check if the refinement or unrefinement operations can be used to handle the search. Emit "request_search" at the end of the call. (e_completion_class_init): Added a new signal "request_search". "begin_search" is now purely informational, telling views that a series of matches and an "end_search" are forthcoming. * configure.in: Increment version of 0.10.99.3. svn path=/trunk/; revision=12116
* bumped up to 0.10.99.3jacob berkman2001-08-105-86/+199
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2001-08-09 jacob berkman <jacob@ximian.com> * configure.in: bumped up to 0.10.99.3 * gal/e-text/e-completion-view.c (e_completion_view_init): init matches array (e_completion_view_destroy): free matches array (e_completion_view_disconnect): disconnect from the clear and lost_match signals (e_completion_view_clear_choices): fixup for ptr array (e_completion_view_set_cursor_row): ditto (e_completion_view_select): ditto (e_completion_view_key_press_handler): ditto (clear_completion_cb): handle the clear signal (lost_completion_cb): remove a row from the model (table_row_count): fixup for ptr array (table_value_at): ditto (e_completion_view_construct): connect to clear and lost completion signals (e_completion_view_set_width): ptr array fixup again * gal/e-text/e-completion.c (e_completion_class_init): add new clean / lost completion signals (e_completion_init): initialize the matches array (e_completion_destroy): free the matches array (e_completion_add_match): fixup for matches being a GPtrArray (e_completion_clear_matches): ditto (e_completion_clear): new function to clear the list of matches (e_completion_foreach_match): fixup for ptrarray (e_completion_restart): ditto (e_completion_found_match): if we are at the limit return first, rather than adding and then unreffing. there very well could be some weird crashes this caused but it is kind of unlikely. (e_completion_lost_match): new function to forget about a match (e_completion_end_search): add a comment on why this is broken * gal/e-text/e-entry.c (e_entry_text_keypress): only start a delayed completion if our completion timeout is >= 0. this provides a way for the completion starting / stopping to be controlled by something other than the EEntry (ie, file-sel) svn path=/trunk/; revision=11843
* Bumped version up to 0.10.99.2.Jon Trowbridge2001-08-094-28/+89
| | | | | | | | | | | | | | | | | | | | | | 2001-08-09 Jon Trowbridge <trow@ximian.com> * configure.in: Bumped version up to 0.10.99.2. * gal/e-text/e-entry.c (e_entry_class_init): Added "completion_popup" signal. (e_entry_show_popup): Emit "completion_popup" signal if the popup has appeared or disappeared. (e_entry_enable_completion_full): Listen for "cancel_completion" signals from our model, and disable our completion if get one. (e_entry_completion_popup_is_visible): Added. Returns TRUE if the completion popup is on the screen. * gal/e-text/e-text-model.c (e_text_model_class_init): Added "cancel_completion" signal. (e_text_model_cancel_completion): Added. Emits "cancel_completion" signal. svn path=/trunk/; revision=11824
* Quintuple sigh. See below.Federico Mena Quintero2001-08-091-0/+3
| | | | | | | | | | 2001-08-09 Federico Mena Quintero <federico@ximian.com> * gal/e-text/e-entry.c (e_entry_destroy): Quintuple sigh. See below. * gal/util/e-bit-array.c (eba_destroy): Sextuple sigh. svn path=/trunk/; revision=11815
* avoid freed memory reading, when you call it likeRadek Doulik2001-08-021-2/+8
| | | | | | | | | | | 2001-08-02 Radek Doulik <rodo@ximian.com> * gal/e-text/e-completion-match.c (e_completion_match_set_text): avoid freed memory reading, when you call it like e_completion_match_set_text (match, e_completion_match_get_match_text (match), tmp); svn path=/trunk/; revision=11571
* Properly ref the font we pass in as an ARG_FONT_E. (_do_tooltip): RemovedJon Trowbridge2001-07-251-3/+2
| | | | | | | | | | | | | | | | | | 2001-07-25 Jon Trowbridge <trow@ximian.com> * gal/e-text/e-text.c (e_text_set_arg): Properly ref the font we pass in as an ARG_FONT_E. (_do_tooltip): Removed some crack. We no longer have to manually ref the font. The ref-counting now happens inside the set_arg function, as it should. (e_text_destroy): Set text->font to NULL after unrefing it. 2001-07-25 Jon Trowbridge <trow@ximian.com> * e-cell-text.c (ect_unrealize): Set text_view->font to NULL after we unref it. svn path=/trunk/; revision=11393
* Removed some debugging spew I committed by mistake.Jon Trowbridge2001-07-211-4/+1
| | | | | | | | | 2001-07-20 Jon Trowbridge <trow@ximian.com> * gal/e-text/e-completion-view.c (e_completion_view_set_width): Removed some debugging spew I committed by mistake. svn path=/trunk/; revision=11293
* Change window policy to allow the completion window to shrink when theJon Trowbridge2001-07-212-11/+9
| | | | | | | | | | | | | 2001-07-20 Jon Trowbridge <trow@ximian.com> * gal/e-text/e-entry.c (e_entry_enable_completion_full): Change window policy to allow the completion window to shrink when the number of options decreases. * gal/e-text/e-completion-view.c (e_completion_view_construct): Removed some obsolete code. svn path=/trunk/; revision=11292
* Start editing immediately on a button_press that grabs the focus.Christopher James Lahey2001-07-151-27/+44
| | | | | | | | | | | 2001-07-15 Christopher James Lahey <clahey@ximian.com> * gal/e-text/e-text.c (e_text_event): Start editing immediately on a button_press that grabs the focus. e_canvas_item_grab_focus doesn't seem to get us the focus event until the event loop. Fixes Ximian bug #1766. svn path=/trunk/; revision=11111
* For E_TEP_END_OF_BUFFER, use the length in bytes, not the length inFederico Mena Quintero2001-07-101-1/+1
| | | | | | | | | | 2001-07-09 Federico Mena Quintero <federico@ximian.com> * gal/e-text/e-text.c (_get_position): For E_TEP_END_OF_BUFFER, use the length in bytes, not the length in characters --- this function is supposed to return byte offsets. svn path=/trunk/; revision=10941
* Destroy the tooltip if we're the owner when we're destroyed. Also, keep aChristopher James Lahey2001-07-082-1/+22
| | | | | | | | | | | | | | 2001-07-07 Christopher James Lahey <clahey@ximian.com> * gal/e-text/e-text.c, gal/e-text/e-text.h (e_text_destroy): Destroy the tooltip if we're the owner when we're destroyed. Also, keep a reference to the text object in case we get a signal on the window after the text object is destroyed. * gal/widgets/e-canvas.c (e_canvas_destroy): Hide the tooltip if there is one when the canvas is destroyed. svn path=/trunk/; revision=10888
* Don't scroll to the cursor on grab, ungrab, noop, and copy commands.Christopher James Lahey2001-07-051-1/+6
| | | | | | | | | 2001-07-05 Christopher James Lahey <clahey@ximian.com> * gal/e-text/e-text.c (e_text_command): Don't scroll to the cursor on grab, ungrab, noop, and copy commands. svn path=/trunk/; revision=10808
* If lines is NULL here split into lines and just return that the point isChristopher James Lahey2001-07-031-0/+7
| | | | | | | | | | 2001-07-03 Christopher James Lahey <clahey@ximian.com> * gal/e-text/e-text.c (e_text_point): If lines is NULL here split into lines and just return that the point is outside this text object. svn path=/trunk/; revision=10730
* Do nothing if passed NULL. (e_completion_match_compare): Move theJon Trowbridge2001-06-301-16/+16
| | | | | | | | | | | | | | 2001-06-29 Jon Trowbridge <trow@ximian.com> * gal/e-text/e-completion-match.c (e_completion_match_unref): Do nothing if passed NULL. (e_completion_match_compare): Move the sort_major comparison out to make it the primary sort key (followed by score and then sort_minor). (e_completion_match_compare_alpha): Move the sort_major comparison out to make it the primary sort key. svn path=/trunk/; revision=10625
* Removed unused frame variable.Christopher James Lahey2001-06-091-2/+0
| | | | | | | | | 2001-06-09 Christopher James Lahey <clahey@ximian.com> * gal/e-text/e-completion-view.c (e_completion_view_construct): Removed unused frame variable. svn path=/trunk/; revision=10174
* Turned off alternating row colors in our ETable specification.Jon Trowbridge2001-06-093-13/+11
| | | | | | | | | | | | | | 2001-06-08 Jon Trowbridge <trow@ximian.com> * gal/e-text/e-completion-view.c: Turned off alternating row colors in our ETable specification. * gal/e-text/e-completion-match.c (e_completion_match_compare_alpha): Fix the sort routine to properly use the major & minor keys for sorting grouped elements with the same match text. I had this all wrong. svn path=/trunk/; revision=10159
* we can ignore the border, as e-text takes care of that for usjacob berkman2001-06-072-24/+15
| | | | | | | | | | | | | | 2001-06-07 jacob berkman <jacob@ximian.com> * gal/e-text/e-entry.c (canvas_size_allocate): we can ignore the border, as e-text takes care of that for us (canvas_size_request): correctly handle when borders should be drawn * gal/e-text/e-completion-view.c (e_completion_view_paint): fix a small bug in the drawing-2-pixel-border change to my patch svn path=/trunk/; revision=10149
* Applied patch from Jacob Berkman to un-offset the completion popup and addJon Trowbridge2001-06-073-4/+148
| | | | | | | | | | | | 2001-06-06 Jon Trowbridge <trow@ximian.com> * gal/e-text/e-entry.c: * gal/e-text/e-completion-view.c: Applied patch from Jacob Berkman to un-offset the completion popup and add a border around it. I tweaked it slightly to make the border two pixels thick instead of one. (Which I like, but might annoy everyone else. We'll see.) svn path=/trunk/; revision=10133
* Oops. Forgot to remove some debugging code before committing.Jon Trowbridge2001-06-061-16/+0
| | | | svn path=/trunk/; revision=10119
* Small changes throughout to use ECompletionMatch.Jon Trowbridge2001-06-0610-143/+342
| | | | | | | | | | | | | | | | | | | | 2001-06-05 Jon Trowbridge <trow@gnu.org> * gal/e-text/e-entry.c: Small changes throughout to use ECompletionMatch. * gal/e-text/e-completion-view.c: Small changes throughout to use ECompletionMatch. * gal/e-text/e-completion.c: Small changes throughout to use ECompletionMatch. * gal/e-text/e-completion-match.h: * gal/e-text/e-completion-match.c: Added. A struct to contain completion matches. This lets us more easily pass around information between the various bits of completion machinery. svn path=/trunk/; revision=10118
* set allow_newlines on the etext item to false, since we are like an entryjacob berkman2001-06-011-0/+1
| | | | | | | | | 2001-05-31 jacob berkman <jacob@ximian.com> * gal/e-text/e-entry.c (e_entry_init): set allow_newlines on the etext item to false, since we are like an entry svn path=/trunk/; revision=10061
* Validate utf8 to avoid lock-ups. (_get_position): Validate utf8 to avoidJon Trowbridge2001-05-151-6/+8
| | | | | | | | | | 2001-05-14 Jon Trowbridge <trow@ximian.com> * gal/e-text/e-text.c (calc_line_widths): Validate utf8 to avoid lock-ups. (_get_position): Validate utf8 to avoid lock-ups. svn path=/trunk/; revision=9797
* Request an update if just our line widths needed recalculation. This fixesFederico Mena Quintero2001-05-082-1/+3
| | | | | | | | | | | 2001-05-07 Federico Mena Quintero <federico@ximian.com> * gal/e-text/e-text.c (e_text_reflow): Request an update if just our line widths needed recalculation. This fixes the bug where the text item would not repaint itself if the canvas lost the focus. svn path=/trunk/; revision=9705
* Made fewer calls to functions like split_into_lines to save time whenChristopher James Lahey2001-04-301-86/+53
| | | | | | | | | 2001-04-29 Christopher James Lahey <clahey@ximian.com> * gal/e-text/e-text.c: Made fewer calls to functions like split_into_lines to save time when possible. svn path=/trunk/; revision=9629
* add e-completion-testDan Winship2001-04-281-0/+1
| | | | svn path=/trunk/; revision=9615
* Remove UNICODE_CFLAGS (e_text_test_LDADD, e_entry_test_LDADD,Dan Winship2001-04-241-43/+42
| | | | | | | | | | * gal/e-text/Makefile.am (INCLUDES): Remove UNICODE_CFLAGS (e_text_test_LDADD, e_entry_test_LDADD, e_text_model_test_LDADD, e_completion_test_LDADD): remove -lunicode, add libunicode.la * gal/e-text/e-text.c: Remove <unicode.h>, use gunicode functions. svn path=/trunk/; revision=9516
* Limit total matches, for better performance on slow machines. It isJon Trowbridge2001-04-204-29/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2001-04-20 Jon Trowbridge <trow@ximian.com> * gal/e-text/e-completion-test.c: Limit total matches, for better performance on slow machines. It is supposed to be a test, so correctness of the completion operations isn't really a priority... * gal/e-text/e-completion-view.c (e_completion_view_construct): Set GTK_CAN_FOCUS flag. * gal/e-text/e-entry.c (e_entry_show_popup): Evil! Evil! Unclean! Unclean! Manually check if the pointer is in the area where the popup is going to appear, and if it is, warp the pointer out of the way. After days of fucking around, this horrible hack is the only way that I've been able to figure out to keep the focus from being taken away from the entry and ending up somewhere strange when the popup pops up. (The main problem is with the case of focus-follows-cursor --- click-to-focus works fine. Sawfish idiocincracies may also be causing problems, but I don't want to unjustly accuse the WM of anything, as tempting and appealing as that can be.) (key_press_cb): Proxy for forwarding the popup's key press events to the entry. (key_release_cb): Proxy for forwarding the popup's key release events to the entry. These proxies should be enough to take care of my focus problems. Unfortunately, they aren't, and the pointer-warping-focus-horror is required for reasons that I don't fully understand. * gal/e-text/e-text.c (_get_xy_from_position): Made _get_xy_from_position return a boolean. It returns TRUE if the computation was successful (and if valid data is now in *xp and *yp), FALSE otherwise. Make sure that text->lines is not NULL, and return FALSE if it is. (_get_position): Test that _get_xy_from_position returns TRUE before using the values in x and y. (_get_position): Test that _get_xy_from_position returns TRUE before using the values in x and y. Garbage values being returned in passed-in pointers created a race condition where you could hang an EText if you deleted the entire contents of the buffer really quickly. svn path=/trunk/; revision=9468
* Propagate the event after sending it to the base EText.Christopher James Lahey2001-04-171-0/+3
| | | | | | | | | 2001-04-16 Christopher James Lahey <clahey@ximian.com> * gal/e-text/e-text.c (tooltip_event): Propagate the event after sending it to the base EText. svn path=/trunk/; revision=9379
* Made setting the rgba color work even if you're using the non-aa canvasChristopher James Lahey2001-04-161-8/+7
| | | | | | | | | 2001-04-15 Christopher James Lahey <clahey@ximian.com> * gal/e-text/e-text.c: Made setting the rgba color work even if you're using the non-aa canvas (except for the a.) svn path=/trunk/; revision=9337
* Added strikeout argument.Christopher James Lahey2001-04-162-4/+34
| | | | | | | | | 2001-04-15 Christopher James Lahey <clahey@ximian.com> * gal/e-text/e-text.c, gal/e-text/e-text.h: Added strikeout argument. svn path=/trunk/; revision=9327
* Use e_canvas_hide_tooltip and e_canvas_popup_tooltip. Set bold on theChristopher James Lahey2001-04-151-20/+16
| | | | | | | | | | | | 2001-04-15 Christopher James Lahey <clahey@ximian.com> * gal/e-text/e-text.c (tooltip_event): Use e_canvas_hide_tooltip and e_canvas_popup_tooltip. Set bold on the tooltip. * gal/widgets/e-canvas.c, gal/widgets/e-canvas.h: Added e_canvas_popup_tooltip and e_canvas_hide_tooltip. svn path=/trunk/; revision=9323
* Added "bold" argument.Christopher James Lahey2001-04-152-37/+58
| | | | | | | | 2001-04-15 Christopher James Lahey <clahey@ximian.com> * gal/e-text/e-text.c, gal/e-text/e-text.h: Added "bold" argument. svn path=/trunk/; revision=9319
* add a missing \Dan Winship2001-04-081-0/+1
| | | | | | | | | * tests/test-tree-3.c (INITIAL_SPEC): add a missing \ * gal/e-text/e-text.c (_get_position_from_xy): Add a "break;" to an otherwise-empty default case to make it ANSI. svn path=/trunk/; revision=9201
* Some small header cleanups & fixes, and fix to translate all popup menusGediminas Paulauskas2001-04-051-2/+2
| | | | | | | | | | | | (woohoo!): 2001-04-05 Gediminas Paulauskas <menesis@delfi.lt> * gal/widgets/e-popup-menu.c: Copied gnome_app_helper_gettext function here, and use it for translating menu names (they are passed from app as well as from gal in arrays with N_(), and domains differ). svn path=/trunk/; revision=9190
* Fixed headers. Moved the .h associated with each .c to the top of the listChristopher James Lahey2001-04-043-4/+10
| | | | | | | | | | | | | | | | | | | | | | 2001-04-04 Christopher James Lahey <clahey@ximian.com> * gal/e-text/e-text-model-uri.c, gal/e-text/e-text.c, gal/e-text/e-text.h, gal/e-text/e-text-event-processor.c, gal/util/e-xml-utils.c, gal/widgets/e-cursors.c, gal/widgets/e-cursors.h: Fixed headers. Moved the .h associated with each .c to the top of the list of included files. * gal/util/e-util.h: Removed the bonobo-xobject.h header here. * gal/util/e-xml-utils.c: Replaced strcasecmp with g_strcasecmp. * gal/widgets/e-canvas-vbox.c: Make this work even if the item is destroyed after the vbox. * gal/widgets/e-categories.c (do_parse_categories): Made this translate using e_utf8_from_locale string as it should. svn path=/trunk/; revision=9175
* Fix headers. Ditto. Ditto. Ditto. Ditto. Ditto. Ditto. Same. Ditto. SameKjartan Maraas2001-04-049-8/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2001-04-04 Kjartan Maraas <kmaraas@gnome.org> * gal/e-text/e-entry.c: Fix headers. * gal/e-text/e-table-text-model.[ch]: Ditto. * gal/e-text/e-table-text-model-uri.c: Ditto. * gal/e-text/e-text-model-uri.[ch]: Ditto. * gal/e-text/e-text-model.[ch]: Ditto. * gal/e-text/e-text.[ch]: Ditto. * gal/util/e-text-event-processor-emacs-like.[ch]: Ditto. * gal/util/e-text-event-processor.[ch]: Same. * gal/util/e-util.h: Ditto. * gal/util/e-xml-utils.[ch]: Same here. * gal/widgets/color-group.[ch]: Ditto. * gal/widgets/color-palette.[ch]: Ditto. * gal/widgets/e-canvas-utils.h: Ditto. * gal/widgets/e-canvas-vbox.[ch]: Ditto. * gal/widgets/e-canvas.[ch]: Ditto. * gal/widgets/e-categories.h: Ditto. * gal/widgets/e-colors.[ch]: Ditto. * gal/widgets/e-cursors.c: Ditto. * gal/widgets/e-gui-utils.c: Ditto * gal/widgets/e-popup-menu.[ch]: Same. * gal/widgets/e-reflow-sorted.c: Same. * gal/widgets/e-reflow.[ch]: Same. * gal/widgets/e-selection-model.c: Same * gal/widgets/e-unicode.[ch]: Same. * gal/widgets/gtk-combo-stack.[ch]: Same. * gal/widgets/widget-color-combo.[ch]: Same. * gal/widgets/widget-pixmap-combo.[ch]: Same. svn path=/trunk/; revision=9168
* Set the size of the thing to a decent value that lets us test stuff.Miguel de Icaza2001-03-192-58/+69
| | | | | | | | | | | | | | 2001-03-18 Miguel de Icaza <miguel@ximian.com> * tests/test-tree-1.c (create_tree): Set the size of the thing to a decent value that lets us test stuff. 2001-03-16 Miguel de Icaza <miguel@ximian.com> * gal/e-text/e-entry.h: Expose the canvas/item that used to be public and that were privatized. svn path=/trunk/; revision=8802
* Comment out text after #endif. Add #include <string.h> for strcmp().Kjartan Maraas2001-03-161-0/+1
| | | | | | | | | 2001-03-16 Kjartan Maraas <kmaraas@gnome.org> * gal/widgets/widget-pixmap-combo.h: Comment out text after #endif. * gal/e-text/e-completion.c: Add #include <string.h> for strcmp(). svn path=/trunk/; revision=8758
* Make this take an extra argument saying whether or not to grab theDan Winship2001-03-161-2/+2
| | | | | | | | | | | * gal/widgets/e-canvas.c (e_canvas_item_grab_focus): Make this take an extra argument saying whether or not to grab the widget-level focus. * gal/e-text/e-text.c (e_text_event): Update arguments to e_canvas_item_grab_focus. svn path=/trunk/; revision=8745
* Renamed "temp" as "new_text", to avoid confusion.Jon Trowbridge2001-03-131-5/+5
| | | | | | | | | | | 2001-03-12 Jon Trowbridge <trow@ximian.com> * gal/e-text/e-text-model.c (e_text_model_real_insert_length): Renamed "temp" as "new_text", to avoid confusion. (e_text_model_real_delete): Renamed "temp" as "new_text", to avoid confusion. svn path=/trunk/; revision=8640
* Added. This is part of a change of sematics that makes things much nicerJon Trowbridge2001-03-064-28/+68
| | | | | | | | | | | | | | | | | | | | | | | 2001-03-06 Jon Trowbridge <trow@gnu.org> * gal/e-text/e-entry.c (e_entry_text_keypress): Added. This is part of a change of sematics that makes things much nicer for the user --- auto-activate the completion popup only on keypresses than also change the entry. (e_entry_proxy_changed): Record that the underlying EText has changed, and set up a timeout to clear the changed_since_keypress flag in a very short amount of time. (e_entry_init): Connect to the EText's "keypress" signal". (e_entry_destroy): If our completion_delay_tag timeout is still floating around out there when we are winding things down, remove it. * gal/e-text/e-text.c (e_text_class_init): Added keypress signal. (e_text_text_model_reposition): Removed some old cruft. (e_text_event): Emit our keypress signal after handling events of type GDK_KEY_PRESS. svn path=/trunk/; revision=8566
* Set version number to 0.5.99.5Jon Trowbridge2001-03-065-10/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2001-03-05 Jon Trowbridge <trow@gnu.org> * configure.in: Set version number to 0.5.99.5 * gal/e-text/e-entry.c (e_entry_class_init): Add a "popup" signal. If you have trepidations about this, see the technical argument below. (e_entry_init): Connect to the EText's popup signal. (e_entry_proxy_popup): Proxy emitter for popup signals from the EText. * gal/e-text/e-text.c (e_text_class_init): Added a "popup" signal. (e_text_event): Emit the "popup" signal on right-clicks. Now you could ask yourself: "should there be a signal named 'popup' in EText that gets emitted on right-clicks?" And this is a reasonable question, since... well, this has a funny feeling to it. But the whole point of GNOME, or at least one of the original points of GNOME, was to impose policy in a reasonable way when it made sense in order to simplify the user's experience. Convention dictates that popup menus are tied to right-clicks --- so rather than setting up some elaborate forwarding of button-press signals, why not just impose a little policy and set up a signal that is closely tied to a familiar set of semantics? Maybe it isn't the best thing to do from a aesthetics-of-the-API point of view, but I doubt anyone could condemn it as being anything more than mostly harmless. svn path=/trunk/; revision=8565
* Upped the version number to 0.5.99.4.Christopher James Lahey2001-03-061-0/+1
| | | | | | | | | | 2001-03-05 Christopher James Lahey <clahey@ximian.com> * configure.in: Upped the version number to 0.5.99.4. * gal/e-text/e-text.c (e_text_draw): Fixed a crash here. svn path=/trunk/; revision=8556
* Boost version number to 0.5.99.3.Jon Trowbridge2001-03-025-99/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2001-03-01 Jon Trowbridge <trow@ximian.com> * configure.in: Boost version number to 0.5.99.3. * gal/e-text/e-entry.c (e_entry_show_popup): Grab pointer when the popup is visible, and then hide the popup if any button press events occur outside of the popup. This lets up avoid most of the worst "floating popup" cases that would occur if windows are moved, desktops changed, etc. with the mouse. (Doing things like changing desktop w/ keybindings can still cause a "floating popup", but that is also true of Gtk's own combo box.) Change popup positioning to slightly offset it from the entry, rather than just plopping it down directly below. (button_press_cb): Determine if a button press occured outside of the popup when the pointer was grabbed, and unbrowse accordingly. * gal/e-text/e-completion-view.c (e_completion_view_key_press_handler): Improve keystroke handling. Allow Tabs to pass through (after hiding the pop-up) in order to allow focus change requests to work properly. (e_completion_view_construct): Disable horizontal scrollbars. * gal/e-text/e-completion-test.c (main): Reworked to use signals instead of explicit callbacks. * gal/e-text/e-completion.h: * gal/e-text/e-completion.c: Fix the awkward mix of signals and explicitly-specified callbacks by taking out the explicit callbacks. This approach is more gtk-ish, after all. svn path=/trunk/; revision=8458
* Changed e_table_selection_model_clear to e_selection_model_clear.Christopher James Lahey2001-02-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2001-02-27 Christopher James Lahey <clahey@ximian.com> * gal/e-text/e-completion-view.c: Changed e_table_selection_model_clear to e_selection_model_clear. * tests/test-tree-3.c: Changed E_TABLE_CURSOR_LINE to E_CURSOR_LINE. From gal/e-table/ChangeLog: 2001-02-27 Christopher James Lahey <clahey@ximian.com> * e-table-click-to-add.c, e-table-group-container.c, e-table-group-container.h, e-table-group-leaf.c, e-table-group-leaf.h, e-table-item.c, e-table-item.h, e-table-specification.c, e-table-specification.h, e-table.c, e-table.h: Changed a lot of the ETableSelectionModels to ESelectionModels, a lot of the ETableSorters to ESorters, all the ETableCursorModes to ECursorModes, and all of the ETableForeachFuncs into EForeachFuncs. * e-table-defines.h: Moved ETableForeachFunc and ETableCursorMode to e-selection-model.h. * e-table-selection-model.c, e-table-selection-model.h: Made this a subclass of ESelectionModel which simple connects to an ETableModel. * e-table-sorter.c, e-table-sorter.h: Made this a subclass of ESorter so that implements the same semantics it used to. svn path=/trunk/; revision=8422
* Fixed. (e_entry_select_region): Fixed. (e_entry_show_popup): Grab/ungrabJon Trowbridge2001-02-243-8/+49
| | | | | | | | | | | | | | | | | | | 2001-02-23 Jon Trowbridge <trow@ximian.com> * gal/e-text/e-entry.c (e_entry_set_position): Fixed. (e_entry_select_region): Fixed. (e_entry_show_popup): Grab/ungrab the pointer and keyboard when the popup appears/disappears. This (mostly) solves the "floating popup" problem. (button_press_cb): Added. We catch button presses outside of the popup, and hide the popup when they occur. * gal/e-text/e-completion-view.c (e_completion_view_get_type, e_completion_view_class_init): Changed base class to GtkEventBox. (e_completion_view_key_press_handler): Make Escape always cause an unbrowse, even wehen we are editting. svn path=/trunk/; revision=8369
* Changed the version number to 0.5.99.1.Christopher James Lahey2001-02-208-928/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2001-02-19 Christopher James Lahey <clahey@ximian.com> * configure.in: Changed the version number to 0.5.99.1. * gal/Makefile.am (libgal_la_LIBADD): Change the directories for e-table-text-model.lo, e-text-event-processor.lo, and e-text-event-processor-emacs-like.lo. Reordered the e-text directory to be after the e-table directory in build order. * gal/e-text/Makefile.am: Removed e-text-event-processor-emacs-like.c, e-text-event-processor-emacs-like.h, e-text-event-processor-types.h, e-text-event-processor.c, and e-text-event-processor.h. Added e-table-text-model.c and e-table-text-model.h. * gal/e-text/e-table-text-model.c: Changed the signature of these mehtods to match the changed signature in ETextModel. * gal/e-text/e-text-event-processor-emacs-like.c, gal/e-text/e-text-event-processor-emacs-like.h, gal/e-text/e-text-event-processor-types.h, gal/e-text/e-text-event-processor.c, gal/e-text/e-text-event-processor.h: Moved these to gal/util/. * gal/e-text/e-text.c, gal/e-text/e-text.h: Changed the includes to match the moved files. * gal/util/Makefile.am: Added e-text-event-processor-emacs-like.c, e-text-event-processor-emacs-like.h, e-text-event-processor-types.h, e-text-event-processor.c, and e-text-event-processor.h. * gal/util/e-text-event-processor-emacs-like.h, gal/util/e-text-event-processor.h: Changed the includes to match the moved files. 2001-02-19 Christopher James Lahey <clahey@ximian.com> * Makefile.am: Removed e-table-text-model.c and e-table-text-model.h. * e-table-text-model.c, e-table-text-model.h: Moved these to gal/e-text/. * e-cell-text.c: Changed the include line for e-text-event-processor.h and e-text-event-processor-emacs-like.h. svn path=/trunk/; revision=8298
* Forgot to add. Doh!Jon Trowbridge2001-02-202-0/+790
| | | | svn path=/trunk/; revision=8281
* Added. Allows you to attach an ECompletion to an EEntry, and have thatJon Trowbridge2001-02-2014-623/+2483
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2001-02-19 Jon Trowbridge <trow@ximian.com> * gal/e-text/e-entry.c (e_entry_enable_completion_full): Added. Allows you to attach an ECompletion to an EEntry, and have that ECompletion be used for (obviously enough) completions. * gal/e-text/e-completion-view.h, gal/e-text/e-completion-view.c: Added. ECompletionView is a widget for displaying the results of a completion request in a format that is appropriate for a drop-down window. * gal/e-text/e-completion.h, gal/e-text/e-completion.c: Added. ECompletion is a "pure virtual base class" for completion-type operations. It is implemented so that completions can be either synchronous or asynchronous. * gal/e-text/e-text.c: Lots of changes to accomodate the ETextModel changes. First of all, we render embedded text objects as being underlined. We also cause the model to emit the appropriate object activation signal when an embedded object is double-clicked. Also, all of the code that moves the cursor in response to user input has been removed. Instead, the EText now listens for "reposition" events from the underlying model, and bases all cursor motions on those. (get_bounds_item_relative): Fixed bug in the handling of differently-anchored text. Being differently-anchored is not a crime or a perversion --- it is an alternative lifestyle that we have to respect. * gal/e-text/e-text-model-uri.h, gal/e-text/e-text-model-uri.c: A sample ETextModel that converts URIs into embedded objects that get opened in the browser when you double-click them. * gal/e-text/e-text-model-repos.h, gal/e-text/e-text-model-repos.c: Added. A group of simple structures & functions for handling various cursor movement rules. These are the sorts of things that are passed as arguments to ETextModel "reposition" event handlers. * gal/e-text/e-text-model.h, gal/e-text/e-text-model.c: Privitized the ETextModel struct and "methodized" all of the operations, so that derived classes can do arbitrarily respond to get/set requests in arbitrarily strange ways. Also added the concept of declaring regions of the text as "embedded text objects". Finally, caused operations that change the text to emit a "reposition" signal that passes information that can be used by a view (like an EText) to move the cursor or selection in an intelligent way in response to those changes. This means that you can now open two ETexts that look at the same ETextModel, and have the cursor in one do the right thing when you edit the other. (As opposed to producing a lot of potential segfaults, as it was before.) svn path=/trunk/; revision=8280
* Commented out this function since it's not being used.Christopher James Lahey2001-02-091-0/+3
| | | | | | | | | 2001-02-08 Christopher James Lahey <clahey@ximian.com> * gal/e-text/e-text-model-test.c (describe_model): Commented out this function since it's not being used. svn path=/trunk/; revision=8109
* Don't handle C-Enter.Christopher James Lahey2001-02-091-4/+4
| | | | | | | | | 2001-02-08 Christopher James Lahey <clahey@ximian.com> * gal/e-text/e-text-event-processor-emacs-like.c (e_text_event_processor_emacs_like_event): Don't handle C-Enter. svn path=/trunk/; revision=8107
* Store the whole GdkColor instead of just the pixel.Christopher James Lahey2001-02-082-13/+9
| | | | | | | | | 2001-02-07 Christopher James Lahey <clahey@ximian.com> * gal/e-text/e-text.c, gal/e-text/e-text.h (e_text_realize): Store the whole GdkColor instead of just the pixel. svn path=/trunk/; revision=8063
* Added e-text-model-testJeffrey Stedfast2001-02-061-0/+1
| | | | | | | | 2001-02-05 Jeffrey Stedfast <fejj@ximian.com> * gal/e-text/.cvsignore: Added e-text-model-test svn path=/trunk/; revision=8015
* Changed draw_borders from a gboolean to a a guint : 1.Christopher James Lahey2001-02-061-1/+1
| | | | | | | | | 2001-02-05 Christopher James Lahey <clahey@ximian.com> * gal/e-text/e-entry.h: Changed draw_borders from a gboolean to a a guint : 1. svn path=/trunk/; revision=7990
* added gboolean draw_borders to make it compile, probably some forgottenRadek Doulik2001-02-011-0/+2
| | | | | | | | | 2001-01-31 Radek Doulik <rodo@ximian.com> * gal/e-text/e-entry.h: added gboolean draw_borders to make it compile, probably some forgotten commit of e-entry.h svn path=/trunk/; revision=7926
* Fixed allocation and placement of text for no bordered text.Christopher James Lahey2001-01-311-16/+33
| | | | | | | | | 2001-01-30 Christopher James Lahey <clahey@ximian.com> * gal/e-text/e-entry.c (canvas_size_allocate, et_set_arg): Fixed allocation and placement of text for no bordered text. svn path=/trunk/; revision=7922
* Fixed allocation and placement of text window.Christopher James Lahey2001-01-312-25/+34
| | | | | | | | | | | 2001-01-30 Christopher James Lahey <clahey@ximian.com> * gal/e-text/e-entry.c (canvas_size_allocate, et_set_arg): Fixed allocation and placement of text window. * gal/e-text/e-text.c (e_text_draw): Fixed display of the text. svn path=/trunk/; revision=7920
* Reverted the latest change to EText since we're in feature freeze.Christopher James Lahey2001-01-306-333/+63
| | | | | | | | 2001-01-30 Christopher James Lahey <clahey@helixcode.com> * Reverted the latest change to EText since we're in feature freeze. svn path=/trunk/; revision=7912
* Connect to the model's "position" signal. (e_text_init): Set default valueJon Trowbridge2001-01-306-63/+333
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2001-01-29 Jon Trowbridge <trow@gnu.org> * gal/e-text/e-text.c (e_text_init): Connect to the model's "position" signal. (e_text_init): Set default value for rgba_object as blue. (e_text_destroy): Disconnect model position signal. (fix_selection): Some extra sanity checking to keep the selection from spilling outside of the bounds of the text string as it expands or contracts. Should be obsolete due to the changes to objectify_uris --- but I'll leave this in here for now, in an attempt to avoid non-\0-terminated strings, segfaults, and all of that fun stuff. (e_text_text_model_position): Move our cursor according to the suggestions made by our ETextModel, via the "position" signal. (text_width_with_objects): Check that text is not NULL. (text_draw_with_objects): Accept an extra GdkGC for use in drawing objects. (e_text_set_arg): Properly handle the "position" signal when changing models. (e_text_draw): Initialize the GC for drawing objects, if necessary. (_insert): Comment out the code that adjustes text->selection_*. The cursor is now moved by the ETextModel directly via the position signal, not by the view. * gal/e-text/e-text-model-uri.c (objectify_uris): Add more sophisticated uri recognition via regular expressions. (objectify_uris): Changed to track position changes as model->text expands and contracts along with the objects. Block the objectification of any chunks of text that straddle our current position. (e_text_model_uri_set_text): Added position info to objectify_uris call. (e_text_model_uri_insert): Added position info to objectify_uris call. (e_text_model_uri_insert_length): Added position info to objectify_uris call. (e_text_model_uri_delete): Added position info to objectify_uris call. * gal/e-text/e-text-model.c (e_text_model_class_init): Added a "position" signal that allows the ETextModel to send cursor positioning information back to any view. We need this for text with objects, where the text string can grow and shrink in ways that the view doesn't expect. (e_text_model_real_insert): Added sanity checking of args and a position emission. (e_text_model_real_insert_length): Added sanity checking of args and a position emission. (e_text_model_real_delete): Added sanity checking of args. (e_text_model_suggest_position): A wrapper around the "position" signal emitter. svn path=/trunk/; revision=7894
* Added; a new test program that demonstrates objects in ETexts.Jon Trowbridge2001-01-276-111/+776
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2001-01-26 Jon Trowbridge <trow@gnu.org> * gal/e-text/e-text-model-test.c: Added; a new test program that demonstrates objects in ETexts. * gal/e-text/e-text-model-uri.c: Added; a text model that converts URIs in the text into objects that are passed off to the GNOME URI handler when activated. This is actually still extremely broken; I got it just working enough to test out my EText changes. * gal/e-text/e-text.c: A whole lot of changes, designed to make ETextModel objects render properly. The basic idea of the changes is pretty simple, though. (text_width_with_objects): First of all, this function is an alternative to e_font_utf8_text_width that takes into the account the embedded \1s in the text string and properly accounts for the width of the object strings. (unicode_strlen_with_objects): Next, this function finds the proper strlen of a string, expanding the \1s. (text_draw_with_objects): Finally, this is just a replacement for e_font_draw_utf8_text that does the right thing for objects. I've gone through all of e-text.c and replace calls by those original functions with my new object-enabled alternatives. (split_into_lines): Some tweaking to get line breaking to work properly. Made \1 into a "break character", so that we can break lines between multiple adjacent objects. (Which seemed like the right thing to do, but there may be cases where that is undesireable.) (_get_position_from_xy): Fixed to properly handle embedded objects, and to get the right selection semantics for objects. (Or at least semantics that feel right to me.) Also fixed a bug that caused selection, etc. to not work properly if the text was anchored anywhere other than with GTK_ANCHOR_NORTH*. (_get_position): Hacked to cause objects to activate when they are double-clicked. There is probably a better way to do this. * gal/e-text/e-text-model.c (e_text_model_real_object_count): Provide a default implementation of an object counter. Derived classes might want to override this for efficiency reasons. (e_text_model_strdup_expanded_text): Added. Allocates and returns a string contains the model's text with the objects "expanded" within. * gal/e-text/e-text-model.h: Added obj_count, get_nth_obj, and activate_nth_obj virtual methods to ETextModelClass. svn path=/trunk/; revision=7842
* Fixed text misplacement.Christopher James Lahey2001-01-191-10/+12
| | | | | | | | 2001-01-18 Christopher James Lahey <clahey@helixcode.com> * gal/e-text/e-entry.c: Fixed text misplacement. svn path=/trunk/; revision=7632
* Make tooltip appear properly even if anchor is set.Christopher James Lahey2001-01-181-1/+1
| | | | | | | | | 2001-01-18 Christopher James Lahey <clahey@helixcode.com> * gal/e-text/e-text.c (_do_tooltip): Make tooltip appear properly even if anchor is set. svn path=/trunk/; revision=7620
* Center text vertically.Christopher James Lahey2001-01-181-10/+13
| | | | | | | | | 2001-01-18 Christopher James Lahey <clahey@helixcode.com> * gal/e-text/e-entry.c (canvas_size_allocate, et_set_arg): Center text vertically. svn path=/trunk/; revision=7619
* Made EEntry be shrinkable.Christopher James Lahey2001-01-181-3/+6
| | | | | | | | 2001-01-17 Christopher James Lahey <clahey@helixcode.com> * gal/e-text/e-entry.c (e_entry_init): Made EEntry be shrinkable. svn path=/trunk/; revision=7604
* Make justification work properly for entries. Documented.Christopher James Lahey2001-01-182-2/+50
| | | | | | | | | 2001-01-17 Christopher James Lahey <clahey@helixcode.com> * gal/e-text/e-entry.c, gal/e-text/e-entry.h (et_set_arg): Make justification work properly for entries. Documented. svn path=/trunk/; revision=7603
* Emit a "changed" signal to the EText after we gtk_object_set a "model" argJason Leach2001-01-161-0/+1
| | | | | | | | | | 2001-01-16 Jason Leach <jasonleach@usa.net> * gal/e-text/e-text.c (e_text_set_arg): Emit a "changed" signal to the EText after we gtk_object_set a "model" arg and fill the EText with text from the model, which obviously changes the text. svn path=/trunk/; revision=7530
* Rename from Helix Code -> XimianMiguel de Icaza2001-01-162-2/+2
| | | | svn path=/trunk/; revision=7520
* Fixed the border bug. Borders draw properly now.Christopher James Lahey2001-01-051-2/+2
| | | | | | | | | 2001-01-04 Christopher James Lahey <clahey@helixcode.com> * gal/e-text/e-text.c (e_text_draw): Fixed the border bug. Borders draw properly now. svn path=/trunk/; revision=7263
* Add support here for "cursor_pos". (et_get_arg): Handle ARG_CURSOR_POS.Miguel de Icaza2000-12-292-5/+35
| | | | | | | | | | | | | | | 2000-12-29 Miguel de Icaza <miguel@helixcode.com> * gal/e-text/e-entry.c: Add support here for "cursor_pos". (et_get_arg): Handle ARG_CURSOR_POS. (et_set_arg): ditto. * gal/e-text/e-text.c: Add new argument: "cursor_pos". (e_text_get_arg): Handle ARG_CURSOR_POS. (e_text_set_arg): Handle ARG_CURSOR_POS. (e_text_class_init): Add. svn path=/trunk/; revision=7192
* Added a "draw_background" argument. Set the default for theChristopher James Lahey2000-12-272-2/+19
| | | | | | | | | | | | | 2000-12-26 Christopher James Lahey <clahey@helixcode.com> * gal/e-text/e-entry.c: Added a "draw_background" argument. Set the default for the "draw_background" argument to the contained EText to TRUE. * gal/e-text/e-text.c: Changed the default for the "draw_background" argument to FALSE. svn path=/trunk/; revision=7176
* Connect to the "changed" and "activate" signals on the EText to the proxyMiguel de Icaza2000-12-261-0/+22
| | | | | | | | | | | 2000-12-26 Miguel de Icaza <miguel@helixcode.com> * gal/e-text/e-entry.c: Connect to the "changed" and "activate" signals on the EText to the proxy routines. (e_entry_proxy_changed): Proxy this to our signals. (e_entry_proxy_activate): ditto. svn path=/trunk/; revision=7173
* Always have some text. Fixes crash.Miguel de Icaza2000-12-261-1/+0
| | | | | | | | | | 2000-12-25 Miguel de Icaza <miguel@helixcode.com> * gal/e-text/e-text.c (e_text_init): Always have some text. Fixes crash. * gal/widgets/e-reflow.c (set_empty): Set draw_background to FALSE. svn path=/trunk/; revision=7172
* Always have some text. Fixes crash.Miguel de Icaza2000-12-262-5/+7
| | | | | | | | 2000-12-25 Miguel de Icaza <miguel@helixcode.com> * gal/e-text/e-text.c (e_text_init): Always have some text. Fixes crash. svn path=/trunk/; revision=7171
* Made the code CanvasItem correct: the code should not draw at arbitraryMiguel de Icaza2000-12-251-6/+16
| | | | | | | | | | | | | | | 2000-12-25 Miguel de Icaza <miguel@helixcode.com> * gal/e-text/e-text.c (e_text_draw): Made the code CanvasItem correct: the code should not draw at arbitrary positions in the GdkWindow, it should instead draw from item->x1, item->y1 to item->y1, item->y2 (Chris, we need to talk about this, I think my current fix is passable, but might not be fully correct. Specially the interpretation of the width, height arguments). (e_text_class_init): Fix name. (e_text_set_arg): Use correct name. svn path=/trunk/; revision=7163
* Handle draw background. (e_text_draw): Support both border drawing andMiguel de Icaza2000-12-253-50/+106
| | | | | | | | | | | | | 2000-12-24 Miguel de Icaza <miguel@helixcode.com> * gal/e-text/e-text.c (e_text_set_arg): Handle draw background. (e_text_draw): Support both border drawing and background drawing. * gal/e-text/e-entry.c (et_get_arg, et_set_arg): Reduce code size by casting once. (et_set_arg, et_get_arg): Add ARG_DRAW_BORDERS handling. svn path=/trunk/; revision=7159
* Changed the color from yellow to light gray.Christopher James Lahey2000-12-141-1/+1
| | | | | | | | | | | | | 2000-12-13 Christopher James Lahey <clahey@helixcode.com> * gal/e-text/e-text.c (_do_tooltip): Changed the color from yellow to light gray. * gal/widgets/e-canvas-vbox.c (e_canvas_vbox_event): Made it so that e-canvas-vbox doesn't eat all the keyboard events. This means widget navigation keys work properly. svn path=/trunk/; revision=6989
* Work to get a Gtk-Doc infrastructure in place for Gal.Miguel de Icaza2000-12-091-19/+12
| | | | | | | | Work to get a Gtk-Doc infrastructure in place for Gal. Miguel. svn path=/trunk/; revision=6883
* Added an "allow_newlines" argument.Christopher James Lahey2000-10-276-23/+99
| | | | | | | | | | | | | 2000-10-27 Christopher James Lahey <clahey@helixcode.com> * gal/e-text/e-entry.c, gal/e-text/e-text-event-processor-emacs-like.c, gal/e-text/e-text-event-processor-emacs-like.h, gal/e-text/e-text-event-processor.c, gal/e-text/e-text-event-processor.h, gal/e-text/e-text.c: Added an "allow_newlines" argument. svn path=/trunk/; revision=6226
* remove timeouts on destroy so they don't try to write to freed dataDan Winship2000-10-201-0/+10
| | | | svn path=/trunk/; revision=6032
* Made the number keys on the number pad work in ETexts and ECellTexts.Christopher James Lahey2000-10-191-1/+108
| | | | | | | | | 2000-10-19 Christopher James Lahey <clahey@helixcode.com> * gal/e-text/e-text-event-processor-emacs-like.c: Made the number keys on the number pad work in ETexts and ECellTexts. svn path=/trunk/; revision=6027
* Made EEntry accept focus properly.Christopher James Lahey2000-10-191-0/+11
| | | | | | | | 2000-10-18 Christopher James Lahey <clahey@helixcode.com> * gal/e-text/e-entry.c: Made EEntry accept focus properly. svn path=/trunk/; revision=6015
* Fixed gdk-font refcountingIain Holmes2000-10-131-17/+30
| | | | | | | Added font_e argument to e-text Fixed the header-item drawing the pixmap incorrectly svn path=/trunk/; revision=5894
* set cursors to NULL after destroying them, to avoid any possibility ofDamon Chaplin2000-10-081-0/+5
| | | | | | | | | | 2000-10-07 Damon Chaplin <damon@helixcode.com> * gal/e-text/e-text.c (e_text_unrealize): set cursors to NULL after destroying them, to avoid any possibility of BadCursor. (e_text_event): just return if the EText item is destroyed. svn path=/trunk/; revision=5780
* Fixed operation of the keypad keys in EText and ECellText.Christopher James Lahey2000-09-221-6/+23
| | | | | | | | | 2000-09-22 Christopher James Lahey <clahey@helixcode.com> * gal/e-text/e-text-event-processor-emacs-like.c: Fixed operation of the keypad keys in EText and ECellText. svn path=/trunk/; revision=5548
* Moved files, fixed header files and paths - FedericoFederico Mena Quintero2000-09-2010-19/+22
| | | | svn path=/trunk/; revision=5513
* Fixed e-table #includes so that it would compile.Chris Lahey2000-09-181-1/+1
| | | | svn path=/trunk/; revision=5482
* Changed #include lines to get e-text to compile.Chris Lahey2000-09-184-9/+9
| | | | svn path=/trunk/; revision=5481
* Some UTF-8 fixes and experimental 16-bit unicode font supportLauris Kaplinski2000-09-091-5/+5
| | | | svn path=/trunk/; revision=5279
* A bit more e_utf8 wrappers here and thereLauris Kaplinski2000-09-021-1/+2
| | | | svn path=/trunk/; revision=5180
* Added some g_return_if_fails and g_return_val_if_fails.Christopher James Lahey2000-08-261-1/+6
| | | | | | | | | | 2000-08-25 Christopher James Lahey <clahey@helixcode.com> * e-table-col.c, e-table-config.c, e-table-header.c, e-table-text-model.c: Added some g_return_if_fails and g_return_val_if_fails. svn path=/trunk/; revision=5056
* Unicode in addressbook basically works, including simple searchingLauris Kaplinski2000-08-241-1/+1
| | | | svn path=/trunk/; revision=4997
* UTF-8 in contact editor + some fixes for dealing with illegal stringsLauris Kaplinski2000-08-231-1/+4
| | | | svn path=/trunk/; revision=4976
* Handle iso-8859-1 keys nicely in e-text and e-table. Other encodings toLauris Kaplinski2000-08-231-2/+19
| | | | | | come... svn path=/trunk/; revision=4972
* Use byte, not character based UTF-8 syntax in e-textLauris Kaplinski2000-08-222-123/+127
| | | | svn path=/trunk/; revision=4963
* Fixed a warning.Christopher James Lahey2000-08-201-0/+2
| | | | | | | | 2000-08-20 Christopher James Lahey <clahey@helixcode.com> * widgets/e-text/e-text.c: Fixed a warning. svn path=/trunk/; revision=4889
* Moved e-text to UTF-8Lauris Kaplinski2000-08-202-222/+290
| | | | svn path=/trunk/; revision=4886
* Added a test for the EEntry widget.Christopher James Lahey2000-08-112-0/+80
| | | | | | | | | 2000-08-10 Christopher James Lahey <clahey@helixcode.com> * widgets/e-text/.cvsignore, widgets/e-text/Makefile.am, widgets/e-text/e-entry-test.c: Added a test for the EEntry widget. svn path=/trunk/; revision=4725
* Made clicking choose the right character even if show_borders is on.Christopher James Lahey2000-08-031-1/+7
| | | | | | | | | 2000-08-02 Christopher James Lahey <clahey@helixcode.com> * widgets/e-text/e-text.c: Made clicking choose the right character even if show_borders is on. svn path=/trunk/; revision=4492
* Made focus in not change your selection position.Christopher James Lahey2000-07-221-2/+0
| | | | | | | | | 2000-07-21 Christopher James Lahey <clahey@helixcode.com> * widgets/e-text/e-text.c: Made focus in not change your selection position. svn path=/trunk/; revision=4268
* Don't draw quite as large a "flat_box". If draw_borders is TRUE, cause theChristopher James Lahey2000-07-091-8/+8
| | | | | | | | | | 2000-07-09 Christopher James Lahey <clahey@helixcode.com> * widgets/e-text/e-text.c: Don't draw quite as large a "flat_box". If draw_borders is TRUE, cause the cursor to change even if not editing. svn path=/trunk/; revision=4017
* Removed some border padding and set the "draw_borders" argument of theChristopher James Lahey2000-07-093-27/+121
| | | | | | | | | | | | | 2000-07-09 Christopher James Lahey <clahey@helixcode.com> * widgets/e-text/e-entry.c: Removed some border padding and set the "draw_borders" argument of the contained GtkText. * widgets/e-text/e-text.c, widget/e-text/e-text.h: Added a "draw_borders" argument which, if set, makes the EText look more like a GtkEntry. svn path=/trunk/; revision=4011
* Return "" instead of NULL.Christopher James Lahey2000-07-091-1/+4
| | | | | | | | | 2000-07-09 Christopher James Lahey <clahey@helixcode.com> * widgets/e-text/e-text-model.c (e_text_model_real_get_text): Return "" instead of NULL. svn path=/trunk/; revision=4003
* Set "anchor" and "fill_clip_rectangle" arguments.Christopher James Lahey2000-07-083-0/+45
| | | | | | | | | | | | | 2000-07-07 Christopher James Lahey <clahey@helixcode.com> * widgets/e-text/e-entry.c: Set "anchor" and "fill_clip_rectangle" arguments. * widgets/e-text/e-text.c, widgets/e-text/e-text.h: Added "fill_clip_rectangle" argument which describes whether to accept clicks throughout the clipping rectangle. svn path=/trunk/; revision=3956
* Fixed some typos.Christopher James Lahey2000-07-081-9/+5
| | | | | | | | 2000-07-07 Christopher James Lahey <clahey@helixcode.com> * widgets/e-text/e-entry.c: Fixed some typos. svn path=/trunk/; revision=3949
* Added e-entry.c and e-entry.h.Christopher James Lahey2000-07-043-1/+453
| | | | | | | | | | | | | 2000-07-03 Christopher James Lahey <clahey@helixcode.com> * widgets/e-text/Makefile.am: Added e-entry.c and e-entry.h. * widgets/e-text/e-entry.c, widgets/e-text/e-entry.h: New files to be a widget containing a text item. * widgets/e-text/e-text.c: Fixed some spacing. svn path=/trunk/; revision=3874
* Calculate height including if clip_height is set to -1.Christopher James Lahey2000-06-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2000-06-26 Christopher James Lahey <clahey@helixcode.com> * widgets/e-text/e-text.c: Calculate height including if clip_height is set to -1. From addressbook/ChangeLog: 2000-06-26 Christopher James Lahey <clahey@helixcode.com> * contact-editor/e-contact-editor-categories.c, addressbook/gui/component/e-cardlist-model.c: Added value_to_string handlers. * demo/addressbook-widget.c, demo/demo.c: Removed usage of "x" and "y" arguments. * addressbook/gui/component/addressbook.c: Activated Click To Add and set the click to add message. * addressbook/gui/component/e-addressbook-model.c: Added value_to_string and append_row handlers. * addressbook/gui/component/e-select-names.c: Added a column. From calendar/ChangeLog: 2000-06-26 Christopher James Lahey <clahey@helixcode.com> * gui/calendar-model.c: Added an #ifdefed value_to_string handler assignment. From camel/ChangeLog: 2000-06-26 Christopher James Lahey <clahey@helixcode.com> * providers/mbox/camel-mbox-summary.c: Added debugging information. From composer/ChangeLog: 2000-06-26 Christopher James Lahey <clahey@helixcode.com> * Makefile.am: Added e-msg-composer-select-file.h for make distcheck. From e-util/ChangeLog: 2000-06-26 Christopher James Lahey <clahey@helixcode.com> * Makefile.am: Added e-canvas-vbox.c and e-canvas-vbox.h. * e-canvas-vbox.c, e-canvas-vbox.h: New canvas object to act like a vbox using the reflow system. From mail/ChangeLog: 2000-06-26 Christopher James Lahey <clahey@helixcode.com> * message-list.c: Added a value_to_string handler. From shell/ChangeLog: 2000-06-26 Christopher James Lahey <clahey@helixcode.com> * glade/Makefile.am: Added EXTRA_DIST for make distcheck. From widgets/e-table/ChangeLog: 2000-06-26 Christopher James Lahey <clahey@helixcode.com> * Makefile.am: Added e-table-click-to-add.c, e-table-click-to-add.h, e-table-one.c, and e-table-one.h. * e-table-click-to-add.c, e-table-click-to-add.h: A new canvas item that represents a single row that sometimes exists. It's for adding new rows to your table. * e-table-example-1.c, e-table-example-2.c, e-table-size-test.c, test-check.c, test-cols.c, test-table.c: Added value_to_string handlers. * e-table-group-container.c: Use value_to_string to make grouping not crash for non string columns. Made some changes to work properly in an ECanvasVbox. * e-table-group-leaf.c, e-table-item.c: Made some changes to work properly in an ECanvasVbox. * e-table-model.c, e-table-model.h: Added append_row and value_to_string methods. * e-table-one.c, e-table-one.h: Given a source ETableModel, this provides a single row model that uses the initialize_value, duplicate_value, free_value, and value_is_empty methods of the original source to implement set_value and value_at (and proxies most of the other methods.) This is used for ETableClickToAdd. * e-table-simple.c, e-table-simple.h: Added append_row and value_to_string handlers. append_row uses a GtkArg instead of a parameter to e_table_simple_new. * e-table-subset.c: Added append_row and value_to_string handlers. * e-table.c, e-table.h: Use a vbox containing an ETableClickToAdd and an ETableItem instead of an ETableItem directly. Only show the ETableClickToAdd if the top level of the xml SPEC has the attribute click-to-add set to some non-zero integer. (click-to-add="1"). Add a "click_to_add_message" argument. * e-tree-model.c: Add a commented out value_to_string handler. From widgets/meeting-time-sel/ChangeLog: 2000-06-26 Christopher James Lahey <clahey@helixcode.com> * Makefile.am: Added the include path to top_srcdir. svn path=/trunk/; revision=3744
* Fixed some vertical scroll bugs.Christopher James Lahey2000-06-211-8/+8
| | | | | | | | 2000-06-21 Christopher James Lahey <clahey@helixcode.com> * widgets/e-text/e-text.c: Fixed some vertical scroll bugs. svn path=/trunk/; revision=3673
* Fix a bug with intial vertical scroll.Christopher James Lahey2000-06-211-0/+1
| | | | | | | | 2000-06-21 Christopher James Lahey <clahey@helixcode.com> * widgets/e-text/e-text.c: Fix a bug with intial vertical scroll. svn path=/trunk/; revision=3672
* Removed the usage of "x" and "y" arguments to EText.Christopher James Lahey2000-06-212-47/+69
| | | | | | | | | | | | | 2000-06-21 Christopher James Lahey <clahey@helixcode.com> * notes/e-note.c, widgets/meeting-time-sel/e-meeting-time-sel.c, widgets/shortcut-bar/e-icon-bar.c: Removed the usage of "x" and "y" arguments to EText. * widgets/e-text/e-text.c, widgets/e-text/e-text.h: Removed the "x" and "y" arguments to EText. Added vertical scrolling. svn path=/trunk/; revision=3670
* Made EText use the font from the canvas's style if one isn't set.Christopher James Lahey2000-06-171-0/+4
| | | | | | | | | 2000-06-17 Christopher James Lahey <clahey@helixcode.com> * widgets/e-text/e-text.c: Made EText use the font from the canvas's style if one isn't set. svn path=/trunk/; revision=3607
* Remove the tooltip callback when destroyed.Christopher James Lahey2000-05-101-0/+5
| | | | | | | | | 2000-05-09 Christopher James Lahey <clahey@helixcode.com> * widgets/e-text/e-text.c: Remove the tooltip callback when destroyed. svn path=/trunk/; revision=2952
* Added an activate signal.Christopher James Lahey2000-05-082-0/+12
| | | | | | | | | 2000-05-08 Christopher James Lahey <clahey@helixcode.com> * widget/e-text/e-text.c, widgets/e-text/e-text.h: Added an activate signal. svn path=/trunk/; revision=2890
* Added a "changed" signal that gets sent whenever the text changes.Christopher James Lahey2000-05-072-7/+7
| | | | | | | | | 2000-05-06 Christopher James Lahey <clahey@helixcode.com> * widgets/e-text/e-text.c, widgets/e-text/e-text.h: Added a "changed" signal that gets sent whenever the text changes. svn path=/trunk/; revision=2837
* ignore the .pure directoryChris Toshok2000-05-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | * addressbook/backend/ebook/.cvsignore, addressbook/contact-editor/.cvsignore, addressbook/gui/component/.cvsignore, addressbook/gui/minicard/.cvsignore, addressbook/printing/.cvsignore, calendar/cal-client/.cvsignore, calendar/gui/.cvsignore, calendar/pcs/.cvsignore, filter/.cvsignore, mail/.cvsignore, shell/.cvsignore, tests/.cvsignore, widgets/e-table/.cvsignore, widgets/e-text/.cvsignore, widgets/meeting-time-sel/.cvsignore, widgets/shortcut-bar/.cvsignore, wombat/.cvsignore: ignore the .pure directory svn path=/trunk/; revision=2812
* + * widgets/e-text/e-text.c (e_text_destroy): Kill text->timer andMatthew Loper2000-04-271-0/+11
| | | | | | | | | | | + text->timeout on destroy. + + * e-shell-view.c (bonobo_widget_is_dead): Helper function to see + whether a bonobo widget is a zombie (ie the remote bonobo control + died). + (e_shell_view_set_view): Try to respawn dead bonobo widgets. svn path=/trunk/; revision=2638
* Made the tooltip show up in the correct place and configuration when usingChristopher James Lahey2000-04-244-28/+199
| | | | | | | | | | | | | | | | | | | | | | | | 2000-04-24 Christopher James Lahey <clahey@helixcode.com> * widgets/e-text/e-text.c: Made the tooltip show up in the correct place and configuration when using the "max_lines", "anchor" (untested), or "justification" arguments. From a patch by Iain Holmes <ih@csd.abdn.ac.uk> * widgets/e-text/e-text-event-processor-emacs-like.c, widget/e-text/e-text-event-processor-types.h, widgets/e-text/e-text.c, widgets/e-text/e-text.h: Changed C-w and C-y to control the X clipboard. Added double and triple click events. From widgets/e-table/: 2000-04-24 Christopher James Lahey <clahey@helixcode.com> * e-table.c: Fixed some warnings. svn path=/trunk/; revision=2581
* Moved some logic a bit. Minor changes.Christopher James Lahey2000-04-121-8/+1
| | | | | | | | 2000-04-11 Christopher James Lahey <clahey@helixcode.com> * widgets/e-text/e-text.c: Moved some logic a bit. Minor changes. svn path=/trunk/; revision=2396
* e-text.c: Recalc bounds when changing the width/clip_widthiholmes2000-04-121-3/+24
| | | | | | | | forward clicks on the tooltip to the pareent item tooltip obeys parents line_wrap and max_lines e_text_point returns 0 when pointer is on the item svn path=/trunk/; revision=2394
* pixmap_DATA isn't defined so don't use it as a variable.Christopher James Lahey2000-04-091-10/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2000-04-08 Christopher James Lahey <clahey@helixcode.com> * art/Makefile.am: pixmap_DATA isn't defined so don't use it as a variable. * addressbook/gui/component/, addressbook/gui/component/.cvsignore, addressbook/gui/Makefile.am, addressbook/gui/component/addressbook-factory.c, addressbook/gui/component/addressbook.c, addressbook/gui/component/addressbook.gnorba, addressbook/gui/component/addressbook.h: New directory to proivde the component for contact management. Simply uses an e-minicard-view. * addressbook/gui/minicard/e-minicard-view.c, addressbook/gui/minicard/e-minicard-view.h: New subclass of e-reflow-sorted that takes an EBook and uses it to compute the card data to display. * addressbook/gui/minicard/e-minicard.c, addressbook/gui/minicard/e-minicard.h: This now backends to a ECard instead of a ETableModel. * addressbook/gui/minicard/e-reflow.c, addressbook/gui/minicard/e-reflow.h: This now has a virtualized add method. * addressbook/gui/minicard/e-reflow-sorted.c, addressbook/gui/minicard/e-reflow-sorted.h: New subclass of e-reflow that allows the data to be sorted on the fly. * addressbook/gui/minicard/test-minicard-view.c: New test to test the new minicard view. * addressbook/gui/minicard/test-reflow.c: Uses the new ECard backend of the e-minicard. * addressbook/gui/minicard/.cvsignore, addressbook/gui/minicard/Makefile.am: Added new test. Fixed dependencies. Added new files. * addressbook/gui/, addressbook/gui/Makefile.am, addressbook/gui/.cvsignore: New directory for addressbook gui bits. Added subdirectories. Created an initial .cvsignore. * addressbook/Makefile.am (SUBDIRS): Removed demo and added gui. * addressbook/backend/pas/pas-backend-file.c: Added code to do notification on bookviews when changes in the backend are made. * addressbook/backend/pas/pas-book-view.c, addressbook/backend/pas/pas-book-view.h: Added helper functions to notify the view about the addition or modification of a single card. Fixed a mistaken extra free. * addressbook/backend/ebook/e-card-list-iterator.h: Fixed incorrect parent class. * addressbook/backend/ebook/test-client.c: Made this accept an optional parameter that specifies the vcard to add. * configure.in: Replaced widgets/e-minicard/Makefile and addressbook/demo/Makefile with addressbook/gui/minicard/Makefile and addressbook/gui/component/Makefile respectively. * widgets/Makefile.am: Removed e-minicard since it's being moved to addressbook/gui/minicard. * widgets/e-text/e-text.c: Fixed the border width around tooltips and made the main tooltip area yellow. From camel/ChangeLog: 2000-04-08 Christopher James Lahey <clahey@helixcode.com> * providers/smtp/.cvsignore: Added a .cvsignore file. From calendar/ChangeLog: 2000-04-08 Christopher James Lahey <clahey@helixcode.com> * gui/Makefile.am: Removed linking with libetable and libeminicard since they weren't being used. svn path=/trunk/; revision=2343
* Made text tooltips appear in place. Iain figured out that to get them toChristopher James Lahey2000-04-081-28/+54
| | | | | | | | | | | | 2000-04-07 Christopher James Lahey <clahey@helixcode.com> * widgets/e-text/e-text.c: Made text tooltips appear in place. Iain figured out that to get them to not appear, we hide the tooltip when the mouse leaves the tooltip window, not the canvas item (this works because the tooltip window always covers the canvas item completely.) svn path=/trunk/; revision=2328
* Got rid of some runtime errors. Changed to "fixed" font so that it willChristopher James Lahey2000-04-051-7/+56
| | | | | | | | | | | | | | 2000-04-04 Christopher James Lahey <clahey@helixcode.com> * widgets/e-text/e-text-test.c: Got rid of some runtime errors. Changed to "fixed" font so that it will work on everyone's machine. Added a white background rectangle. Made resizing the window resize the contained text item. Changed to using affines (e_canvas_item_move_absolute) instead of "x" and "y" attributes. Set the text in the entries so that they match the original values of the displayed text object. svn path=/trunk/; revision=2292
* Fixed some referencing and lifetime issues.Christopher James Lahey2000-04-051-2/+3
| | | | | | | | | | | | | | | | | 2000-04-04 Christopher James Lahey <clahey@helixcode.com> * widgets/e-minicard/e-minicard.c: Fixed some referencing and lifetime issues. From widgets/e-table: 2000-04-04 Christopher James Lahey <clahey@helixcode.com> * e-table-text-model.c: Make this assert a bit more readable. * e-table-item.c: Fix update loop behavior. svn path=/trunk/; revision=2291
* Removed an unnecessary get_bounds call.Christopher James Lahey2000-04-051-20/+62
| | | | | | | | | | | | | 2000-04-04 Christopher James Lahey <clahey@helixcode.com> * widgets/e-text/e-text.c: Removed an unnecessary get_bounds call. (From a patch by Iain Holmes <ih@csd.abdn.ac.uk>) * widgets/e-text/e-text.c: Made tooltips look more like the underlying text. Made tooltips show up more consistently. svn path=/trunk/; revision=2290
* Fix indentationMiguel de Icaza2000-03-302-42/+42
| | | | svn path=/trunk/; revision=2252
* + * wombat/Makefile.am: new file.Matthew Loper2000-03-291-2/+1
| | | | | | | | | | | + * wombat/wombat.gnorba: Cleaned up. + + * wombat/wombat.c (setup_pcs): filled in the rest. + + * e-table-text-model.c (e_table_text_model_destroy): made + assertion more accurate. svn path=/trunk/; revision=2244
* Added some assertions.Matthew Loper2000-03-231-1/+4
| | | | | | | * e-table-text-model.c (e_table_text_model_destroy): Added some assertions. svn path=/trunk/; revision=2146
* Changed gnome_canvas_item_grab_focus to e_canvas_item_grab_focus.Christopher James Lahey2000-03-221-2/+2
| | | | | | | | | 2000-03-21 Christopher James Lahey <clahey@helixcode.com> * widgets/e-text/e-text.c: Changed gnome_canvas_item_grab_focus to e_canvas_item_grab_focus. svn path=/trunk/; revision=2138
* Added the ability to access the text event processor.Christopher James Lahey2000-03-212-16/+37
| | | | | | | | | | | | | | | 2000-03-20 Christopher James Lahey <clahey@helixcode.com> * widgets/e-text/e-text.c, widgets/e-text/e-text.h: Added the ability to access the text event processor. 2000-03-13 Christopher James Lahey <clahey@helixcode.com> * addressbook/demo/addressbook-widget.c: Made the addressbook component look in the users home directory for the addressbook.xml file. svn path=/trunk/; revision=2125
* Added e-text-test.Christopher James Lahey2000-03-121-0/+1
| | | | | | | | | | | | | | | | | | | 2000-03-12 Christopher James Lahey <clahey@helixcode.com> * widgets/e-text/.cvsignore: Added e-text-test. * addressbook/demo/e-test-model.c, addressbook/demo/e-test-model.h: A model storing data in an array of Address objects. * addressbook/demo/demo.c: Changed to use addressbook/demo/e-test-model.c and addressbook/demo/e-test-model.h. * addressbook/demo/Makefile.am: Added e-test-model.c and e-test-model.h. svn path=/trunk/; revision=2104
* Rearranged SUBDIRS for dependencies.Christopher James Lahey2000-03-126-37/+696
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2000-03-12 Christopher James Lahey <clahey@helixcode.com> * widgets/Makefile.am: Rearranged SUBDIRS for dependencies. * widgets/e-text/e-text-model.c, widgets/e-text-model.h: New object which stores a piece of text data. All methods are virtual. * widgets/e-text/e-text.c, widgets/e-text/e-text.h: Modified this to use an ETextModel for its data. * widgets/e-text/Makefile.am: Added e-text-model.c and e-text-model.h. * widgets/e-minicard/test-minicard-label.c: Made this work again. * widgets/e-minicard/e-minicard.c, widgets/e-minicard/e-minicard.h: Made this use an ETableModel to get its data. * widgets/e-minicard/e-minicard-label.c, widgets/e-minicard/e-minicard-label.h: Added the ability to set the text model used for the contained text widget. * widgets/e-minicard/Makefile.am: Added e-table since e-minicard is now dependent on an e-table-model for its data. * e-util/e-canvas.c, e-util/e-canvas.h: Fixed some bugs here to speed up reflow and to make it fail less often. * addressbook/demo, addressbook/demo/.cvsignore, addressbook/demo/Makefile.am, addressbook/demo/demo.c, addressbook/demo/spec: A new program to test ETable and EMinicard integration. * configure.in: Added addressbook/demo/Makefile. * addressbook/Makefile.am: Added the demo/ subdirectory. in widgets/e-table/: 2000-03-12 Christopher James Lahey <clahey@helixcode.com> * e-table.c: Made this use an ECanvas. Fixed a bug where e_table_new_from_spec_file was calling e_table_construct instead of e_table_construct_from_spec_file. * e-table-item.c, e-table-header-item.c, e-table-column-item.c: Switched these to use GTK_TYPE_OBJECT and GTK_VALUE_OBJECT instead of GTK_TYPE_POINTER and GTK_TYPE_OBJECT. * e-cell-text.c: Got rid of a crashing bug. * e-table-text-model.c, e-table-text-model.h: A new object which is an e-text-model which uses an e-table-model for its data. * Makefile.am: Added e-table-text-model.c and e-table-text-model.h. * .cvsignore: Added table-example-1 and table-example-2. svn path=/trunk/; revision=2101
* Designed a new system for doing hierarchical displays in the canvas. AddsChristopher James Lahey2000-03-112-53/+164
| | | | | | | | | | | | | | | | | 2000-03-10 Christopher James Lahey <clahey@helixcode.com> * e-util/e-canvas.c, e-util/e-canvas.h: Designed a new system for doing hierarchical displays in the canvas. Adds an extra idle loop to the canvas system. * widgets/e-minicard/e-minicard.c, widgets/e-minicard/e-minicard-label.c, widgets/e-minicard/e-minicard-label.h, widgets/e-minicard/e-reflow.c, widgets/e-minicard/test-reflow.c, widgets/e-text/e-text.c, widgets/e-text/e-text.h: Adapted to use the new e-canvas reflow system. svn path=/trunk/; revision=2096
* Added a "break_characters" argument. It lets you define a set ofChristopher James Lahey2000-03-083-46/+155
| | | | | | | | | | | | | | | | | | | | | | | | 2000-03-07 Christopher James Lahey <clahey@helixcode.com> * widgets/e-text/e-text.c, widgets/e-text/e-text.h: Added a "break_characters" argument. It lets you define a set of characters which should cause optional linebreaks to occur. Made setting the "clip_height" argument to -1 mean no height clipping. Moved calling the "resize" signal into an idle handler to avoid reentering the canvas update loop. Made EText recalc bounds if the affine has changed. Fixed up tooltip_count (this counts the number of ENTER and LEAVE events.) * widgets/e-text/e-text-test.c: Got rid of a few warnings. * widgets/e-minicard/e-minicard-label.h: Reindent a few lines. * widgets/e-minicard/e-minicard.c, widgets/e-minicard/e-minicard-label.c: Switch from using "x" and "y" to set the children's position to using e_canvas_item_move_absolute. svn path=/trunk/; revision=2079
* Don't show the tooltip if the text is being editted or isn't clipped.Iain Holmes2000-03-011-3/+18
| | | | | | | | | | | 2000-02-29 Iain Holmes <ih@csd.abdn.ac.uk> * widgets/e-text/e-text.c: Don't show the tooltip if the text is being editted or isn't clipped. Remove the tooltip when editting starts. * widgets/e-text/Makefile.am: Build the test program svn path=/trunk/; revision=1994
* Compilation error.Chris Lahey2000-02-281-9/+8
| | | | | | | | 2000-02-28 Chris Lahey <clahey@umich.edu> * widgets/e-text/e-text.c: Compilation error. svn path=/trunk/; revision=1973
* Updated these to use the canvas ::update system properly.Chris Lahey2000-02-282-64/+72
| | | | | | | | | 2000-02-28 Chris Lahey <clahey@umich.edu> * widgets/e-text/e-text.c, widgets/e-text/e-text.h: Updated these to use the canvas ::update system properly. svn path=/trunk/; revision=1972
* This were moved to widgets/e-text/ a while ago but never removed. TheyChristopher James Lahey2000-02-242-52/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2000-02-24 Christopher James Lahey <clahey@helixcode.com> * widgets/e-text.c, widgets/e-text.h, e-text-event-processor.c, e-text-event-processor.h, e-text-event-processor-emacs-like.c, e-text-event-processor-emacs-like.h, e-text-event-processor-types.h: This were moved to widgets/e-text/ a while ago but never removed. They have now been removed. * widgets/e-text/e-text.c, widgets/e-text/e-text.h: Removed some warnings from this file. Made tooltips disappear when you're finished with them. * widgets/e-minicard/test-reflow.c, widgets/e-minicard/test-minicard.c, widgets/e-minicard/test-minicard-label.c: Commented out unused about_callback functions. * widgets/e-minicard/e-reflow.c: Made e-reflow pass an EFocus to its e-minicard children. * widgets/e-minicard/e-minicard.c: Made e-minicard take and return an EFocus for its "has_focus" argument. This makes shift-tab work properly. * widgets/e-minicard/e-minicard-label.c: Made e-minicard-label take and return an EFocus for its "has_focus" argument. Made the font that e-minicard-label uses only be allocated once. * e-util/e-canvas-utils.h: Fixed the comment at the top and added #ifndef __E_CANVAS_UTILS__. * e-util/Makefile.am: Added e-xml-utils.c and e-xml-utils.h. * e-util/e-xml-utils.h, e-util/e-xml-utils.c: Added files for some xml utilities. * e-util/e-util.h: Added type EFocus which describes which direction the focus will be coming from. in mail: 2000-02-24 Christopher James Lahey <clahey@helixcode.com> * message-list.c: Changed this to not use the "x" and "y" arguments to e-table-item. in widgets/e-table: 2000-02-24 Christopher James Lahey <clahey@helixcode.com> * e-table-subset-variable.c, e-table-subset-variable.h: A new model which is a subset, but you can add and remove rows. * test-table.c: Added a thaw method for use with the e-table-subset (emits model_changed.) Adapted to the changes to e_table_item. Properly parse headers. Adapted to the changes to e_table, including creating example xml spec data. * test-cols.c, test-check.c: Added a thaw method for use with the e-table-subset (emits model_changed.) Adapted to the changes to e_table_item. * e-table.c, e-table.h: Reworked e-table to use the ETable grouping system. The only difference for the interface is that instead of passing in a column_spec and a grouping_spec, you pass in a single string that is an xml format that includes both pieces of information. * e-table-subset.h: Added rules for emacs to do correct indentation. * e-table-subset.c: Implemented freezing. No signals are emitted while frozen and "model_changed" is emitted when thawed. * e-table-sorted.h: ETableSortedClass has ETableSubset as its parent object instead of ETableSubsetClass. Fixed this. * e-table-simple.c, e-table-simple.h: Implemented the thaw method. Use of simple now requires an extra argument (the thaw method.) * e-table-model.h, e-table-model.c: Added e_table_model_freeze and e_table_model_thaw. * e-table-item.h, e-table-item.c: Reworked this a bit to make it provide some things the new group system needed and to make inter-item keyboard focus work. Changed the external interface only in the list of arguments it recognizes and signals it emits. Instead of "x" and "y", you have to use e_canvas_item_move_absolute and instead of emitting a "height_changed" signal, it emits a "resize" signal. There's new "has_focus", "width", and "height" arguments and a function to get the currently focused column. * e-table-header-item.c: Got rid of some warnings here. Changed the * e-table-group-leaf.h, e-table-group-leaf.c, e-table-group-container.h, e-table-group-container.c: New types to make e_table_group work properly. * e-table-group.h, e-table-group.c: Completely reworked e-table grouping. e-table-group now uses a hierarchical structure. * e-cell.h: Added e_cell_print. This doesn't work yet. * e-cell.c: Made e_cell_realize exist. (It was improperly named e_cell_view_realize in the .c.) * e-cell-text.c: Made the blinking cursor disappear properly. * check-filled.xpm, check-empty.xpm: Made these const char *[] instead of char *[] to avoid compiler warnings. * Makefile.am: Added e-table-group-container.c, e-table-group-container.h, e-table-group-leaf.c, e-table-group-leaf.h, e-table-subset-variable.c, e-table-subset-variable.h. svn path=/trunk/; revision=1915
* Show the text of the item, in a tooltip style. (e_text_event): Add aIain Holmes2000-02-213-1/+157
| | | | | | | | | | | | | 2000-02-20 Iain Holmes <ih@csd.abdn.ac.uk> * widgets/e-text/e-text.[ch] (_do_tooltip): Show the text of the item, in a tooltip style. (e_text_event): Add a timeout on the Enter and remove it on the Leave events. * e-text-test.c: New file to test e-text items. svn path=/trunk/; revision=1866
* Made a click on a text widget set the cursor properly.Christopher James Lahey2000-02-121-3/+18
| | | | | | | | | 2000-02-11 Christopher James Lahey <clahey@helixcode.com> * widgets/e-text/e-text.c (e_text_event): Made a click on a text widget set the cursor properly. svn path=/trunk/; revision=1740
* Removed some arguments from the .h that will never be implemented.Christopher James Lahey2000-02-121-4/+0
| | | | | | | | | 2000-02-11 Christopher James Lahey <clahey@helixcode.com> * widgets/e-text/e-text.h: Removed some arguments from the .h that will never be implemented. svn path=/trunk/; revision=1737
* chutBertrand Guiheneuf2000-02-111-0/+6
| | | | svn path=/trunk/; revision=1730
* Added line wrap and a max number of lines (max number of lines is onlyChristopher James Lahey2000-02-082-132/+271
| | | | | | | | | | 2000-02-07 Christopher James Lahey <clahey@helixcode.com> * widgets/e-text.h, widgets/e-text.c: Added line wrap and a max number of lines (max number of lines is only obeyed if text is not being edited). svn path=/trunk/; revision=1691
* Handle the grab and ungrab command instead of doing focus by hand. ThisChristopher James Lahey2000-01-283-13/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2000-01-28 Christopher James Lahey <clahey@helixcode.com> * widgets/e-text.c (e_text_command): Handle the grab and ungrab command instead of doing focus by hand. This fixes a problem related to the scroll wheel. (e_text_command): Reset the blink timer in many more command situations so that the cursor blinks less when you're interacting with it. * widgets/e-text-event-processor-emacs-like.c: Send the grab focus command when starting a selection and the ungrab focus command when ending it. * widgets/e-text-event-processor-types.h: Added grab command type so that the event processor can tell the widget to grab the focus. * widgets/e-reflow.c: Redefined all sizes using #defines so that they can be tweaked later. Added scroll wheel handling and set up adjustment increments so that the scroll bars will work correctly. * widgets/e-minicard.h: Added minicard focus type enum. This doesn't mean anything yet, but it will later be used to say which direction the focus is coming from (below for shift-tab, above for tab.) svn path=/trunk/; revision=1650
* Added an arrow cursor for the draggable columns. Made the clickable columnChristopher James Lahey2000-01-262-0/+51
| | | | | | | | | | | | | | | | 2000-01-27 Christopher James Lahey <clahey@helixcode.com> * widgets/e-reflow.h, widgets/e-reflow.c: Added an arrow cursor for the draggable columns. Made the clickable column area larger. * widgets/e-text.h, widgets/e-text.c: Added an I beam cursor for the text item when it is editable. * widgets/e-minicard-label.c: Forward enter and leave notifications to the contained editable text item. svn path=/trunk/; revision=1647
* Changed some line spacing.Chris Lahey2000-01-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * widgets/e-text-event-processor-types.h: Changed some line spacing. * widgets/test-reflow.c: Connected to the resize signal of the reflow. * widgets/e-minicard.c: Made width argument set function only update if width is different. * widgets/e-reflow.h, widgets/e-reflow.c: Added draggable column dividers. * addressbook/contact-editor/test-editor.c: Open two dialogs for more interesting testing. * addressbook/contact-editor/e-contact-editor.h, addressbook/contact-editor/e-contact-editor.c: Modified to use glade. Added menus to change which phone/address/email entries to view. Added images to the dialog. * addressbook/contact-editor/e-contact-editor-strings.h, addressbook/contact-editor/contact-editor.glade: Glade files for the contact editor dialog. * addressbook/contact-editor/Makefile.am: Added images and added glade stuff. * addressbook/contact-editor/arrow.png, addressbook/contact-editor/briefcase.png, addressbook/contact-editor/netfreebusy.png, addressbook/contact-editor/netmeeting.png: Image files for the contact editor dialog. svn path=/trunk/; revision=1599
* Finishing previous commit.Chris Lahey2000-01-172-78/+63
| | | | svn path=/trunk/; revision=1582
* Added selection and clipboard support. Added up and down arrow keys. FixedChris Lahey2000-01-144-15/+292
| | | | | | | | | | | | | | | | * widgets/e-text-event-processor-types.h, widgets/e-text-event-processor-emacs-like.c, widgets/e-text.c, widgets/e-text.h: Added selection and clipboard support. Added up and down arrow keys. Fixed choice of font colors for the selection to be based on the current style. * widgets/e-minicard.c: Caused a click to grab the focus. Changed the fake information added. * widgets/e-minicard-label.c: Forward mouse events to the field EText item. svn path=/trunk/; revision=1568
* e_canvas_item_move_absolute is just a helper function not supplied by theChris Lahey2000-01-142-11/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * widgets/e-canvas-utils.c, widgets/e-canvas-utils.h: e_canvas_item_move_absolute is just a helper function not supplied by the gnome_canvas.[ch] I put it here so that multiple items can use it. * widgets/e-reflow.c, widgets/e-reflow.h: This item contains a number of other items and places them into multiple columns. The items contained must support a number of arguments and signals to allow the reflow to interact with them. * widgets/test-reflow.c: This is a test program for e-reflow. * widgets/e-text.c, widgets/e-text.h: Added properly drawn selected text. Added some preliminary code for X selection handling and cut & paste. * widgets/e-minicard.c, widgets/e-minicard.h: Added ARG_HAS_FOCUS handling. Made label display random for more interesting tests of multiple cards. Tweaked sizing information for better display. * widgets/e-minicard-label.c, widgets/e-minicard-label.h: Added ARG_HAS_FOCUS handling. * widgets/Makefile.am: Added the reflow test and reflow files. svn path=/trunk/; revision=1566
* Added a resize signal for when the card changes height. Made it so thatChris Lahey2000-01-122-8/+80
| | | | | | | | | | | | | | | | * widgets/e-minicard.c, widgets/e-minicard.h: Added a resize signal for when the card changes height. Made it so that when you press tab inside of a field, it goes to the next field. * widgets/e-minicard-label.c, widgets/e-minicard-label.h: Added a resize signal for when the label changes height. * widgets/e-text.c, widgets/e-text.h: Added a resize signal for multiple lines. Added scrolling based on cursor position. * widgets/Makefile.am: Removed an extraneous build target. svn path=/trunk/; revision=1562
* Blocked the tab key from getting inserted into the buffer since theChris Lahey2000-01-123-6/+127
| | | | | | | | | | | * widgets/e-text-event-processor-emacs-like.c: Blocked the tab key from getting inserted into the buffer since the renderer doesn't know what a tab is. * widgets/e-text.c, widgets/e-text.h: Fixed a memory leak. Added a blinking cursor and scrolling for the text item. svn path=/trunk/; revision=1554
* Removed some code which got in the way of testing properly.Chris Lahey2000-01-117-27/+1160
| | | | | | | | | | | | | | | | | | | | | | | * widgets/test-minicard.c: Removed some code which got in the way of testing properly. * widgets/e-minicard-label.c (e_minicard_label_realize): Made the field text item editable. * widgets/Makefile.am: Added e-text-event-process*.[ch]. * widgets/e-text.c, widgets/e-text.h: Changed these to support editing. * widgets/e-text-event-processor.c, widgets/e-text-event-processor.h, widgets/e-text-event-processor-types.h, widgets/e-text-event-processor-emacs-like.c, widgets/e-text-event-processor-emacs-like.h: These are a new pair of classes which handle all events from the text item and convert them into commands. svn path=/trunk/; revision=1553
* Added minicard and text stuff.Chris Lahey2000-01-102-0/+1556
* widgets/Makefile.am: Added minicard and text stuff. * widgets/e-minicard.c, widgets/e-minicard.h, widgets/e-minicard-label.c, widgets/e-minicard-label.h: Added canvas items for the minicard view in the contact manager. * widgets/test-minicard.c, widgets/test-minicard-label.c: Tests for the minicard items. * widgets/e-text.h, widgets/e-text.c: New canvas item. Based on GnomeCanvasText. Adds ellipsis capabilities. Used in e-minicard*.[ch]. * widgets/.cvsignore: Added minicard-test and minicard-label-test. svn path=/trunk/; revision=1552