callisto-debian/gtk2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix default values

Browse Source 
svn path=/trunk/; revision=19272
This commit is contained in:
Matthias Clasen
2007-12-28 15:43:51 +00:00
parent 0006024e6f
commit b78baef499
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,5 +1,10 @@
2007-12-28 Matthias Clasen <mclasen@redhat.com> 2007-12-28 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkfontsel.c: Fix the default values of several properties.
* gtk/gtkfilesel.c: Fix the default value of the show-fileops
property.
* gtk/gtkcurve.c: Fix the default value of the curve-type property. * gtk/gtkcurve.c: Fix the default value of the curve-type property.
* gtk/gtkcombo.c: Fix the default value of the enable-arrows-always * gtk/gtkcombo.c: Fix the default value of the enable-arrows-always

13
gtk/gtkfontsel.c
View File

@ -74,6 +74,8 @@
can set it. Remember that some fonts only have capital letters. */ can set it. Remember that some fonts only have capital letters. */
#define PREVIEW_TEXT N_("abcdefghijk ABCDEFGHIJK") #define PREVIEW_TEXT N_("abcdefghijk ABCDEFGHIJK")
#define DEFAULT_FONT_NAME "Sans 10"
/* This is the initial and maximum height of the preview entry (it expands /* This is the initial and maximum height of the preview entry (it expands
when large font sizes are selected). Initial height is also the minimum. */ when large font sizes are selected). Initial height is also the minimum. */
#define INITIAL_PREVIEW_HEIGHT 44 #define INITIAL_PREVIEW_HEIGHT 44
@ -177,8 +179,8 @@ gtk_font_selection_class_init (GtkFontSelectionClass *klass)
PROP_FONT_NAME, PROP_FONT_NAME,
g_param_spec_string ("font-name", g_param_spec_string ("font-name",
P_("Font name"), P_("Font name"),
P_("The X string that represents this font"), P_("The string that represents this font"),
NULL, DEFAULT_FONT_NAME,
GTK_PARAM_READWRITE)); GTK_PARAM_READWRITE));
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_FONT, PROP_FONT,
@ -192,7 +194,7 @@ gtk_font_selection_class_init (GtkFontSelectionClass *klass)
g_param_spec_string ("preview-text", g_param_spec_string ("preview-text",
P_("Preview text"), P_("Preview text"),
P_("The text to display in order to demonstrate the selected font"), P_("The text to display in order to demonstrate the selected font"),
PREVIEW_TEXT, _(PREVIEW_TEXT),
GTK_PARAM_READWRITE)); GTK_PARAM_READWRITE));
gobject_class->finalize = gtk_font_selection_finalize; gobject_class->finalize = gtk_font_selection_finalize;
} }
@ -236,7 +238,7 @@ static void gtk_font_selection_get_property (GObject *object,
g_value_set_string (value, gtk_font_selection_get_font_name (fontsel)); g_value_set_string (value, gtk_font_selection_get_font_name (fontsel));
break; break;
case PROP_FONT: case PROP_FONT:
g_value_set_object (value, gtk_font_selection_get_font_internal (fontsel)); g_value_set_boxed (value, gtk_font_selection_get_font_internal (fontsel));
break; break;
case PROP_PREVIEW_TEXT: case PROP_PREVIEW_TEXT:
g_value_set_string (value, gtk_font_selection_get_preview_text (fontsel)); g_value_set_string (value, gtk_font_selection_get_preview_text (fontsel));
@ -523,6 +525,7 @@ gtk_font_selection_init (GtkFontSelection *fontsel)
fontsel->preview_entry = gtk_entry_new (); fontsel->preview_entry = gtk_entry_new ();
gtk_label_set_mnemonic_widget (GTK_LABEL (label), fontsel->preview_entry); gtk_label_set_mnemonic_widget (GTK_LABEL (label), fontsel->preview_entry);
gtk_entry_set_text (GTK_ENTRY (fontsel->preview_entry), _(PREVIEW_TEXT));
gtk_widget_show (fontsel->preview_entry); gtk_widget_show (fontsel->preview_entry);
g_signal_connect (fontsel->preview_entry, "changed", g_signal_connect (fontsel->preview_entry, "changed",
@ -1058,7 +1061,7 @@ gtk_font_selection_get_font_description (GtkFontSelection *fontsel)
pango_font_description_set_size (font_desc, fontsel->size); pango_font_description_set_size (font_desc, fontsel->size);
} }
else else
font_desc = pango_font_description_from_string ("Sans 10"); font_desc = pango_font_description_from_string (DEFAULT_FONT_NAME);
return font_desc; return font_desc;
} }