[Goodies-commits] r7354 - in xfce4-dict/trunk: . lib
Enrico Troeger
enrico at xfce.org
Sun May 17 02:18:01 CEST 2009
Author: enrico
Date: 2009-05-17 00:18:01 +0000 (Sun, 17 May 2009)
New Revision: 7354
Modified:
xfce4-dict/trunk/ChangeLog
xfce4-dict/trunk/lib/common.c
xfce4-dict/trunk/lib/common.h
xfce4-dict/trunk/lib/dictd.c
xfce4-dict/trunk/lib/gui.c
xfce4-dict/trunk/lib/prefs.c
Log:
Rename some variables.
Rename the colour button labels in the preferences dialog.
Modified: xfce4-dict/trunk/ChangeLog
===================================================================
--- xfce4-dict/trunk/ChangeLog 2009-05-17 00:17:56 UTC (rev 7353)
+++ xfce4-dict/trunk/ChangeLog 2009-05-17 00:18:01 UTC (rev 7354)
@@ -2,6 +2,9 @@
* lib/gui.c, lib/speedreader.c:
Mark some strings as translatable (closes #5360).
+ * lib/common.c, lib/common.h, lib/dictd.c, lib/gui.c, lib/prefs.c:
+ Rename some variables.
+ Rename the colour button labels in the preferences dialog.
2009-05-12 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
Modified: xfce4-dict/trunk/lib/common.c
===================================================================
--- xfce4-dict/trunk/lib/common.c 2009-05-17 00:17:56 UTC (rev 7353)
+++ xfce4-dict/trunk/lib/common.c 2009-05-17 00:18:01 UTC (rev 7354)
@@ -433,14 +433,14 @@
else
dd->spell_dictionary = spell_dictionary_default;
- dd->link_color = g_new0(GdkColor, 1);
- gdk_color_parse(link_color_str, dd->link_color);
- dd->phon_color = g_new0(GdkColor, 1);
- gdk_color_parse(phon_color_str, dd->phon_color);
- dd->error_color = g_new0(GdkColor, 1);
- gdk_color_parse(error_color_str, dd->error_color);
- dd->success_color = g_new0(GdkColor, 1);
- gdk_color_parse(success_color_str, dd->success_color);
+ dd->color_link = g_new0(GdkColor, 1);
+ gdk_color_parse(link_color_str, dd->color_link);
+ dd->color_phonetic = g_new0(GdkColor, 1);
+ gdk_color_parse(phon_color_str, dd->color_phonetic);
+ dd->color_incorrect = g_new0(GdkColor, 1);
+ gdk_color_parse(error_color_str, dd->color_incorrect);
+ dd->color_correct = g_new0(GdkColor, 1);
+ gdk_color_parse(success_color_str, dd->color_correct);
dd->speedreader_wpm = wpm;
dd->speedreader_font = g_strdup(speedreader_font);
@@ -470,10 +470,10 @@
xfce_rc_write_entry(rc, "spell_bin", dd->spell_bin);
xfce_rc_write_entry(rc, "spell_dictionary", dd->spell_dictionary);
- link_color_str = get_hex_from_color(dd->link_color);
- phon_color_str = get_hex_from_color(dd->phon_color);
- error_color_str = get_hex_from_color(dd->error_color);
- success_color_str = get_hex_from_color(dd->success_color);
+ link_color_str = get_hex_from_color(dd->color_link);
+ phon_color_str = get_hex_from_color(dd->color_phonetic);
+ error_color_str = get_hex_from_color(dd->color_incorrect);
+ success_color_str = get_hex_from_color(dd->color_correct);
xfce_rc_write_entry(rc, "link_color", link_color_str);
xfce_rc_write_entry(rc, "phonetic_color", phon_color_str);
xfce_rc_write_entry(rc, "error_color", error_color_str);
@@ -512,10 +512,10 @@
g_free(dd->spell_bin);
g_free(dd->speedreader_font);
- g_free(dd->link_color);
- g_free(dd->phon_color);
- g_free(dd->success_color);
- g_free(dd->error_color);
+ g_free(dd->color_link);
+ g_free(dd->color_phonetic);
+ g_free(dd->color_correct);
+ g_free(dd->color_incorrect);
if (dd->icon != NULL)
g_object_unref(dd->icon);
Modified: xfce4-dict/trunk/lib/common.h
===================================================================
--- xfce4-dict/trunk/lib/common.h 2009-05-17 00:17:56 UTC (rev 7353)
+++ xfce4-dict/trunk/lib/common.h 2009-05-17 00:18:01 UTC (rev 7354)
@@ -110,10 +110,10 @@
GtkTextMark *mark_click;
GdkPixbuf *icon;
- GdkColor *link_color;
- GdkColor *phon_color;
- GdkColor *error_color;
- GdkColor *success_color;
+ GdkColor *color_link;
+ GdkColor *color_phonetic;
+ GdkColor *color_correct;
+ GdkColor *color_incorrect;
/* speed reader */
gint speedreader_wpm;
Modified: xfce4-dict/trunk/lib/dictd.c
===================================================================
--- xfce4-dict/trunk/lib/dictd.c 2009-05-17 00:17:56 UTC (rev 7353)
+++ xfce4-dict/trunk/lib/dictd.c 2009-05-17 00:18:01 UTC (rev 7354)
@@ -203,7 +203,7 @@
tag = gtk_text_buffer_create_tag(dd->main_textbuffer, NULL,
"underline", PANGO_UNDERLINE_SINGLE,
- "foreground-gdk", dd->link_color, NULL);
+ "foreground-gdk", dd->color_link, NULL);
g_object_set_data_full(G_OBJECT(tag), TAG_LINK, g_strdup(link_str), g_free);
Modified: xfce4-dict/trunk/lib/gui.c
===================================================================
--- xfce4-dict/trunk/lib/gui.c 2009-05-17 00:17:56 UTC (rev 7353)
+++ xfce4-dict/trunk/lib/gui.c 2009-05-17 00:18:01 UTC (rev 7354)
@@ -695,18 +695,18 @@
dd->error_tag = gtk_text_buffer_create_tag(dd->main_textbuffer,
TAG_ERROR,
"style", PANGO_STYLE_ITALIC,
- "foreground-gdk", dd->error_color, NULL);
+ "foreground-gdk", dd->color_incorrect, NULL);
dd->success_tag = gtk_text_buffer_create_tag(dd->main_textbuffer,
TAG_SUCCESS,
- "foreground-gdk", dd->success_color, NULL);
+ "foreground-gdk", dd->color_correct, NULL);
dd->phon_tag = gtk_text_buffer_create_tag(dd->main_textbuffer,
TAG_PHONETIC,
"style", PANGO_STYLE_ITALIC,
- "foreground-gdk", dd->phon_color, NULL);
+ "foreground-gdk", dd->color_phonetic, NULL);
dd->link_tag = gtk_text_buffer_create_tag(dd->main_textbuffer,
TAG_LINK,
"underline", PANGO_UNDERLINE_SINGLE,
- "foreground-gdk", dd->link_color, NULL);
+ "foreground-gdk", dd->color_link, NULL);
/* support for links (cross-references) for dictd responses */
{
Modified: xfce4-dict/trunk/lib/prefs.c
===================================================================
--- xfce4-dict/trunk/lib/prefs.c 2009-05-17 00:17:56 UTC (rev 7353)
+++ xfce4-dict/trunk/lib/prefs.c 2009-05-17 00:18:01 UTC (rev 7354)
@@ -153,10 +153,10 @@
dd->panel_entry_size = gtk_spin_button_get_value_as_int(
GTK_SPIN_BUTTON(g_object_get_data(G_OBJECT(dlg), "panel_entry_size_spinner")));
}
- g_object_set(G_OBJECT(dd->link_tag), "foreground-gdk", dd->link_color, NULL);
- g_object_set(G_OBJECT(dd->phon_tag), "foreground-gdk", dd->phon_color, NULL);
- g_object_set(G_OBJECT(dd->error_tag), "foreground-gdk", dd->error_color, NULL);
- g_object_set(G_OBJECT(dd->success_tag), "foreground-gdk", dd->success_color, NULL);
+ g_object_set(G_OBJECT(dd->link_tag), "foreground-gdk", dd->color_link, NULL);
+ g_object_set(G_OBJECT(dd->phon_tag), "foreground-gdk", dd->color_phonetic, NULL);
+ g_object_set(G_OBJECT(dd->error_tag), "foreground-gdk", dd->color_incorrect, NULL);
+ g_object_set(G_OBJECT(dd->success_tag), "foreground-gdk", dd->color_correct, NULL);
/* save settings */
dict_write_rc_file(dd);
@@ -359,18 +359,18 @@
gtk_widget_show(label);
gtk_box_pack_start(GTK_BOX(inner_vbox), label, FALSE, FALSE, 5);
- label1 = gtk_label_new(_("Link Color:"));
- label2 = gtk_label_new(_("Phonetic Color:"));
- label3 = gtk_label_new(_("Success Color:"));
- label4 = gtk_label_new(_("Error Color:"));
- color_link = gtk_color_button_new_with_color(dd->link_color);
- color_phon = gtk_color_button_new_with_color(dd->phon_color);
- color_error = gtk_color_button_new_with_color(dd->error_color);
- color_success = gtk_color_button_new_with_color(dd->success_color);
- g_signal_connect(color_link, "color-set", G_CALLBACK(color_set_cb), dd->link_color);
- g_signal_connect(color_phon, "color-set", G_CALLBACK(color_set_cb), dd->phon_color);
- g_signal_connect(color_error, "color-set", G_CALLBACK(color_set_cb), dd->error_color);
- g_signal_connect(color_success, "color-set", G_CALLBACK(color_set_cb), dd->success_color);
+ label1 = gtk_label_new(_("Links:"));
+ label2 = gtk_label_new(_("Phonetics:"));
+ label3 = gtk_label_new(_("Spelled correctly:"));
+ label4 = gtk_label_new(_("Spelled incorrectly:"));
+ color_link = gtk_color_button_new_with_color(dd->color_link);
+ color_phon = gtk_color_button_new_with_color(dd->color_phonetic);
+ color_error = gtk_color_button_new_with_color(dd->color_incorrect);
+ color_success = gtk_color_button_new_with_color(dd->color_correct);
+ g_signal_connect(color_link, "color-set", G_CALLBACK(color_set_cb), dd->color_link);
+ g_signal_connect(color_phon, "color-set", G_CALLBACK(color_set_cb), dd->color_phonetic);
+ g_signal_connect(color_error, "color-set", G_CALLBACK(color_set_cb), dd->color_incorrect);
+ g_signal_connect(color_success, "color-set", G_CALLBACK(color_set_cb), dd->color_correct);
table = gtk_table_new(2, 4, FALSE);
gtk_widget_show(table);
More information about the Goodies-commits
mailing list