summaryrefslogtreecommitdiff
path: root/src/theme-parser.c
diff options
context:
space:
mode:
authorHavoc Pennington <hp@pobox.com>2002-02-09 17:02:38 +0000
committerHavoc Pennington <hp@src.gnome.org>2002-02-09 17:02:38 +0000
commit339bdf8dd21d024b4f5bf382590702c0f8b28034 (patch)
tree8f46d3c037cec1d43139f5668ee900db6ab9ec45 /src/theme-parser.c
parent116fc5546f3ab87a6a2650aa7afa4aa5c842a9bd (diff)
downloadmetacity-339bdf8dd21d024b4f5bf382590702c0f8b28034.tar.gz
metacity-339bdf8dd21d024b4f5bf382590702c0f8b28034.tar.bz2
try to make more error message strings the same, easier for translators
2002-02-09 Havoc Pennington <hp@pobox.com> * src/theme-parser.c: try to make more error message strings the same, easier for translators * src/theme.c (meta_draw_op_free): free color spec for line op (meta_theme_free): free the integer_constants hash * src/theme-parser.c (parse_boolean): move above first use * src/theme-viewer.c: fixes for theme.h changes * src/frames.c (queue_recalc_func): don't recreate layout immediately, just save title text. should speed things up. (meta_frames_set_title): just remove the layout here also, and save title text. * src/theme-parser.c (parse_toplevel_element): parse title_scale attribute on frame_geometry * src/theme.c: support setting the text size * src/frames.c: support setting the text size * theme-format.txt: updates
Diffstat (limited to 'src/theme-parser.c')
-rw-r--r--src/theme-parser.c182
1 files changed, 114 insertions, 68 deletions
diff --git a/src/theme-parser.c b/src/theme-parser.c
index 331b565..d857be8 100644
--- a/src/theme-parser.c
+++ b/src/theme-parser.c
@@ -534,6 +534,28 @@ parse_double (const char *str,
}
static gboolean
+parse_boolean (const char *str,
+ gboolean *val,
+ GMarkupParseContext *context,
+ GError **error)
+{
+ if (strcmp ("true", str) == 0)
+ *val = TRUE;
+ else if (strcmp ("false", str) == 0)
+ *val = FALSE;
+ else
+ {
+ set_error (error, context, G_MARKUP_ERROR,
+ G_MARKUP_ERROR_PARSE,
+ _("Boolean values must be \"true\" or \"false\" not \"%s\""),
+ str);
+ return FALSE;
+ }
+
+ return TRUE;
+}
+
+static gboolean
parse_angle (const char *str,
double *val,
GMarkupParseContext *context,
@@ -573,6 +595,41 @@ parse_alpha (const char *str,
return TRUE;
}
+static gboolean
+parse_title_scale (const char *str,
+ double *val,
+ GMarkupParseContext *context,
+ GError **error)
+{
+ double factor;
+
+ if (strcmp (str, "xx-small") == 0)
+ factor = PANGO_SCALE_XX_SMALL;
+ else if (strcmp (str, "x-small") == 0)
+ factor = PANGO_SCALE_X_SMALL;
+ else if (strcmp (str, "small") == 0)
+ factor = PANGO_SCALE_SMALL;
+ else if (strcmp (str, "medium") == 0)
+ factor = PANGO_SCALE_MEDIUM;
+ else if (strcmp (str, "large") == 0)
+ factor = PANGO_SCALE_LARGE;
+ else if (strcmp (str, "x-large") == 0)
+ factor = PANGO_SCALE_X_LARGE;
+ else if (strcmp (str, "xx-large") == 0)
+ factor = PANGO_SCALE_XX_LARGE;
+ else
+ {
+ set_error (error, context, G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE,
+ _("Invalid title scale \"%s\" (must be one of xx-small,x-small,small,medium,large,x-large,xx-large)\n"),
+ str);
+ return FALSE;
+ }
+
+ *val = factor;
+
+ return TRUE;
+}
+
static void
parse_toplevel_element (GMarkupParseContext *context,
const gchar *element_name,
@@ -608,14 +665,16 @@ parse_toplevel_element (GMarkupParseContext *context,
if (name == NULL)
{
set_error (error, context, G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE,
- _("No \"name\" attribute on element <%s>"), element_name);
+ _("No \"%s\" attribute on element <%s>"),
+ "name", element_name);
return;
}
-
+
if (value == NULL)
{
set_error (error, context, G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE,
- _("No \"value\" attribute on element <%s>"), element_name);
+ _("No \"%s\" attribute on element <%s>"),
+ "value", element_name);
return;
}
@@ -657,27 +716,33 @@ parse_toplevel_element (GMarkupParseContext *context,
const char *name = NULL;
const char *parent = NULL;
const char *has_title = NULL;
+ const char *title_scale = NULL;
gboolean has_title_val;
+ double title_scale_val;
MetaFrameLayout *parent_layout;
if (!locate_attributes (context, element_name, attribute_names, attribute_values,
error,
"name", &name, "parent", &parent,
- "has_title", &has_title,
+ "has_title", &has_title, "title_scale", &title_scale,
NULL))
return;
if (name == NULL)
{
set_error (error, context, G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE,
- _("No \"name\" attribute on <%s> element"),
- element_name);
+ _("No \"%s\" attribute on <%s> element"),
+ "name", element_name);
return;
}
has_title_val = TRUE;
if (has_title && !parse_boolean (has_title, &has_title_val, context, error))
return;
+
+ title_scale_val = 1.0;
+ if (title_scale && !parse_title_scale (title_scale, &title_scale_val, context, error))
+ return;
if (meta_theme_lookup_layout (info->theme, name))
{
@@ -709,6 +774,9 @@ parse_toplevel_element (GMarkupParseContext *context,
if (has_title) /* only if explicit, otherwise inherit */
info->layout->has_title = has_title_val;
+
+ if (title_scale)
+ info->layout->title_scale = title_scale_val;
meta_theme_insert_layout (info->theme, name, info->layout);
@@ -727,8 +795,8 @@ parse_toplevel_element (GMarkupParseContext *context,
if (name == NULL)
{
set_error (error, context, G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE,
- _("No \"name\" attribute on <%s> element"),
- element_name);
+ _("No \"%s\" attribute on <%s> element"),
+ "name", element_name);
return;
}
@@ -765,8 +833,8 @@ parse_toplevel_element (GMarkupParseContext *context,
if (name == NULL)
{
set_error (error, context, G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE,
- _("No \"name\" attribute on <%s> element"),
- element_name);
+ _("No \"%s\" attribute on <%s> element"),
+ "name", element_name);
return;
}
@@ -842,8 +910,8 @@ parse_toplevel_element (GMarkupParseContext *context,
if (name == NULL)
{
set_error (error, context, G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE,
- _("No \"name\" attribute on <%s> element"),
- element_name);
+ _("No \"%s\" attribute on <%s> element"),
+ "name", element_name);
return;
}
@@ -892,16 +960,16 @@ parse_toplevel_element (GMarkupParseContext *context,
if (type_name == NULL)
{
set_error (error, context, G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE,
- _("No \"type\" attribute on <%s> element"),
- element_name);
+ _("No \"%s\" attribute on <%s> element"),
+ "type", element_name);
return;
}
if (style_set_name == NULL)
{
set_error (error, context, G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE,
- _("No \"style_set\" attribute on <%s> element"),
- element_name);
+ _("No \"%s\" attribute on <%s> element"),
+ "style_set", element_name);
return;
}
@@ -956,16 +1024,16 @@ parse_toplevel_element (GMarkupParseContext *context,
if (function == NULL)
{
set_error (error, context, G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE,
- _("No \"function\" attribute on <%s> element"),
- element_name);
+ _("No \"%s\" attribute on <%s> element"),
+ "function", element_name);
return;
}
if (state == NULL)
{
set_error (error, context, G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE,
- _("No \"state\" attribute on <%s> element"),
- element_name);
+ _("No \"%s\" attribute on <%s> element"),
+ "state", element_name);
return;
}
@@ -1022,8 +1090,8 @@ parse_toplevel_element (GMarkupParseContext *context,
{
set_error (error, context,
G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE,
- _("Element <%s> is not allowed below <metacity_theme>"),
- element_name);
+ _("Element <%s> is not allowed below <%s>"),
+ element_name, "metacity_theme");
}
}
@@ -1086,8 +1154,8 @@ parse_info_element (GMarkupParseContext *context,
{
set_error (error, context,
G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE,
- _("Element <%s> is not allowed below <info>"),
- element_name);
+ _("Element <%s> is not allowed below <%s>"),
+ element_name, "info");
}
}
@@ -1284,8 +1352,8 @@ parse_geometry_element (GMarkupParseContext *context,
{
set_error (error, context,
G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE,
- _("Element <%s> is not allowed below <frame_geometry>"),
- element_name);
+ _("Element <%s> is not allowed below <%s>"),
+ element_name, "frame_geometry");
}
}
@@ -1354,28 +1422,6 @@ optimize_expression (MetaTheme *theme,
return meta_theme_replace_constants (theme, expr, NULL);
}
-static gboolean
-parse_boolean (const char *str,
- gboolean *val,
- GMarkupParseContext *context,
- GError **error)
-{
- if (strcmp ("true", str) == 0)
- *val = TRUE;
- else if (strcmp ("false", str) == 0)
- *val = FALSE;
- else
- {
- set_error (error, context, G_MARKUP_ERROR,
- G_MARKUP_ERROR_PARSE,
- _("Boolean values must be \"true\" or \"false\" not \"%s\""),
- str);
- return FALSE;
- }
-
- return TRUE;
-}
-
static void
parse_draw_op_element (GMarkupParseContext *context,
const gchar *element_name,
@@ -2655,8 +2701,8 @@ parse_draw_op_element (GMarkupParseContext *context,
{
set_error (error, context,
G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE,
- _("Element <%s> is not allowed below <draw_ops>"),
- element_name);
+ _("Element <%s> is not allowed below <%s>"),
+ element_name, "draw_ops");
}
}
@@ -2709,8 +2755,8 @@ parse_gradient_element (GMarkupParseContext *context,
{
set_error (error, context,
G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE,
- _("Element <%s> is not allowed below <gradient>"),
- element_name);
+ _("Element <%s> is not allowed below <%s>"),
+ element_name, "gradient");
}
}
@@ -2869,8 +2915,8 @@ parse_style_element (GMarkupParseContext *context,
{
set_error (error, context,
G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE,
- _("Element <%s> is not allowed below <frame_style>"),
- element_name);
+ _("Element <%s> is not allowed below <%s>"),
+ element_name, "frame_style");
}
}
@@ -3046,8 +3092,8 @@ parse_style_set_element (GMarkupParseContext *context,
{
set_error (error, context,
G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE,
- _("Element <%s> is not allowed below <frame_style_set>"),
- element_name);
+ _("Element <%s> is not allowed below <%s>"),
+ element_name, "frame_style_set");
}
}
@@ -3084,8 +3130,8 @@ parse_piece_element (GMarkupParseContext *context,
{
set_error (error, context,
G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE,
- _("Element <%s> is not allowed below <piece>"),
- element_name);
+ _("Element <%s> is not allowed below <%s>"),
+ element_name, "piece");
}
}
@@ -3122,8 +3168,8 @@ parse_button_element (GMarkupParseContext *context,
{
set_error (error, context,
G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE,
- _("Element <%s> is not allowed below <piece>"),
- element_name);
+ _("Element <%s> is not allowed below <%s>"),
+ element_name, "button");
}
}
@@ -3160,8 +3206,8 @@ parse_menu_icon_element (GMarkupParseContext *context,
{
set_error (error, context,
G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE,
- _("Element <%s> is not allowed below <piece>"),
- element_name);
+ _("Element <%s> is not allowed below <%s>"),
+ element_name, "menu_icon");
}
}
@@ -3257,8 +3303,8 @@ start_element_handler (GMarkupParseContext *context,
break;
case STATE_COLOR:
set_error (error, context, G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE,
- _("Element <%s> is not allowed inside a <color> element"),
- element_name);
+ _("Element <%s> is not allowed inside a <%s> element"),
+ element_name, "color");
break;
case STATE_FRAME_STYLE:
parse_style_element (context, element_name,
@@ -3287,13 +3333,13 @@ start_element_handler (GMarkupParseContext *context,
break;
case STATE_FRAME:
set_error (error, context, G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE,
- _("Element <%s> is not allowed inside a <frame> element"),
- element_name);
+ _("Element <%s> is not allowed inside a <%s> element"),
+ element_name, "frame");
break;
case STATE_WINDOW:
set_error (error, context, G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE,
- _("Element <%s> is not allowed inside a <window> element"),
- element_name);
+ _("Element <%s> is not allowed inside a <%s> element"),
+ element_name, "window");
break;
}
}