anjuta r4073 - in trunk: . plugins/language-support-cpp-java plugins/symbol-db
- From: jhs svn gnome org
- To: svn-commits-list gnome org
- Subject: anjuta r4073 - in trunk: . plugins/language-support-cpp-java plugins/symbol-db
- Date: Wed, 9 Jul 2008 13:45:16 +0000 (UTC)
Author: jhs
Date: Wed Jul 9 13:45:15 2008
New Revision: 4073
URL: http://svn.gnome.org/viewvc/anjuta?rev=4073&view=rev
Log:
2008-07-09 Johannes Schmid <jhs gnome org>
* plugins/language-support-cpp-java/cpp-java-assist.c
(cpp_java_assist_create_word_completion_cache),
(cpp_java_assist_check):
* plugins/symbol-db/plugin.c (symbol_db_activate):
Show all completions even when the editor makes own suggestions
Modified:
trunk/ChangeLog
trunk/plugins/language-support-cpp-java/cpp-java-assist.c
trunk/plugins/symbol-db/plugin.c
Modified: trunk/plugins/language-support-cpp-java/cpp-java-assist.c
==============================================================================
--- trunk/plugins/language-support-cpp-java/cpp-java-assist.c (original)
+++ trunk/plugins/language-support-cpp-java/cpp-java-assist.c Wed Jul 9 13:45:15 2008
@@ -59,6 +59,7 @@
gchar *search_cache;
gchar *scope_context_cache;
GCompletion *completion_cache;
+ gboolean editor_only;
};
static gchar*
@@ -351,6 +352,7 @@
gint max_completions;
GCompletion *completion = NULL;
GList* editor_completions = NULL;
+ assist->priv->editor_only = FALSE;
max_completions =
anjuta_preferences_get_int_with_default (assist->priv->preferences,
PREF_AUTOCOMPLETE_CHOICES,
@@ -398,10 +400,17 @@
tag->name = node->data;
tag->type = 0;
tag->is_func = FALSE;
- tag_list = g_list_append (tag_list, tag);
+ if (completion && !g_list_find_custom (completion->items, tag,
+ completion_compare))
+ tag_list = g_list_append (tag_list, tag);
+ else
+ cpp_java_assist_tag_destroy (tag);
}
if (!completion)
+ {
completion = g_completion_new(completion_function);
+ assist->priv->editor_only = TRUE;
+ }
tag_list = g_list_sort (tag_list, completion_compare);
g_completion_add_items (completion, tag_list);
g_list_free (editor_completions);
@@ -684,7 +693,8 @@
{
if (!assist->priv->search_cache ||
strncmp (assist->priv->search_cache,
- pre_word, strlen (assist->priv->search_cache)) != 0)
+ pre_word, strlen (assist->priv->search_cache)) != 0 ||
+ assist->priv->editor_only)
{
cpp_java_assist_create_word_completion_cache (assist, pre_word);
}
@@ -722,6 +732,7 @@
g_object_unref (iter_save);
g_free (pre_word);
g_free (scope_operator);
+
return shown;
}
Modified: trunk/plugins/symbol-db/plugin.c
==============================================================================
--- trunk/plugins/symbol-db/plugin.c (original)
+++ trunk/plugins/symbol-db/plugin.c Wed Jul 9 13:45:15 2008
@@ -1257,10 +1257,15 @@
/* Create widgets */
symbol_db->dbv_main = gtk_vbox_new(FALSE, 5);
symbol_db->dbv_notebook = gtk_notebook_new();
- symbol_db->progress_bar_project = gtk_progress_bar_new();
+ symbol_db->progress_bar_project = gtk_progress_bar_new();
+ gtk_progress_bar_set_ellipsize (GTK_PROGRESS_BAR(symbol_db->progress_bar_project),
+ PANGO_ELLIPSIZE_END);
g_object_ref (symbol_db->progress_bar_project);
symbol_db->progress_bar_system = gtk_progress_bar_new();
+ gtk_progress_bar_set_ellipsize (GTK_PROGRESS_BAR(symbol_db->progress_bar_system),
+ PANGO_ELLIPSIZE_END);
+
g_object_ref (symbol_db->progress_bar_system);
gtk_box_pack_start (GTK_BOX (symbol_db->dbv_main), symbol_db->dbv_notebook,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]