| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
| |
'MERGE_TO_HEAD_1'.
svn path=/tags/MERGE_TO_HEAD_1/; revision=12887
|
|
|
|
|
|
|
| |
* gui/widgets/e-addressbook-util.c (e_addressbook_error_dialog):
Display localized status string (added missing _()).
svn path=/trunk/; revision=12476
|
|
|
|
|
|
|
|
|
|
|
|
| |
2001-08-14 Christopher James Lahey <clahey@ximian.com>
* gui/merging/e-card-merging-book-commit-duplicate-detected.glade:
Got rid of an extraneous _ here.
* gui/widgets/e-addressbook-util.c (e_addressbook_error_dialog):
Changed Canceled to Cancelled here. Fixes Ximian bug #2465.
svn path=/trunk/; revision=12002
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2001-06-24 Chris Toshok <toshok@ximian.com>
* gui/widgets/Makefile.am (minicard_test_LDADD): correct path to
libecontacteditor.a.
(minicard_widget_test_LDADD): same.
(INCLUDES): same, for the includes.
* gui/widgets/e-minicard.h: correct e-contact-editor.h path.
* gui/widgets/e-addressbook-util.h: correct path to
e-contact-editor.h, and add e-contact-list-editor.h. Add
prototype for e_addressbook_show_contact_list_editor.
* gui/widgets/e-addressbook-util.c: remove #include
"e-contact-editor.h" (our header includes it.)
(added_cb): rename card_added_cb to this, and make it so it can be
reused in both the list and card cases. remove the g_print too.
(modified_cb): same for modified case.
(deleted_cb): same for deleted case.
(editor_closed_cb): change first arg to GtkObject* so we can reuse
this for both list and card.
(e_addressbook_show_contact_editor): use added_cb, modified_cb,
deleted_cb, and pass FALSE as user_data.
(e_addressbook_show_contact_list_editor): new function, same as
above but creating a contact-list-editor, and pass TRUE as
user_data.
* gui/component/e-address-popup.c: correct path to contact-editor.
* gui/component/e-address-widget.c: same.
* gui/component/select-names/e-select-names-popup.c: same.
* gui/component/select-names/e-select-names-text-model.c: same.
* gui/component/addressbook.c (new_contact_list_cb): new function.
(update_command_state): update ContactNewList command.
(verbs): remove ViewAll from the toolbar from the verb list. Add
ContactNewList.
(pixmaps): same for pixmaps.
* gui/component/Makefile.am (evolution_addressbook_LDADD): new
path for contact-editor.
(INCLUDES): same.
* gui/contact-list-editor/e-contact-list-model.h:
* gui/contact-list-editor/e-contact-list-model.c:
* gui/contact-list-editor/e-contact-list-editor.h:
* gui/contact-list-editor/e-contact-list-editor.c:
* gui/contact-list-editor/Makefile.am: Initial contact-list editor
commit.
* gui/Makefile.am (SUBDIRS): add contact-editor.
* Makefile.am: (SUBDIRS): remove contact-editor.
svn path=/trunk/; revision=10463
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2001-06-19 Chris Toshok <toshok@ximian.com>
* gui/widgets/e-addressbook-view.c (table_double_click): track
change to e_addressbook_show_contact_editor signature.
* gui/widgets/e-minicard-view.c (e_minicard_view_event): same.
* gui/widgets/e-minicard.c (e_minicard_event): same.
* gui/widgets/e-addressbook-util.c (e_addressbook_error_dialog):
add an entry for "Card ID already exists".
(e_addressbook_show_contact_editor): track the change to signal
names and e_contact_editor_new signature here.
* gui/widgets/e-addressbook-util.h: change
e_addressbook_show_contact_editor's signature to match
e_contact_editor_new more closely.
* gui/widgets/e-addressbook-table-adapter.c (unlink_model): free
up the simple mapping to plug a potentially sizeable memory leak.
* gui/component/select-names/e-select-names-text-model.c
(e_select_names_text_model_activate_obj): call
e_addressbook_show_contact_editor here.
* gui/component/select-names/e-select-names-popup.c
(edit_contact_info_have_book_cb): remove the get_supported_fields
stuff, since the contact editor handles it for us now, and call
e_addressbook_show_contact_editor.
* gui/component/e-address-popup.c (edit_contact_info_cb): same.
* gui/component/addressbook.c (new_contact_cb): track change to
e_addressbook_show_contact_editor.
svn path=/trunk/; revision=10318
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2001-06-11 Christopher James Lahey <clahey@ximian.com>
* gui/merging/Makefile.am (glade_DATA): Added
e-card-merging-book-commit-duplicate-detected.glade here.
* gui/merging/e-card-merging-book-commit-duplicate-detected.glade:
Added this file. The GUI for asking whether to commit a modified
card.
* gui/merging/e-card-merging.c, gui/merging/e-card-merging.h
(e_card_merging_book_commit_card): Added this function.
* gui/widgets/e-addressbook-table-adapter.c
(addressbook_set_value_at), gui/widgets/e-addressbook-util.c
(commit_card_cb), gui/widgets/e-minicard.c (e_minicard_event): Use
e_card_merging_book_commit_card instead of e_book_commit_card here.
svn path=/trunk/; revision=10184
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2001-06-09 Christopher James Lahey <clahey@ximian.com>
* backend/ebook/e-card-compare.c (use_common_book_cb): Null
terminate the strv here.
(e_card_locate_match): ref here instead of unref.
* backend/ebook/e-card-simple.c (e_card_simple_get): Handle a NULL
card here.
* contact-editor/Makefile.am (INCLUDES), gui/widgets/Makefile.am
(INCLUDES): Added addressbook/gui/merging here.
* contact-editor/e-contact-quick-add.c (book_ready_cb),
gui/component/addressbook-component.c (dnd_drop_book_open_cb),
gui/widgets/e-addressbook-table-adapter.c
(addressbook_append_row), gui/widgets/e-addressbook-util.c
(add_card_cb), gui/widgets/e-addressbook-view.c
(selection_received), gui/widgets/e-minicard-control.c
(book_open_cb): Use e_card_merging_book_add_card instead of
e_book_add_card here.
* gui/Makefile.am (SUBDIRS): Added merging.
* gui/component/Makefile.am (evolution_addressbook_LDADD),
gui/widgets/Makefile.am (minicard_test_LDADD,
minicard_widget_test_LDADD): Added libecardmerging.a here.
* gui/merging/, gui/merging/.cvsignore, gui/merging/Makefile.am:
New addressbook library.
* gui/merging/e-card-duplicate-detected.glade: Glade file for
duplicate detected dialog.
* gui/merging/e-card-merging.c, gui/merging/e-card-merging.h: New
files for detecting duplicates before adding and putting up a
dialog if duplicates are found.
* gui/widgets/e-minicard-view.c: Include e-addressbook-util.h
here.
svn path=/trunk/; revision=10170
|
|
2001-06-08 Chris Toshok <toshok@ximian.com>
* contact-editor/e-contact-editor.c (e_contact_editor_new): remove
the gtk_widget_show call...
(e_contact_editor_show): and put it here.
* contact-editor/e-contact-editor.h: add prototype for
e_contact_editor_show.
* gui/widgets/e-minicard.c (e_minicard_event): call
e_addressbook_show_contact_editor.
(card_modified_cb): call e_addressbook_error_dialog if status !=
SUCCESS.
* gui/widgets/e-minicard-view.c (e_minicard_view_event): call
e_addressbook_show_contact_editor. also, use card_modified_cb as
the commit_card callback.
* gui/widgets/e-addressbook-view.c (table_double_click): clean
this area up alot, call e_addressbook_show_contact_editor.
(card_deleted_cb): call e_addressbook_error_dialog.
* gui/widgets/e-addressbook-table-adapter.c
(card_modified_cb): new function, call e_addressbook_error_dialog
if the status != SUCCESS.
(addressbook_set_value_at): use card_modified_cb as the callback
for e_book_commit_card.
* gui/widgets/Makefile.am (libeminicard_a_SOURCES): add
e-addressbook-util.[ch].
* gui/component/addressbook.c (new_contact_cb): use
e_addressbook_show_contact_editor here.
svn path=/trunk/; revision=10164
|