From de2c8eaf31acf7798970de160e71a86d633d8f44 Mon Sep 17 00:00:00 2001 From: Nicola Fontana Date: Tue, 13 Apr 2010 14:29:45 +0200 Subject: [PATCH] [AdgDress] s/text/font/u Renamed ..._TEXT_... dresses to ..._FONT_... dresses to be consistent with AdgFontStyle. --- src/adg/adg-dim-style.c | 12 ++++++------ src/adg/adg-dress-builtins.c | 18 +++++++++--------- src/adg/adg-dress-builtins.h | 12 ++++++------ src/adg/adg-table-style.c | 8 ++++---- src/adg/adg-toy-text.c | 4 ++-- src/adg/tests/test-canvas.c | 2 +- src/adg/tests/test-dim-style.c | 14 +++++++------- src/adg/tests/test-font-style.c | 2 +- src/adg/tests/test-hatch.c | 2 +- src/adg/tests/test-line-style.c | 2 +- src/adg/tests/test-stroke.c | 2 +- src/adg/tests/test-table-style.c | 12 ++++++------ src/adg/tests/test-toy-text.c | 4 ++-- 13 files changed, 47 insertions(+), 47 deletions(-) diff --git a/src/adg/adg-dim-style.c b/src/adg/adg-dim-style.c index 9a5e39a7..1d775118 100644 --- a/src/adg/adg-dim-style.c +++ b/src/adg/adg-dim-style.c @@ -146,21 +146,21 @@ adg_dim_style_class_init(AdgDimStyleClass *klass) param = adg_param_spec_dress("value-dress", P_("Value Dress"), P_("Font dress for the nominal value of the dimension"), - ADG_DRESS_TEXT_VALUE, + ADG_DRESS_FONT_VALUE, G_PARAM_READWRITE); g_object_class_install_property(gobject_class, PROP_VALUE_DRESS, param); param = adg_param_spec_dress("min-dress", P_("Minimum Limit Dress"), P_("Font dress for the lower limit value"), - ADG_DRESS_TEXT_LIMIT, + ADG_DRESS_FONT_LIMIT, G_PARAM_READWRITE); g_object_class_install_property(gobject_class, PROP_MIN_DRESS, param); param = adg_param_spec_dress("max-dress", P_("Maximum Limit Dress"), P_("Font dress for the upper limit value"), - ADG_DRESS_TEXT_LIMIT, + ADG_DRESS_FONT_LIMIT, G_PARAM_READWRITE); g_object_class_install_property(gobject_class, PROP_MAX_DRESS, param); @@ -249,9 +249,9 @@ adg_dim_style_init(AdgDimStyle *dim_style) data->marker2.n_parameters = 0; data->marker2.parameters = NULL; data->color_dress = ADG_DRESS_COLOR_DIMENSION; - data->value_dress = ADG_DRESS_TEXT_VALUE; - data->min_dress = ADG_DRESS_TEXT_LIMIT; - data->max_dress = ADG_DRESS_TEXT_LIMIT; + data->value_dress = ADG_DRESS_FONT_VALUE; + data->min_dress = ADG_DRESS_FONT_LIMIT; + data->max_dress = ADG_DRESS_FONT_LIMIT; data->line_dress = ADG_DRESS_LINE_DIMENSION; data->marker_dress = ADG_DRESS_UNDEFINED; data->from_offset = 6; diff --git a/src/adg/adg-dress-builtins.c b/src/adg/adg-dress-builtins.c index 4b6b1cf9..996c7253 100644 --- a/src/adg/adg-dress-builtins.c +++ b/src/adg/adg-dress-builtins.c @@ -347,7 +347,7 @@ _adg_dress_line_frame(void) } /** - * ADG_DRESS_TEXT: + * ADG_DRESS_FONT: * * The default builtin #AdgDress font. The fallback style is * a %Sans %14 font with a pass-through color dress. @@ -355,7 +355,7 @@ _adg_dress_line_frame(void) * This dress will be resolved to an #AdgFontStyle instance. **/ AdgDress -_adg_dress_text(void) +_adg_dress_font(void) { static AdgDress dress = 0; @@ -364,7 +364,7 @@ _adg_dress_text(void) "family", "Serif", "size", 14., NULL); - dress = adg_dress_new("text", fallback); + dress = adg_dress_new("font", fallback); g_object_unref(fallback); } @@ -372,7 +372,7 @@ _adg_dress_text(void) } /** - * ADG_DRESS_TEXT_VALUE: + * ADG_DRESS_FONT_VALUE: * * The builtin #AdgDress font used for rendering the nominal * value of a dimension. The fallback style is %Sans %12 %bold @@ -381,7 +381,7 @@ _adg_dress_text(void) * This dress will be resolved to an #AdgFontStyle instance. **/ AdgDress -_adg_dress_text_value(void) +_adg_dress_font_value(void) { static AdgDress dress = 0; @@ -391,7 +391,7 @@ _adg_dress_text_value(void) "weight", CAIRO_FONT_WEIGHT_BOLD, "size", 12., NULL); - dress = adg_dress_new("text-value", fallback); + dress = adg_dress_new("font-value", fallback); g_object_unref(fallback); } @@ -399,7 +399,7 @@ _adg_dress_text_value(void) } /** - * ADG_DRESS_TEXT_LIMIT: + * ADG_DRESS_FONT_LIMIT: * * The builtin #AdgDress font used to render the limits of either * the min and max values of a dimension. The fallback style @@ -408,7 +408,7 @@ _adg_dress_text_value(void) * This dress will be resolved to an #AdgFontStyle instance. **/ AdgDress -_adg_dress_text_limit(void) +_adg_dress_font_limit(void) { static AdgDress dress = 0; @@ -417,7 +417,7 @@ _adg_dress_text_limit(void) "family", "Sans", "size", 8., NULL); - dress = adg_dress_new("text-limit", fallback); + dress = adg_dress_new("font-limit", fallback); g_object_unref(fallback); } diff --git a/src/adg/adg-dress-builtins.h b/src/adg/adg-dress-builtins.h index 33611161..c70da2cf 100644 --- a/src/adg/adg-dress-builtins.h +++ b/src/adg/adg-dress-builtins.h @@ -44,9 +44,9 @@ G_BEGIN_DECLS #define ADG_DRESS_LINE_HATCH (_adg_dress_line_hatch()) #define ADG_DRESS_LINE_GRID (_adg_dress_line_grid()) #define ADG_DRESS_LINE_FRAME (_adg_dress_line_frame()) -#define ADG_DRESS_TEXT (_adg_dress_text()) -#define ADG_DRESS_TEXT_VALUE (_adg_dress_text_value()) -#define ADG_DRESS_TEXT_LIMIT (_adg_dress_text_limit()) +#define ADG_DRESS_FONT (_adg_dress_font()) +#define ADG_DRESS_FONT_VALUE (_adg_dress_font_value()) +#define ADG_DRESS_FONT_LIMIT (_adg_dress_font_limit()) #define ADG_DRESS_DIMENSION (_adg_dress_dimension()) #define ADG_DRESS_FILL (_adg_dress_fill()) #define ADG_DRESS_FILL_HATCH (_adg_dress_fill_hatch()) @@ -65,9 +65,9 @@ AdgDress _adg_dress_line_dimension (void) G_GNUC_CONST; AdgDress _adg_dress_line_hatch (void) G_GNUC_CONST; AdgDress _adg_dress_line_grid (void) G_GNUC_CONST; AdgDress _adg_dress_line_frame (void) G_GNUC_CONST; -AdgDress _adg_dress_text (void) G_GNUC_CONST; -AdgDress _adg_dress_text_value (void) G_GNUC_CONST; -AdgDress _adg_dress_text_limit (void) G_GNUC_CONST; +AdgDress _adg_dress_font (void) G_GNUC_CONST; +AdgDress _adg_dress_font_value (void) G_GNUC_CONST; +AdgDress _adg_dress_font_limit (void) G_GNUC_CONST; AdgDress _adg_dress_dimension (void) G_GNUC_CONST; AdgDress _adg_dress_fill (void) G_GNUC_CONST; AdgDress _adg_dress_fill_hatch (void) G_GNUC_CONST; diff --git a/src/adg/adg-table-style.c b/src/adg/adg-table-style.c index a9d9eead..b813512c 100644 --- a/src/adg/adg-table-style.c +++ b/src/adg/adg-table-style.c @@ -118,14 +118,14 @@ adg_table_style_class_init(AdgTableStyleClass *klass) param = adg_param_spec_dress("title-dress", P_("Title Dress"), P_("Font dress to use for titles"), - ADG_DRESS_TEXT_LIMIT, + ADG_DRESS_FONT_LIMIT, G_PARAM_READWRITE); g_object_class_install_property(gobject_class, PROP_TITLE_DRESS, param); param = adg_param_spec_dress("value-dress", P_("Value Dress"), P_("Font dress to use for values inside the cells"), - ADG_DRESS_TEXT_VALUE, + ADG_DRESS_FONT_VALUE, G_PARAM_READWRITE); g_object_class_install_property(gobject_class, PROP_VALUE_DRESS, param); @@ -162,8 +162,8 @@ adg_table_style_init(AdgTableStyle *table_style) data->color_dress = ADG_DRESS_COLOR_TABLE, data->grid_dress = ADG_DRESS_LINE_GRID; data->frame_dress = ADG_DRESS_LINE_FRAME; - data->title_dress = ADG_DRESS_TEXT_LIMIT; - data->value_dress = ADG_DRESS_TEXT_VALUE; + data->title_dress = ADG_DRESS_FONT_LIMIT; + data->value_dress = ADG_DRESS_FONT_VALUE; data->row_height = 30; data->cell_padding.x = 5; data->cell_padding.y = 5; diff --git a/src/adg/adg-toy-text.c b/src/adg/adg-toy-text.c index 8d07b5d8..de0f8660 100644 --- a/src/adg/adg-toy-text.c +++ b/src/adg/adg-toy-text.c @@ -102,7 +102,7 @@ adg_toy_text_class_init(AdgToyTextClass *klass) param = adg_param_spec_dress("font-dress", P_("Font Dress"), P_("The font dress to use for rendering this text"), - ADG_DRESS_TEXT, + ADG_DRESS_FONT, G_PARAM_READWRITE); g_object_class_install_property(gobject_class, PROP_FONT_DRESS, param); @@ -121,7 +121,7 @@ adg_toy_text_init(AdgToyText *toy_text) ADG_TYPE_TOY_TEXT, AdgToyTextPrivate); - data->font_dress = ADG_DRESS_TEXT; + data->font_dress = ADG_DRESS_FONT; data->label = NULL; data->glyphs = NULL; diff --git a/src/adg/tests/test-canvas.c b/src/adg/tests/test-canvas.c index ff30ac10..c0c89b63 100644 --- a/src/adg/tests/test-canvas.c +++ b/src/adg/tests/test-canvas.c @@ -31,7 +31,7 @@ _adg_test_background_dress(void) canvas = adg_canvas_new(); valid_dress_1 = ADG_DRESS_COLOR_DIMENSION; valid_dress_2 = ADG_DRESS_COLOR_HATCH; - incompatible_dress = ADG_DRESS_TEXT_LIMIT; + incompatible_dress = ADG_DRESS_FONT_LIMIT; /* Using the public APIs */ adg_canvas_set_background_dress(canvas, valid_dress_1); diff --git a/src/adg/tests/test-dim-style.c b/src/adg/tests/test-dim-style.c index a5da7af8..ce4adf40 100644 --- a/src/adg/tests/test-dim-style.c +++ b/src/adg/tests/test-dim-style.c @@ -113,7 +113,7 @@ _adg_color_dress(void) dim_style = adg_dim_style_new(); valid_dress_1 = ADG_DRESS_COLOR_DIMENSION; valid_dress_2 = ADG_DRESS_COLOR_HATCH; - incompatible_dress = ADG_DRESS_TEXT_LIMIT; + incompatible_dress = ADG_DRESS_FONT_LIMIT; /* Using the public APIs */ adg_dim_style_set_color_dress(dim_style, valid_dress_1); @@ -409,8 +409,8 @@ _adg_max_dress(void) AdgDress max_dress; dim_style = adg_dim_style_new(); - valid_dress_1 = ADG_DRESS_TEXT; - valid_dress_2 = ADG_DRESS_TEXT_LIMIT; + valid_dress_1 = ADG_DRESS_FONT; + valid_dress_2 = ADG_DRESS_FONT_LIMIT; incompatible_dress = ADG_DRESS_FILL_HATCH; /* Using the public APIs */ @@ -450,8 +450,8 @@ _adg_min_dress(void) AdgDress min_dress; dim_style = adg_dim_style_new(); - valid_dress_1 = ADG_DRESS_TEXT; - valid_dress_2 = ADG_DRESS_TEXT_LIMIT; + valid_dress_1 = ADG_DRESS_FONT; + valid_dress_2 = ADG_DRESS_FONT_LIMIT; incompatible_dress = ADG_DRESS_FILL_HATCH; /* Using the public APIs */ @@ -664,8 +664,8 @@ _adg_value_dress(void) AdgDress value_dress; dim_style = adg_dim_style_new(); - valid_dress_1 = ADG_DRESS_TEXT; - valid_dress_2 = ADG_DRESS_TEXT_LIMIT; + valid_dress_1 = ADG_DRESS_FONT; + valid_dress_2 = ADG_DRESS_FONT_LIMIT; incompatible_dress = ADG_DRESS_FILL_HATCH; /* Using the public APIs */ diff --git a/src/adg/tests/test-font-style.c b/src/adg/tests/test-font-style.c index efdf349e..3bfae116 100644 --- a/src/adg/tests/test-font-style.c +++ b/src/adg/tests/test-font-style.c @@ -62,7 +62,7 @@ _adg_test_color_dress(void) font_style = adg_font_style_new(); valid_dress_1 = ADG_DRESS_COLOR_DIMENSION; valid_dress_2 = ADG_DRESS_COLOR_HATCH; - incompatible_dress = ADG_DRESS_TEXT_LIMIT; + incompatible_dress = ADG_DRESS_FONT_LIMIT; /* Using the public APIs */ adg_font_style_set_color_dress(font_style, valid_dress_1); diff --git a/src/adg/tests/test-hatch.c b/src/adg/tests/test-hatch.c index 832da85e..936f1deb 100644 --- a/src/adg/tests/test-hatch.c +++ b/src/adg/tests/test-hatch.c @@ -31,7 +31,7 @@ _adg_test_fill_dress(void) hatch = adg_hatch_new(NULL); valid_dress_1 = ADG_DRESS_FILL; valid_dress_2 = ADG_DRESS_FILL_HATCH; - incompatible_dress = ADG_DRESS_TEXT_VALUE; + incompatible_dress = ADG_DRESS_FONT_VALUE; /* Using the public APIs */ adg_hatch_set_fill_dress(hatch, valid_dress_1); diff --git a/src/adg/tests/test-line-style.c b/src/adg/tests/test-line-style.c index 6721faf7..6ac04c41 100644 --- a/src/adg/tests/test-line-style.c +++ b/src/adg/tests/test-line-style.c @@ -93,7 +93,7 @@ _adg_test_color_dress(void) line_style = adg_line_style_new(); valid_dress_1 = ADG_DRESS_COLOR_DIMENSION; valid_dress_2 = ADG_DRESS_COLOR_HATCH; - incompatible_dress = ADG_DRESS_TEXT_LIMIT; + incompatible_dress = ADG_DRESS_FONT_LIMIT; /* Using the public APIs */ adg_line_style_set_color_dress(line_style, valid_dress_1); diff --git a/src/adg/tests/test-stroke.c b/src/adg/tests/test-stroke.c index dd52061c..fd29408c 100644 --- a/src/adg/tests/test-stroke.c +++ b/src/adg/tests/test-stroke.c @@ -31,7 +31,7 @@ _adg_test_line_dress(void) stroke = adg_stroke_new(NULL); valid_dress_1 = ADG_DRESS_LINE_GRID; valid_dress_2 = ADG_DRESS_LINE_DIMENSION; - incompatible_dress = ADG_DRESS_TEXT_VALUE; + incompatible_dress = ADG_DRESS_FONT_VALUE; /* Using the public APIs */ adg_stroke_set_line_dress(stroke, valid_dress_1); diff --git a/src/adg/tests/test-table-style.c b/src/adg/tests/test-table-style.c index d5653dfb..1ccfa18a 100644 --- a/src/adg/tests/test-table-style.c +++ b/src/adg/tests/test-table-style.c @@ -164,7 +164,7 @@ _adg_frame_dress(void) table_style = adg_table_style_new(); valid_dress_1 = ADG_DRESS_LINE_DIMENSION; valid_dress_2 = ADG_DRESS_LINE_STROKE; - incompatible_dress = ADG_DRESS_TEXT; + incompatible_dress = ADG_DRESS_FONT; /* Using the public APIs */ adg_table_style_set_frame_dress(table_style, valid_dress_1); @@ -205,7 +205,7 @@ _adg_grid_dress(void) table_style = adg_table_style_new(); valid_dress_1 = ADG_DRESS_LINE; valid_dress_2 = ADG_DRESS_LINE_DIMENSION; - incompatible_dress = ADG_DRESS_TEXT; + incompatible_dress = ADG_DRESS_FONT; /* Using the public APIs */ adg_table_style_set_grid_dress(table_style, valid_dress_1); @@ -285,8 +285,8 @@ _adg_title_dress(void) AdgDress title_dress; table_style = adg_table_style_new(); - valid_dress_1 = ADG_DRESS_TEXT; - valid_dress_2 = ADG_DRESS_TEXT_VALUE; + valid_dress_1 = ADG_DRESS_FONT; + valid_dress_2 = ADG_DRESS_FONT_VALUE; incompatible_dress = ADG_DRESS_LINE_HATCH; /* Using the public APIs */ @@ -326,8 +326,8 @@ _adg_value_dress(void) AdgDress value_dress; table_style = adg_table_style_new(); - valid_dress_1 = ADG_DRESS_TEXT; - valid_dress_2 = ADG_DRESS_TEXT_VALUE; + valid_dress_1 = ADG_DRESS_FONT; + valid_dress_2 = ADG_DRESS_FONT_VALUE; incompatible_dress = ADG_DRESS_LINE; /* Using the public APIs */ diff --git a/src/adg/tests/test-toy-text.c b/src/adg/tests/test-toy-text.c index fc51b6be..9237d695 100644 --- a/src/adg/tests/test-toy-text.c +++ b/src/adg/tests/test-toy-text.c @@ -29,8 +29,8 @@ _adg_test_font_dress(void) AdgDress font_dress; toy_text = adg_toy_text_new(NULL); - valid_dress_1 = ADG_DRESS_TEXT_VALUE; - valid_dress_2 = ADG_DRESS_TEXT_LIMIT; + valid_dress_1 = ADG_DRESS_FONT_VALUE; + valid_dress_2 = ADG_DRESS_FONT_LIMIT; incompatible_dress = ADG_DRESS_LINE; /* Using the public APIs */ -- 2.11.4.GIT