anjuta r4445 - in trunk: . plugins/build-basic-autotools plugins/document-manager plugins/search plugins/tools

[sgranjoux svn gnome org]

Author: sgranjoux
Date: Sun Dec 14 12:20:15 2008
New Revision: 4445
URL: http://svn.gnome.org/viewvc/anjuta?rev=4445&view=rev

Log:
	* plugins/document-manager/plugin.c (update_status):
	Fixed #563988 â don't display zoom factor when using GtkSourceView editor
	* plugins/build-basic-autotools/plugin.c (on_build_terminated),
	plugins/tools/execute.c (atp_output_context_print_result):
	#564295 - minor English fix

	* plugins/document-manager/search-box.c (search_box_init),
	plugins/search/anjuta-search.glade,
	plugins/search/plugin.c (find_incremental),
	plugins/search/search-replace.c (search_replace_populate),
	(search_update_dialog), (search_replace_find_usage),
	plugins/search/search-replace.h,
	plugins/search/search-replace_backend.c (get_next_match),
	plugins/search/search-replace_backend.h,
	plugins/search/search_preferences.c
	(search_preferences_read_setting),
	(search_preferences_setting_by_default),
	(search_preferences_save_setting):
	fixed #563500 â inconsistent case sensitivity defaults


Modified:
   trunk/ChangeLog
   trunk/plugins/build-basic-autotools/plugin.c
   trunk/plugins/document-manager/plugin.c
   trunk/plugins/document-manager/search-box.c
   trunk/plugins/search/anjuta-search.glade
   trunk/plugins/search/plugin.c
   trunk/plugins/search/search-replace.c
   trunk/plugins/search/search-replace.h
   trunk/plugins/search/search-replace_backend.c
   trunk/plugins/search/search-replace_backend.h
   trunk/plugins/search/search_preferences.c
   trunk/plugins/tools/execute.c

Modified: trunk/plugins/build-basic-autotools/plugin.c
==============================================================================
--- trunk/plugins/build-basic-autotools/plugin.c	(original)
+++ trunk/plugins/build-basic-autotools/plugin.c	Sun Dec 14 12:20:15 2008
@@ -942,12 +942,12 @@
 		if (status)
 		{
 			ianjuta_message_view_buffer_append (context->message_view,
-									_("Completed unsuccessful\n"), NULL);
+									_("Completed unsuccessfully\n"), NULL);
 		}
 		else
 		{
 			ianjuta_message_view_buffer_append (context->message_view,
-									   _("Completed successful\n"), NULL);
+									   _("Completed successfully\n"), NULL);
 		}
 		ianjuta_message_view_buffer_append (context->message_view, buff1, NULL);
 		g_free (buff1);

Modified: trunk/plugins/document-manager/plugin.c
==============================================================================
--- trunk/plugins/document-manager/plugin.c	(original)
+++ trunk/plugins/document-manager/plugin.c	Sun Dec 14 12:20:15 2008
@@ -954,7 +954,12 @@
 		{
 			edit = g_strdup (_("INS"));
 		}
-		anjuta_status_set_default (status, _("Zoom"), "%d", zoom);
+		
+		if (IANJUTA_IS_EDITOR_ZOOM(te))
+			anjuta_status_set_default (status, _("Zoom"), "%d", zoom);
+		else
+			anjuta_status_set_default (status, _("Zoom"), NULL);
+		
 		anjuta_status_set_default (status, _("Line"), "%04d", line);
 		anjuta_status_set_default (status, _("Col"), "%03d", col);
 		anjuta_status_set_default (status, _("Mode"), edit);

Modified: trunk/plugins/document-manager/search-box.c
==============================================================================
--- trunk/plugins/document-manager/search-box.c	(original)
+++ trunk/plugins/document-manager/search-box.c	Sun Dec 14 12:20:15 2008
@@ -445,7 +445,7 @@
 					  G_CALLBACK (on_search_focus_out),
 					  object);	
 	
-	private->case_check = gtk_check_button_new_with_label (_("Case sensitive"));
+	private->case_check = gtk_check_button_new_with_label (_("Match case"));
 	
 	private->search_button = gtk_button_new ();
 	gtk_button_set_image (GTK_BUTTON (private->search_button), search);

