diff --git a/capplets/appearance/ChangeLog b/capplets/appearance/ChangeLog index 49a4aa1c7..cb4b5fbe0 100644 --- a/capplets/appearance/ChangeLog +++ b/capplets/appearance/ChangeLog @@ -1,3 +1,14 @@ +2007-07-30 Thomas Wood + + * appearance-style.c: (update_color_buttons_from_string), + (check_color_schemes_enabled), (color_button_clicked_cb), + (style_init): + * data/appearance.glade: + + Add tooltip foreground and background colours to the list of recognised + symbolic colours. + + 2007-07-29 Jens Granseuer * appearance-main.c: (main): default to showing the background tab diff --git a/capplets/appearance/appearance-style.c b/capplets/appearance/appearance-style.c index bc7ca3ae1..da8276fd8 100644 --- a/capplets/appearance/appearance-style.c +++ b/capplets/appearance/appearance-style.c @@ -161,7 +161,7 @@ cursor_theme_sort_func (GtkTreeModel *model, static void update_color_buttons_from_string (const gchar *color_scheme, AppearanceData *data) { - GdkColor color_scheme_colors[6]; + GdkColor color_scheme_colors[8]; GtkWidget *widget; if (!gnome_theme_color_scheme_parse (color_scheme, color_scheme_colors)) @@ -180,6 +180,10 @@ update_color_buttons_from_string (const gchar *color_scheme, AppearanceData *dat gtk_color_button_set_color (GTK_COLOR_BUTTON (widget), &color_scheme_colors[4]); widget = glade_xml_get_widget (data->xml, "selected_bg_colorbutton"); gtk_color_button_set_color (GTK_COLOR_BUTTON (widget), &color_scheme_colors[5]); + widget = glade_xml_get_widget (data->xml, "tooltip_fg_colorbutton"); + gtk_color_button_set_color (GTK_COLOR_BUTTON (widget), &color_scheme_colors[6]); + widget = glade_xml_get_widget (data->xml, "tooltip_bg_colorbutton"); + gtk_color_button_set_color (GTK_COLOR_BUTTON (widget), &color_scheme_colors[7]); } static void @@ -247,8 +251,8 @@ static void color_button_clicked_cb (GtkWidget *colorbutton, AppearanceData *data) { gchar *new_scheme; - GdkColor colors[6]; - gchar *bg, *fg, *text, *base, *selected_fg, *selected_bg; + GdkColor colors[7]; + gchar *bg, *fg, *text, *base, *selected_fg, *selected_bg, *tooltip_fg, *tooltip_bg; GtkWidget *widget; widget = glade_xml_get_widget (data->xml, "fg_colorbutton"); @@ -263,6 +267,10 @@ color_button_clicked_cb (GtkWidget *colorbutton, AppearanceData *data) gtk_color_button_get_color (GTK_COLOR_BUTTON (widget), &colors[4]); widget = glade_xml_get_widget (data->xml, "selected_bg_colorbutton"); gtk_color_button_get_color (GTK_COLOR_BUTTON (widget), &colors[5]); + widget = glade_xml_get_widget (data->xml, "tooltip_fg_colorbutton"); + gtk_color_button_get_color (GTK_COLOR_BUTTON (widget), &colors[5]); + widget = glade_xml_get_widget (data->xml, "tooltip_fg_colorbutton"); + gtk_color_button_get_color (GTK_COLOR_BUTTON (widget), &colors[5]); fg = g_strdup_printf ("fg_color:#%04x%04x%04x\n", colors[0].red, colors[0].green, colors[0].blue); bg = g_strdup_printf ("bg_color:#%04x%04x%04x\n", colors[1].red, colors[1].green, colors[1].blue); @@ -270,8 +278,10 @@ color_button_clicked_cb (GtkWidget *colorbutton, AppearanceData *data) base = g_strdup_printf ("base_color:#%04x%04x%04x\n", colors[3].red, colors[3].green, colors[3].blue); selected_fg = g_strdup_printf ("selected_fg_color:#%04x%04x%04x\n", colors[4].red, colors[4].green, colors[4].blue); selected_bg = g_strdup_printf ("selected_bg_color:#%04x%04x%04x", colors[5].red, colors[5].green, colors[5].blue); + tooltip_fg = g_strdup_printf ("tooltip_fg_color:#%04x%04x%04x\n", colors[6].red, colors[6].green, colors[6].blue); + tooltip_bg = g_strdup_printf ("tooltip_bg_color:#%04x%04x%04x", colors[7].red, colors[7].green, colors[7].blue); - new_scheme = g_strconcat (fg, bg, text, base, selected_fg, selected_bg, NULL); + new_scheme = g_strconcat (fg, bg, text, base, selected_fg, selected_bg, tooltip_fg, tooltip_bg, NULL); /* Currently we assume this has only been called when one of the colours has * actually changed, so we don't check the original key first */ @@ -285,6 +295,8 @@ color_button_clicked_cb (GtkWidget *colorbutton, AppearanceData *data) g_free (base); g_free (selected_fg); g_free (selected_bg); + g_free (tooltip_fg); + g_free (tooltip_bg); g_free (new_scheme); } @@ -920,6 +932,8 @@ style_init (AppearanceData *data) g_signal_connect (G_OBJECT (glade_xml_get_widget (data->xml, "base_colorbutton")), "color-set", (GCallback) color_button_clicked_cb, data); g_signal_connect (G_OBJECT (glade_xml_get_widget (data->xml, "selected_fg_colorbutton")), "color-set", (GCallback) color_button_clicked_cb, data); g_signal_connect (G_OBJECT (glade_xml_get_widget (data->xml, "selected_bg_colorbutton")), "color-set", (GCallback) color_button_clicked_cb, data); + g_signal_connect (G_OBJECT (glade_xml_get_widget (data->xml, "tooltip_fg_colorbutton")), "color-set", (GCallback) color_button_clicked_cb, data); + g_signal_connect (G_OBJECT (glade_xml_get_widget (data->xml, "tooltip_bg_colorbutton")), "color-set", (GCallback) color_button_clicked_cb, data); /* revert button */ g_signal_connect (G_OBJECT (glade_xml_get_widget (data->xml, "color_scheme_defaults_button")), "clicked", (GCallback) color_scheme_defaults_button_clicked_cb, data); /* delete buttons */ diff --git a/capplets/appearance/data/appearance.glade b/capplets/appearance/data/appearance.glade index 8635c4ab1..3c2d68008 100644 --- a/capplets/appearance/data/appearance.glade +++ b/capplets/appearance/data/appearance.glade @@ -1,5 +1,6 @@ + 5 @@ -92,15 +93,17 @@ - + True - + True True - _None + Sub_pixel (LCDs) True + 0 True + antialias_none_radio False @@ -108,11 +111,11 @@ - + True 5 - + True @@ -123,6 +126,8 @@ + 1 + 2 GTK_FILL @@ -135,6 +140,7 @@ True Gra_yscale True + 0 True antialias_none_radio @@ -165,16 +171,16 @@ - + True - + True True - Sub_pixel (LCDs) + _None True + 0 True - antialias_none_radio False @@ -182,11 +188,11 @@ - + True 5 - + True @@ -197,8 +203,6 @@ - 1 - 2 GTK_FILL @@ -232,114 +236,6 @@ True 2 2 - - - True - - - True - True - N_one - True - True - - - False - False - - - - - True - 5 - - - True - - - - - 1 - - - - - - - True - - - True - True - _Slight - True - True - hint_none_radio - - - False - False - - - - - True - 5 - - - True - - - - - 1 - - - - - 1 - 2 - GTK_FILL - - - - - True - - - True - True - _Medium - True - True - hint_none_radio - - - False - False - - - - - True - 5 - - - True - - - - - 1 - - - - - 1 - 2 - GTK_FILL - - True @@ -349,6 +245,7 @@ True _Full True + 0 True hint_none_radio @@ -381,6 +278,117 @@ GTK_FILL + + + True + + + True + True + _Medium + True + 0 + True + hint_none_radio + + + False + False + + + + + True + 5 + + + True + + + + + 1 + + + + + 1 + 2 + GTK_FILL + + + + + True + + + True + True + _Slight + True + 0 + True + hint_none_radio + + + False + False + + + + + True + 5 + + + True + + + + + 1 + + + + + 1 + 2 + GTK_FILL + + + + + True + + + True + True + N_one + True + 0 + True + + + False + False + + + + + True + 5 + + + True + + + + + 1 + + + + 1 @@ -413,96 +421,6 @@ 2 5 5 - - - True - - - True - True - _RGB - True - True - - - - - True - gtk-missing-image - - - False - False - 5 - 1 - - - - - - - True - - - True - True - _BGR - True - True - subpixel_rgb_radio - - - - - True - gtk-missing-image - - - False - False - 5 - 1 - - - - - 1 - 2 - GTK_FILL - - - - - True - - - True - True - _VRGB - True - True - subpixel_rgb_radio - - - - - True - gtk-missing-image - - - False - False - 5 - 1 - - - - - 1 - 2 - GTK_FILL - - True @@ -512,6 +430,7 @@ True VB_GR True + 0 True subpixel_rgb_radio @@ -538,6 +457,99 @@ GTK_FILL + + + True + + + True + True + _VRGB + True + 0 + True + subpixel_rgb_radio + + + + + True + gtk-missing-image + + + False + False + 5 + 1 + + + + + 1 + 2 + GTK_FILL + + + + + True + + + True + True + _BGR + True + 0 + True + subpixel_rgb_radio + + + + + True + gtk-missing-image + + + False + False + 5 + 1 + + + + + 1 + 2 + GTK_FILL + + + + + True + + + True + True + _RGB + True + 0 + True + + + + + True + gtk-missing-image + + + False + False + 5 + 1 + + + + 1 @@ -628,8 +640,8 @@ True - 6 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 6 True @@ -640,18 +652,18 @@ GTK_SHADOW_IN + 1 True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - GTK_SELECTION_BROWSE 0 1 + GTK_SELECTION_BROWSE + 150 + 3 18 18 - 3 18 - 1 - 150 @@ -664,38 +676,25 @@ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 6 GTK_BUTTONBOX_END - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - _Install... - True - - - 3 - - True + False True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK gtk-delete True - False + 0 - - 0 - True + False True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Save _As... - False + Save _As... + 0 1 @@ -708,11 +707,25 @@ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK C_ustomize... True + 0 2 + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + _Install... + True + 0 + + + 3 + + False @@ -795,16 +808,16 @@ GTK_SHADOW_IN + 1 True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True 0 GTK_SELECTION_BROWSE 3 3 True - 1 - True @@ -848,6 +861,7 @@ Tiled True _Add... True + 0 False @@ -862,6 +876,7 @@ Tiled True gtk-remove True + 0 False @@ -952,6 +967,7 @@ Vertical gradient True True + 0 Open a dialog to specify the color @@ -965,6 +981,7 @@ Vertical gradient True + 0 Open a dialog to specify the color @@ -1014,92 +1031,44 @@ Vertical gradient 12 6 - - True - True - True - - - 1 - 2 - 1 - 2 - GTK_FILL - - - - - + True 0 - _Document font: - True - document_font - - - 1 - 2 - GTK_FILL - - - - - - True - True - True - - - 1 - 2 - 2 - 3 - GTK_FILL - - - - - - True - True - True - - - 1 - 2 - 3 - 4 - GTK_FILL - - - - - - True - True - True - - - 1 - 2 - 4 - 5 - GTK_FILL - - - - - - True - 0 - Des_ktop font: + _Application font: True GTK_JUSTIFY_RIGHT - desktop_font + application_font - 2 - 3 + GTK_FILL + + + + + + True + True + 0 + True + + + 1 + 2 + + + + + + True + 0 + _Fixed width font: + True + GTK_JUSTIFY_RIGHT + monospace_font + + + 4 + 5 GTK_FILL @@ -1121,15 +1090,31 @@ Vertical gradient - + True 0 - _Fixed width font: + Des_ktop font: True GTK_JUSTIFY_RIGHT - monospace_font + desktop_font + 2 + 3 + GTK_FILL + + + + + + True + True + 0 + True + + + 1 + 2 4 5 GTK_FILL @@ -1137,27 +1122,64 @@ Vertical gradient - + True True + 0 True 1 2 + 3 + 4 + GTK_FILL - + True - 0 - _Application font: - True - GTK_JUSTIFY_RIGHT - application_font + True + 0 + True + 1 + 2 + 2 + 3 + GTK_FILL + + + + + + True + 0 + _Document font: + True + document_font + + + 1 + 2 + GTK_FILL + + + + + + True + True + 0 + True + + + 1 + 2 + 1 + 2 GTK_FILL @@ -1194,6 +1216,115 @@ Vertical gradient 2 12 6 + + + True + 6 + + + True + True + _Monochrome + True + 0 + True + + + False + False + + + + + True + + + True + + + + + 1 + + + + + + + True + 6 + + + True + True + Best _shapes + True + 0 + True + monochrome_radio + + + False + False + + + + + True + + + True + + + + + 1 + + + + + 1 + 2 + + + + + True + 6 + + + True + True + Best co_ntrast + True + 0 + True + monochrome_radio + + + False + False + + + + + True + + + True + + + + + 1 + + + + + 1 + 2 + + True @@ -1204,6 +1335,7 @@ Vertical gradient True Sub_pixel smoothing (LCDs) True + 0 True monochrome_radio @@ -1233,112 +1365,6 @@ Vertical gradient 2 - - - True - 6 - - - True - True - Best co_ntrast - True - True - monochrome_radio - - - False - False - - - - - True - - - True - - - - - 1 - - - - - 1 - 2 - - - - - True - 6 - - - True - True - Best _shapes - True - True - monochrome_radio - - - False - False - - - - - True - - - True - - - - - 1 - - - - - 1 - 2 - - - - - True - 6 - - - True - True - _Monochrome - True - True - - - False - False - - - - - True - - - True - - - - - 1 - - - - @@ -1363,6 +1389,7 @@ Vertical gradient GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK D_etails... True + 0 @@ -1433,6 +1460,7 @@ Vertical gradient True Show _icons in menus True + 0 True True @@ -1447,6 +1475,7 @@ Vertical gradient True _Editable menu shortcut keys True + 0 True @@ -1553,90 +1582,6 @@ Text only True _File True - - - - - True - _New - True - - - True - gtk-new - 1 - - - - - - - True - _Open - True - - - True - gtk-open - 1 - - - - - - - True - _Save - True - - - True - gtk-save - 1 - - - - - - - True - - - - - True - _Print - True - - - True - gtk-print - 1 - - - - - - - True - - - - - True - _Quit - True - - - True - gtk-quit - 1 - - - - - - @@ -1644,52 +1589,6 @@ Text only True Edit True - - - - - True - C_ut - True - - - True - gtk-cut - 1 - - - - - - - True - _Copy - True - - - True - gtk-copy - 1 - - - - - - - True - _Paste - True - - - True - gtk-paste - 1 - - - - - - @@ -1880,12 +1779,13 @@ Text only True + False True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK gtk-delete True - False + 0 @@ -1954,109 +1854,106 @@ Text only True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 4 + 5 3 12 12 - - - - + True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Background - - - 1 - 2 - GTK_FILL - GTK_FILL - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Text + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + #000000000000 2 3 - GTK_FILL - GTK_FILL - - - - - True - 0 - _Windows: - True - bg_colorbutton - - - 1 - 2 - - - - - - True - 0 - _Input boxes: - True - base_colorbutton - - - 2 - 3 - - - - - - True - True - - - 1 - 2 - 1 - 2 + 4 + 5 - + True True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + #000000000000 1 2 - 2 - 3 + 4 + 5 - + True - True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Tooltips: - 1 - 2 + 4 + 5 + + + + + + + + True + True + 0 + + + 2 + 3 3 4 + + + True + True + 0 + + + 2 + 3 + 2 + 3 + + + + + + + True + True + 0 + + + 2 + 3 + 1 + 2 + + + + True @@ -2072,27 +1969,29 @@ Text only - + True True + 0 - 2 - 3 - 1 - 2 + 1 + 2 + 3 + 4 - + True True + 0 - 2 - 3 + 1 + 2 2 3 @@ -2100,17 +1999,72 @@ Text only - + True True + 0 + + + 1 + 2 + 1 + 2 + + + + + + + True + 0 + _Input boxes: + True + base_colorbutton + + + 2 + 3 + + + + + + True + 0 + _Windows: + True + bg_colorbutton + + + 1 + 2 + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Text 2 3 - 3 - 4 - - + GTK_FILL + GTK_FILL + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Background + + + 1 + 2 + GTK_FILL + GTK_FILL @@ -2131,6 +2085,7 @@ Text only True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Reset to Defaults + 0 @@ -2192,12 +2147,13 @@ Text only True + False True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK gtk-delete True - False + 0 @@ -2259,12 +2215,13 @@ Text only True + False True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK gtk-delete True - False + 0 @@ -2301,8 +2258,8 @@ Text only GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 6 True + 6 True @@ -2356,10 +2313,10 @@ Text only - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 12 - + Size: @@ -2369,8 +2326,8 @@ Text only - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 6 @@ -2411,7 +2368,7 @@ Text only 1 - + True @@ -2436,11 +2393,11 @@ Text only - - False - 2 - - + + False + 2 + + 4 @@ -2506,218 +2463,144 @@ Text only 6 Save Theme As... - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE True - True - False - True - False - False GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - False False - True - False 2 - - - - True - GTK_BUTTONBOX_END - - - - True - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - True - -6 - - - - - - True - True - True - True - gtk-save - True - GTK_RELIEF_NORMAL - True - -5 - - - - - 0 - False - True - GTK_PACK_END - - - - - 6 - True - 3 - 2 - False - 6 - 12 - - - - True - True - True - True - 0 - - True - True - - - 1 - 2 - 0 - 1 - - - - - - - True - _Name: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - save_dialog_entry - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - fill - - - - - - True - True - GTK_POLICY_NEVER - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - True - True - False - False - GTK_JUSTIFY_LEFT - GTK_WRAP_WORD - True - 0 - 0 - 0 - 0 - 0 - 0 - - - - - - 1 - 2 - 1 - 2 - - - - - - True - _Description: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0 - 0 - 0 - save_dialog_textview - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - fill - - - - - - True - True - Save _Background Image - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 1 - 2 - 2 - 3 - fill - - - - - - 0 - True - True - + + True + 6 + 3 + 2 + 12 + 6 + + + + + + True + True + Save _Background Image + True + 0 + True + + + 1 + 2 + 2 + 3 + GTK_FILL + + + + + + True + 0 + 0 + _Description: + True + save_dialog_textview + + + 1 + 2 + GTK_FILL + GTK_FILL + + + + + True + True + GTK_POLICY_NEVER + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + + + True + True + GTK_WRAP_WORD + False + + + + + 1 + 2 + 1 + 2 + + + + + True + 0 + _Name: + True + save_dialog_entry + + + GTK_FILL + GTK_FILL + + + + + True + True + True + + + 1 + 2 + + + + + + 1 + + + + + True + GTK_BUTTONBOX_END + + + True + True + True + gtk-cancel + True + -6 + + + + + True + True + True + True + gtk-save + True + -5 + + + 1 + + + + + False + GTK_PACK_END + diff --git a/capplets/common/ChangeLog b/capplets/common/ChangeLog index 4ab421e8f..727c7c9c3 100644 --- a/capplets/common/ChangeLog +++ b/capplets/common/ChangeLog @@ -1,3 +1,8 @@ +2007-07-30 Thomas Wood + + * gnome-theme-info.c: (gnome_theme_color_scheme_parse): Add tooltip foreground + and background colours to the list of recognised symbolic colours. + 2007-07-29 Thomas Wood * gnome-theme-info.c: (gnome_theme_read_meta_theme): Expand check for empty diff --git a/capplets/common/gnome-theme-info.c b/capplets/common/gnome-theme-info.c index 2ebd6b60d..5a5371a51 100644 --- a/capplets/common/gnome-theme-info.c +++ b/capplets/common/gnome-theme-info.c @@ -1857,6 +1857,12 @@ gnome_theme_color_scheme_parse (const gchar *scheme, GdkColor *colors) color_scheme_strings = g_strsplit (scheme, "\n", 0); + /* initialise the array */ + for (i = 0; i < 8; i++) + { + gdk_color_parse ("#000", &colors[i]); + } + /* loop through the name:color pairs, and save the color if we recognise the name */ i = 0; while ((current_string = color_scheme_strings[i++])) { @@ -1878,6 +1884,10 @@ gnome_theme_color_scheme_parse (const gchar *scheme, GdkColor *colors) gdk_color_parse (color_scheme_pair[1], &colors[4]); else if (!strcmp ("selected_bg_color", color_scheme_pair[0])) gdk_color_parse (color_scheme_pair[1], &colors[5]); + else if (!strcmp ("tooltip_fg_color", color_scheme_pair[0])) + gdk_color_parse (color_scheme_pair[1], &colors[6]); + else if (!strcmp ("tooltip_bg_color", color_scheme_pair[0])) + gdk_color_parse (color_scheme_pair[1], &colors[7]); } g_strfreev (color_scheme_pair); @@ -1891,14 +1901,14 @@ gnome_theme_color_scheme_parse (const gchar *scheme, GdkColor *colors) gboolean gnome_theme_color_scheme_equal (const gchar *s1, const gchar *s2) { - GdkColor c1[6], c2[6]; + GdkColor c1[8], c2[8]; int i; if (!gnome_theme_color_scheme_parse (s1, c1) || !gnome_theme_color_scheme_parse (s2, c2)) return FALSE; - for (i = 0; i < 6; ++i) { + for (i = 0; i < 8; ++i) { if (!gdk_color_equal (&c1[i], &c2[i])) return FALSE; }