18d96c5ff3
2003-02-09 Chris Toshok <toshok@ximian.com> * tests/.cvsignore: ignore test-completion. * tests/test-completion.c: new program, completion test. * tests/Makefile.am (noinst_PROGRAMS): add test-completion. * gal/e-text/Makefile.am: remove e-completion-test from the build here, moving it to ../../tests. * gal/e-text/e-completion.c (e_completion_class_init): we've removed the restart, cancel, clear, and lost signals. Also, we've renamed some so it's easier to tell from the name which it is (virtual func or signal.) (e_completion_dispose): remove call to clear_search_stack, as we don't do auto-refinement anymore. (e_completion_clear): gone. (e_completion_push_search): gone. (e_completion_pop_search): gone. (e_completion_clear_search_stack): gone. (e_completion_refine_search): gone. (e_completion_unrefine_search): gone. (e_completion_begin_search): substantially clear this up, since we don't have the refinement stuff anymore. Also, the call to request_completion is a virtual function call, not a signal. (e_completion_match_count): always return matches->len here, never match_count, which is gone (with the refinement stuff) (e_completion_foreach_match): remove the hit_count stuff. (e_completion_restart): gone. (e_completion_lost_match): gone. (e_completion_end_search): remove the sorting stuff from here (and the call to restart.) the etable sorting stuff will have to take up the slack, but for now there's no reason to restart the search here. * gal/e-text/e-completion.h (struct _ECompletionClass): straighten out what's a virtual function and what's a signal, instead of using signals for both. Also, remove the auto_refine stuff, as it's not used. * gal/e-text/e-completion-view.c (e_completion_view_size_request): make the damn drop down window bigger (100 pixels, or the requisition height, whichever is bigger.) (e_completion_view_disconnect): remove handling for signals that are gone. (restart_completion_cb): gone. (cancel_completion_cb): gone. (clear_completion_cb): gone. (lost_completion_cb): gone. (e_completion_view_construct): track new names of ECompletion signals. * gal/e-text/e-completion-view.h (struct _ECompletionView): remove restart_signal_id, cancel_signal_id, clear_signal_id, and lost_signal_id. * gal/e-text/e-entry.c (get_borders): new function, ala gtkentry. (canvas_size_request): use get_borders instead of computing it here. (e_entry_init): remove duplicate assignment of emulate_label_resize. (e_entry_show_popup): remove some ifdef'ed crap. (e_entry_start_completion): don't cancel the completion before starting again. This keeps the popup from disappearing. * gal/e-text/e-completion-match.c (e_completion_match_construct): no more hit_count. * gal/e-text/e-completion-match.h (struct _ECompletionMatch): remove hit_count. * gal/e-text/e-completion-callbacks.[ch]: new class so we can use callbacks instead of subclassing. svn path=/trunk/; revision=19859
68 lines
2.2 KiB
C
68 lines
2.2 KiB
C
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
|
|
/*
|
|
* e-completion-match.h
|
|
* Copyright 2000, 2001, Ximian, Inc.
|
|
*
|
|
* Authors:
|
|
* Jon Trowbridge <trow@ximian.com>
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Library General Public
|
|
* License, version 2, as published by the Free Software Foundation.
|
|
*
|
|
* This library is distributed in the hope that it will be useful, but
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Library General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Library General Public
|
|
* License along with this library; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
|
* 02111-1307, USA.
|
|
*/
|
|
|
|
#ifndef __E_COMPLETION_MATCH_H__
|
|
#define __E_COMPLETION_MATCH_H__
|
|
|
|
#include <glib.h>
|
|
#include <gtk/gtkwidget.h>
|
|
|
|
G_BEGIN_DECLS
|
|
|
|
typedef struct _ECompletionMatch ECompletionMatch;
|
|
|
|
struct _ECompletionMatch {
|
|
gchar *match_text; /* in utf8 */
|
|
gchar *menu_text; /* in utf8 */
|
|
double score;
|
|
gint sort_major;
|
|
gint sort_minor;
|
|
gpointer user_data;
|
|
|
|
gint ref;
|
|
void (*destroy) (ECompletionMatch *);
|
|
};
|
|
|
|
typedef void (*ECompletionMatchFn) (ECompletionMatch *, gpointer closure);
|
|
|
|
void e_completion_match_construct (ECompletionMatch *);
|
|
void e_completion_match_ref (ECompletionMatch *);
|
|
void e_completion_match_unref (ECompletionMatch *);
|
|
|
|
void e_completion_match_set_text (ECompletionMatch *, const gchar *match_text, const gchar *label_text);
|
|
const gchar *e_completion_match_get_match_text (ECompletionMatch *);
|
|
const gchar *e_completion_match_get_menu_text (ECompletionMatch *);
|
|
|
|
gint e_completion_match_compare (const ECompletionMatch *, const ECompletionMatch *);
|
|
gint e_completion_match_compare_alpha (const ECompletionMatch *, const ECompletionMatch *);
|
|
|
|
ECompletionMatch *e_completion_match_new (const gchar *match_text, const gchar *menu_text, double score);
|
|
|
|
|
|
|
|
|
|
G_END_DECLS
|
|
|
|
#endif /* __E_COMPLETION_MATCH_H__ */
|
|
|