Modified: trunk/plugins/search/anjuta-search.glade
==============================================================================
--- trunk/plugins/search/anjuta-search.glade	(original)
+++ trunk/plugins/search/anjuta-search.glade	Sun Dec 14 12:20:15 2008
@@ -310,10 +310,10 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <widget class="GtkCheckButton" id="search.ignore.case">
+                                      <widget class="GtkCheckButton" id="search.match.case">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property name="label" translatable="yes">Case insensitive</property>
+                                        <property name="label" translatable="yes">Match case</property>
                                         <property name="use_underline">True</property>
                                         <property name="response_id">0</property>
                                         <property name="draw_indicator">True</property>
@@ -330,7 +330,7 @@
                                       <widget class="GtkCheckButton" id="search.regex">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property name="label" translatable="yes">Regular Expression</property>
+                                        <property name="label" translatable="yes">Regular expression</property>
                                         <property name="use_underline">True</property>
                                         <property name="response_id">0</property>
                                         <property name="draw_indicator">True</property>

Modified: trunk/plugins/search/plugin.c
==============================================================================
--- trunk/plugins/search/plugin.c	(original)
+++ trunk/plugins/search/plugin.c	Sun Dec 14 12:20:15 2008
@@ -53,7 +53,7 @@
 	se->search_str = expression;
 	se->regex = FALSE;
 	se->greedy = FALSE;
-	se->ignore_case = TRUE;
+	se->match_case = FALSE;
 	se->whole_word = FALSE;
 	se->whole_line = FALSE;
 	se->word_start = FALSE;

Modified: trunk/plugins/search/search-replace.c
==============================================================================
--- trunk/plugins/search/search-replace.c	(original)
+++ trunk/plugins/search/search-replace.c	Sun Dec 14 12:20:15 2008
@@ -170,8 +170,8 @@
 	{GE_BOOLEAN, "search.regex", NULL, NULL},
 	/* GREEDY */
 	{GE_BOOLEAN, "search.greedy", NULL, NULL},
-       	/* IGNORE_CASE */
-	{GE_BOOLEAN, "search.ignore.case", NULL, NULL},
+       	/* MATCH_CASE */
+	{GE_BOOLEAN, "search.match.case", NULL, NULL},
 	/* WHOLE_WORD */
 	{GE_BOOLEAN, "search.match.whole.word", NULL, NULL},
 	/* WORD_START */
@@ -1172,7 +1172,7 @@
 	populate_value(SEARCH_STRING, &(sr->search.expr.search_str));
 	populate_value(SEARCH_REGEX, &(sr->search.expr.regex));
 	populate_value(GREEDY, &(sr->search.expr.greedy));
-	populate_value(IGNORE_CASE, &(sr->search.expr.ignore_case));
+	populate_value(MATCH_CASE, &(sr->search.expr.match_case));
 	populate_value(WHOLE_WORD, &(sr->search.expr.whole_word));
 	populate_value(WHOLE_LINE, &(sr->search.expr.whole_line));
 	populate_value(WORD_START, &(sr->search.expr.word_start));
@@ -1433,8 +1433,8 @@
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), s->expr.regex);
 	widget = sr_get_gladewidget(GREEDY)->widget;
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), s->expr.greedy);
-	widget = sr_get_gladewidget(IGNORE_CASE)->widget;
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), s->expr.ignore_case);
+	widget = sr_get_gladewidget(MATCH_CASE)->widget;
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), s->expr.match_case);
 	widget = sr_get_gladewidget(WHOLE_WORD)->widget;
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), s->expr.whole_word);
 	widget = sr_get_gladewidget(WHOLE_LINE)->widget;
@@ -1816,7 +1816,7 @@
 	sr->search.expr.search_str = g_strdup (symbol);
 	sr->search.expr.regex = FALSE;
 	sr->search.expr.greedy = FALSE;
-	sr->search.expr.ignore_case = FALSE;
+	sr->search.expr.match_case = TRUE;
 	sr->search.expr.whole_word = TRUE;
 	sr->search.expr.whole_line = FALSE;
 	sr->search.expr.word_start = FALSE;

Modified: trunk/plugins/search/search-replace.h
==============================================================================
--- trunk/plugins/search/search-replace.h	(original)
+++ trunk/plugins/search/search-replace.h	Sun Dec 14 12:20:15 2008
@@ -63,7 +63,7 @@
 	/* Checkboxes */
 	SEARCH_REGEX,
 	GREEDY,
-	IGNORE_CASE,
+	MATCH_CASE,
 	WHOLE_WORD,
 	WORD_START,
 	WHOLE_LINE,

Modified: trunk/plugins/search/search-replace_backend.c
==============================================================================
--- trunk/plugins/search/search-replace_backend.c	(original)
+++ trunk/plugins/search/search-replace_backend.c	Sun Dec 14 12:20:15 2008
@@ -452,7 +452,7 @@
 			GRegexMatchFlags match_flags = 0;
 		
 			match_flags |= G_REGEX_MATCH_NOTEMPTY;
