[Goodies-commits] r6505 - in xfce4-dict/trunk: . lib
Enrico Troeger
enrico at xfce.org
Mon Jan 19 19:59:42 CET 2009
Author: enrico
Date: 2009-01-19 18:59:42 +0000 (Mon, 19 Jan 2009)
New Revision: 6505
Modified:
xfce4-dict/trunk/ChangeLog
xfce4-dict/trunk/lib/common.c
xfce4-dict/trunk/lib/dictd.c
xfce4-dict/trunk/lib/gui.c
xfce4-dict/trunk/lib/prefs.c
xfce4-dict/trunk/lib/spell.c
xfce4-dict/trunk/lib/spell.h
Log:
Improve some strings, thanks to J?\195?\169r?\195?\180me Guelfucci for the suggestions.
Use less spacing for spell checker results and don't display any failed searches if used as fallback for a dictionary search.
Modified: xfce4-dict/trunk/ChangeLog
===================================================================
--- xfce4-dict/trunk/ChangeLog 2009-01-19 18:50:16 UTC (rev 6504)
+++ xfce4-dict/trunk/ChangeLog 2009-01-19 18:59:42 UTC (rev 6505)
@@ -1,3 +1,10 @@
+2009-01-19 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * Improve some strings, thanks to Jérôme Guelfucci for the suggestions.
+ * Use less spacing for spell checker results and don't display any
+ failed searches if used as fallback for a dictionary search.
+
+
2008-12-05 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
* When highlighting cross-references, ignore also {vr}.
Modified: xfce4-dict/trunk/lib/common.c
===================================================================
--- xfce4-dict/trunk/lib/common.c 2009-01-19 18:50:16 UTC (rev 6504)
+++ xfce4-dict/trunk/lib/common.c 2009-01-19 18:59:42 UTC (rev 6505)
@@ -236,7 +236,7 @@
}
case DICTMODE_SPELL:
{
- dict_spell_start_query(dd, dd->searched_word);
+ dict_spell_start_query(dd, dd->searched_word, FALSE);
break;
}
default:
Modified: xfce4-dict/trunk/lib/dictd.c
===================================================================
--- xfce4-dict/trunk/lib/dictd.c 2009-01-19 18:50:16 UTC (rev 6504)
+++ xfce4-dict/trunk/lib/dictd.c 2009-01-19 18:59:42 UTC (rev 6505)
@@ -410,11 +410,12 @@
if (dd->query_status == NOTHING_FOUND)
{
- dict_gui_status_add(dd, _("Ready."));
gtk_text_buffer_insert(dd->main_textbuffer, &dd->textiter, "\n", 1);
tmp = g_strdup_printf(_("No matches could be found for \"%s\"."), dd->searched_word);
- gtk_text_buffer_insert(dd->main_textbuffer, &dd->textiter, tmp, -1);
+ gtk_text_buffer_insert_with_tags_by_name(dd->main_textbuffer, &dd->textiter,
+ tmp, -1, "error", NULL);
+ dict_gui_status_add(dd, "%s", tmp);
g_free(tmp);
g_free(dd->query_buffer);
@@ -423,19 +424,18 @@
if (NZV(dd->web_url))
{
gchar *text = g_strdup_printf(
- _("Do you want to search \"%s\" on the Web using "), dd->searched_word);
+ /* for translators: the first wildcard is the search term, the second wildcard
+ * is the name of the preferred web search engine */
+ _("Search \"%s\" using \"%s\""), dd->searched_word, dict_prefs_get_web_url_label(dd));
gtk_text_buffer_insert(dd->main_textbuffer, &dd->textiter, "\n\n", 2);
- gtk_text_buffer_insert(dd->main_textbuffer, &dd->textiter, text, -1);
- gtk_text_buffer_insert(dd->main_textbuffer, &dd->textiter, "\"", 1);
gtk_text_buffer_insert_with_tags_by_name(dd->main_textbuffer, &dd->textiter,
- dict_prefs_get_web_url_label(dd), -1, "link", NULL);
- gtk_text_buffer_insert(dd->main_textbuffer, &dd->textiter, "\"?", 2);
+ text, -1, "link", NULL);
g_free(text);
}
if (NZV(dd->spell_bin))
{
gtk_text_buffer_insert(dd->main_textbuffer, &dd->textiter, "\n", 1);
- dict_spell_start_query(dd, dd->searched_word);
+ dict_spell_start_query(dd, dd->searched_word, TRUE);
}
return FALSE;
Modified: xfce4-dict/trunk/lib/gui.c
===================================================================
--- xfce4-dict/trunk/lib/gui.c 2009-01-19 18:50:16 UTC (rev 6504)
+++ xfce4-dict/trunk/lib/gui.c 2009-01-19 18:59:42 UTC (rev 6505)
@@ -42,6 +42,7 @@
static GdkCursor *hand_cursor = NULL;
static GdkCursor *regular_cursor = NULL;
static gboolean entry_is_dirty = FALSE;
+static const GdkColor error_color = { 0, 0x8000, 0, 0 }; /* dark red */
/* all textview_* functions are from the gtk-demo app to get links in the textview working */
@@ -587,19 +588,19 @@
gtk_widget_show(label);
gtk_box_pack_start(GTK_BOX(method_chooser), label, FALSE, FALSE, 6);
- radio = gtk_radio_button_new_with_mnemonic(NULL, _("_Dict"));
+ radio = gtk_radio_button_new_with_mnemonic(NULL, _("_Dictionary Server"));
gtk_widget_show(radio);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radio), (dd->mode_in_use == DICTMODE_DICT));
g_signal_connect(radio, "toggled", G_CALLBACK(search_mode_dict_toggled), dd);
gtk_box_pack_start(GTK_BOX(method_chooser), radio, FALSE, FALSE, 6);
- radio = gtk_radio_button_new_with_mnemonic_from_widget(GTK_RADIO_BUTTON(radio), _("_Web"));
+ radio = gtk_radio_button_new_with_mnemonic_from_widget(GTK_RADIO_BUTTON(radio), _("_Web Service"));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radio), (dd->mode_in_use == DICTMODE_WEB));
g_signal_connect(radio, "toggled", G_CALLBACK(search_mode_web_toggled), dd);
gtk_widget_show(radio);
gtk_box_pack_start(GTK_BOX(method_chooser), radio, FALSE, FALSE, 6);
- radio = gtk_radio_button_new_with_mnemonic_from_widget(GTK_RADIO_BUTTON(radio), _("_Spell Check"));
+ radio = gtk_radio_button_new_with_mnemonic_from_widget(GTK_RADIO_BUTTON(radio), _("_Spell Checker"));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radio), (dd->mode_in_use == DICTMODE_SPELL));
g_signal_connect(radio, "toggled", G_CALLBACK(search_mode_spell_toggled), dd);
gtk_widget_show(radio);
@@ -629,6 +630,10 @@
"style", PANGO_STYLE_ITALIC,
"indent", 10,
"pixels-below-lines", 5, NULL);
+ gtk_text_buffer_create_tag(dd->main_textbuffer,
+ "error",
+ "style", PANGO_STYLE_ITALIC,
+ "foreground-gdk", &error_color, NULL);
dd->phon_tag = gtk_text_buffer_create_tag(dd->main_textbuffer,
"phonetic",
"style", PANGO_STYLE_ITALIC,
Modified: xfce4-dict/trunk/lib/prefs.c
===================================================================
--- xfce4-dict/trunk/lib/prefs.c 2009-01-19 18:50:16 UTC (rev 6504)
+++ xfce4-dict/trunk/lib/prefs.c 2009-01-19 18:59:42 UTC (rev 6505)
@@ -314,7 +314,7 @@
gtk_widget_show(label);
gtk_box_pack_start(GTK_BOX(inner_vbox), label, FALSE, FALSE, 0);
- radio_button = gtk_radio_button_new_with_label(NULL, _("Dict"));
+ radio_button = gtk_radio_button_new_with_label(NULL, _("Dictionary Server"));
search_method = gtk_radio_button_get_group(GTK_RADIO_BUTTON(radio_button));
if (dd->mode_default == DICTMODE_DICT)
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radio_button), TRUE);
@@ -323,7 +323,7 @@
g_object_set_data(G_OBJECT(radio_button), "type", GINT_TO_POINTER(DICTMODE_DICT));
g_signal_connect(G_OBJECT(radio_button), "toggled", G_CALLBACK(search_method_changed), dd);
- radio_button = gtk_radio_button_new_with_label(search_method, _("Web"));
+ radio_button = gtk_radio_button_new_with_label(search_method, _("Web Service"));
search_method = gtk_radio_button_get_group(GTK_RADIO_BUTTON(radio_button));
if (dd->mode_default == DICTMODE_WEB)
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radio_button), TRUE);
@@ -332,7 +332,7 @@
g_object_set_data(G_OBJECT(radio_button), "type", GINT_TO_POINTER(DICTMODE_WEB));
g_signal_connect(G_OBJECT(radio_button), "toggled", G_CALLBACK(search_method_changed), dd);
- radio_button = gtk_radio_button_new_with_label(search_method, _("Spell Check"));
+ radio_button = gtk_radio_button_new_with_label(search_method, _("Spell Checker"));
search_method = gtk_radio_button_get_group(GTK_RADIO_BUTTON(radio_button));
if (dd->mode_default == DICTMODE_SPELL)
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radio_button), TRUE);
@@ -451,7 +451,7 @@
gtk_container_set_border_width(GTK_CONTAINER(inner_vbox), 5);
gtk_widget_show(inner_vbox);
gtk_notebook_insert_page(GTK_NOTEBOOK(notebook),
- notebook_vbox, gtk_label_new(_("Dict")), NOTEBOOK_PAGE_DICTD);
+ notebook_vbox, gtk_label_new(_("Dictionary Server")), NOTEBOOK_PAGE_DICTD);
/* server address */
label1 = gtk_label_new_with_mnemonic(_("Server:"));
@@ -572,7 +572,7 @@
gtk_container_set_border_width(GTK_CONTAINER(inner_vbox), 5);
gtk_widget_show(inner_vbox);
gtk_notebook_insert_page(GTK_NOTEBOOK(notebook),
- notebook_vbox, gtk_label_new(_("Web")), NOTEBOOK_PAGE_WEB);
+ notebook_vbox, gtk_label_new(_("Web Service")), NOTEBOOK_PAGE_WEB);
label = gtk_label_new(_("<b>Web search URL:</b>"));
gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
@@ -622,7 +622,7 @@
gtk_container_set_border_width(GTK_CONTAINER(inner_vbox), 5);
gtk_widget_show(inner_vbox);
gtk_notebook_insert_page(GTK_NOTEBOOK(notebook),
- notebook_vbox, gtk_label_new(_("Spell Check")), NOTEBOOK_PAGE_SPELL);
+ notebook_vbox, gtk_label_new(_("Spell Checker")), NOTEBOOK_PAGE_SPELL);
label1 = gtk_label_new_with_mnemonic(_("Spell Check Program:"));
gtk_widget_show(label1);
Modified: xfce4-dict/trunk/lib/spell.c
===================================================================
--- xfce4-dict/trunk/lib/spell.c 2009-01-19 18:50:16 UTC (rev 6504)
+++ xfce4-dict/trunk/lib/spell.c 2009-01-19 18:59:42 UTC (rev 6505)
@@ -44,6 +44,7 @@
{
DictData *dd;
gchar *word;
+ gboolean quiet;
} iodata;
@@ -80,9 +81,10 @@
gint count;
tmp = strchr(msg + 2, ' ') + 1;
count = atoi(tmp);
- dict_gui_status_add(dd, ngettext("%d suggestion found.",
- "%d suggestions found.",
- count), count);
+ if (! iod->quiet)
+ dict_gui_status_add(dd, ngettext("%d suggestion found.",
+ "%d suggestions found.",
+ count), count);
gtk_text_buffer_insert(dd->main_textbuffer, &dd->textiter, "\n", 1);
tmp = g_strdup_printf(_("Suggestions for \"%s\":"), iod->word);
@@ -93,23 +95,23 @@
tmp = strchr(msg, ':') + 2;
gtk_text_buffer_insert(dd->main_textbuffer, &dd->textiter, g_strchomp(tmp), -1);
- gtk_text_buffer_insert(dd->main_textbuffer, &dd->textiter, "\n\n", 2);
+ gtk_text_buffer_insert(dd->main_textbuffer, &dd->textiter, "\n", 1);
}
- else if (msg[0] == '*')
+ else if (msg[0] == '*' && ! iod->quiet)
{
gtk_text_buffer_insert(dd->main_textbuffer, &dd->textiter, "\n", 1);
tmp = g_strdup_printf(_("\"%s\" is spelled correctly."), iod->word);
gtk_text_buffer_insert(dd->main_textbuffer, &dd->textiter, tmp, -1);
- gtk_text_buffer_insert(dd->main_textbuffer, &dd->textiter, "\n\n", 2);
+ gtk_text_buffer_insert(dd->main_textbuffer, &dd->textiter, "\n", 1);
g_free(tmp);
}
- else if (msg[0] == '#')
+ else if (msg[0] == '#' && ! iod->quiet)
{
gtk_text_buffer_insert(dd->main_textbuffer, &dd->textiter, "\n", 1);
tmp = g_strdup_printf(_("No suggestions could be found for \"%s\"."),
iod->word);
gtk_text_buffer_insert(dd->main_textbuffer, &dd->textiter, tmp, -1);
- gtk_text_buffer_insert(dd->main_textbuffer, &dd->textiter, "\n\n", 2);
+ gtk_text_buffer_insert(dd->main_textbuffer, &dd->textiter, "\n", 1);
g_free(tmp);
}
g_free(msg);
@@ -157,7 +159,7 @@
}
-void dict_spell_start_query(DictData *dd, const gchar *word)
+void dict_spell_start_query(DictData *dd, const gchar *word, gboolean quiet)
{
GError *error = NULL;
gchar **argv;
@@ -202,13 +204,15 @@
&stdin_fd, &stdout_fd, &stderr_fd, &error))
{
iod = g_new(iodata, 1);
+ iod->quiet = quiet;
iod->dd = dd;
iod->word = g_strdup(tts[i]);
set_up_io_channel(stdin_fd, G_IO_OUT, iofunc_write, g_strdup(tts[i]));
set_up_io_channel(stdout_fd, G_IO_IN|G_IO_PRI|G_IO_HUP|G_IO_ERR|G_IO_NVAL, iofunc_read, iod);
set_up_io_channel(stderr_fd, G_IO_IN|G_IO_PRI|G_IO_HUP|G_IO_ERR|G_IO_NVAL, iofunc_read_err, dd);
- dict_gui_status_add(dd, _("Ready."));
+ if (! quiet)
+ dict_gui_status_add(dd, _("Ready."));
}
else
{
Modified: xfce4-dict/trunk/lib/spell.h
===================================================================
--- xfce4-dict/trunk/lib/spell.h 2009-01-19 18:50:16 UTC (rev 6504)
+++ xfce4-dict/trunk/lib/spell.h 2009-01-19 18:59:42 UTC (rev 6505)
@@ -22,7 +22,7 @@
#define SPELL_H 1
-void dict_spell_start_query(DictData *dd, const gchar *word);
+void dict_spell_start_query(DictData *dd, const gchar *word, gboolean quiet);
void dict_spell_get_dictionaries(DictData *dd, GtkWidget *spell_combo);
More information about the Goodies-commits
mailing list