-			if (s->ignore_case)
+			if (!s->match_case)
 			{
 				compile_flags |= G_REGEX_CASELESS;
 			}
@@ -517,7 +517,7 @@
 		if (SD_BACKWARD == direction)
 		{
 			/* Backward matching. */
-			if (s->ignore_case)
+			if (!s->match_case)
 			{
 				gchar* current = g_utf8_offset_to_pointer (fb->buf, fb->pos);
 				gint len = g_utf8_strlen (s->search_str, -1);
@@ -563,7 +563,7 @@
 		else
 		{
 			/* Forward match */
-			if (s->ignore_case)
+			if (!s->match_case)
 			{
 				gchar* current = g_utf8_offset_to_pointer (fb->buf, fb->pos);
 				gint len = g_utf8_strlen (s->search_str, -1);

Modified: trunk/plugins/search/search-replace_backend.h
==============================================================================
--- trunk/plugins/search/search-replace_backend.h	(original)
+++ trunk/plugins/search/search-replace_backend.h	Sun Dec 14 12:20:15 2008
@@ -31,7 +31,7 @@
 	gchar *search_str;
 	gboolean regex;
 	gboolean greedy;
-	gboolean ignore_case;
+	gboolean match_case;
 	gboolean whole_word;
 	gboolean whole_line;
 	gboolean word_start;

Modified: trunk/plugins/search/search_preferences.c
==============================================================================
--- trunk/plugins/search/search_preferences.c	(original)
+++ trunk/plugins/search/search_preferences.c	Sun Dec 14 12:20:15 2008
@@ -146,8 +146,8 @@
 	                        gconf_concat_dir_and_key(name, "regex"), NULL);
 	sr->search.expr.greedy = gconf_client_get_bool(client, 
 	                         gconf_concat_dir_and_key(name, "greedy"), NULL);
-	sr->search.expr.ignore_case = gconf_client_get_bool(client, 
-	                              gconf_concat_dir_and_key(name, "ignore_case"), NULL);
+	sr->search.expr.match_case = gconf_client_get_bool(client, 
+	                              gconf_concat_dir_and_key(name, "match_case"), NULL);
 	sr->search.expr.whole_word = gconf_client_get_bool(client, 
 	                             gconf_concat_dir_and_key(name, "whole_word"), NULL);
 	sr->search.expr.whole_line = gconf_client_get_bool(client, 
@@ -176,7 +176,7 @@
  {
 	sr->search.expr.regex =FALSE;
 	sr->search.expr.greedy = FALSE;
-	sr->search.expr.ignore_case = FALSE;
+	sr->search.expr.match_case = FALSE;
 	sr->search.expr.whole_word = FALSE;
 	sr->search.expr.whole_line = FALSE;
 	sr->search.expr.word_start = FALSE;
@@ -206,8 +206,8 @@
 	                      sr->search.expr.regex, NULL);
 	gconf_client_set_bool(client, gconf_concat_dir_and_key(path, "greedy"),
 	                      sr->search.expr.greedy, NULL);
-	gconf_client_set_bool(client, gconf_concat_dir_and_key(path, "ignore_case"),
-                          sr->search.expr.ignore_case, NULL);
+	gconf_client_set_bool(client, gconf_concat_dir_and_key(path, "match_case"),
+                          sr->search.expr.match_case, NULL);
 	gconf_client_set_bool(client, gconf_concat_dir_and_key(path, "whole_word"), 
 	                      sr->search.expr.whole_word, NULL);
 	gconf_client_set_bool(client, gconf_concat_dir_and_key(path, "whole_line"), 

Modified: trunk/plugins/tools/execute.c
==============================================================================
--- trunk/plugins/tools/execute.c	(original)
+++ trunk/plugins/tools/execute.c	Sun Dec 14 12:20:15 2008
@@ -504,14 +504,14 @@
 		{
 			if (error)
 			{
-				buffer = g_strdup_printf (_("Completed unsuccessful with status code %d\n"),
+				buffer = g_strdup_printf (_("Completed unsuccessfully with status code %d\n"),
 										  error);
 				ok = atp_output_context_print (this, buffer);
 				g_free (buffer);
 			}
 			else
 			{
-				ok = atp_output_context_print (this, _("Completed successful\n"));
+				ok = atp_output_context_print (this, _("Completed successfully\n"));
 			}
 			ok &= atp_output_context_print (this, "\n");
 			if (this->view)