diff --git a/clutter/clutter-actor.c b/clutter/clutter-actor.c index 60d0f861f..95b9a7b97 100644 --- a/clutter/clutter-actor.c +++ b/clutter/clutter-actor.c @@ -284,6 +284,8 @@ #include "config.h" #endif +#define CLUTTER_DISABLE_DEPRECATION_WARNINGS + #include "cogl/cogl.h" #include "clutter-actor-private.h" @@ -10200,6 +10202,26 @@ clutter_actor_shader_post_paint (ClutterActor *actor) } } +static inline void +clutter_actor_set_shader_param_internal (ClutterActor *self, + const gchar *param, + const GValue *value) +{ + ShaderData *shader_data; + GValue *var; + + shader_data = g_object_get_qdata (G_OBJECT (self), quark_shader_data); + if (shader_data == NULL) + return; + + var = g_slice_new0 (GValue); + g_value_init (var, G_VALUE_TYPE (value)); + g_value_copy (value, var); + g_hash_table_insert (shader_data->value_hash, g_strdup (param), var); + + clutter_actor_queue_redraw (self); +} + /** * clutter_actor_set_shader_param: * @self: a #ClutterActor @@ -10218,9 +10240,6 @@ clutter_actor_set_shader_param (ClutterActor *self, const gchar *param, const GValue *value) { - ShaderData *shader_data; - GValue *var; - g_return_if_fail (CLUTTER_IS_ACTOR (self)); g_return_if_fail (param != NULL); g_return_if_fail (CLUTTER_VALUE_HOLDS_SHADER_FLOAT (value) || @@ -10229,16 +10248,7 @@ clutter_actor_set_shader_param (ClutterActor *self, G_VALUE_HOLDS_FLOAT (value) || G_VALUE_HOLDS_INT (value)); - shader_data = g_object_get_qdata (G_OBJECT (self), quark_shader_data); - if (shader_data == NULL) - return; - - var = g_slice_new0 (GValue); - g_value_init (var, G_VALUE_TYPE (value)); - g_value_copy (value, var); - g_hash_table_insert (shader_data->value_hash, g_strdup (param), var); - - clutter_actor_queue_redraw (self); + clutter_actor_set_shader_param_internal (self, param, value); } /** @@ -10264,7 +10274,7 @@ clutter_actor_set_shader_param_float (ClutterActor *self, g_value_init (&var, G_TYPE_FLOAT); g_value_set_float (&var, value); - clutter_actor_set_shader_param (self, param, &var); + clutter_actor_set_shader_param_internal (self, param, &var); g_value_unset (&var); } @@ -10292,7 +10302,7 @@ clutter_actor_set_shader_param_int (ClutterActor *self, g_value_init (&var, G_TYPE_INT); g_value_set_int (&var, value); - clutter_actor_set_shader_param (self, param, &var); + clutter_actor_set_shader_param_internal (self, param, &var); g_value_unset (&var); } diff --git a/clutter/clutter-align-constraint.c b/clutter/clutter-align-constraint.c index c7f415d28..83136c2ec 100644 --- a/clutter/clutter-align-constraint.c +++ b/clutter/clutter-align-constraint.c @@ -142,13 +142,14 @@ clutter_align_constraint_update_allocation (ClutterConstraint *constraint, if (align->source == NULL) return; + clutter_actor_box_get_size (allocation, &actor_width, &actor_height); + clutter_actor_get_position (align->source, &source_x, &source_y); clutter_actor_get_size (align->source, &source_width, &source_height); switch (align->align_axis) { case CLUTTER_ALIGN_X_AXIS: - actor_width = clutter_actor_box_get_width (allocation); allocation->x1 = ((source_width - actor_width) * align->factor) + source_x; allocation->x1 = floorf (allocation->x1 + 0.5); @@ -156,13 +157,23 @@ clutter_align_constraint_update_allocation (ClutterConstraint *constraint, break; case CLUTTER_ALIGN_Y_AXIS: - actor_height = clutter_actor_box_get_height (allocation); allocation->y1 = ((source_height - actor_height) * align->factor) + source_y; allocation->y1 = floorf (allocation->y1 + 0.5); allocation->y2 = allocation->y1 + actor_height; break; + case CLUTTER_ALIGN_BOTH: + allocation->x1 = ((source_width - actor_width) * align->factor) + + source_x; + allocation->y1 = ((source_height - actor_height) * align->factor) + + source_y; + allocation->x1 = floorf (allocation->x1 + 0.5f); + allocation->y1 = floorf (allocation->y1 + 0.5f); + allocation->x2 = allocation->x1 + actor_width; + allocation->y2 = allocation->y1 + actor_height; + break; + default: g_assert_not_reached (); break; diff --git a/clutter/clutter-debug.h b/clutter/clutter-debug.h index be551e155..88b7fcec3 100644 --- a/clutter/clutter-debug.h +++ b/clutter/clutter-debug.h @@ -27,8 +27,7 @@ typedef enum { CLUTTER_DEBUG_PICK = 1 << 16, CLUTTER_DEBUG_EVENTLOOP = 1 << 17, CLUTTER_DEBUG_CLIPPING = 1 << 18, - CLUTTER_DEBUG_OOB_TRANSFORMS = 1 << 19, - CLUTTER_DEBUG_PAINT_DEFORM_TILES = 1 << 20, + CLUTTER_DEBUG_OOB_TRANSFORMS = 1 << 19 } ClutterDebugFlag; typedef enum { @@ -43,7 +42,8 @@ typedef enum { CLUTTER_DEBUG_PAINT_VOLUMES = 1 << 3, CLUTTER_DEBUG_DISABLE_CULLING = 1 << 4, CLUTTER_DEBUG_DISABLE_OFFSCREEN_REDIRECT = 1 << 5, - CLUTTER_DEBUG_CONTINUOUS_REDRAW = 1 << 6 + CLUTTER_DEBUG_CONTINUOUS_REDRAW = 1 << 6, + CLUTTER_DEBUG_PAINT_DEFORM_TILES = 1 << 7 } ClutterDrawDebugFlag; #ifdef CLUTTER_ENABLE_DEBUG diff --git a/clutter/clutter-deform-effect.c b/clutter/clutter-deform-effect.c index 8037a1d99..5f1954e44 100644 --- a/clutter/clutter-deform-effect.c +++ b/clutter/clutter-deform-effect.c @@ -291,7 +291,7 @@ clutter_deform_effect_paint_target (ClutterOffscreenEffect *effect) else if (priv->back_material == COGL_INVALID_HANDLE && is_cull_enabled) cogl_set_backface_culling_enabled (TRUE); - if (G_UNLIKELY (clutter_debug_flags & CLUTTER_DEBUG_PAINT_DEFORM_TILES)) + if (G_UNLIKELY (clutter_paint_debug_flags & CLUTTER_DEBUG_PAINT_DEFORM_TILES)) { cogl_set_source_color4f (1.0, 0, 0, 1.0); cogl_vertex_buffer_draw_elements (priv->vbo, diff --git a/clutter/clutter-enums.h b/clutter/clutter-enums.h index e9358ad94..bf381f634 100644 --- a/clutter/clutter-enums.h +++ b/clutter/clutter-enums.h @@ -416,15 +416,17 @@ typedef enum { * ClutterAlignAxis: * @CLUTTER_ALIGN_X_AXIS: Maintain the alignment on the X axis * @CLUTTER_ALIGN_Y_AXIS: Maintain the alignment on the Y axis + * @CLUTTER_ALIGN_BOTH: Maintain the alignment on both the X and Y axis * * Specifies the axis on which #ClutterAlignConstraint should maintain - * the alignment + * the alignment. * * Since: 1.4 */ typedef enum { /*< prefix=CLUTTER_ALIGN >*/ CLUTTER_ALIGN_X_AXIS, - CLUTTER_ALIGN_Y_AXIS + CLUTTER_ALIGN_Y_AXIS, + CLUTTER_ALIGN_BOTH } ClutterAlignAxis; /** diff --git a/clutter/clutter-main.c b/clutter/clutter-main.c index 7c482c4f7..d31b44485 100644 --- a/clutter/clutter-main.c +++ b/clutter/clutter-main.c @@ -77,6 +77,16 @@ * g_timeout_add() that acquire the Clutter lock before invoking the provided * callback: clutter_threads_add_idle() and * clutter_threads_add_timeout(). + * The example below shows how to use a worker thread to perform a + * blocking operation, and perform UI updates using the main loop. + * + * A worker thread example + * + * + * FIXME: MISSING XINCLUDE CONTENT + * + * + * * */ @@ -166,13 +176,12 @@ static const GDebugKey clutter_debug_keys[] = { { "layout", CLUTTER_DEBUG_LAYOUT }, { "clipping", CLUTTER_DEBUG_CLIPPING }, { "oob-transforms", CLUTTER_DEBUG_OOB_TRANSFORMS }, - { "paint-deform-tiles", CLUTTER_DEBUG_PAINT_DEFORM_TILES }, }; #endif /* CLUTTER_ENABLE_DEBUG */ static const GDebugKey clutter_pick_debug_keys[] = { { "nop-picking", CLUTTER_DEBUG_NOP_PICKING }, - { "dump-pick-buffers", CLUTTER_DEBUG_DUMP_PICK_BUFFERS } + { "dump-pick-buffers", CLUTTER_DEBUG_DUMP_PICK_BUFFERS }, }; static const GDebugKey clutter_paint_debug_keys[] = { @@ -182,7 +191,8 @@ static const GDebugKey clutter_paint_debug_keys[] = { { "paint-volumes", CLUTTER_DEBUG_PAINT_VOLUMES }, { "disable-culling", CLUTTER_DEBUG_DISABLE_CULLING }, { "disable-offscreen-redirect", CLUTTER_DEBUG_DISABLE_OFFSCREEN_REDIRECT }, - { "continuous-redraw", CLUTTER_DEBUG_CONTINUOUS_REDRAW } + { "continuous-redraw", CLUTTER_DEBUG_CONTINUOUS_REDRAW }, + { "paint-deform-tiles", CLUTTER_DEBUG_PAINT_DEFORM_TILES }, }; #ifdef CLUTTER_ENABLE_PROFILE @@ -2855,6 +2865,7 @@ void clutter_grab_pointer_for_device (ClutterActor *actor, gint id_) { + ClutterDeviceManager *manager; ClutterInputDevice *dev; g_return_if_fail (actor == NULL || CLUTTER_IS_ACTOR (actor)); @@ -2870,7 +2881,8 @@ clutter_grab_pointer_for_device (ClutterActor *actor, return; } - dev = clutter_get_input_device_for_id (id_); + manager = clutter_device_manager_get_default (); + dev = clutter_device_manager_get_device (manager, id_); if (dev == NULL) return; @@ -2910,7 +2922,13 @@ clutter_ungrab_pointer (void) void clutter_ungrab_pointer_for_device (gint id_) { - clutter_grab_pointer_for_device (NULL, id_); + ClutterDeviceManager *manager; + ClutterInputDevice *device; + + manager = clutter_device_manager_get_default (); + device = clutter_device_manager_get_device (manager, id_); + if (device != NULL) + clutter_input_device_ungrab (device); } @@ -3061,29 +3079,47 @@ clutter_set_font_flags (ClutterFontFlags flags) ClutterFontFlags old_flags, changed_flags; const cairo_font_options_t *font_options; cairo_font_options_t *new_font_options; + cairo_hint_style_t hint_style; gboolean use_mipmapping; ClutterBackend *backend; backend = clutter_get_default_backend (); - font_map = clutter_context_get_pango_fontmap (); - use_mipmapping = (flags & CLUTTER_FONT_MIPMAPPING) != 0; - cogl_pango_font_map_set_use_mipmapping (font_map, use_mipmapping); - - old_flags = clutter_get_font_flags (); - font_options = clutter_backend_get_font_options (backend); + old_flags = 0; + + if (cogl_pango_font_map_get_use_mipmapping (font_map)) + old_flags |= CLUTTER_FONT_MIPMAPPING; + + hint_style = cairo_font_options_get_hint_style (font_options); + if (hint_style != CAIRO_HINT_STYLE_DEFAULT && + hint_style != CAIRO_HINT_STYLE_NONE) + old_flags |= CLUTTER_FONT_HINTING; + + if (old_flags == flags) + return; + new_font_options = cairo_font_options_copy (font_options); /* Only set the font options that have actually changed so we don't override a detailed setting from the backend */ changed_flags = old_flags ^ flags; + if ((changed_flags & CLUTTER_FONT_MIPMAPPING)) + { + use_mipmapping = (changed_flags & CLUTTER_FONT_MIPMAPPING) != 0; + + cogl_pango_font_map_set_use_mipmapping (font_map, use_mipmapping); + } + if ((changed_flags & CLUTTER_FONT_HINTING)) - cairo_font_options_set_hint_style (new_font_options, - (flags & CLUTTER_FONT_HINTING) - ? CAIRO_HINT_STYLE_FULL - : CAIRO_HINT_STYLE_NONE); + { + hint_style = (flags & CLUTTER_FONT_HINTING) + ? CAIRO_HINT_STYLE_FULL + : CAIRO_HINT_STYLE_NONE; + + cairo_font_options_set_hint_style (new_font_options, hint_style); + } clutter_backend_set_font_options (backend, new_font_options); diff --git a/clutter/clutter-path.c b/clutter/clutter-path.c index 91b2be2ff..d46f33a02 100644 --- a/clutter/clutter-path.c +++ b/clutter/clutter-path.c @@ -1582,3 +1582,65 @@ clutter_path_node_equal (const ClutterPathNode *node_a, return TRUE; } + +G_DEFINE_BOXED_TYPE (ClutterKnot, clutter_knot, + clutter_knot_copy, + clutter_knot_free); + +/** + * clutter_knot_copy: + * @knot: a #ClutterKnot + * + * Makes an allocated copy of a knot. + * + * Return value: the copied knot. + * + * Since: 0.2 + */ +ClutterKnot * +clutter_knot_copy (const ClutterKnot *knot) +{ + if (G_UNLIKELY (knot == NULL)) + return NULL; + + return g_slice_dup (ClutterKnot, knot); +} + +/** + * clutter_knot_free: + * @knot: a #ClutterKnot + * + * Frees the memory of an allocated knot. + * + * Since: 0.2 + */ +void +clutter_knot_free (ClutterKnot *knot) +{ + if (G_LIKELY (knot != NULL)) + g_slice_free (ClutterKnot, knot); +} + +/** + * clutter_knot_equal: + * @knot_a: First knot + * @knot_b: Second knot + * + * Compares to knot and checks if the point to the same location. + * + * Return value: %TRUE if the knots point to the same location. + * + * Since: 0.2 + */ +gboolean +clutter_knot_equal (const ClutterKnot *knot_a, + const ClutterKnot *knot_b) +{ + g_return_val_if_fail (knot_a != NULL, FALSE); + g_return_val_if_fail (knot_b != NULL, FALSE); + + if (knot_a == knot_b) + return TRUE; + + return knot_a->x == knot_b->x && knot_a->y == knot_b->y; +} diff --git a/clutter/clutter-texture.c b/clutter/clutter-texture.c index 3e7516dad..95a7a150a 100644 --- a/clutter/clutter-texture.c +++ b/clutter/clutter-texture.c @@ -44,6 +44,9 @@ #include "config.h" #endif +/* sadly, we are still using ClutterShader internally */ +#define CLUTTER_DISABLE_DEPRECATION_WARNINGS + #include "clutter-texture.h" #include "clutter-actor-private.h" @@ -54,8 +57,9 @@ #include "clutter-marshal.h" #include "clutter-private.h" #include "clutter-scriptable.h" -#include "clutter-shader.h" #include "clutter-stage-private.h" + +#include "clutter-shader.h" #include "clutter-util.h" static void clutter_scriptable_iface_init (ClutterScriptableIface *iface); diff --git a/clutter/deprecated/clutter-behaviour-depth.c b/clutter/deprecated/clutter-behaviour-depth.c index 91acb5bb0..28eb3c058 100644 --- a/clutter/deprecated/clutter-behaviour-depth.c +++ b/clutter/deprecated/clutter-behaviour-depth.c @@ -27,6 +27,8 @@ #include "config.h" #endif +#define CLUTTER_DISABLE_DEPRECATION_WARNINGS + #include "clutter-behaviour.h" #include "clutter-behaviour-depth.h" #include "clutter-enum-types.h" diff --git a/clutter/deprecated/clutter-behaviour-depth.h b/clutter/deprecated/clutter-behaviour-depth.h index 4ee2f83f8..1354295f8 100644 --- a/clutter/deprecated/clutter-behaviour-depth.h +++ b/clutter/deprecated/clutter-behaviour-depth.h @@ -34,8 +34,6 @@ G_BEGIN_DECLS -#if !defined(CLUTTER_DISABLE_DEPRECATED) || defined(CLUTTER_COMPILATION) - #define CLUTTER_TYPE_BEHAVIOUR_DEPTH (clutter_behaviour_depth_get_type ()) #define CLUTTER_BEHAVIOUR_DEPTH(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_BEHAVIOUR_DEPTH, ClutterBehaviourDepth)) #define CLUTTER_IS_BEHAVIOUR_DEPTH(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_BEHAVIOUR_DEPTH)) @@ -82,19 +80,21 @@ struct _ClutterBehaviourDepthClass }; GType clutter_behaviour_depth_get_type (void) G_GNUC_CONST; + +CLUTTER_DEPRECATED_FOR(clutter_actor_animate and ClutterActor:depth) ClutterBehaviour *clutter_behaviour_depth_new (ClutterAlpha *alpha, gint depth_start, gint depth_end); +CLUTTER_DEPRECATED void clutter_behaviour_depth_set_bounds (ClutterBehaviourDepth *behaviour, gint depth_start, gint depth_end); +CLUTTER_DEPRECATED void clutter_behaviour_depth_get_bounds (ClutterBehaviourDepth *behaviour, gint *depth_start, gint *depth_end); -#endif /* CLUTTER_DISABLE_DEPRECATED */ - G_END_DECLS #endif /* __CLUTTER_BEHAVIOUR_DEPTH__ */ diff --git a/clutter/deprecated/clutter-behaviour-ellipse.c b/clutter/deprecated/clutter-behaviour-ellipse.c index aafbc6e48..ab2cf60f8 100644 --- a/clutter/deprecated/clutter-behaviour-ellipse.c +++ b/clutter/deprecated/clutter-behaviour-ellipse.c @@ -50,6 +50,8 @@ #include #include +#define CLUTTER_DISABLE_DEPRECATION_WARNINGS + #include "clutter-behaviour.h" #include "clutter-behaviour-ellipse.h" #include "clutter-debug.h" diff --git a/clutter/deprecated/clutter-behaviour-ellipse.h b/clutter/deprecated/clutter-behaviour-ellipse.h index 8dffa869d..40634347b 100644 --- a/clutter/deprecated/clutter-behaviour-ellipse.h +++ b/clutter/deprecated/clutter-behaviour-ellipse.h @@ -32,8 +32,6 @@ G_BEGIN_DECLS -#if !defined(CLUTTER_DISABLE_DEPRECATED) || defined(CLUTTER_COMPILATION) - #define CLUTTER_TYPE_BEHAVIOUR_ELLIPSE (clutter_behaviour_ellipse_get_type ()) #define CLUTTER_BEHAVIOUR_ELLIPSE(obj) \ @@ -94,6 +92,7 @@ struct _ClutterBehaviourEllipseClass GType clutter_behaviour_ellipse_get_type (void) G_GNUC_CONST; +CLUTTER_DEPRECATED_FOR(clutter_actor_animate) ClutterBehaviour * clutter_behaviour_ellipse_new (ClutterAlpha *alpha, gint x, gint y, @@ -102,43 +101,58 @@ ClutterBehaviour * clutter_behaviour_ellipse_new (ClutterAlpha ClutterRotateDirection direction, gdouble start, gdouble end); + +CLUTTER_DEPRECATED void clutter_behaviour_ellipse_set_center (ClutterBehaviourEllipse *self, gint x, gint y); +CLUTTER_DEPRECATED void clutter_behaviour_ellipse_get_center (ClutterBehaviourEllipse *self, gint *x, gint *y); +CLUTTER_DEPRECATED void clutter_behaviour_ellipse_set_width (ClutterBehaviourEllipse *self, gint width); +CLUTTER_DEPRECATED gint clutter_behaviour_ellipse_get_width (ClutterBehaviourEllipse *self); +CLUTTER_DEPRECATED void clutter_behaviour_ellipse_set_height (ClutterBehaviourEllipse *self, gint height); +CLUTTER_DEPRECATED gint clutter_behaviour_ellipse_get_height (ClutterBehaviourEllipse *self); +CLUTTER_DEPRECATED void clutter_behaviour_ellipse_set_angle_start (ClutterBehaviourEllipse *self, gdouble angle_start); +CLUTTER_DEPRECATED gdouble clutter_behaviour_ellipse_get_angle_start (ClutterBehaviourEllipse *self); +CLUTTER_DEPRECATED void clutter_behaviour_ellipse_set_angle_end (ClutterBehaviourEllipse *self, gdouble angle_end); +CLUTTER_DEPRECATED gdouble clutter_behaviour_ellipse_get_angle_end (ClutterBehaviourEllipse *self); +CLUTTER_DEPRECATED void clutter_behaviour_ellipse_set_angle_tilt (ClutterBehaviourEllipse *self, ClutterRotateAxis axis, gdouble angle_tilt); +CLUTTER_DEPRECATED gdouble clutter_behaviour_ellipse_get_angle_tilt (ClutterBehaviourEllipse *self, ClutterRotateAxis axis); +CLUTTER_DEPRECATED void clutter_behaviour_ellipse_set_tilt (ClutterBehaviourEllipse *self, gdouble angle_tilt_x, gdouble angle_tilt_y, gdouble angle_tilt_z); +CLUTTER_DEPRECATED void clutter_behaviour_ellipse_get_tilt (ClutterBehaviourEllipse *self, gdouble *angle_tilt_x, gdouble *angle_tilt_y, gdouble *angle_tilt_z); +CLUTTER_DEPRECATED ClutterRotateDirection clutter_behaviour_ellipse_get_direction (ClutterBehaviourEllipse *self); +CLUTTER_DEPRECATED void clutter_behaviour_ellipse_set_direction (ClutterBehaviourEllipse *self, ClutterRotateDirection direction); -#endif /* CLUTTER_DISABLE_DEPRECATED */ - G_END_DECLS #endif /* __CLUTTER_BEHAVIOUR_ELLIPSE_H__ */ diff --git a/clutter/deprecated/clutter-behaviour-opacity.c b/clutter/deprecated/clutter-behaviour-opacity.c index 5cc3899e2..072b28fa1 100644 --- a/clutter/deprecated/clutter-behaviour-opacity.c +++ b/clutter/deprecated/clutter-behaviour-opacity.c @@ -42,6 +42,8 @@ #include +#define CLUTTER_DISABLE_DEPRECATION_WARNINGS + #include "clutter-behaviour.h" #include "clutter-behaviour-opacity.h" #include "clutter-private.h" diff --git a/clutter/deprecated/clutter-behaviour-opacity.h b/clutter/deprecated/clutter-behaviour-opacity.h index b6519aab8..63ae33d67 100644 --- a/clutter/deprecated/clutter-behaviour-opacity.h +++ b/clutter/deprecated/clutter-behaviour-opacity.h @@ -34,8 +34,6 @@ G_BEGIN_DECLS -#if !defined(CLUTTER_DISABLE_DEPRECATED) || defined(CLUTTER_COMPILATION) - #define CLUTTER_TYPE_BEHAVIOUR_OPACITY (clutter_behaviour_opacity_get_type ()) #define CLUTTER_BEHAVIOUR_OPACITY(obj) \ @@ -97,19 +95,20 @@ struct _ClutterBehaviourOpacityClass GType clutter_behaviour_opacity_get_type (void) G_GNUC_CONST; +CLUTTER_DEPRECATED_FOR(clutter_actor_animate and ClutterActor:opacity) ClutterBehaviour *clutter_behaviour_opacity_new (ClutterAlpha *alpha, guint8 opacity_start, guint8 opacity_end); +CLUTTER_DEPRECATED void clutter_behaviour_opacity_set_bounds (ClutterBehaviourOpacity *behaviour, guint8 opacity_start, guint8 opacity_end); +CLUTTER_DEPRECATED void clutter_behaviour_opacity_get_bounds (ClutterBehaviourOpacity *behaviour, guint8 *opacity_start, guint8 *opacity_end); -#endif /* CLUTTER_DISABLE_DEPRECATED */ - G_END_DECLS #endif /* __CLUTTER_BEHAVIOUR_OPACITY_H__ */ diff --git a/clutter/deprecated/clutter-behaviour-path.c b/clutter/deprecated/clutter-behaviour-path.c index 30c5380f7..48ada7ed8 100644 --- a/clutter/deprecated/clutter-behaviour-path.c +++ b/clutter/deprecated/clutter-behaviour-path.c @@ -67,6 +67,8 @@ #include "config.h" #endif +#define CLUTTER_DISABLE_DEPRECATION_WARNINGS + #include "clutter-behaviour.h" #include "clutter-behaviour-path.h" #include "clutter-bezier.h" diff --git a/clutter/deprecated/clutter-behaviour-path.h b/clutter/deprecated/clutter-behaviour-path.h index fe15c3e50..f26e3e570 100644 --- a/clutter/deprecated/clutter-behaviour-path.h +++ b/clutter/deprecated/clutter-behaviour-path.h @@ -35,8 +35,6 @@ G_BEGIN_DECLS -#if !defined(CLUTTER_DISABLE_DEPRECATED) || defined(CLUTTER_COMPILATION) - #define CLUTTER_TYPE_BEHAVIOUR_PATH (clutter_behaviour_path_get_type ()) #define CLUTTER_BEHAVIOUR_PATH(obj) \ @@ -110,25 +108,27 @@ struct _ClutterBehaviourPathClass GType clutter_behaviour_path_get_type (void) G_GNUC_CONST; +CLUTTER_DEPRECATED_FOR(clutter_actor_animate) ClutterBehaviour *clutter_behaviour_path_new (ClutterAlpha *alpha, ClutterPath *path); +CLUTTER_DEPRECATED_FOR(clutter_actor_animate) ClutterBehaviour *clutter_behaviour_path_new_with_description (ClutterAlpha *alpha, const gchar *desc); +CLUTTER_DEPRECATED_FOR(clutter_actor_animate) ClutterBehaviour *clutter_behaviour_path_new_with_knots (ClutterAlpha *alpha, const ClutterKnot *knots, guint n_knots); +CLUTTER_DEPRECATED void clutter_behaviour_path_set_path (ClutterBehaviourPath *pathb, ClutterPath *path); - +CLUTTER_DEPRECATED ClutterPath * clutter_behaviour_path_get_path (ClutterBehaviourPath *pathb); -#endif /* CLUTTER_DISABLE_DEPRECATED */ - G_END_DECLS #endif /* __CLUTTER_BEHAVIOUR_PATH_H__ */ diff --git a/clutter/deprecated/clutter-behaviour-rotate.c b/clutter/deprecated/clutter-behaviour-rotate.c index 0ab5da67c..056eb544b 100644 --- a/clutter/deprecated/clutter-behaviour-rotate.c +++ b/clutter/deprecated/clutter-behaviour-rotate.c @@ -41,6 +41,8 @@ #include +#define CLUTTER_DISABLE_DEPRECATION_WARNINGS + #include "clutter-behaviour.h" #include "clutter-behaviour-rotate.h" #include "clutter-debug.h" diff --git a/clutter/deprecated/clutter-behaviour-rotate.h b/clutter/deprecated/clutter-behaviour-rotate.h index df880a562..84764ebe3 100644 --- a/clutter/deprecated/clutter-behaviour-rotate.h +++ b/clutter/deprecated/clutter-behaviour-rotate.h @@ -32,8 +32,6 @@ G_BEGIN_DECLS -#if !defined(CLUTTER_DISABLE_DEPRECATED) || defined(CLUTTER_COMPILATION) - #define CLUTTER_TYPE_BEHAVIOUR_ROTATE (clutter_behaviour_rotate_get_type ()) #define CLUTTER_BEHAVIOUR_ROTATE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_BEHAVIOUR_ROTATE, ClutterBehaviourRotate)) #define CLUTTER_IS_BEHAVIOUR_ROTATE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_BEHAVIOUR_ROTATE)) @@ -80,34 +78,41 @@ struct _ClutterBehaviourRotateClass GType clutter_behaviour_rotate_get_type (void) G_GNUC_CONST; +CLUTTER_DEPRECATED_FOR(clutter_actor_animate) ClutterBehaviour * clutter_behaviour_rotate_new (ClutterAlpha *alpha, ClutterRotateAxis axis, ClutterRotateDirection direction, gdouble angle_start, gdouble angle_end); +CLUTTER_DEPRECATED void clutter_behaviour_rotate_get_center (ClutterBehaviourRotate *rotate, gint *x, gint *y, gint *z); +CLUTTER_DEPRECATED void clutter_behaviour_rotate_set_center (ClutterBehaviourRotate *rotate, gint x, gint y, gint z); +CLUTTER_DEPRECATED ClutterRotateAxis clutter_behaviour_rotate_get_axis (ClutterBehaviourRotate *rotate); +CLUTTER_DEPRECATED void clutter_behaviour_rotate_set_axis (ClutterBehaviourRotate *rotate, ClutterRotateAxis axis); +CLUTTER_DEPRECATED ClutterRotateDirection clutter_behaviour_rotate_get_direction (ClutterBehaviourRotate *rotate); +CLUTTER_DEPRECATED void clutter_behaviour_rotate_set_direction (ClutterBehaviourRotate *rotate, ClutterRotateDirection direction); +CLUTTER_DEPRECATED void clutter_behaviour_rotate_get_bounds (ClutterBehaviourRotate *rotate, gdouble *angle_start, gdouble *angle_end); +CLUTTER_DEPRECATED void clutter_behaviour_rotate_set_bounds (ClutterBehaviourRotate *rotate, gdouble angle_start, gdouble angle_end); -#endif /* CLUTTER_DISABLE_DEPRECATED */ - G_END_DECLS #endif /* __CLUTTER_BEHAVIOUR_ROTATE_H__ */ diff --git a/clutter/deprecated/clutter-behaviour-scale.c b/clutter/deprecated/clutter-behaviour-scale.c index 82a3b0e6c..23292e117 100644 --- a/clutter/deprecated/clutter-behaviour-scale.c +++ b/clutter/deprecated/clutter-behaviour-scale.c @@ -41,6 +41,8 @@ #include +#define CLUTTER_DISABLE_DEPRECATION_WARNINGS + #include "clutter-behaviour.h" #include "clutter-behaviour-scale.h" #include "clutter-debug.h" diff --git a/clutter/deprecated/clutter-behaviour-scale.h b/clutter/deprecated/clutter-behaviour-scale.h index 3479c7c37..c03207b19 100644 --- a/clutter/deprecated/clutter-behaviour-scale.h +++ b/clutter/deprecated/clutter-behaviour-scale.h @@ -34,8 +34,6 @@ G_BEGIN_DECLS -#if !defined(CLUTTER_DISABLE_DEPRECATED) || defined(CLUTTER_COMPILATION) - #define CLUTTER_TYPE_BEHAVIOUR_SCALE (clutter_behaviour_scale_get_type ()) #define CLUTTER_BEHAVIOUR_SCALE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_BEHAVIOUR_SCALE, ClutterBehaviourScale)) #define CLUTTER_BEHAVIOUR_SCALE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CLUTTER_TYPE_BEHAVIOUR_SCALE, ClutterBehaviourScaleClass)) @@ -83,24 +81,26 @@ struct _ClutterBehaviourScaleClass GType clutter_behaviour_scale_get_type (void) G_GNUC_CONST; +CLUTTER_DEPRECATED_FOR(clutter_actor_animate with ClutterActor:scale-x and ClutterActor:scale-y) ClutterBehaviour *clutter_behaviour_scale_new (ClutterAlpha *alpha, gdouble x_scale_start, gdouble y_scale_start, gdouble x_scale_end, gdouble y_scale_end); + +CLUTTER_DEPRECATED void clutter_behaviour_scale_set_bounds (ClutterBehaviourScale *scale, gdouble x_scale_start, gdouble y_scale_start, gdouble x_scale_end, gdouble y_scale_end); +CLUTTER_DEPRECATED void clutter_behaviour_scale_get_bounds (ClutterBehaviourScale *scale, gdouble *x_scale_start, gdouble *y_scale_start, gdouble *x_scale_end, gdouble *y_scale_end); -#endif /* CLUTTER_DISABLE_DEPRECATED */ - G_END_DECLS #endif /* __CLUTTER_BEHAVIOUR_SCALE_H__ */ diff --git a/clutter/deprecated/clutter-behaviour.c b/clutter/deprecated/clutter-behaviour.c index 9f238fe7c..1cbdbe742 100644 --- a/clutter/deprecated/clutter-behaviour.c +++ b/clutter/deprecated/clutter-behaviour.c @@ -77,6 +77,7 @@ #include "config.h" #endif +#define CLUTTER_DISABLE_DEPRECATION_WARNINGS #include "clutter-behaviour.h" #include "clutter-debug.h" @@ -86,73 +87,6 @@ #include "clutter-scriptable.h" #include "clutter-script-private.h" -/** - * clutter_knot_copy: - * @knot: a #ClutterKnot - * - * Makes an allocated copy of a knot. - * - * Return value: the copied knot. - * - * Since: 0.2 - */ -ClutterKnot * -clutter_knot_copy (const ClutterKnot *knot) -{ - ClutterKnot *copy; - - copy = g_slice_new0 (ClutterKnot); - - *copy = *knot; - - return copy; -} - -/** - * clutter_knot_free: - * @knot: a #ClutterKnot - * - * Frees the memory of an allocated knot. - * - * Since: 0.2 - */ -void -clutter_knot_free (ClutterKnot *knot) -{ - if (G_LIKELY (knot)) - { - g_slice_free (ClutterKnot, knot); - } -} - -/** - * clutter_knot_equal: - * @knot_a: First knot - * @knot_b: Second knot - * - * Compares to knot and checks if the point to the same location. - * - * Return value: %TRUE if the knots point to the same location. - * - * Since: 0.2 - */ -gboolean -clutter_knot_equal (const ClutterKnot *knot_a, - const ClutterKnot *knot_b) -{ - g_return_val_if_fail (knot_a != NULL, FALSE); - g_return_val_if_fail (knot_b != NULL, FALSE); - - if (knot_a == knot_b) - return TRUE; - - return knot_a->x == knot_b->x && knot_a->y == knot_b->y; -} - -G_DEFINE_BOXED_TYPE (ClutterKnot, clutter_knot, - clutter_knot_copy, - clutter_knot_free); - static void clutter_scriptable_iface_init (ClutterScriptableIface *iface); G_DEFINE_ABSTRACT_TYPE_WITH_CODE (ClutterBehaviour, @@ -298,6 +232,8 @@ clutter_behaviour_class_init (ClutterBehaviourClass *klass) * the alpha-notify virtual function is called. * * Since: 0.2 + * + * Deprecated: 1.6 */ obj_props[PROP_ALPHA] = g_param_spec_object ("alpha", @@ -321,6 +257,8 @@ clutter_behaviour_class_init (ClutterBehaviourClass *klass) * to an actor. * * Since: 0.4 + * + * Deprecated: 1.6 */ behave_signals[APPLIED] = g_signal_new ("applied", @@ -340,6 +278,8 @@ clutter_behaviour_class_init (ClutterBehaviourClass *klass) * to an actor anymore. * * Since: 0.4 + * + * Deprecated: 1.6 */ behave_signals[REMOVED] = g_signal_new ("removed", @@ -376,6 +316,8 @@ remove_actor_on_destroy (ClutterActor *actor, * the actor. * * Since: 0.2 + * + * Deprecated: 1.6 */ void clutter_behaviour_apply (ClutterBehaviour *behave, @@ -415,6 +357,8 @@ clutter_behaviour_apply (ClutterBehaviour *behave, * Return value: TRUE if actor has behaviour. FALSE otherwise. * * Since: 0.4 + * + * Deprecated: 1.6 */ gboolean clutter_behaviour_is_applied (ClutterBehaviour *behave, @@ -435,6 +379,8 @@ clutter_behaviour_is_applied (ClutterBehaviour *behave, * @behave applies. This function removes a reference on the actor. * * Since: 0.2 + * + * Deprecated: 1.6 */ void clutter_behaviour_remove (ClutterBehaviour *behave, @@ -476,6 +422,8 @@ clutter_behaviour_remove (ClutterBehaviour *behave, * Return value: The number of applied actors * * Since: 0.2 + * + * Deprecated: 1.6 */ gint clutter_behaviour_get_n_actors (ClutterBehaviour *behave) @@ -495,8 +443,10 @@ clutter_behaviour_get_n_actors (ClutterBehaviour *behave) * Return value: (transfer none): A Clutter actor or NULL if @index_ is invalid. * * Since: 0.2 + * + * Deprecated: 1.6 */ -ClutterActor* +ClutterActor * clutter_behaviour_get_nth_actor (ClutterBehaviour *behave, gint index_) { @@ -515,6 +465,8 @@ clutter_behaviour_get_nth_actor (ClutterBehaviour *behave, * Calls @func for every actor driven by @behave. * * Since: 0.2 + * + * Deprecated: 1.6 */ void clutter_behaviour_actors_foreach (ClutterBehaviour *behave, @@ -546,6 +498,8 @@ clutter_behaviour_actors_foreach (ClutterBehaviour *behave, * object has been bound to this behaviour. * * Since: 0.2 + * + * Deprecated: 1.6 */ ClutterAlpha * clutter_behaviour_get_alpha (ClutterBehaviour *behave) @@ -598,6 +552,8 @@ notify_cb (GObject *object, * of the #ClutterAlpha instance. * * Since: 0.2 + * + * Deprecated: 1.6 */ void clutter_behaviour_set_alpha (ClutterBehaviour *behave, @@ -658,6 +614,8 @@ clutter_behaviour_set_alpha (ClutterBehaviour *behave, * finished using it. * * Since: 0.2 + * + * Deprecated: 1.6 */ GSList * clutter_behaviour_get_actors (ClutterBehaviour *behave) @@ -682,6 +640,8 @@ clutter_behaviour_get_actors (ClutterBehaviour *behave) * Removes every actor from the list that @behave holds. * * Since: 0.4 + * + * Deprecated: 1.6 */ void clutter_behaviour_remove_all (ClutterBehaviour *behave) diff --git a/clutter/deprecated/clutter-behaviour.h b/clutter/deprecated/clutter-behaviour.h index 129c6fb65..97674186d 100644 --- a/clutter/deprecated/clutter-behaviour.h +++ b/clutter/deprecated/clutter-behaviour.h @@ -34,8 +34,6 @@ G_BEGIN_DECLS -#if !defined(CLUTTER_DISABLE_DEPRECATED) || defined(CLUTTER_COMPILATION) - #define CLUTTER_TYPE_BEHAVIOUR clutter_behaviour_get_type() #define CLUTTER_BEHAVIOUR(obj) \ @@ -138,26 +136,34 @@ struct _ClutterBehaviourClass GType clutter_behaviour_get_type (void) G_GNUC_CONST; +CLUTTER_DEPRECATED void clutter_behaviour_apply (ClutterBehaviour *behave, ClutterActor *actor); +CLUTTER_DEPRECATED void clutter_behaviour_remove (ClutterBehaviour *behave, ClutterActor *actor); +CLUTTER_DEPRECATED void clutter_behaviour_remove_all (ClutterBehaviour *behave); +CLUTTER_DEPRECATED void clutter_behaviour_actors_foreach (ClutterBehaviour *behave, ClutterBehaviourForeachFunc func, gpointer data); +CLUTTER_DEPRECATED gint clutter_behaviour_get_n_actors (ClutterBehaviour *behave); +CLUTTER_DEPRECATED ClutterActor *clutter_behaviour_get_nth_actor (ClutterBehaviour *behave, gint index_); +CLUTTER_DEPRECATED GSList * clutter_behaviour_get_actors (ClutterBehaviour *behave); +CLUTTER_DEPRECATED ClutterAlpha *clutter_behaviour_get_alpha (ClutterBehaviour *behave); +CLUTTER_DEPRECATED void clutter_behaviour_set_alpha (ClutterBehaviour *behave, ClutterAlpha *alpha); +CLUTTER_DEPRECATED gboolean clutter_behaviour_is_applied (ClutterBehaviour *behave, ClutterActor *actor); -#endif /* !CLUTTER_DISABLE_DEPRECATED || CLUTTER_COMPILATION */ - G_END_DECLS #endif /* __CLUTTER_BEHAVIOUR_H__ */ diff --git a/clutter/deprecated/clutter-fixed.c b/clutter/deprecated/clutter-fixed.c index b37c15f9f..e5a0746f1 100644 --- a/clutter/deprecated/clutter-fixed.c +++ b/clutter/deprecated/clutter-fixed.c @@ -29,6 +29,8 @@ #include "config.h" #endif +#define CLUTTER_DISABLE_DEPRECATION_WARNINGS + #include #include diff --git a/clutter/deprecated/clutter-fixed.h b/clutter/deprecated/clutter-fixed.h index d284bffdd..c313a0344 100644 --- a/clutter/deprecated/clutter-fixed.h +++ b/clutter/deprecated/clutter-fixed.h @@ -29,13 +29,11 @@ #ifndef __CLUTTER_FIXED_H__ #define __CLUTTER_FIXED_H__ -#include #include +#include G_BEGIN_DECLS -#if !defined(CLUTTER_DISABLE_DEPRECATED) || defined(CLUTTER_COMPILATION) - #define CLUTTER_TYPE_PARAM_FIXED (clutter_param_fixed_get_type ()) #define CLUTTER_PARAM_SPEC_FIXED(pspec) (G_TYPE_CHECK_INSTANCE_CAST ((pspec), CLUTTER_TYPE_PARAM_FIXED, ClutterParamSpecFixed)) #define CLUTTER_IS_PARAM_SPEC_FIXED(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), CLUTTER_TYPE_PARAM_FIXED)) @@ -79,10 +77,13 @@ struct _ClutterParamSpecFixed GType clutter_param_fixed_get_type (void) G_GNUC_CONST; +CLUTTER_DEPRECATED_FOR(g_value_set_int) void clutter_value_set_fixed (GValue *value, CoglFixed fixed_); +CLUTTER_DEPRECATED_FOR(g_value_get_int) CoglFixed clutter_value_get_fixed (const GValue *value); +CLUTTER_DEPRECATED_FOR(g_param_spec_int) GParamSpec * clutter_param_spec_fixed (const gchar *name, const gchar *nick, const gchar *blurb, @@ -91,9 +92,6 @@ GParamSpec * clutter_param_spec_fixed (const gchar *name, CoglFixed default_value, GParamFlags flags); - -#endif /* DISABLE_DEPRECATED */ - G_END_DECLS #endif /* __CLUTTER_FIXED_H__ */ diff --git a/clutter/deprecated/clutter-frame-source.c b/clutter/deprecated/clutter-frame-source.c index 8f5f46b11..cba050a0f 100644 --- a/clutter/deprecated/clutter-frame-source.c +++ b/clutter/deprecated/clutter-frame-source.c @@ -27,6 +27,8 @@ #include "config.h" #endif +#define CLUTTER_DISABLE_DEPRECATION_WARNINGS + #include "clutter-frame-source.h" #include "clutter-timeout-interval.h" #include "clutter-private.h" diff --git a/clutter/deprecated/clutter-frame-source.h b/clutter/deprecated/clutter-frame-source.h index a8a40cc45..d3649fbd3 100644 --- a/clutter/deprecated/clutter-frame-source.h +++ b/clutter/deprecated/clutter-frame-source.h @@ -28,24 +28,22 @@ #ifndef __CLUTTER_FRAME_SOURCE_H__ #define __CLUTTER_FRAME_SOURCE_H__ -#include +#include G_BEGIN_DECLS -#if !defined(CLUTTER_DISABLE_DEPRECATED) || defined(CLUTTER_COMPILATION) - +CLUTTER_DEPRECATED guint clutter_frame_source_add (guint fps, GSourceFunc func, gpointer data); +CLUTTER_DEPRECATED guint clutter_frame_source_add_full (gint priority, guint fps, GSourceFunc func, gpointer data, GDestroyNotify notify); -#endif /* CLUTTER_DISABLE_DEPRECATED */ - G_END_DECLS #endif /* __CLUTTER_FRAME_SOURCE_H__ */ diff --git a/clutter/deprecated/clutter-score.c b/clutter/deprecated/clutter-score.c index b3153b053..316c54907 100644 --- a/clutter/deprecated/clutter-score.c +++ b/clutter/deprecated/clutter-score.c @@ -83,6 +83,8 @@ #include "config.h" #endif +#define CLUTTER_DISABLE_DEPRECATION_WARNINGS + #include "clutter-score.h" #include "clutter-main.h" #include "clutter-marshal.h" diff --git a/clutter/deprecated/clutter-score.h b/clutter/deprecated/clutter-score.h index 790e711f4..a00d28d88 100644 --- a/clutter/deprecated/clutter-score.h +++ b/clutter/deprecated/clutter-score.h @@ -32,8 +32,6 @@ G_BEGIN_DECLS -#if !defined(CLUTTER_DISABLE_DEPRECATED) || defined(CLUTTER_COMPILATION) - #define CLUTTER_TYPE_SCORE (clutter_score_get_type ()) #define CLUTTER_SCORE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_SCORE, ClutterScore)) @@ -100,34 +98,46 @@ struct _ClutterScoreClass GType clutter_score_get_type (void) G_GNUC_CONST; +CLUTTER_DEPRECATED ClutterScore * clutter_score_new (void); +CLUTTER_DEPRECATED void clutter_score_set_loop (ClutterScore *score, gboolean loop); +CLUTTER_DEPRECATED gboolean clutter_score_get_loop (ClutterScore *score); +CLUTTER_DEPRECATED gulong clutter_score_append (ClutterScore *score, ClutterTimeline *parent, ClutterTimeline *timeline); +CLUTTER_DEPRECATED gulong clutter_score_append_at_marker (ClutterScore *score, ClutterTimeline *parent, const gchar *marker_name, ClutterTimeline *timeline); +CLUTTER_DEPRECATED void clutter_score_remove (ClutterScore *score, gulong id_); +CLUTTER_DEPRECATED void clutter_score_remove_all (ClutterScore *score); +CLUTTER_DEPRECATED ClutterTimeline *clutter_score_get_timeline (ClutterScore *score, gulong id_); +CLUTTER_DEPRECATED GSList * clutter_score_list_timelines (ClutterScore *score); +CLUTTER_DEPRECATED void clutter_score_start (ClutterScore *score); +CLUTTER_DEPRECATED void clutter_score_stop (ClutterScore *score); +CLUTTER_DEPRECATED void clutter_score_pause (ClutterScore *score); +CLUTTER_DEPRECATED void clutter_score_rewind (ClutterScore *score); +CLUTTER_DEPRECATED gboolean clutter_score_is_playing (ClutterScore *score); -#endif /* CLUTTER_DISABLE_DEPRECATED */ - G_END_DECLS #endif /* __CLUTTER_SCORE_H__ */ diff --git a/clutter/deprecated/clutter-shader.c b/clutter/deprecated/clutter-shader.c index cf3b20c71..8108ecc18 100644 --- a/clutter/deprecated/clutter-shader.c +++ b/clutter/deprecated/clutter-shader.c @@ -52,6 +52,8 @@ #include #endif +#define CLUTTER_DISABLE_DEPRECATION_WARNINGS + #include #include @@ -819,20 +821,6 @@ clutter_shader_set_uniform (ClutterShader *shader, g_assert_not_reached (); } -/* - * _clutter_shader_release_all: - * - * Iterate through all #ClutterShaders and tell them to release GL context - * related sources. - */ -void -_clutter_shader_release_all (void) -{ - g_list_foreach (clutter_shaders_list, - (GFunc) clutter_shader_release, - NULL); -} - /** * clutter_shader_get_fragment_source: * @shader: a #ClutterShader diff --git a/clutter/deprecated/clutter-shader.h b/clutter/deprecated/clutter-shader.h index 2604fe55e..ae24caf16 100644 --- a/clutter/deprecated/clutter-shader.h +++ b/clutter/deprecated/clutter-shader.h @@ -34,8 +34,6 @@ G_BEGIN_DECLS -#if !defined(CLUTTER_DISABLE_DEPRECATED) || defined(CLUTTER_COMPILATION) - #define CLUTTER_TYPE_SHADER (clutter_shader_get_type ()) #define CLUTTER_SHADER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), CLUTTER_TYPE_SHADER, ClutterShader)) #define CLUTTER_SHADER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), CLUTTER_TYPE_SHADER, ClutterShaderClass)) @@ -110,40 +108,48 @@ struct _ClutterShaderClass GQuark clutter_shader_error_quark (void); GType clutter_shader_get_type (void) G_GNUC_CONST; +CLUTTER_DEPRECATED_FOR(ClutterShaderEffect) ClutterShader * clutter_shader_new (void); +CLUTTER_DEPRECATED_FOR(ClutterShaderEffect) void clutter_shader_set_is_enabled (ClutterShader *shader, gboolean enabled); +CLUTTER_DEPRECATED_FOR(ClutterShaderEffect) gboolean clutter_shader_get_is_enabled (ClutterShader *shader); +CLUTTER_DEPRECATED_FOR(ClutterShaderEffect) gboolean clutter_shader_compile (ClutterShader *shader, GError **error); +CLUTTER_DEPRECATED_FOR(ClutterShaderEffect) void clutter_shader_release (ClutterShader *shader); +CLUTTER_DEPRECATED_FOR(ClutterShaderEffect) gboolean clutter_shader_is_compiled (ClutterShader *shader); +CLUTTER_DEPRECATED_FOR(ClutterShaderEffect) void clutter_shader_set_vertex_source (ClutterShader *shader, const gchar *data, gssize length); +CLUTTER_DEPRECATED_FOR(ClutterShaderEffect) void clutter_shader_set_fragment_source (ClutterShader *shader, const gchar *data, gssize length); - +CLUTTER_DEPRECATED_FOR(ClutterShaderEffect) const gchar * clutter_shader_get_vertex_source (ClutterShader *shader); +CLUTTER_DEPRECATED_FOR(ClutterShaderEffect) const gchar * clutter_shader_get_fragment_source (ClutterShader *shader); +CLUTTER_DEPRECATED_FOR(ClutterShaderEffect) void clutter_shader_set_uniform (ClutterShader *shader, const gchar *name, const GValue *value); +CLUTTER_DEPRECATED_FOR(ClutterShaderEffect) CoglHandle clutter_shader_get_cogl_program (ClutterShader *shader); +CLUTTER_DEPRECATED_FOR(ClutterShaderEffect) CoglHandle clutter_shader_get_cogl_fragment_shader (ClutterShader *shader); +CLUTTER_DEPRECATED_FOR(ClutterShaderEffect) CoglHandle clutter_shader_get_cogl_vertex_shader (ClutterShader *shader); -/* private */ -void _clutter_shader_release_all (void); - -#endif /* CLUTTER_DISABLE_DEPRECATED */ - G_END_DECLS #endif /* __CLUTTER_SHADER_H__ */ diff --git a/clutter/deprecated/clutter-timeout-interval.c b/clutter/deprecated/clutter-timeout-interval.c index ac0ad44d1..52ee18029 100644 --- a/clutter/deprecated/clutter-timeout-interval.c +++ b/clutter/deprecated/clutter-timeout-interval.c @@ -25,6 +25,8 @@ #include "config.h" #endif +#define CLUTTER_DISABLE_DEPRECATION_WARNINGS + /* This file contains the common code to check whether an interval has expired used in clutter-frame-source and clutter-timeout-pool. */ diff --git a/clutter/deprecated/clutter-timeout-pool.c b/clutter/deprecated/clutter-timeout-pool.c index 6ef839b8e..0a7ad4b81 100644 --- a/clutter/deprecated/clutter-timeout-pool.c +++ b/clutter/deprecated/clutter-timeout-pool.c @@ -34,6 +34,8 @@ #include "config.h" #endif +#define CLUTTER_DISABLE_DEPRECATION_WARNINGS + #include "clutter-timeout-pool.h" #include "clutter-debug.h" diff --git a/clutter/deprecated/clutter-timeout-pool.h b/clutter/deprecated/clutter-timeout-pool.h index 0268ab833..44a3f2d54 100644 --- a/clutter/deprecated/clutter-timeout-pool.h +++ b/clutter/deprecated/clutter-timeout-pool.h @@ -35,12 +35,10 @@ #ifndef __CLUTTER_TIMEOUT_POOL_H__ #define __CLUTTER_TIMEOUT_POOL_H__ -#include +#include G_BEGIN_DECLS -#if !defined(CLUTTER_DISABLE_DEPRECATED) || defined(CLUTTER_COMPILATION) - /** * ClutterTimeoutPool: (skip) * @@ -53,17 +51,19 @@ G_BEGIN_DECLS */ typedef struct _ClutterTimeoutPool ClutterTimeoutPool; +CLUTTER_DEPRECATED ClutterTimeoutPool *clutter_timeout_pool_new (gint priority); + +CLUTTER_DEPRECATED guint clutter_timeout_pool_add (ClutterTimeoutPool *pool, guint fps, GSourceFunc func, gpointer data, GDestroyNotify notify); +CLUTTER_DEPRECATED void clutter_timeout_pool_remove (ClutterTimeoutPool *pool, guint id_); -#endif /* CLUTTER_DISABLE_DEPRECATED */ - G_END_DECLS #endif /* __CLUTTER_TIMEOUT_POOL_H__ */ diff --git a/clutter/osx/clutter-backend-osx.c b/clutter/osx/clutter-backend-osx.c index 9d930742f..520f53134 100644 --- a/clutter/osx/clutter-backend-osx.c +++ b/clutter/osx/clutter-backend-osx.c @@ -228,8 +228,6 @@ clutter_backend_osx_dispose (GObject *object) { ClutterBackendOSX *self = CLUTTER_BACKEND_OSX (object); - _clutter_shader_release_all (); - [self->context release]; self->context = NULL; diff --git a/clutter/win32/clutter-backend-win32.c b/clutter/win32/clutter-backend-win32.c index 0d1e05ed7..1fb121428 100644 --- a/clutter/win32/clutter-backend-win32.c +++ b/clutter/win32/clutter-backend-win32.c @@ -148,9 +148,6 @@ clutter_backend_win32_dispose (GObject *gobject) CLUTTER_NOTE (BACKEND, "Removing the event source"); _clutter_backend_win32_events_uninit (CLUTTER_BACKEND (backend_win32)); - /* Unrealize all shaders, since the GL context is going away */ - _clutter_shader_release_all (); - G_OBJECT_CLASS (clutter_backend_win32_parent_class)->dispose (gobject); if (backend->cogl_context) diff --git a/configure.ac b/configure.ac index 2ec33ea13..02f7507ea 100644 --- a/configure.ac +++ b/configure.ac @@ -121,7 +121,7 @@ m4_define([cairo_req_version], [1.10]) m4_define([pango_req_version], [1.20]) m4_define([gi_req_version], [0.9.5]) m4_define([uprof_req_version], [0.3]) -m4_define([gtk_doc_req_version], [1.13]) +m4_define([gtk_doc_req_version], [1.15]) m4_define([xfixes_req_version], [3]) m4_define([xcomposite_req_version], [0.4]) @@ -736,7 +736,7 @@ AS_CASE([$enable_deprecated], [no], [ - CLUTTER_DEPRECATED_CFLAGS="-DG_DISABLE_DEPRECATED -DG_DISABLE_SINGLE_INCLUDES -DCOGL_DISABLE_DEPRECATED -DCLUTTER_DISABLE_DEPRECATED" + CLUTTER_DEPRECATED_CFLAGS="-DG_DISABLE_SINGLE_INCLUDES -DCOGL_DISABLE_DEPRECATED -DCLUTTER_DISABLE_DEPRECATED" ], [yes], diff --git a/po/POTFILES.in b/po/POTFILES.in index 5ee0ff7fc..3144e2500 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -6,6 +6,13 @@ clutter/clutter-alpha.c clutter/clutter-animation.c clutter/clutter-animator.c clutter/clutter-backend.c +clutter/deprecated/clutter-behaviour.c +clutter/deprecated/clutter-behaviour-depth.c +clutter/deprecated/clutter-behaviour-ellipse.c +clutter/deprecated/clutter-behaviour-opacity.c +clutter/deprecated/clutter-behaviour-path.c +clutter/deprecated/clutter-behaviour-rotate.c +clutter/deprecated/clutter-behaviour-scale.c clutter/clutter-bind-constraint.c clutter/clutter-binding-pool.c clutter/clutter-bin-layout.c @@ -24,6 +31,8 @@ clutter/clutter-device-manager.c clutter/clutter-drag-action.c clutter/clutter-drop-action.c clutter/clutter-event.c +clutter/deprecated/clutter-fixed.c +clutter/deprecated/clutter-fixed.h clutter/clutter-flow-layout.c clutter/clutter-gesture-action.c clutter/clutter-input-device.c @@ -36,6 +45,7 @@ clutter/clutter-path-constraint.c clutter/clutter-rectangle.c clutter/clutter-script.c clutter/clutter-settings.c +clutter/deprecated/clutter-shader.c clutter/clutter-shader-effect.c clutter/clutter-shader-types.c clutter/clutter-snap-constraint.c diff --git a/po/gl.po b/po/gl.po index e1f086d34..a543d0077 100644 --- a/po/gl.po +++ b/po/gl.po @@ -2,805 +2,821 @@ # This file is distributed under the same license as the PACKAGE package. # # Fran Diéguez , 2011. +# Fran Dieguez , 2011. +# msgid "" msgstr "" "Project-Id-Version: clutter\n" "Report-Msgid-Bugs-To: http://bugzilla.clutter-project.org/enter_bug.cgi?" "product=clutter\n" -"POT-Creation-Date: 2011-09-12 13:51+0100\n" -"PO-Revision-Date: 2011-09-04 18:18+0200\n" -"Last-Translator: \n" -"Language-Team: Galician \n" +"POT-Creation-Date: 2011-10-15 15:21+0200\n" +"PO-Revision-Date: 2011-10-15 15:23+0200\n" +"Last-Translator: Fran Dieguez \n" +"Language-Team: Galician \n" "Language: gl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2011-05-12 10:24+0000\n" "X-Generator: Lokalize 1.2\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=(n!=1);\n" -#: clutter/clutter-actor.c:3852 +#: ../clutter/clutter-actor.c:3877 msgid "X coordinate" msgstr "Coordenada X" -#: clutter/clutter-actor.c:3853 +#: ../clutter/clutter-actor.c:3878 msgid "X coordinate of the actor" msgstr "Coordenada X do actor" -#: clutter/clutter-actor.c:3868 +#: ../clutter/clutter-actor.c:3893 msgid "Y coordinate" msgstr "Coordenada Y" -#: clutter/clutter-actor.c:3869 +#: ../clutter/clutter-actor.c:3894 msgid "Y coordinate of the actor" msgstr "Coordenada Y do actor" -#: clutter/clutter-actor.c:3884 clutter/clutter-behaviour-ellipse.c:477 +#: ../clutter/clutter-actor.c:3909 +#: ../clutter/deprecated/clutter-behaviour-ellipse.c:479 msgid "Width" msgstr "Largura" -#: clutter/clutter-actor.c:3885 +#: ../clutter/clutter-actor.c:3910 msgid "Width of the actor" msgstr "Largura do actor" -#: clutter/clutter-actor.c:3899 clutter/clutter-behaviour-ellipse.c:493 +#: ../clutter/clutter-actor.c:3924 +#: ../clutter/deprecated/clutter-behaviour-ellipse.c:495 msgid "Height" msgstr "Altura" -#: clutter/clutter-actor.c:3900 +#: ../clutter/clutter-actor.c:3925 msgid "Height of the actor" msgstr "Altura do actor" -#: clutter/clutter-actor.c:3918 +#: ../clutter/clutter-actor.c:3943 msgid "Fixed X" msgstr "X fixa" -#: clutter/clutter-actor.c:3919 +#: ../clutter/clutter-actor.c:3944 msgid "Forced X position of the actor" msgstr "Posición X forzada do actor" -#: clutter/clutter-actor.c:3937 +#: ../clutter/clutter-actor.c:3962 msgid "Fixed Y" msgstr "Y fixa" -#: clutter/clutter-actor.c:3938 +#: ../clutter/clutter-actor.c:3963 msgid "Forced Y position of the actor" msgstr "Posición Y forzada do actor" -#: clutter/clutter-actor.c:3954 +#: ../clutter/clutter-actor.c:3979 msgid "Fixed position set" msgstr "Estabelecer a posición fixa" -#: clutter/clutter-actor.c:3955 +#: ../clutter/clutter-actor.c:3980 msgid "Whether to use fixed positioning for the actor" msgstr "Cando se emprega o posicionamento fixo do actor" -#: clutter/clutter-actor.c:3977 +#: ../clutter/clutter-actor.c:4002 msgid "Min Width" msgstr "Largura mínima" -#: clutter/clutter-actor.c:3978 +#: ../clutter/clutter-actor.c:4003 msgid "Forced minimum width request for the actor" msgstr "Forzar a largura mínima requirida para o actor" -#: clutter/clutter-actor.c:3997 +#: ../clutter/clutter-actor.c:4022 msgid "Min Height" msgstr "Altura mínima" -#: clutter/clutter-actor.c:3998 +#: ../clutter/clutter-actor.c:4023 msgid "Forced minimum height request for the actor" msgstr "Forzar a altura mínima requirida para o actor" -#: clutter/clutter-actor.c:4017 +#: ../clutter/clutter-actor.c:4042 msgid "Natural Width" msgstr "Largura natural" -#: clutter/clutter-actor.c:4018 +#: ../clutter/clutter-actor.c:4043 msgid "Forced natural width request for the actor" msgstr "Forzar a largura natural requirida para o actor" -#: clutter/clutter-actor.c:4037 +#: ../clutter/clutter-actor.c:4062 msgid "Natural Height" msgstr "Altura natural" -#: clutter/clutter-actor.c:4038 +#: ../clutter/clutter-actor.c:4063 msgid "Forced natural height request for the actor" msgstr "Forzar a altura natural requirida para o actor" -#: clutter/clutter-actor.c:4054 +#: ../clutter/clutter-actor.c:4079 msgid "Minimum width set" msgstr "Estabelecer a largura mínima" -#: clutter/clutter-actor.c:4055 +#: ../clutter/clutter-actor.c:4080 msgid "Whether to use the min-width property" msgstr "Cando se emprega a propiedade de largura mínima" -#: clutter/clutter-actor.c:4070 +#: ../clutter/clutter-actor.c:4095 msgid "Minimum height set" msgstr "Estabelecer a altura mínima" -#: clutter/clutter-actor.c:4071 +#: ../clutter/clutter-actor.c:4096 msgid "Whether to use the min-height property" msgstr "Cando se emprega a propiedade de altura mínima" -#: clutter/clutter-actor.c:4086 +#: ../clutter/clutter-actor.c:4111 msgid "Natural width set" msgstr "Estabelecer a largura natural" -#: clutter/clutter-actor.c:4087 +#: ../clutter/clutter-actor.c:4112 msgid "Whether to use the natural-width property" msgstr "Cando se emprega a propiedade de largura natural" -#: clutter/clutter-actor.c:4104 +#: ../clutter/clutter-actor.c:4129 msgid "Natural height set" msgstr "Estabelecer a altura natural" -#: clutter/clutter-actor.c:4105 +#: ../clutter/clutter-actor.c:4130 msgid "Whether to use the natural-height property" msgstr "Cando se emprega a propiedade de altura natural" -#: clutter/clutter-actor.c:4124 +#: ../clutter/clutter-actor.c:4149 msgid "Allocation" msgstr "Asignación" -#: clutter/clutter-actor.c:4125 +#: ../clutter/clutter-actor.c:4150 msgid "The actor's allocation" msgstr "Asignación do actor" -#: clutter/clutter-actor.c:4181 +#: ../clutter/clutter-actor.c:4206 msgid "Request Mode" msgstr "Modo requirido" -#: clutter/clutter-actor.c:4182 +#: ../clutter/clutter-actor.c:4207 msgid "The actor's request mode" msgstr "Modo de requirimento do actor" -#: clutter/clutter-actor.c:4197 +#: ../clutter/clutter-actor.c:4222 msgid "Depth" msgstr "Profundidade" -#: clutter/clutter-actor.c:4198 +#: ../clutter/clutter-actor.c:4223 msgid "Position on the Z axis" msgstr "Posición no eixo Z" -#: clutter/clutter-actor.c:4212 +#: ../clutter/clutter-actor.c:4237 msgid "Opacity" msgstr "Opacidade" -#: clutter/clutter-actor.c:4213 +#: ../clutter/clutter-actor.c:4238 msgid "Opacity of an actor" msgstr "Opacidade dun actor" -#: clutter/clutter-actor.c:4232 +#: ../clutter/clutter-actor.c:4257 msgid "Offscreen redirect" msgstr "Redirección fóra da pantalal" -#: clutter/clutter-actor.c:4233 +#: ../clutter/clutter-actor.c:4258 msgid "Flags controlling when to flatten the actor into a single image" msgstr "Opcións que controlan se se debe aplanar o actor nunha única imaxe" -#: clutter/clutter-actor.c:4251 +#: ../clutter/clutter-actor.c:4276 msgid "Visible" msgstr "Visíbel" -#: clutter/clutter-actor.c:4252 +#: ../clutter/clutter-actor.c:4277 msgid "Whether the actor is visible or not" msgstr "Se o actor é visíbel ou non" -#: clutter/clutter-actor.c:4267 +#: ../clutter/clutter-actor.c:4292 msgid "Mapped" msgstr "Mapeamento" -#: clutter/clutter-actor.c:4268 +#: ../clutter/clutter-actor.c:4293 msgid "Whether the actor will be painted" msgstr "Cando o actor será pintado" -#: clutter/clutter-actor.c:4282 +#: ../clutter/clutter-actor.c:4307 msgid "Realized" msgstr "Decatado" -#: clutter/clutter-actor.c:4283 +#: ../clutter/clutter-actor.c:4308 msgid "Whether the actor has been realized" msgstr "Cando o actor se decata" -#: clutter/clutter-actor.c:4299 +#: ../clutter/clutter-actor.c:4324 msgid "Reactive" msgstr "Reactivo" -#: clutter/clutter-actor.c:4300 +#: ../clutter/clutter-actor.c:4325 msgid "Whether the actor is reactive to events" msgstr "Cando o actor reacciona a accións" -#: clutter/clutter-actor.c:4312 +#: ../clutter/clutter-actor.c:4337 msgid "Has Clip" msgstr "Ten recorte" -#: clutter/clutter-actor.c:4313 +#: ../clutter/clutter-actor.c:4338 msgid "Whether the actor has a clip set" msgstr "Cando o actor ten un conxunto de recorte" -#: clutter/clutter-actor.c:4328 +#: ../clutter/clutter-actor.c:4353 msgid "Clip" msgstr "Recorte" -#: clutter/clutter-actor.c:4329 +#: ../clutter/clutter-actor.c:4354 msgid "The clip region for the actor" msgstr "A rexión de recorte para o actor" -#: clutter/clutter-actor.c:4343 clutter/clutter-actor-meta.c:207 -#: clutter/clutter-binding-pool.c:319 clutter/clutter-input-device.c:236 +#: ../clutter/clutter-actor.c:4368 ../clutter/clutter-actor-meta.c:207 +#: ../clutter/clutter-binding-pool.c:319 ../clutter/clutter-input-device.c:236 msgid "Name" msgstr "Nome" -#: clutter/clutter-actor.c:4344 +#: ../clutter/clutter-actor.c:4369 msgid "Name of the actor" msgstr "Nome do actor" -#: clutter/clutter-actor.c:4358 +#: ../clutter/clutter-actor.c:4383 msgid "Scale X" msgstr "Escala X" -#: clutter/clutter-actor.c:4359 +#: ../clutter/clutter-actor.c:4384 msgid "Scale factor on the X axis" msgstr "Factor de escala para o eixo X" -#: clutter/clutter-actor.c:4374 +#: ../clutter/clutter-actor.c:4399 msgid "Scale Y" msgstr "Escala Y" -#: clutter/clutter-actor.c:4375 +#: ../clutter/clutter-actor.c:4400 msgid "Scale factor on the Y axis" msgstr "Factor de escala para o eixo Y" -#: clutter/clutter-actor.c:4390 +#: ../clutter/clutter-actor.c:4415 msgid "Scale Center X" msgstr "Centro da escala X" -#: clutter/clutter-actor.c:4391 +#: ../clutter/clutter-actor.c:4416 msgid "Horizontal scale center" msgstr "Centro na escala horizontal" -#: clutter/clutter-actor.c:4406 +#: ../clutter/clutter-actor.c:4431 msgid "Scale Center Y" msgstr "Centro da escala Y" -#: clutter/clutter-actor.c:4407 +#: ../clutter/clutter-actor.c:4432 msgid "Vertical scale center" msgstr "Centro na escala vertical" -#: clutter/clutter-actor.c:4422 +#: ../clutter/clutter-actor.c:4447 msgid "Scale Gravity" msgstr "Escala de gravidade" -#: clutter/clutter-actor.c:4423 +#: ../clutter/clutter-actor.c:4448 msgid "The center of scaling" msgstr "O centro da escala" -#: clutter/clutter-actor.c:4440 +#: ../clutter/clutter-actor.c:4465 msgid "Rotation Angle X" msgstr "Ángulo de rotación de X" -#: clutter/clutter-actor.c:4441 +#: ../clutter/clutter-actor.c:4466 msgid "The rotation angle on the X axis" msgstr "Ángulo de rotación do eixo X" -#: clutter/clutter-actor.c:4456 +#: ../clutter/clutter-actor.c:4481 msgid "Rotation Angle Y" msgstr "Ángulo de rotación Y" -#: clutter/clutter-actor.c:4457 +#: ../clutter/clutter-actor.c:4482 msgid "The rotation angle on the Y axis" msgstr "Ángulo de rotación do eixo Y" -#: clutter/clutter-actor.c:4472 +#: ../clutter/clutter-actor.c:4497 msgid "Rotation Angle Z" msgstr "Ángulo de rotación Z" -#: clutter/clutter-actor.c:4473 +#: ../clutter/clutter-actor.c:4498 msgid "The rotation angle on the Z axis" msgstr "Ángulo de rotación do eixo Z" -#: clutter/clutter-actor.c:4488 +#: ../clutter/clutter-actor.c:4513 msgid "Rotation Center X" msgstr "Centro de rotación X" -#: clutter/clutter-actor.c:4489 +#: ../clutter/clutter-actor.c:4514 msgid "The rotation center on the X axis" msgstr "O centro de rotación do eixo X" -#: clutter/clutter-actor.c:4505 +#: ../clutter/clutter-actor.c:4530 msgid "Rotation Center Y" msgstr "Centro de rotación Y" -#: clutter/clutter-actor.c:4506 +#: ../clutter/clutter-actor.c:4531 msgid "The rotation center on the Y axis" msgstr "O centro de rotación no eixo Y" -#: clutter/clutter-actor.c:4522 +#: ../clutter/clutter-actor.c:4547 msgid "Rotation Center Z" msgstr "Centro de rotación Z" -#: clutter/clutter-actor.c:4523 +#: ../clutter/clutter-actor.c:4548 msgid "The rotation center on the Z axis" msgstr "O centro de rotación no eixo Z" -#: clutter/clutter-actor.c:4539 +#: ../clutter/clutter-actor.c:4564 msgid "Rotation Center Z Gravity" msgstr "Gravidade do centro de rotación Z" -#: clutter/clutter-actor.c:4540 +#: ../clutter/clutter-actor.c:4565 msgid "Center point for rotation around the Z axis" msgstr "Punto central de rotación arredor do eixo Z" -#: clutter/clutter-actor.c:4558 +#: ../clutter/clutter-actor.c:4583 msgid "Anchor X" msgstr "Ancoraxe X" -#: clutter/clutter-actor.c:4559 +#: ../clutter/clutter-actor.c:4584 msgid "X coordinate of the anchor point" msgstr "Coordenada X do punto de ancoraxe" -#: clutter/clutter-actor.c:4575 +#: ../clutter/clutter-actor.c:4600 msgid "Anchor Y" msgstr "Ancoraxe Y" -#: clutter/clutter-actor.c:4576 +#: ../clutter/clutter-actor.c:4601 msgid "Y coordinate of the anchor point" msgstr "Coordenada Y do punto de ancoraxe" -#: clutter/clutter-actor.c:4591 +#: ../clutter/clutter-actor.c:4616 msgid "Anchor Gravity" msgstr "Gravidade do ancoraxe" -#: clutter/clutter-actor.c:4592 +#: ../clutter/clutter-actor.c:4617 msgid "The anchor point as a ClutterGravity" msgstr "O punto de ancoraxe como ClutterGravity" -#: clutter/clutter-actor.c:4611 +#: ../clutter/clutter-actor.c:4636 msgid "Show on set parent" msgstr "Mostrar no pai do conxunto" -#: clutter/clutter-actor.c:4612 +#: ../clutter/clutter-actor.c:4637 msgid "Whether the actor is shown when parented" msgstr "Especifica se o actor se mostra ao seren desenvolvido polo pai" -#: clutter/clutter-actor.c:4632 +#: ../clutter/clutter-actor.c:4657 msgid "Clip to Allocation" msgstr "Fragmento de asignación" -#: clutter/clutter-actor.c:4633 +#: ../clutter/clutter-actor.c:4658 msgid "Sets the clip region to track the actor's allocation" msgstr "Estabelece a rexión de recorte para rastrexar a asignación do actor" -#: clutter/clutter-actor.c:4643 +#: ../clutter/clutter-actor.c:4668 msgid "Text Direction" msgstr "Dirección do texto" -#: clutter/clutter-actor.c:4644 +#: ../clutter/clutter-actor.c:4669 msgid "Direction of the text" msgstr "A dirección do texto" -#: clutter/clutter-actor.c:4662 +#: ../clutter/clutter-actor.c:4687 msgid "Has Pointer" msgstr "Ten punteiro" -#: clutter/clutter-actor.c:4663 +#: ../clutter/clutter-actor.c:4688 msgid "Whether the actor contains the pointer of an input device" msgstr "Cando o actor ten un punteiro dun dispositivo de entrada" -#: clutter/clutter-actor.c:4680 +#: ../clutter/clutter-actor.c:4705 msgid "Actions" msgstr "Accións" -#: clutter/clutter-actor.c:4681 +#: ../clutter/clutter-actor.c:4706 msgid "Adds an action to the actor" msgstr "Engade unha acción ao actor" -#: clutter/clutter-actor.c:4695 +#: ../clutter/clutter-actor.c:4720 msgid "Constraints" msgstr "Restricións" -#: clutter/clutter-actor.c:4696 +#: ../clutter/clutter-actor.c:4721 msgid "Adds a constraint to the actor" msgstr "Engade unha restrición ao actor" -#: clutter/clutter-actor-meta.c:193 clutter/clutter-child-meta.c:142 +#: ../clutter/clutter-actor.c:4735 +msgid "Effect" +msgstr "Efecto" + +#: ../clutter/clutter-actor.c:4736 +msgid "Add an effect to be applied on the actor" +msgstr "Engade un efecto para aplicato no actor" + +#: ../clutter/clutter-actor-meta.c:193 ../clutter/clutter-child-meta.c:142 msgid "Actor" msgstr "Actor" -#: clutter/clutter-actor-meta.c:194 +#: ../clutter/clutter-actor-meta.c:194 msgid "The actor attached to the meta" msgstr "O actor axuntado ao destino" -#: clutter/clutter-actor-meta.c:208 +#: ../clutter/clutter-actor-meta.c:208 msgid "The name of the meta" msgstr "O nome do destino" -#: clutter/clutter-actor-meta.c:221 clutter/clutter-input-device.c:315 -#: clutter/clutter-shader.c:307 +#: ../clutter/clutter-actor-meta.c:221 ../clutter/clutter-input-device.c:315 +#: ../clutter/deprecated/clutter-shader.c:309 msgid "Enabled" msgstr "Activado" -#: clutter/clutter-actor-meta.c:222 +#: ../clutter/clutter-actor-meta.c:222 msgid "Whether the meta is enabled" msgstr "Cando o destino está activado" -#: clutter/clutter-align-constraint.c:270 -#: clutter/clutter-bind-constraint.c:349 clutter/clutter-clone.c:340 -#: clutter/clutter-snap-constraint.c:321 +#: ../clutter/clutter-align-constraint.c:270 +#: ../clutter/clutter-bind-constraint.c:349 ../clutter/clutter-clone.c:340 +#: ../clutter/clutter-snap-constraint.c:321 msgid "Source" msgstr "Orixe" -#: clutter/clutter-align-constraint.c:271 +#: ../clutter/clutter-align-constraint.c:271 msgid "The source of the alignment" msgstr "A orixe do aliñamento" -#: clutter/clutter-align-constraint.c:284 +#: ../clutter/clutter-align-constraint.c:284 msgid "Align Axis" msgstr "Aliñar o eixo" -#: clutter/clutter-align-constraint.c:285 +#: ../clutter/clutter-align-constraint.c:285 msgid "The axis to align the position to" msgstr "Os eixos para aliñar a posición de" -#: clutter/clutter-align-constraint.c:304 -#: clutter/clutter-desaturate-effect.c:304 +#: ../clutter/clutter-align-constraint.c:304 +#: ../clutter/clutter-desaturate-effect.c:304 msgid "Factor" msgstr "Factor" -#: clutter/clutter-align-constraint.c:305 +#: ../clutter/clutter-align-constraint.c:305 msgid "The alignment factor, between 0.0 and 1.0" msgstr "Factor de aliñamento, entre 0,0 e 1,0" -#: clutter/clutter-alpha.c:345 clutter/clutter-animation.c:538 -#: clutter/clutter-animator.c:1802 +#: ../clutter/clutter-alpha.c:345 ../clutter/clutter-animation.c:538 +#: ../clutter/clutter-animator.c:1802 msgid "Timeline" msgstr "Liña de tempo" -#: clutter/clutter-alpha.c:346 +#: ../clutter/clutter-alpha.c:346 msgid "Timeline used by the alpha" msgstr "Liña de tempo usada pola alfa" -#: clutter/clutter-alpha.c:361 +#: ../clutter/clutter-alpha.c:361 msgid "Alpha value" msgstr "Valor alfa" -#: clutter/clutter-alpha.c:362 +#: ../clutter/clutter-alpha.c:362 msgid "Alpha value as computed by the alpha" msgstr "Valor alfa calculado para a alfa" -#: clutter/clutter-alpha.c:382 clutter/clutter-animation.c:494 +#: ../clutter/clutter-alpha.c:382 ../clutter/clutter-animation.c:494 msgid "Mode" msgstr "Modo" -#: clutter/clutter-alpha.c:383 +#: ../clutter/clutter-alpha.c:383 msgid "Progress mode" msgstr "Modo de progreso" -#: clutter/clutter-animation.c:478 +#: ../clutter/clutter-animation.c:478 msgid "Object" msgstr "Obxecto" -#: clutter/clutter-animation.c:479 +#: ../clutter/clutter-animation.c:479 msgid "Object to which the animation applies" msgstr "Obxecto ao que se aplica a animación" -#: clutter/clutter-animation.c:495 +#: ../clutter/clutter-animation.c:495 msgid "The mode of the animation" msgstr "O modo de animación" -#: clutter/clutter-animation.c:509 clutter/clutter-animator.c:1786 -#: clutter/clutter-media.c:194 clutter/clutter-state.c:1486 -#: clutter/clutter-timeline.c:294 +#: ../clutter/clutter-animation.c:509 ../clutter/clutter-animator.c:1786 +#: ../clutter/clutter-media.c:194 ../clutter/clutter-state.c:1486 +#: ../clutter/clutter-timeline.c:294 msgid "Duration" msgstr "Duración" -#: clutter/clutter-animation.c:510 +#: ../clutter/clutter-animation.c:510 msgid "Duration of the animation, in milliseconds" msgstr "Duración da animación en milisegundos" -#: clutter/clutter-animation.c:524 clutter/clutter-timeline.c:263 +#: ../clutter/clutter-animation.c:524 ../clutter/clutter-timeline.c:263 msgid "Loop" msgstr "Bucle" -#: clutter/clutter-animation.c:525 +#: ../clutter/clutter-animation.c:525 msgid "Whether the animation should loop" msgstr "Cando a animación debe ser un bucle" -#: clutter/clutter-animation.c:539 +#: ../clutter/clutter-animation.c:539 msgid "The timeline used by the animation" msgstr "Liña de tempo empregada pola animación" -#: clutter/clutter-animation.c:552 clutter/clutter-behaviour.c:304 +#: ../clutter/clutter-animation.c:552 +#: ../clutter/deprecated/clutter-behaviour.c:240 msgid "Alpha" msgstr "Alfa" -#: clutter/clutter-animation.c:553 +#: ../clutter/clutter-animation.c:553 msgid "The alpha used by the animation" msgstr "Alfa usada pola animación" -#: clutter/clutter-animator.c:1787 +#: ../clutter/clutter-animator.c:1787 msgid "The duration of the animation" msgstr "A duración da animación" -#: clutter/clutter-animator.c:1803 +#: ../clutter/clutter-animator.c:1803 msgid "The timeline of the animation" msgstr "Liña de tempo da animación" -#: clutter/clutter-behaviour.c:305 +#: ../clutter/deprecated/clutter-behaviour.c:241 msgid "Alpha Object to drive the behaviour" msgstr "Obxecto alfa para guiar o comportamento" -#: clutter/clutter-behaviour-depth.c:178 +#: ../clutter/deprecated/clutter-behaviour-depth.c:180 msgid "Start Depth" msgstr "Profundidade de inicio" -#: clutter/clutter-behaviour-depth.c:179 +#: ../clutter/deprecated/clutter-behaviour-depth.c:181 msgid "Initial depth to apply" msgstr "Profundidade inicial a aplicar" -#: clutter/clutter-behaviour-depth.c:194 +#: ../clutter/deprecated/clutter-behaviour-depth.c:196 msgid "End Depth" msgstr "Profundidade de remate" -#: clutter/clutter-behaviour-depth.c:195 +#: ../clutter/deprecated/clutter-behaviour-depth.c:197 msgid "Final depth to apply" msgstr "Profundidade final a aplicar" -#: clutter/clutter-behaviour-ellipse.c:397 +#: ../clutter/deprecated/clutter-behaviour-ellipse.c:399 msgid "Start Angle" msgstr "Ángulo de inicio" -#: clutter/clutter-behaviour-ellipse.c:398 -#: clutter/clutter-behaviour-rotate.c:280 +#: ../clutter/deprecated/clutter-behaviour-ellipse.c:400 +#: ../clutter/deprecated/clutter-behaviour-rotate.c:282 msgid "Initial angle" msgstr "Ángulo inicial" -#: clutter/clutter-behaviour-ellipse.c:413 +#: ../clutter/deprecated/clutter-behaviour-ellipse.c:415 msgid "End Angle" msgstr "Ángulo de remate" -#: clutter/clutter-behaviour-ellipse.c:414 -#: clutter/clutter-behaviour-rotate.c:298 +#: ../clutter/deprecated/clutter-behaviour-ellipse.c:416 +#: ../clutter/deprecated/clutter-behaviour-rotate.c:300 msgid "Final angle" msgstr "Ángulo final" -#: clutter/clutter-behaviour-ellipse.c:429 +#: ../clutter/deprecated/clutter-behaviour-ellipse.c:431 msgid "Angle x tilt" msgstr "Ángulo de inclinación X" -#: clutter/clutter-behaviour-ellipse.c:430 +#: ../clutter/deprecated/clutter-behaviour-ellipse.c:432 msgid "Tilt of the ellipse around x axis" msgstr "Inclinación da elipse arredor do eixo X" -#: clutter/clutter-behaviour-ellipse.c:445 +#: ../clutter/deprecated/clutter-behaviour-ellipse.c:447 msgid "Angle y tilt" msgstr "Ángulo de inclinación Y" -#: clutter/clutter-behaviour-ellipse.c:446 +#: ../clutter/deprecated/clutter-behaviour-ellipse.c:448 msgid "Tilt of the ellipse around y axis" msgstr "Inclinación da elipse arredor do eixo Y" -#: clutter/clutter-behaviour-ellipse.c:461 +#: ../clutter/deprecated/clutter-behaviour-ellipse.c:463 msgid "Angle z tilt" msgstr "Ángulo de inclinación Z" -#: clutter/clutter-behaviour-ellipse.c:462 +#: ../clutter/deprecated/clutter-behaviour-ellipse.c:464 msgid "Tilt of the ellipse around z axis" msgstr "Inclinación da elipse arredor do eixo Z" -#: clutter/clutter-behaviour-ellipse.c:478 +#: ../clutter/deprecated/clutter-behaviour-ellipse.c:480 msgid "Width of the ellipse" msgstr "Largo da elipse" -#: clutter/clutter-behaviour-ellipse.c:494 +#: ../clutter/deprecated/clutter-behaviour-ellipse.c:496 msgid "Height of ellipse" msgstr "Altura da elipse" -#: clutter/clutter-behaviour-ellipse.c:509 +#: ../clutter/deprecated/clutter-behaviour-ellipse.c:511 msgid "Center" msgstr "Centro" -#: clutter/clutter-behaviour-ellipse.c:510 +#: ../clutter/deprecated/clutter-behaviour-ellipse.c:512 msgid "Center of ellipse" msgstr "Centro da elipse" -#: clutter/clutter-behaviour-ellipse.c:524 -#: clutter/clutter-behaviour-rotate.c:333 clutter/clutter-timeline.c:310 +#: ../clutter/deprecated/clutter-behaviour-ellipse.c:526 +#: ../clutter/deprecated/clutter-behaviour-rotate.c:335 +#: ../clutter/clutter-timeline.c:310 msgid "Direction" msgstr "Dirección" -#: clutter/clutter-behaviour-ellipse.c:525 -#: clutter/clutter-behaviour-rotate.c:334 +#: ../clutter/deprecated/clutter-behaviour-ellipse.c:527 +#: ../clutter/deprecated/clutter-behaviour-rotate.c:336 msgid "Direction of rotation" msgstr "Dirección da rotación" -#: clutter/clutter-behaviour-opacity.c:181 +#: ../clutter/deprecated/clutter-behaviour-opacity.c:183 msgid "Opacity Start" msgstr "Opacidade de inicio" -#: clutter/clutter-behaviour-opacity.c:182 +#: ../clutter/deprecated/clutter-behaviour-opacity.c:184 msgid "Initial opacity level" msgstr "Nivel inicial de opacidade" -#: clutter/clutter-behaviour-opacity.c:199 +#: ../clutter/deprecated/clutter-behaviour-opacity.c:201 msgid "Opacity End" msgstr "Opacidade de remate" -#: clutter/clutter-behaviour-opacity.c:200 +#: ../clutter/deprecated/clutter-behaviour-opacity.c:202 msgid "Final opacity level" msgstr "Nivel final de opacidade" -#: clutter/clutter-behaviour-path.c:222 clutter/clutter-path-constraint.c:212 +#: ../clutter/deprecated/clutter-behaviour-path.c:224 +#: ../clutter/clutter-path-constraint.c:212 msgid "Path" msgstr "Ruta" -#: clutter/clutter-behaviour-path.c:223 +#: ../clutter/deprecated/clutter-behaviour-path.c:225 msgid "The ClutterPath object representing the path to animate along" msgstr "O obxecto ClutterPath representa a ruta ao longo da animación" -#: clutter/clutter-behaviour-rotate.c:279 +#: ../clutter/deprecated/clutter-behaviour-rotate.c:281 msgid "Angle Begin" msgstr "Ángulo inicial" -#: clutter/clutter-behaviour-rotate.c:297 +#: ../clutter/deprecated/clutter-behaviour-rotate.c:299 msgid "Angle End" msgstr "Ángulo de remate" -#: clutter/clutter-behaviour-rotate.c:315 +#: ../clutter/deprecated/clutter-behaviour-rotate.c:317 msgid "Axis" msgstr "Eixo" -#: clutter/clutter-behaviour-rotate.c:316 +#: ../clutter/deprecated/clutter-behaviour-rotate.c:318 msgid "Axis of rotation" msgstr "Eixo de rotación" -#: clutter/clutter-behaviour-rotate.c:351 +#: ../clutter/deprecated/clutter-behaviour-rotate.c:353 msgid "Center X" msgstr "Centro X" -#: clutter/clutter-behaviour-rotate.c:352 +#: ../clutter/deprecated/clutter-behaviour-rotate.c:354 msgid "X coordinate of the center of rotation" msgstr "Coordenada X do centro de rotación" -#: clutter/clutter-behaviour-rotate.c:369 +#: ../clutter/deprecated/clutter-behaviour-rotate.c:371 msgid "Center Y" msgstr "Centro Y" -#: clutter/clutter-behaviour-rotate.c:370 +#: ../clutter/deprecated/clutter-behaviour-rotate.c:372 msgid "Y coordinate of the center of rotation" msgstr "Coordenada Y do centro de rotación" -#: clutter/clutter-behaviour-rotate.c:387 +#: ../clutter/deprecated/clutter-behaviour-rotate.c:389 msgid "Center Z" msgstr "Centro Z" -#: clutter/clutter-behaviour-rotate.c:388 +#: ../clutter/deprecated/clutter-behaviour-rotate.c:390 msgid "Z coordinate of the center of rotation" msgstr "Coordenada Z do centro de rotación" -#: clutter/clutter-behaviour-scale.c:222 +#: ../clutter/deprecated/clutter-behaviour-scale.c:224 msgid "X Start Scale" msgstr "Escala X de inicio" -#: clutter/clutter-behaviour-scale.c:223 +#: ../clutter/deprecated/clutter-behaviour-scale.c:225 msgid "Initial scale on the X axis" msgstr "Escala inicial no eixo X" -#: clutter/clutter-behaviour-scale.c:241 +#: ../clutter/deprecated/clutter-behaviour-scale.c:243 msgid "X End Scale" msgstr "Escala X de remate" -#: clutter/clutter-behaviour-scale.c:242 +#: ../clutter/deprecated/clutter-behaviour-scale.c:244 msgid "Final scale on the X axis" msgstr "Escala final no eixo X" -#: clutter/clutter-behaviour-scale.c:260 +#: ../clutter/deprecated/clutter-behaviour-scale.c:262 msgid "Y Start Scale" msgstr "Escala Y de inicio" -#: clutter/clutter-behaviour-scale.c:261 +#: ../clutter/deprecated/clutter-behaviour-scale.c:263 msgid "Initial scale on the Y axis" msgstr "Escala inicial no eixo Y" -#: clutter/clutter-behaviour-scale.c:279 +#: ../clutter/deprecated/clutter-behaviour-scale.c:281 msgid "Y End Scale" msgstr "Escala Y de remate" -#: clutter/clutter-behaviour-scale.c:280 +#: ../clutter/deprecated/clutter-behaviour-scale.c:282 msgid "Final scale on the Y axis" msgstr "Escala final no eixo Y" -#: clutter/clutter-bind-constraint.c:350 +#: ../clutter/clutter-bind-constraint.c:350 msgid "The source of the binding" msgstr "A orixe da ligazón" -#: clutter/clutter-bind-constraint.c:363 +#: ../clutter/clutter-bind-constraint.c:363 msgid "Coordinate" msgstr "Coordenada" -#: clutter/clutter-bind-constraint.c:364 +#: ../clutter/clutter-bind-constraint.c:364 msgid "The coordinate to bind" msgstr "A coordenada que ligar" -#: clutter/clutter-bind-constraint.c:378 clutter/clutter-path-constraint.c:226 -#: clutter/clutter-snap-constraint.c:366 +#: ../clutter/clutter-bind-constraint.c:378 +#: ../clutter/clutter-path-constraint.c:226 +#: ../clutter/clutter-snap-constraint.c:366 msgid "Offset" msgstr "Desprazamento" -#: clutter/clutter-bind-constraint.c:379 +#: ../clutter/clutter-bind-constraint.c:379 msgid "The offset in pixels to apply to the binding" msgstr "O desprazamento en píxeles que aplicar á ligazón" -#: clutter/clutter-binding-pool.c:320 +#: ../clutter/clutter-binding-pool.c:320 msgid "The unique name of the binding pool" msgstr "O nome único da ligazón da agrupación" -#: clutter/clutter-bin-layout.c:261 clutter/clutter-bin-layout.c:585 -#: clutter/clutter-box-layout.c:395 clutter/clutter-table-layout.c:652 +#: ../clutter/clutter-bin-layout.c:261 ../clutter/clutter-bin-layout.c:585 +#: ../clutter/clutter-box-layout.c:395 ../clutter/clutter-table-layout.c:652 msgid "Horizontal Alignment" msgstr "Aliñamento horizontal" -#: clutter/clutter-bin-layout.c:262 +#: ../clutter/clutter-bin-layout.c:262 msgid "Horizontal alignment for the actor inside the layout manager" msgstr "Aliñamento horizontal do actor no xestor de deseño" -#: clutter/clutter-bin-layout.c:270 clutter/clutter-bin-layout.c:602 -#: clutter/clutter-box-layout.c:404 clutter/clutter-table-layout.c:667 +#: ../clutter/clutter-bin-layout.c:270 ../clutter/clutter-bin-layout.c:602 +#: ../clutter/clutter-box-layout.c:404 ../clutter/clutter-table-layout.c:667 msgid "Vertical Alignment" msgstr "Aliñamento vertical" -#: clutter/clutter-bin-layout.c:271 +#: ../clutter/clutter-bin-layout.c:271 msgid "Vertical alignment for the actor inside the layout manager" msgstr "Aliñamento vertical do actor no xestor de deseño" -#: clutter/clutter-bin-layout.c:586 +#: ../clutter/clutter-bin-layout.c:586 msgid "Default horizontal alignment for the actors inside the layout manager" msgstr "" "Aliñamento horizontal predeterminado para os actores no xestor de deseño" -#: clutter/clutter-bin-layout.c:603 +#: ../clutter/clutter-bin-layout.c:603 msgid "Default vertical alignment for the actors inside the layout manager" msgstr "Aliñamento vertical predeterminado para os actores no xestor de deseño" -#: clutter/clutter-box.c:544 +#: ../clutter/clutter-box.c:544 msgid "Layout Manager" msgstr "Xestor de deseño" -#: clutter/clutter-box.c:545 +#: ../clutter/clutter-box.c:545 msgid "The layout manager used by the box" msgstr "O xestor de deseño empregado pola caixa" -#: clutter/clutter-box.c:564 clutter/clutter-rectangle.c:267 -#: clutter/clutter-stage.c:1765 +#: ../clutter/clutter-box.c:564 ../clutter/clutter-rectangle.c:267 +#: ../clutter/clutter-stage.c:1790 msgid "Color" msgstr "Cor" -#: clutter/clutter-box.c:565 +#: ../clutter/clutter-box.c:565 msgid "The background color of the box" msgstr "Color de fondo da caixa" -#: clutter/clutter-box.c:579 +#: ../clutter/clutter-box.c:579 msgid "Color Set" msgstr "Estabelecer a cor" -#: clutter/clutter-box.c:580 +#: ../clutter/clutter-box.c:580 msgid "Whether the background color is set" msgstr "Cando se estabelece a cor de fondo" -#: clutter/clutter-box-layout.c:370 +#: ../clutter/clutter-box-layout.c:370 msgid "Expand" msgstr "Expandir" -#: clutter/clutter-box-layout.c:371 +#: ../clutter/clutter-box-layout.c:371 msgid "Allocate extra space for the child" msgstr "Asignar espazo extra para o fillo" -#: clutter/clutter-box-layout.c:377 clutter/clutter-table-layout.c:631 +#: ../clutter/clutter-box-layout.c:377 ../clutter/clutter-table-layout.c:631 msgid "Horizontal Fill" msgstr "Recheo horizontal" -#: clutter/clutter-box-layout.c:378 clutter/clutter-table-layout.c:632 +#: ../clutter/clutter-box-layout.c:378 ../clutter/clutter-table-layout.c:632 msgid "" "Whether the child should receive priority when the container is allocating " "spare space on the horizontal axis" @@ -808,11 +824,11 @@ msgstr "" "Se o fillo debe recibir prioridade cando o contedor está asignado ao espazo " "libre no eixo horizontal" -#: clutter/clutter-box-layout.c:386 clutter/clutter-table-layout.c:638 +#: ../clutter/clutter-box-layout.c:386 ../clutter/clutter-table-layout.c:638 msgid "Vertical Fill" msgstr "Recheo vertical" -#: clutter/clutter-box-layout.c:387 clutter/clutter-table-layout.c:639 +#: ../clutter/clutter-box-layout.c:387 ../clutter/clutter-table-layout.c:639 msgid "" "Whether the child should receive priority when the container is allocating " "spare space on the vertical axis" @@ -820,576 +836,584 @@ msgstr "" "Se o fillo debe recibir prioridade cando o contedor está asignado ao espazo " "libre no eixo vertical" -#: clutter/clutter-box-layout.c:396 clutter/clutter-table-layout.c:653 +#: ../clutter/clutter-box-layout.c:396 ../clutter/clutter-table-layout.c:653 msgid "Horizontal alignment of the actor within the cell" msgstr "Aliñamento horizontal do actor dentro da cela" -#: clutter/clutter-box-layout.c:405 clutter/clutter-table-layout.c:668 +#: ../clutter/clutter-box-layout.c:405 ../clutter/clutter-table-layout.c:668 msgid "Vertical alignment of the actor within the cell" msgstr "Aliñamento vertical do actor dentro da cela" -#: clutter/clutter-box-layout.c:1305 +#: ../clutter/clutter-box-layout.c:1303 msgid "Vertical" msgstr "Vertical" -#: clutter/clutter-box-layout.c:1306 +#: ../clutter/clutter-box-layout.c:1304 msgid "Whether the layout should be vertical, rather than horizontal" msgstr "Cando o deseño debe ser vertical ou quizais horizontal" -#: clutter/clutter-box-layout.c:1321 clutter/clutter-flow-layout.c:901 +#: ../clutter/clutter-box-layout.c:1319 ../clutter/clutter-flow-layout.c:901 msgid "Homogeneous" msgstr "Homoxéneo" -#: clutter/clutter-box-layout.c:1322 +#: ../clutter/clutter-box-layout.c:1320 msgid "" "Whether the layout should be homogeneous, i.e. all childs get the same size" msgstr "" "Cando o deseño debe ser homoxéneo, p.ex. todos os fillos deben obter o mesmo " "tamaño" -#: clutter/clutter-box-layout.c:1337 +#: ../clutter/clutter-box-layout.c:1335 msgid "Pack Start" msgstr "Agrupamento inicial" -#: clutter/clutter-box-layout.c:1338 +#: ../clutter/clutter-box-layout.c:1336 msgid "Whether to pack items at the start of the box" msgstr "Cando se agrupan os elementos no inicio da caixa" -#: clutter/clutter-box-layout.c:1351 +#: ../clutter/clutter-box-layout.c:1349 msgid "Spacing" msgstr "Espazado" -#: clutter/clutter-box-layout.c:1352 +#: ../clutter/clutter-box-layout.c:1350 msgid "Spacing between children" msgstr "Espazamento entre os fillos" -#: clutter/clutter-box-layout.c:1366 clutter/clutter-table-layout.c:1742 +#: ../clutter/clutter-box-layout.c:1364 ../clutter/clutter-table-layout.c:1742 msgid "Use Animations" msgstr "Usar animacións" -#: clutter/clutter-box-layout.c:1367 clutter/clutter-table-layout.c:1743 +#: ../clutter/clutter-box-layout.c:1365 ../clutter/clutter-table-layout.c:1743 msgid "Whether layout changes should be animated" msgstr "Cando os cambios no deseño deben ser animados" -#: clutter/clutter-box-layout.c:1388 clutter/clutter-table-layout.c:1764 +#: ../clutter/clutter-box-layout.c:1386 ../clutter/clutter-table-layout.c:1764 msgid "Easing Mode" msgstr "Modo relaxado" -#: clutter/clutter-box-layout.c:1389 clutter/clutter-table-layout.c:1765 +#: ../clutter/clutter-box-layout.c:1387 ../clutter/clutter-table-layout.c:1765 msgid "The easing mode of the animations" msgstr "O modo relaxado nas animacións" -#: clutter/clutter-box-layout.c:1406 clutter/clutter-table-layout.c:1782 +#: ../clutter/clutter-box-layout.c:1404 ../clutter/clutter-table-layout.c:1782 msgid "Easing Duration" msgstr "Duración do relaxamento" -#: clutter/clutter-box-layout.c:1407 clutter/clutter-table-layout.c:1783 +#: ../clutter/clutter-box-layout.c:1405 ../clutter/clutter-table-layout.c:1783 msgid "The duration of the animations" msgstr "A duración das animacións" -#: clutter/clutter-cairo-texture.c:582 +#: ../clutter/clutter-cairo-texture.c:582 msgid "Surface Width" msgstr "Largura da superficie" -#: clutter/clutter-cairo-texture.c:583 +#: ../clutter/clutter-cairo-texture.c:583 msgid "The width of the Cairo surface" msgstr "A largura da superficie de Cairo" -#: clutter/clutter-cairo-texture.c:597 +#: ../clutter/clutter-cairo-texture.c:597 msgid "Surface Height" msgstr "Altura da superficie" -#: clutter/clutter-cairo-texture.c:598 +#: ../clutter/clutter-cairo-texture.c:598 msgid "The height of the Cairo surface" msgstr "A altura da superficie de Cairo" -#: clutter/clutter-cairo-texture.c:615 +#: ../clutter/clutter-cairo-texture.c:615 msgid "Auto Resize" msgstr "Redimensionar automaticamente" -#: clutter/clutter-cairo-texture.c:616 +#: ../clutter/clutter-cairo-texture.c:616 msgid "Whether the surface should match the allocation" msgstr "Indica se a superficie debe coincidir coa asignación" -#: clutter/clutter-child-meta.c:127 +#: ../clutter/clutter-child-meta.c:127 msgid "Container" msgstr "Contedor" -#: clutter/clutter-child-meta.c:128 +#: ../clutter/clutter-child-meta.c:128 msgid "The container that created this data" msgstr "Contedor que creou estes datos" -#: clutter/clutter-child-meta.c:143 +#: ../clutter/clutter-child-meta.c:143 msgid "The actor wrapped by this data" msgstr "O actor envolvido con estes datos" -#: clutter/clutter-click-action.c:542 +#: ../clutter/clutter-click-action.c:542 msgid "Pressed" msgstr "Premido" -#: clutter/clutter-click-action.c:543 +#: ../clutter/clutter-click-action.c:543 msgid "Whether the clickable should be in pressed state" msgstr "Cando o clic debe estar premido" -#: clutter/clutter-click-action.c:556 +#: ../clutter/clutter-click-action.c:556 msgid "Held" msgstr "Retido" -#: clutter/clutter-click-action.c:557 +#: ../clutter/clutter-click-action.c:557 msgid "Whether the clickable has a grab" msgstr "Cando o clic ten un tirador" -#: clutter/clutter-click-action.c:574 clutter/clutter-settings.c:573 +#: ../clutter/clutter-click-action.c:574 ../clutter/clutter-settings.c:598 msgid "Long Press Duration" msgstr "Duración da pulsación longa" -#: clutter/clutter-click-action.c:575 +#: ../clutter/clutter-click-action.c:575 msgid "The minimum duration of a long press to recognize the gesture" msgstr "A duración mínima dunha pulsación longa para recoñecer o xesto" -#: clutter/clutter-click-action.c:593 +#: ../clutter/clutter-click-action.c:593 msgid "Long Press Threshold" msgstr "Límite da pulsación longa" -#: clutter/clutter-click-action.c:594 +#: ../clutter/clutter-click-action.c:594 msgid "The maximum threshold before a long press is cancelled" msgstr "O límite máximo antes de cancelar unha pulsación longa" -#: clutter/clutter-clone.c:341 +#: ../clutter/clutter-clone.c:341 msgid "Specifies the actor to be cloned" msgstr "Especifica o actor que clonar" -#: clutter/clutter-colorize-effect.c:307 +#: ../clutter/clutter-colorize-effect.c:307 msgid "Tint" msgstr "Matiz" -#: clutter/clutter-colorize-effect.c:308 +#: ../clutter/clutter-colorize-effect.c:308 msgid "The tint to apply" msgstr "O matiz que aplicar" -#: clutter/clutter-deform-effect.c:527 +#: ../clutter/clutter-deform-effect.c:547 msgid "Horizontal Tiles" msgstr "Teselas horizontais" -#: clutter/clutter-deform-effect.c:528 +#: ../clutter/clutter-deform-effect.c:548 msgid "The number of horizontal tiles" msgstr "O número de teselas en horizontal" -#: clutter/clutter-deform-effect.c:543 +#: ../clutter/clutter-deform-effect.c:563 msgid "Vertical Tiles" msgstr "Teselas verticais" -#: clutter/clutter-deform-effect.c:544 +#: ../clutter/clutter-deform-effect.c:564 msgid "The number of vertical tiles" msgstr "O número de teselas en vertical" -#: clutter/clutter-deform-effect.c:561 +#: ../clutter/clutter-deform-effect.c:581 msgid "Back Material" msgstr "Material da traseira" -#: clutter/clutter-deform-effect.c:562 +#: ../clutter/clutter-deform-effect.c:582 msgid "The material to be used when painting the back of the actor" msgstr "O material que se emprega ao pintar a parte posterior del actor" -#: clutter/clutter-desaturate-effect.c:305 +#: ../clutter/clutter-desaturate-effect.c:305 msgid "The desaturation factor" msgstr "O factor de desaturación" -#: clutter/clutter-device-manager.c:131 clutter/clutter-input-device.c:344 -#: clutter/x11/clutter-keymap-x11.c:316 +#: ../clutter/clutter-device-manager.c:131 +#: ../clutter/clutter-input-device.c:344 +#: ../clutter/x11/clutter-keymap-x11.c:316 msgid "Backend" msgstr "Infraestrutura" -#: clutter/clutter-device-manager.c:132 +#: ../clutter/clutter-device-manager.c:132 msgid "The ClutterBackend of the device manager" msgstr "O ClutterBackend do xestor de dispositivos" -#: clutter/clutter-drag-action.c:596 +#: ../clutter/clutter-drag-action.c:596 msgid "Horizontal Drag Threshold" msgstr "Limiar horizontal de arrastre" -#: clutter/clutter-drag-action.c:597 +#: ../clutter/clutter-drag-action.c:597 msgid "The horizontal amount of pixels required to start dragging" msgstr "A cantidade de píxeles horizontais necesarios para comezar a arrastrar" -#: clutter/clutter-drag-action.c:624 +#: ../clutter/clutter-drag-action.c:624 msgid "Vertical Drag Threshold" msgstr "Limiar vertical de arrastre" -#: clutter/clutter-drag-action.c:625 +#: ../clutter/clutter-drag-action.c:625 msgid "The vertical amount of pixels required to start dragging" msgstr "A cantidade de píxeles verticais necesarios para comezar a arrastrar" -#: clutter/clutter-drag-action.c:646 +#: ../clutter/clutter-drag-action.c:646 msgid "Drag Handle" msgstr "Arrastrar o tirador" -#: clutter/clutter-drag-action.c:647 +#: ../clutter/clutter-drag-action.c:647 msgid "The actor that is being dragged" msgstr "O actor que se está a arrastrar" -#: clutter/clutter-drag-action.c:660 +#: ../clutter/clutter-drag-action.c:660 msgid "Drag Axis" msgstr "Eixo de arrastre" -#: clutter/clutter-drag-action.c:661 +#: ../clutter/clutter-drag-action.c:661 msgid "Constraints the dragging to an axis" msgstr "Restricións arrastrando a un eixo" -#: clutter/clutter-flow-layout.c:885 +#: ../clutter/clutter-flow-layout.c:885 msgid "Orientation" msgstr "Orientación" -#: clutter/clutter-flow-layout.c:886 +#: ../clutter/clutter-flow-layout.c:886 msgid "The orientation of the layout" msgstr "A orientación do deseño" -#: clutter/clutter-flow-layout.c:902 +#: ../clutter/clutter-flow-layout.c:902 msgid "Whether each item should receive the same allocation" msgstr "Cando cada elemento debe recibir a mesma asignación" -#: clutter/clutter-flow-layout.c:917 clutter/clutter-table-layout.c:1713 +#: ../clutter/clutter-flow-layout.c:917 ../clutter/clutter-table-layout.c:1713 msgid "Column Spacing" msgstr "Espazamento de columnas" -#: clutter/clutter-flow-layout.c:918 +#: ../clutter/clutter-flow-layout.c:918 msgid "The spacing between columns" msgstr "O espazo entre columnas" -#: clutter/clutter-flow-layout.c:934 clutter/clutter-table-layout.c:1727 +#: ../clutter/clutter-flow-layout.c:934 ../clutter/clutter-table-layout.c:1727 msgid "Row Spacing" msgstr "Espazamento de filas" -#: clutter/clutter-flow-layout.c:935 +#: ../clutter/clutter-flow-layout.c:935 msgid "The spacing between rows" msgstr "O espazo entre filas" -#: clutter/clutter-flow-layout.c:949 +#: ../clutter/clutter-flow-layout.c:949 msgid "Minimum Column Width" msgstr "Largura mínima de columna" -#: clutter/clutter-flow-layout.c:950 +#: ../clutter/clutter-flow-layout.c:950 msgid "Minimum width for each column" msgstr "A largura mínima para cada columna" -#: clutter/clutter-flow-layout.c:965 +#: ../clutter/clutter-flow-layout.c:965 msgid "Maximum Column Width" msgstr "Largura máxima de columna" -#: clutter/clutter-flow-layout.c:966 +#: ../clutter/clutter-flow-layout.c:966 msgid "Maximum width for each column" msgstr "A largura máxima para cada columna" -#: clutter/clutter-flow-layout.c:980 +#: ../clutter/clutter-flow-layout.c:980 msgid "Minimum Row Height" msgstr "Altura mínima de fila" -#: clutter/clutter-flow-layout.c:981 +#: ../clutter/clutter-flow-layout.c:981 msgid "Minimum height for each row" msgstr "A altura mínima de cada fila" -#: clutter/clutter-flow-layout.c:996 +#: ../clutter/clutter-flow-layout.c:996 msgid "Maximum Row Height" msgstr "Altura máxima de fila" -#: clutter/clutter-flow-layout.c:997 +#: ../clutter/clutter-flow-layout.c:997 msgid "Maximum height for each row" msgstr "A altura máxima de cada fila" -#: clutter/clutter-input-device.c:220 +#: ../clutter/clutter-input-device.c:220 msgid "Id" msgstr "ID" -#: clutter/clutter-input-device.c:221 +#: ../clutter/clutter-input-device.c:221 msgid "Unique identifier of the device" msgstr "Identificador único do dispositivo" -#: clutter/clutter-input-device.c:237 +#: ../clutter/clutter-input-device.c:237 msgid "The name of the device" msgstr "O nome do dispositivo" -#: clutter/clutter-input-device.c:251 +#: ../clutter/clutter-input-device.c:251 msgid "Device Type" msgstr "Tipo do dispositivo" -#: clutter/clutter-input-device.c:252 +#: ../clutter/clutter-input-device.c:252 msgid "The type of the device" msgstr "O tipo do dispositivo" -#: clutter/clutter-input-device.c:267 +#: ../clutter/clutter-input-device.c:267 msgid "Device Manager" msgstr "Xestor de dispositivos" -#: clutter/clutter-input-device.c:268 +#: ../clutter/clutter-input-device.c:268 msgid "The device manager instance" msgstr "A instancia do xestor de dispositivos" -#: clutter/clutter-input-device.c:281 +#: ../clutter/clutter-input-device.c:281 msgid "Device Mode" msgstr "Modo de dispositivo" -#: clutter/clutter-input-device.c:282 +#: ../clutter/clutter-input-device.c:282 msgid "The mode of the device" msgstr "O modo do dispositivo" -#: clutter/clutter-input-device.c:296 +#: ../clutter/clutter-input-device.c:296 msgid "Has Cursor" msgstr "Ten cursor" -#: clutter/clutter-input-device.c:297 +#: ../clutter/clutter-input-device.c:297 msgid "Whether the device has a cursor" msgstr "Indica se o dispositivo ten un cursor" -#: clutter/clutter-input-device.c:316 +#: ../clutter/clutter-input-device.c:316 msgid "Whether the device is enabled" msgstr "Indica se o dispositivo está activado" -#: clutter/clutter-input-device.c:329 +#: ../clutter/clutter-input-device.c:329 msgid "Number of Axes" msgstr "Número de eixos" -#: clutter/clutter-input-device.c:330 +#: ../clutter/clutter-input-device.c:330 msgid "The number of axes on the device" msgstr "O número de eixos no dispositivo" -#: clutter/clutter-input-device.c:345 +#: ../clutter/clutter-input-device.c:345 msgid "The backend instance" msgstr "A instancia da infraestrutura" -#: clutter/clutter-interval.c:397 +#: ../clutter/clutter-interval.c:397 msgid "Value Type" msgstr "Tipo de valor" -#: clutter/clutter-interval.c:398 +#: ../clutter/clutter-interval.c:398 msgid "The type of the values in the interval" msgstr "O tipo dos valores no intervalo" -#: clutter/clutter-layout-meta.c:117 +#: ../clutter/clutter-layout-meta.c:117 msgid "Manager" msgstr "Xestor" -#: clutter/clutter-layout-meta.c:118 +#: ../clutter/clutter-layout-meta.c:118 msgid "The manager that created this data" msgstr "O xestor que creou estes datos" -#: clutter/clutter-main.c:490 +#. Translators: Leave this UNTRANSLATED if your language is +#. * left-to-right. If your language is right-to-left +#. * (e.g. Hebrew, Arabic), translate it to "default:RTL". +#. * +#. * Do NOT translate it to non-English e.g. "predefinito:LTR"! If +#. * it isn't default:LTR or default:RTL it will not work. +#. +#: ../clutter/clutter-main.c:717 msgid "default:LTR" msgstr "default:LTR" -#: clutter/clutter-main.c:1321 +#: ../clutter/clutter-main.c:1528 msgid "Show frames per second" msgstr "Mostrar cadros por segundo" -#: clutter/clutter-main.c:1323 +#: ../clutter/clutter-main.c:1530 msgid "Default frame rate" msgstr "Taxa predeterminada de cadros" -#: clutter/clutter-main.c:1325 +#: ../clutter/clutter-main.c:1532 msgid "Make all warnings fatal" msgstr "Facer que todos os avisos sexan fatais" -#: clutter/clutter-main.c:1328 +#: ../clutter/clutter-main.c:1535 msgid "Direction for the text" msgstr "Dirección para o texto" -#: clutter/clutter-main.c:1331 +#: ../clutter/clutter-main.c:1538 msgid "Disable mipmapping on text" msgstr "Desactivar mipmapping no texto" -#: clutter/clutter-main.c:1334 +#: ../clutter/clutter-main.c:1541 msgid "Use 'fuzzy' picking" msgstr "Usar recolección «difusa»" -#: clutter/clutter-main.c:1337 +#: ../clutter/clutter-main.c:1544 msgid "Clutter debugging flags to set" msgstr "Bandeiras de depuración de Clutter que seleccionar" -#: clutter/clutter-main.c:1339 +#: ../clutter/clutter-main.c:1546 msgid "Clutter debugging flags to unset" msgstr "Bandeiras de depuración de Cluter que deseleccionar" -#: clutter/clutter-main.c:1343 +#: ../clutter/clutter-main.c:1550 msgid "Clutter profiling flags to set" msgstr "Bandeiras de perfilado de Clutter que estabelecer" -#: clutter/clutter-main.c:1345 +#: ../clutter/clutter-main.c:1552 msgid "Clutter profiling flags to unset" msgstr "Bandeiras de perfilado de Clutter que desestabelecer" -#: clutter/clutter-main.c:1348 +#: ../clutter/clutter-main.c:1555 msgid "Enable accessibility" msgstr "Activar a accesibilidade" -#: clutter/clutter-main.c:1530 +#: ../clutter/clutter-main.c:1743 msgid "Clutter Options" msgstr "Opcións de Clutter" -#: clutter/clutter-main.c:1531 +#: ../clutter/clutter-main.c:1744 msgid "Show Clutter Options" msgstr "Mostrar as opcións de Clutter" -#: clutter/clutter-media.c:77 +#: ../clutter/clutter-media.c:77 msgid "URI" msgstr "URI" -#: clutter/clutter-media.c:78 +#: ../clutter/clutter-media.c:78 msgid "URI of a media file" msgstr "URI do ficheiro multimedia" -#: clutter/clutter-media.c:91 +#: ../clutter/clutter-media.c:91 msgid "Playing" msgstr "Reproducindo" -#: clutter/clutter-media.c:92 +#: ../clutter/clutter-media.c:92 msgid "Whether the actor is playing" msgstr "Indica se o actor estase reproducindo" -#: clutter/clutter-media.c:106 +#: ../clutter/clutter-media.c:106 msgid "Progress" msgstr "Progreso" -#: clutter/clutter-media.c:107 +#: ../clutter/clutter-media.c:107 msgid "Current progress of the playback" msgstr "Progreso actual da reprodución" -#: clutter/clutter-media.c:120 +#: ../clutter/clutter-media.c:120 msgid "Subtitle URI" msgstr "URI de subtítulos" -#: clutter/clutter-media.c:121 +#: ../clutter/clutter-media.c:121 msgid "URI of a subtitle file" msgstr "URI do ficheiro de subtítulos" -#: clutter/clutter-media.c:136 +#: ../clutter/clutter-media.c:136 msgid "Subtitle Font Name" msgstr "Nome do tipo de letra de subtítulos" -#: clutter/clutter-media.c:137 +#: ../clutter/clutter-media.c:137 msgid "The font used to display subtitles" msgstr "O tipo de letra empregado para os subtítulos" -#: clutter/clutter-media.c:151 +#: ../clutter/clutter-media.c:151 msgid "Audio Volume" msgstr "Volume de son" -#: clutter/clutter-media.c:152 +#: ../clutter/clutter-media.c:152 msgid "The volume of the audio" msgstr "O volume do son" -#: clutter/clutter-media.c:165 +#: ../clutter/clutter-media.c:165 msgid "Can Seek" msgstr "Pode buscar" -#: clutter/clutter-media.c:166 +#: ../clutter/clutter-media.c:166 msgid "Whether the current stream is seekable" msgstr "Cando o fluxo actual e buscábel" -#: clutter/clutter-media.c:180 +#: ../clutter/clutter-media.c:180 msgid "Buffer Fill" msgstr "Ateigamento do búfer" -#: clutter/clutter-media.c:181 +#: ../clutter/clutter-media.c:181 msgid "The fill level of the buffer" msgstr "O nivel de ateigamento do búfer" -#: clutter/clutter-media.c:195 +#: ../clutter/clutter-media.c:195 msgid "The duration of the stream, in seconds" msgstr "A duración do fluxo, en segundos" -#: clutter/clutter-path-constraint.c:213 +#: ../clutter/clutter-path-constraint.c:213 msgid "The path used to constrain an actor" msgstr "A ruta empregada para restrinxir a un actor" -#: clutter/clutter-path-constraint.c:227 +#: ../clutter/clutter-path-constraint.c:227 msgid "The offset along the path, between -1.0 and 2.0" msgstr "O desprazamento ao longo da ruta, entre -1.0 e 2.0" -#: clutter/clutter-rectangle.c:268 +#: ../clutter/clutter-rectangle.c:268 msgid "The color of the rectangle" msgstr "A cor do rectángulo" -#: clutter/clutter-rectangle.c:281 +#: ../clutter/clutter-rectangle.c:281 msgid "Border Color" msgstr "Cor do bordo" -#: clutter/clutter-rectangle.c:282 +#: ../clutter/clutter-rectangle.c:282 msgid "The color of the border of the rectangle" msgstr "A cor do bordo do rectángulo" -#: clutter/clutter-rectangle.c:297 +#: ../clutter/clutter-rectangle.c:297 msgid "Border Width" msgstr "Largura do bordo" -#: clutter/clutter-rectangle.c:298 +#: ../clutter/clutter-rectangle.c:298 msgid "The width of the border of the rectangle" msgstr "A largura do bordo do rectángulo" -#: clutter/clutter-rectangle.c:312 +#: ../clutter/clutter-rectangle.c:312 msgid "Has Border" msgstr "Ten bordo" -#: clutter/clutter-rectangle.c:313 +#: ../clutter/clutter-rectangle.c:313 msgid "Whether the rectangle should have a border" msgstr "Cando o rectángulo debe ter bordo" -#: clutter/clutter-script.c:434 +#: ../clutter/clutter-script.c:434 msgid "Filename Set" msgstr "Estabelecer o nome de ficheiro" -#: clutter/clutter-script.c:435 +#: ../clutter/clutter-script.c:435 msgid "Whether the :filename property is set" msgstr "Cando a propiedade :filename foi estabelecida" -#: clutter/clutter-script.c:449 clutter/clutter-texture.c:1081 +#: ../clutter/clutter-script.c:449 ../clutter/clutter-texture.c:1071 msgid "Filename" msgstr "Nome do ficheiro" -#: clutter/clutter-script.c:450 +#: ../clutter/clutter-script.c:450 msgid "The path of the currently parsed file" msgstr "A ruta do ficheiro analizado actualmente" -#: clutter/clutter-settings.c:414 +#: ../clutter/clutter-settings.c:439 msgid "Double Click Time" msgstr "Tempo de dobre pulsación" -#: clutter/clutter-settings.c:415 +#: ../clutter/clutter-settings.c:440 msgid "The time between clicks necessary to detect a multiple click" msgstr "" "O tempo necesario entre pulsacións para detectar unha pulsación múltiple" -#: clutter/clutter-settings.c:430 +#: ../clutter/clutter-settings.c:455 msgid "Double Click Distance" msgstr "Distancia da dobre pulsación" -#: clutter/clutter-settings.c:431 +#: ../clutter/clutter-settings.c:456 msgid "The distance between clicks necessary to detect a multiple click" msgstr "" "A distancia necesaria entre pulsacións para detectar unha pulsación múltiple" -#: clutter/clutter-settings.c:446 +#: ../clutter/clutter-settings.c:471 msgid "Drag Threshold" msgstr "Limiar de arrastre" -#: clutter/clutter-settings.c:447 +#: ../clutter/clutter-settings.c:472 msgid "The distance the cursor should travel before starting to drag" msgstr "A distancia que o cursor debe recorrer antes de comezar a arrastrar" -#: clutter/clutter-settings.c:462 clutter/clutter-text.c:2939 +#: ../clutter/clutter-settings.c:487 ../clutter/clutter-text.c:2995 msgid "Font Name" msgstr "Nome do tipo de letra" -#: clutter/clutter-settings.c:463 +#: ../clutter/clutter-settings.c:488 msgid "" "The description of the default font, as one that could be parsed by Pango" msgstr "" "A descrición do tipo de letra predeterminado, como un que Pango poida " "analizar." -#: clutter/clutter-settings.c:478 +#: ../clutter/clutter-settings.c:503 msgid "Font Antialias" msgstr "Alisado do tipo de letra" -#: clutter/clutter-settings.c:479 +#: ../clutter/clutter-settings.c:504 msgid "" "Whether to use antialiasing (1 to enable, 0 to disable, and -1 to use the " "default)" @@ -1397,512 +1421,521 @@ msgstr "" "Indica se se debe usar alisado (1 para activar, 0 para desactivar e -1 para " "usar a opción predeterminada)" -#: clutter/clutter-settings.c:495 +#: ../clutter/clutter-settings.c:520 msgid "Font DPI" msgstr "PPP do tipo de letra" -#: clutter/clutter-settings.c:496 +#: ../clutter/clutter-settings.c:521 msgid "" "The resolution of the font, in 1024 * dots/inch, or -1 to use the default" msgstr "" "A resolución do tipo de letra, en 1024 * puntos/polgada, ou -1 para usar a " "predeterminada" -#: clutter/clutter-settings.c:512 +#: ../clutter/clutter-settings.c:537 msgid "Font Hinting" msgstr "Contorno do tipo de letra" -#: clutter/clutter-settings.c:513 +#: ../clutter/clutter-settings.c:538 msgid "" "Whether to use hinting (1 to enable, 0 to disable and -1 to use the default)" msgstr "" "Indica se se debe usar contorno (1 para activar, 0 para desactivar e -1 para " "usar a opción predeterminada)" -#: clutter/clutter-settings.c:534 +#: ../clutter/clutter-settings.c:559 msgid "Font Hint Style" msgstr "Estilo do contorno do tipo de letra" -#: clutter/clutter-settings.c:535 +#: ../clutter/clutter-settings.c:560 msgid "The style of hinting (hintnone, hintslight, hintmedium, hintfull)" msgstr "" "O estilo do contorno («hintnone», «hintslight», «hintmedium», «hintfull»)" -#: clutter/clutter-settings.c:556 +#: ../clutter/clutter-settings.c:581 msgid "Font Subpixel Order" msgstr "Orde do tipo de letra do subpíxel" -#: clutter/clutter-settings.c:557 +#: ../clutter/clutter-settings.c:582 msgid "The type of subpixel antialiasing (none, rgb, bgr, vrgb, vbgr)" msgstr "O tipo de suavizado do subpíxel («none», «rgb», «bgr», «vrgb», «vbgr»)" -#: clutter/clutter-settings.c:574 +#: ../clutter/clutter-settings.c:599 msgid "The minimum duration for a long press gesture to be recognized" msgstr "A duración mínima dunha pulsación longa para recoñecer o xesto" -#: clutter/clutter-settings.c:581 +#: ../clutter/clutter-settings.c:606 msgid "Fontconfig configuration timestamp" msgstr "Configuración da marca de tempo de fontconfig" -#: clutter/clutter-settings.c:582 +#: ../clutter/clutter-settings.c:607 msgid "Timestamp of the current fontconfig configuration" msgstr "Marca de tempo da configuración actual de fontconfig" -#: clutter/clutter-shader.c:255 +#: ../clutter/clutter-settings.c:624 +msgid "Password Hint Time" +msgstr "Tempo da suxestión de contrasinal" + +#: ../clutter/clutter-settings.c:625 +msgid "How long to show the last input character in hidden entries" +msgstr "" +"Canto tempo se debe mostrar o último carácter escrito nas entradas ocultas" + +#: ../clutter/deprecated/clutter-shader.c:257 msgid "Vertex Source" msgstr "Orixe do vértice" -#: clutter/clutter-shader.c:256 +#: ../clutter/deprecated/clutter-shader.c:258 msgid "Source of vertex shader" msgstr "Orixe do vértice de sombreado" -#: clutter/clutter-shader.c:272 +#: ../clutter/deprecated/clutter-shader.c:274 msgid "Fragment Source" msgstr "Orixe do fragmento" -#: clutter/clutter-shader.c:273 +#: ../clutter/deprecated/clutter-shader.c:275 msgid "Source of fragment shader" msgstr "Orixe do fragmento de sombreado" -#: clutter/clutter-shader.c:290 +#: ../clutter/deprecated/clutter-shader.c:292 msgid "Compiled" msgstr "Compilado" -#: clutter/clutter-shader.c:291 +#: ../clutter/deprecated/clutter-shader.c:293 msgid "Whether the shader is compiled and linked" msgstr "Cando o sombreado é compilado e ligado" -#: clutter/clutter-shader.c:308 +#: ../clutter/deprecated/clutter-shader.c:310 msgid "Whether the shader is enabled" msgstr "Cando o sombreado está activado" -#: clutter/clutter-shader.c:519 +#: ../clutter/deprecated/clutter-shader.c:521 #, c-format msgid "%s compilation failed: %s" msgstr "%s produciuse un fallo na compilación: %s" -#: clutter/clutter-shader.c:520 +#: ../clutter/deprecated/clutter-shader.c:522 msgid "Vertex shader" msgstr "Vértice de sombreado" -#: clutter/clutter-shader.c:521 +#: ../clutter/deprecated/clutter-shader.c:523 msgid "Fragment shader" msgstr "Sombreado de fragmentos" -#: clutter/clutter-shader-effect.c:415 +#: ../clutter/clutter-shader-effect.c:482 msgid "Shader Type" msgstr "Tipo de sombreado" -#: clutter/clutter-shader-effect.c:416 +#: ../clutter/clutter-shader-effect.c:483 msgid "The type of shader used" msgstr "O tipo de sombreado empregado" -#: clutter/clutter-snap-constraint.c:322 +#: ../clutter/clutter-snap-constraint.c:322 msgid "The source of the constraint" msgstr "A orixe da restrición" -#: clutter/clutter-snap-constraint.c:335 +#: ../clutter/clutter-snap-constraint.c:335 msgid "From Edge" msgstr "Desde o bordo" -#: clutter/clutter-snap-constraint.c:336 +#: ../clutter/clutter-snap-constraint.c:336 msgid "The edge of the actor that should be snapped" msgstr "O bordo do actor que debe ser encaixado" -#: clutter/clutter-snap-constraint.c:350 +#: ../clutter/clutter-snap-constraint.c:350 msgid "To Edge" msgstr "Ata o bordo" -#: clutter/clutter-snap-constraint.c:351 +#: ../clutter/clutter-snap-constraint.c:351 msgid "The edge of the source that should be snapped" msgstr "O bordo da orixe que debe ser encaixado" -#: clutter/clutter-snap-constraint.c:367 +#: ../clutter/clutter-snap-constraint.c:367 msgid "The offset in pixels to apply to the constraint" msgstr "O desprazamento en píxeles para aplicarllo á restrición" -#: clutter/clutter-stage.c:1707 +#: ../clutter/clutter-stage.c:1732 msgid "Fullscreen Set" msgstr "Estabelecer a pantalla completa" -#: clutter/clutter-stage.c:1708 +#: ../clutter/clutter-stage.c:1733 msgid "Whether the main stage is fullscreen" msgstr "Cando o escenario principal é a pantalla completa" -#: clutter/clutter-stage.c:1724 +#: ../clutter/clutter-stage.c:1749 msgid "Offscreen" msgstr "Fora de pantalla" -#: clutter/clutter-stage.c:1725 +#: ../clutter/clutter-stage.c:1750 msgid "Whether the main stage should be rendered offscreen" msgstr "Cando o escenario principal debe acontecer fora de la pantalla" -#: clutter/clutter-stage.c:1737 clutter/clutter-text.c:3052 +#: ../clutter/clutter-stage.c:1762 ../clutter/clutter-text.c:3108 msgid "Cursor Visible" msgstr "Cursor visíbel" -#: clutter/clutter-stage.c:1738 +#: ../clutter/clutter-stage.c:1763 msgid "Whether the mouse pointer is visible on the main stage" msgstr "Cando o punteiro do rato é visíbel no escenario principal" -#: clutter/clutter-stage.c:1752 +#: ../clutter/clutter-stage.c:1777 msgid "User Resizable" msgstr "Redimensionábel polo usuario" -#: clutter/clutter-stage.c:1753 +#: ../clutter/clutter-stage.c:1778 msgid "Whether the stage is able to be resized via user interaction" msgstr "Cando o escenario pode ser redimensionado cunha acción do usuario" -#: clutter/clutter-stage.c:1766 +#: ../clutter/clutter-stage.c:1791 msgid "The color of the stage" msgstr "A cor do escenario" -#: clutter/clutter-stage.c:1780 +#: ../clutter/clutter-stage.c:1805 msgid "Perspective" msgstr "Perspectiva" -#: clutter/clutter-stage.c:1781 +#: ../clutter/clutter-stage.c:1806 msgid "Perspective projection parameters" msgstr "Parámetros de proxección da perspectiva" -#: clutter/clutter-stage.c:1796 +#: ../clutter/clutter-stage.c:1821 msgid "Title" msgstr "Título" -#: clutter/clutter-stage.c:1797 +#: ../clutter/clutter-stage.c:1822 msgid "Stage Title" msgstr "Título do escenario" -#: clutter/clutter-stage.c:1812 +#: ../clutter/clutter-stage.c:1837 msgid "Use Fog" msgstr "Usar néboa" -#: clutter/clutter-stage.c:1813 +#: ../clutter/clutter-stage.c:1838 msgid "Whether to enable depth cueing" msgstr "Cando se activa a indicación da profundidade" -#: clutter/clutter-stage.c:1827 +#: ../clutter/clutter-stage.c:1852 msgid "Fog" msgstr "Néboa" -#: clutter/clutter-stage.c:1828 +#: ../clutter/clutter-stage.c:1853 msgid "Settings for the depth cueing" msgstr "Axustes para a indicación da profundidade" -#: clutter/clutter-stage.c:1844 +#: ../clutter/clutter-stage.c:1869 msgid "Use Alpha" msgstr "Usar alfa" -#: clutter/clutter-stage.c:1845 +#: ../clutter/clutter-stage.c:1870 msgid "Whether to honour the alpha component of the stage color" msgstr "Cando considera á compoñente alfa da cor do escenario" -#: clutter/clutter-stage.c:1861 +#: ../clutter/clutter-stage.c:1886 msgid "Key Focus" msgstr "Tecla de foco" -#: clutter/clutter-stage.c:1862 +#: ../clutter/clutter-stage.c:1887 msgid "The currently key focused actor" msgstr "A tecla actual pon ao actor en foco" -#: clutter/clutter-stage.c:1878 +#: ../clutter/clutter-stage.c:1903 msgid "No Clear Hint" msgstr "Non limpar suxestión" -#: clutter/clutter-stage.c:1879 +#: ../clutter/clutter-stage.c:1904 msgid "Whether the stage should clear its contents" msgstr "Cando o escenario debe limpar o seu contido" -#: clutter/clutter-stage.c:1892 +#: ../clutter/clutter-stage.c:1917 msgid "Accept Focus" msgstr "Aceptar foco" -#: clutter/clutter-stage.c:1893 +#: ../clutter/clutter-stage.c:1918 msgid "Whether the stage should accept focus on show" msgstr "Se o paso debe aceptar o foco ao mostralo" -#: clutter/clutter-state.c:1472 +#: ../clutter/clutter-state.c:1472 msgid "State" msgstr "Estado" -#: clutter/clutter-state.c:1473 +#: ../clutter/clutter-state.c:1473 msgid "Currently set state, (transition to this state might not be complete)" msgstr "" "Estado actual da configuración (é posíbel que a transición a este estado non " "fose completada)" -#: clutter/clutter-state.c:1487 +#: ../clutter/clutter-state.c:1487 msgid "Default transition duration" msgstr "Duración predeterminada da transición" -#: clutter/clutter-table-layout.c:585 +#: ../clutter/clutter-table-layout.c:585 msgid "Column Number" msgstr "Número de columna" -#: clutter/clutter-table-layout.c:586 +#: ../clutter/clutter-table-layout.c:586 msgid "The column the widget resides in" msgstr "A columna na que reside o trebello" -#: clutter/clutter-table-layout.c:593 +#: ../clutter/clutter-table-layout.c:593 msgid "Row Number" msgstr "Número de fila" -#: clutter/clutter-table-layout.c:594 +#: ../clutter/clutter-table-layout.c:594 msgid "The row the widget resides in" msgstr "A liña na que reside o trebello" -#: clutter/clutter-table-layout.c:601 +#: ../clutter/clutter-table-layout.c:601 msgid "Column Span" msgstr "Columna por cela" -#: clutter/clutter-table-layout.c:602 +#: ../clutter/clutter-table-layout.c:602 msgid "The number of columns the widget should span" msgstr "O número de columnas que debe agrupar o trebello" -#: clutter/clutter-table-layout.c:609 +#: ../clutter/clutter-table-layout.c:609 msgid "Row Span" msgstr "Liña por cela" -#: clutter/clutter-table-layout.c:610 +#: ../clutter/clutter-table-layout.c:610 msgid "The number of rows the widget should span" msgstr "O número de liñas que debe agrupar o trebello" -#: clutter/clutter-table-layout.c:617 +#: ../clutter/clutter-table-layout.c:617 msgid "Horizontal Expand" msgstr "Expansión horizontal" -#: clutter/clutter-table-layout.c:618 +#: ../clutter/clutter-table-layout.c:618 msgid "Allocate extra space for the child in horizontal axis" msgstr "Asigna espazo extra para o fillo no eixo horizontal" -#: clutter/clutter-table-layout.c:624 +#: ../clutter/clutter-table-layout.c:624 msgid "Vertical Expand" msgstr "Expansión vertical" -#: clutter/clutter-table-layout.c:625 +#: ../clutter/clutter-table-layout.c:625 msgid "Allocate extra space for the child in vertical axis" msgstr "Asigna espazo extra para o fillo no eixo vertical" -#: clutter/clutter-table-layout.c:1714 +#: ../clutter/clutter-table-layout.c:1714 msgid "Spacing between columns" msgstr "Espazamento entre columnas" -#: clutter/clutter-table-layout.c:1728 +#: ../clutter/clutter-table-layout.c:1728 msgid "Spacing between rows" msgstr "Espazamento entre filas" -#: clutter/clutter-text.c:2940 +#: ../clutter/clutter-text.c:2996 msgid "The font to be used by the text" msgstr "O tipo de letra que vai ser empregado no texto" -#: clutter/clutter-text.c:2957 +#: ../clutter/clutter-text.c:3013 msgid "Font Description" msgstr "Descrición do tipo de letra" -#: clutter/clutter-text.c:2958 +#: ../clutter/clutter-text.c:3014 msgid "The font description to be used" msgstr "A descrición do tipo de letra que se vai empregar" -#: clutter/clutter-text.c:2974 +#: ../clutter/clutter-text.c:3030 msgid "Text" msgstr "Texto" -#: clutter/clutter-text.c:2975 +#: ../clutter/clutter-text.c:3031 msgid "The text to render" msgstr "O texto a renderizar" -#: clutter/clutter-text.c:2989 +#: ../clutter/clutter-text.c:3045 msgid "Font Color" msgstr "Cor da letra" -#: clutter/clutter-text.c:2990 +#: ../clutter/clutter-text.c:3046 msgid "Color of the font used by the text" msgstr "Cor das letras empregadas no texto" -#: clutter/clutter-text.c:3004 +#: ../clutter/clutter-text.c:3060 msgid "Editable" msgstr "Editábel" -#: clutter/clutter-text.c:3005 +#: ../clutter/clutter-text.c:3061 msgid "Whether the text is editable" msgstr "Cando o texto é editábel" -#: clutter/clutter-text.c:3020 +#: ../clutter/clutter-text.c:3076 msgid "Selectable" msgstr "Seleccionábel" -#: clutter/clutter-text.c:3021 +#: ../clutter/clutter-text.c:3077 msgid "Whether the text is selectable" msgstr "Cando o texto é seleccionábel" -#: clutter/clutter-text.c:3035 +#: ../clutter/clutter-text.c:3091 msgid "Activatable" msgstr "Activábel" -#: clutter/clutter-text.c:3036 +#: ../clutter/clutter-text.c:3092 msgid "Whether pressing return causes the activate signal to be emitted" msgstr "Cando ao premer Intro fai que se active o sinal a ser emitido" -#: clutter/clutter-text.c:3053 +#: ../clutter/clutter-text.c:3109 msgid "Whether the input cursor is visible" msgstr "Cando o cursor de entrada é visíbel" -#: clutter/clutter-text.c:3067 clutter/clutter-text.c:3068 +#: ../clutter/clutter-text.c:3123 ../clutter/clutter-text.c:3124 msgid "Cursor Color" msgstr "Cor do cursor" -#: clutter/clutter-text.c:3082 +#: ../clutter/clutter-text.c:3138 msgid "Cursor Color Set" msgstr "Estabelecer a cor do cursor" -#: clutter/clutter-text.c:3083 +#: ../clutter/clutter-text.c:3139 msgid "Whether the cursor color has been set" msgstr "Cando a cor do cursor foi estabelecida" -#: clutter/clutter-text.c:3098 +#: ../clutter/clutter-text.c:3154 msgid "Cursor Size" msgstr "Tamaño do cursor" -#: clutter/clutter-text.c:3099 +#: ../clutter/clutter-text.c:3155 msgid "The width of the cursor, in pixels" msgstr "A largura do cursor, en píxeles" -#: clutter/clutter-text.c:3113 +#: ../clutter/clutter-text.c:3169 msgid "Cursor Position" msgstr "A posición do cursor" -#: clutter/clutter-text.c:3114 +#: ../clutter/clutter-text.c:3170 msgid "The cursor position" msgstr "A posición do cursor" -#: clutter/clutter-text.c:3129 +#: ../clutter/clutter-text.c:3185 msgid "Selection-bound" msgstr "Selección límite" -#: clutter/clutter-text.c:3130 +#: ../clutter/clutter-text.c:3186 msgid "The cursor position of the other end of the selection" msgstr "A posición do cursor do outro extremo da selección" -#: clutter/clutter-text.c:3145 clutter/clutter-text.c:3146 +#: ../clutter/clutter-text.c:3201 ../clutter/clutter-text.c:3202 msgid "Selection Color" msgstr "Cor da selección" -#: clutter/clutter-text.c:3160 +#: ../clutter/clutter-text.c:3216 msgid "Selection Color Set" msgstr "Estabelecer a cor da selección" -#: clutter/clutter-text.c:3161 +#: ../clutter/clutter-text.c:3217 msgid "Whether the selection color has been set" msgstr "Cando cor da selección foi estabelecida" -#: clutter/clutter-text.c:3176 +#: ../clutter/clutter-text.c:3232 msgid "Attributes" msgstr "Atributos" -#: clutter/clutter-text.c:3177 +#: ../clutter/clutter-text.c:3233 msgid "A list of style attributes to apply to the contents of the actor" msgstr "Unha lista de atributos de estilo para aplicar aos contidos do actor" -#: clutter/clutter-text.c:3199 +#: ../clutter/clutter-text.c:3255 msgid "Use markup" msgstr "Usar a marcación" -#: clutter/clutter-text.c:3200 +#: ../clutter/clutter-text.c:3256 msgid "Whether or not the text includes Pango markup" msgstr "Cando o texto inclúe ou non marcado Pango" -#: clutter/clutter-text.c:3216 +#: ../clutter/clutter-text.c:3272 msgid "Line wrap" msgstr "Axuste de liña" -#: clutter/clutter-text.c:3217 +#: ../clutter/clutter-text.c:3273 msgid "If set, wrap the lines if the text becomes too wide" msgstr "De estabelecerse, axusta as liñas se o texto é moi amplo" -#: clutter/clutter-text.c:3232 +#: ../clutter/clutter-text.c:3288 msgid "Line wrap mode" msgstr "Modo de axuste de liña" -#: clutter/clutter-text.c:3233 +#: ../clutter/clutter-text.c:3289 msgid "Control how line-wrapping is done" msgstr "Controlar se se realiza o axuste de liñas" -#: clutter/clutter-text.c:3248 +#: ../clutter/clutter-text.c:3304 msgid "Ellipsize" msgstr "Elipse en..." -#: clutter/clutter-text.c:3249 +#: ../clutter/clutter-text.c:3305 msgid "The preferred place to ellipsize the string" msgstr "O lugar preferido para elipse na cadea" -#: clutter/clutter-text.c:3265 +#: ../clutter/clutter-text.c:3321 msgid "Line Alignment" msgstr "Aliñamento de liñas" -#: clutter/clutter-text.c:3266 +#: ../clutter/clutter-text.c:3322 msgid "The preferred alignment for the string, for multi-line text" msgstr "O aliñamento preferido das cadeas, para textos multiliña" -#: clutter/clutter-text.c:3282 +#: ../clutter/clutter-text.c:3338 msgid "Justify" msgstr "Xustificar" -#: clutter/clutter-text.c:3283 +#: ../clutter/clutter-text.c:3339 msgid "Whether the text should be justified" msgstr "Cando o texto debe estar xustificado" -#: clutter/clutter-text.c:3298 +#: ../clutter/clutter-text.c:3354 msgid "Password Character" msgstr "Carácter chave" -#: clutter/clutter-text.c:3299 +#: ../clutter/clutter-text.c:3355 msgid "If non-zero, use this character to display the actor's contents" msgstr "" "De ser distinto de cero, use este carácter para amosar os contidos do actor" -#: clutter/clutter-text.c:3313 +#: ../clutter/clutter-text.c:3369 msgid "Max Length" msgstr "Lonxitude máxima" -#: clutter/clutter-text.c:3314 +#: ../clutter/clutter-text.c:3370 msgid "Maximum length of the text inside the actor" msgstr "Lonxitude máxima do texto dentro do actor" -#: clutter/clutter-text.c:3337 +#: ../clutter/clutter-text.c:3393 msgid "Single Line Mode" msgstr "Modo de liña única" -#: clutter/clutter-text.c:3338 +#: ../clutter/clutter-text.c:3394 msgid "Whether the text should be a single line" msgstr "Cando o texto debe ser dunha soa liña" -#: clutter/clutter-text.c:3352 clutter/clutter-text.c:3353 +#: ../clutter/clutter-text.c:3408 ../clutter/clutter-text.c:3409 msgid "Selected Text Color" msgstr "Cor do texto seleccionado" -#: clutter/clutter-text.c:3367 +#: ../clutter/clutter-text.c:3423 msgid "Selected Text Color Set" msgstr "Conxunto de cores de texto seleccionado" -#: clutter/clutter-text.c:3368 +#: ../clutter/clutter-text.c:3424 msgid "Whether the selected text color has been set" msgstr "Indica se se estabeleceu a cor do texto seleccionado" -#: clutter/clutter-texture.c:995 +#: ../clutter/clutter-texture.c:985 msgid "Sync size of actor" msgstr "Sincronizar o tamaño do actor" -#: clutter/clutter-texture.c:996 +#: ../clutter/clutter-texture.c:986 msgid "Auto sync size of actor to underlying pixbuf dimensions" msgstr "" "Sincronización automática do tamaño do actor ás dimensións subxacentes do " "«pixbuf»" -#: clutter/clutter-texture.c:1003 +#: ../clutter/clutter-texture.c:993 msgid "Disable Slicing" msgstr "Desactivar segmentado" -#: clutter/clutter-texture.c:1004 +#: ../clutter/clutter-texture.c:994 msgid "" "Forces the underlying texture to be singular and not made of smaller space " "saving individual textures" @@ -1910,71 +1943,71 @@ msgstr "" "Forza que a textura subxacente sexa singular e que non sexa feita de " "pequenos espazos gardados de texturas individuais." -#: clutter/clutter-texture.c:1013 +#: ../clutter/clutter-texture.c:1003 msgid "Tile Waste" msgstr "Tesela de residuo" -#: clutter/clutter-texture.c:1014 +#: ../clutter/clutter-texture.c:1004 msgid "Maximum waste area of a sliced texture" msgstr "A área máxima dun residuo en segmentos de textura" -#: clutter/clutter-texture.c:1022 +#: ../clutter/clutter-texture.c:1012 msgid "Horizontal repeat" msgstr "Repetición horizontal" -#: clutter/clutter-texture.c:1023 +#: ../clutter/clutter-texture.c:1013 msgid "Repeat the contents rather than scaling them horizontally" msgstr "Repetir o contido no canto de escalalo en horizontal." -#: clutter/clutter-texture.c:1030 +#: ../clutter/clutter-texture.c:1020 msgid "Vertical repeat" msgstr "Repetición vertical" -#: clutter/clutter-texture.c:1031 +#: ../clutter/clutter-texture.c:1021 msgid "Repeat the contents rather than scaling them vertically" msgstr "Repetir o contido no canto de escalalo en vertical" -#: clutter/clutter-texture.c:1038 +#: ../clutter/clutter-texture.c:1028 msgid "Filter Quality" msgstr "Calidade final" -#: clutter/clutter-texture.c:1039 +#: ../clutter/clutter-texture.c:1029 msgid "Rendering quality used when drawing the texture" msgstr "Calidade do renderizado cando se debuxa a textura." -#: clutter/clutter-texture.c:1047 +#: ../clutter/clutter-texture.c:1037 msgid "Pixel Format" msgstr "Formato do píxel" -#: clutter/clutter-texture.c:1048 +#: ../clutter/clutter-texture.c:1038 msgid "The Cogl pixel format to use" msgstr "O formato do píxel COGL que empregar" -#: clutter/clutter-texture.c:1056 +#: ../clutter/clutter-texture.c:1046 msgid "Cogl Texture" msgstr "Textura COGL" -#: clutter/clutter-texture.c:1057 +#: ../clutter/clutter-texture.c:1047 msgid "The underlying Cogl texture handle used to draw this actor" msgstr "A textura COGL subxacente empregada para debuxar este actor" -#: clutter/clutter-texture.c:1064 +#: ../clutter/clutter-texture.c:1054 msgid "Cogl Material" msgstr "Material COGL" -#: clutter/clutter-texture.c:1065 +#: ../clutter/clutter-texture.c:1055 msgid "The underlying Cogl material handle used to draw this actor" msgstr "O material COGL subxacente empregado para debuxar este actor" -#: clutter/clutter-texture.c:1082 +#: ../clutter/clutter-texture.c:1072 msgid "The path of the file containing the image data" msgstr "A ruta do ficheiro que conten os datos da imaxe" -#: clutter/clutter-texture.c:1089 +#: ../clutter/clutter-texture.c:1079 msgid "Keep Aspect Ratio" msgstr "Manter a relación de aspecto" -#: clutter/clutter-texture.c:1090 +#: ../clutter/clutter-texture.c:1080 msgid "" "Keep the aspect ratio of the texture when requesting the preferred width or " "height" @@ -1982,22 +2015,22 @@ msgstr "" "Manter a relación de aspecto da textura cando se require unha largura ou " "unha altura preferida" -#: clutter/clutter-texture.c:1116 +#: ../clutter/clutter-texture.c:1106 msgid "Load asynchronously" msgstr "Carga de forma asíncrona" -#: clutter/clutter-texture.c:1117 +#: ../clutter/clutter-texture.c:1107 msgid "" "Load files inside a thread to avoid blocking when loading images from disk" msgstr "" "Cargar ficheiros dentro dun fío para evitar o bloqueo ao cargar as imaxes " "desde o disco." -#: clutter/clutter-texture.c:1133 +#: ../clutter/clutter-texture.c:1123 msgid "Load data asynchronously" msgstr "Carga os datos de forma asíncrona" -#: clutter/clutter-texture.c:1134 +#: ../clutter/clutter-texture.c:1124 msgid "" "Decode image data files inside a thread to reduce blocking when loading " "images from disk" @@ -2005,189 +2038,192 @@ msgstr "" "Descodificar os ficheiros de datos de imaxes dentro dun fío para reducir o " "bloqueo ao cargar imaxes desde o disco." -#: clutter/clutter-texture.c:1158 +#: ../clutter/clutter-texture.c:1148 msgid "Pick With Alpha" msgstr "Seleccione con alfa" -#: clutter/clutter-texture.c:1159 +#: ../clutter/clutter-texture.c:1149 msgid "Shape actor with alpha channel when picking" msgstr "Cando se selecciona a forma actor leva canle alfa" -#: clutter/clutter-texture.c:1557 clutter/clutter-texture.c:1967 -#: clutter/clutter-texture.c:2062 clutter/clutter-texture.c:2343 +#: ../clutter/clutter-texture.c:1547 ../clutter/clutter-texture.c:1930 +#: ../clutter/clutter-texture.c:2024 ../clutter/clutter-texture.c:2305 +#, c-format msgid "Failed to load the image data" msgstr "Produciuse un fallo ao cargar os datos da imaxe" -#: clutter/clutter-texture.c:1703 +#: ../clutter/clutter-texture.c:1693 +#, c-format msgid "YUV textures are not supported" msgstr "Non se admiten as texturas YUV" -#: clutter/clutter-texture.c:1712 +#: ../clutter/clutter-texture.c:1702 +#, c-format msgid "YUV2 textues are not supported" msgstr "Non se admiten as texturas YUV2" -#: clutter/clutter-timeline.c:264 +#: ../clutter/clutter-timeline.c:264 msgid "Should the timeline automatically restart" msgstr "A liña de tempo debe reiniciarse automaticamente" -#: clutter/clutter-timeline.c:278 +#: ../clutter/clutter-timeline.c:278 msgid "Delay" msgstr "Atraso" -#: clutter/clutter-timeline.c:279 +#: ../clutter/clutter-timeline.c:279 msgid "Delay before start" msgstr "Atraso antes de comezar" -#: clutter/clutter-timeline.c:295 +#: ../clutter/clutter-timeline.c:295 msgid "Duration of the timeline in milliseconds" msgstr "Duración da liña de tempo en milisegundos" -#: clutter/clutter-timeline.c:311 +#: ../clutter/clutter-timeline.c:311 msgid "Direction of the timeline" msgstr "Dirección da liña de tempo" -#: clutter/clutter-timeline.c:326 +#: ../clutter/clutter-timeline.c:326 msgid "Auto Reverse" msgstr "Inversión automática" -#: clutter/clutter-timeline.c:327 +#: ../clutter/clutter-timeline.c:327 msgid "Whether the direction should be reversed when reaching the end" msgstr "Se a dirección debe ser revertida cando chega a fin" -#: clutter/evdev/clutter-input-device-evdev.c:147 +#: ../clutter/evdev/clutter-input-device-evdev.c:147 msgid "sysfs Path" msgstr "Ruta a «sysfs»" -#: clutter/evdev/clutter-input-device-evdev.c:148 +#: ../clutter/evdev/clutter-input-device-evdev.c:148 msgid "Path of the device in sysfs" msgstr "Ruta ao dispositivo en «sysfs»" -#: clutter/evdev/clutter-input-device-evdev.c:163 +#: ../clutter/evdev/clutter-input-device-evdev.c:163 msgid "Device Path" msgstr "Ruta ao dispositivo" -#: clutter/evdev/clutter-input-device-evdev.c:164 +#: ../clutter/evdev/clutter-input-device-evdev.c:164 msgid "Path of the device node" msgstr "Ruta ao nodo dodispositivo" -#: clutter/x11/clutter-backend-x11.c:483 +#: ../clutter/x11/clutter-backend-x11.c:483 msgid "X display to use" msgstr "Visor [display] X que usar" -#: clutter/x11/clutter-backend-x11.c:489 +#: ../clutter/x11/clutter-backend-x11.c:489 msgid "X screen to use" msgstr "Pantalla [screen] X que usar" -#: clutter/x11/clutter-backend-x11.c:494 +#: ../clutter/x11/clutter-backend-x11.c:494 msgid "Make X calls synchronous" msgstr "Facer que as chamadas a X sexan síncronas" -#: clutter/x11/clutter-backend-x11.c:501 +#: ../clutter/x11/clutter-backend-x11.c:501 msgid "Enable XInput support" msgstr "Activar a compatibilidade con XInput" -#: clutter/x11/clutter-keymap-x11.c:317 +#: ../clutter/x11/clutter-keymap-x11.c:317 msgid "The Clutter backend" msgstr "Infraestrutura do Clutter" -#: clutter/x11/clutter-x11-texture-pixmap.c:545 +#: ../clutter/x11/clutter-x11-texture-pixmap.c:545 msgid "Pixmap" msgstr "Mapa de píxeles" -#: clutter/x11/clutter-x11-texture-pixmap.c:546 +#: ../clutter/x11/clutter-x11-texture-pixmap.c:546 msgid "The X11 Pixmap to be bound" msgstr "Asociar o mapa de píxeles X11" -#: clutter/x11/clutter-x11-texture-pixmap.c:554 +#: ../clutter/x11/clutter-x11-texture-pixmap.c:554 msgid "Pixmap width" msgstr "Largura do mapa de píxeles" -#: clutter/x11/clutter-x11-texture-pixmap.c:555 +#: ../clutter/x11/clutter-x11-texture-pixmap.c:555 msgid "The width of the pixmap bound to this texture" msgstr "A largura do mapa de píxeles asociado a esta textura" -#: clutter/x11/clutter-x11-texture-pixmap.c:563 +#: ../clutter/x11/clutter-x11-texture-pixmap.c:563 msgid "Pixmap height" msgstr "Altura do mapa de píxeles" -#: clutter/x11/clutter-x11-texture-pixmap.c:564 +#: ../clutter/x11/clutter-x11-texture-pixmap.c:564 msgid "The height of the pixmap bound to this texture" msgstr "A altura do mapa de píxeles asociado a esta textura" -#: clutter/x11/clutter-x11-texture-pixmap.c:572 +#: ../clutter/x11/clutter-x11-texture-pixmap.c:572 msgid "Pixmap Depth" msgstr "Profundidade do mapa de píxeles" -#: clutter/x11/clutter-x11-texture-pixmap.c:573 +#: ../clutter/x11/clutter-x11-texture-pixmap.c:573 msgid "The depth (in number of bits) of the pixmap bound to this texture" msgstr "" "A profundidade (en número de bits) do mapa de píxeles asociado a esta textura" -#: clutter/x11/clutter-x11-texture-pixmap.c:581 +#: ../clutter/x11/clutter-x11-texture-pixmap.c:581 msgid "Automatic Updates" msgstr "Actualizacións automáticas" -#: clutter/x11/clutter-x11-texture-pixmap.c:582 +#: ../clutter/x11/clutter-x11-texture-pixmap.c:582 msgid "If the texture should be kept in sync with any pixmap changes." msgstr "" "Se a textura debe manterse sincronizada con calquera cambio do mapa de " "píxeles." -#: clutter/x11/clutter-x11-texture-pixmap.c:590 +#: ../clutter/x11/clutter-x11-texture-pixmap.c:590 msgid "Window" msgstr "Xanela" -#: clutter/x11/clutter-x11-texture-pixmap.c:591 +#: ../clutter/x11/clutter-x11-texture-pixmap.c:591 msgid "The X11 Window to be bound" msgstr "A xanela X11 que asociar" -#: clutter/x11/clutter-x11-texture-pixmap.c:599 +#: ../clutter/x11/clutter-x11-texture-pixmap.c:599 msgid "Window Redirect Automatic" msgstr "Redirixir a xanela automaticamente" -#: clutter/x11/clutter-x11-texture-pixmap.c:600 +#: ../clutter/x11/clutter-x11-texture-pixmap.c:600 msgid "If composite window redirects are set to Automatic (or Manual if false)" msgstr "" "Se a redirección da xanela composta estabelecese en automática (ou manual de " "ser falso)" -#: clutter/x11/clutter-x11-texture-pixmap.c:610 +#: ../clutter/x11/clutter-x11-texture-pixmap.c:610 msgid "Window Mapped" msgstr "Mapeamento da xanela" -#: clutter/x11/clutter-x11-texture-pixmap.c:611 +#: ../clutter/x11/clutter-x11-texture-pixmap.c:611 msgid "If window is mapped" msgstr "Se a xanela é mapeada" -#: clutter/x11/clutter-x11-texture-pixmap.c:620 +#: ../clutter/x11/clutter-x11-texture-pixmap.c:620 msgid "Destroyed" msgstr "Destruída" -#: clutter/x11/clutter-x11-texture-pixmap.c:621 +#: ../clutter/x11/clutter-x11-texture-pixmap.c:621 msgid "If window has been destroyed" msgstr "Se a xanela foi destruída" -#: clutter/x11/clutter-x11-texture-pixmap.c:629 +#: ../clutter/x11/clutter-x11-texture-pixmap.c:629 msgid "Window X" msgstr "Xanela X" -#: clutter/x11/clutter-x11-texture-pixmap.c:630 +#: ../clutter/x11/clutter-x11-texture-pixmap.c:630 msgid "X position of window on screen according to X11" msgstr "Posición X da xanela na pantalla conforme X11" -#: clutter/x11/clutter-x11-texture-pixmap.c:638 +#: ../clutter/x11/clutter-x11-texture-pixmap.c:638 msgid "Window Y" msgstr "Xanela Y" -#: clutter/x11/clutter-x11-texture-pixmap.c:639 +#: ../clutter/x11/clutter-x11-texture-pixmap.c:639 msgid "Y position of window on screen according to X11" msgstr "Posición Y da xanela na pantalla conforme X11" -#: clutter/x11/clutter-x11-texture-pixmap.c:646 +#: ../clutter/x11/clutter-x11-texture-pixmap.c:646 msgid "Window Override Redirect" msgstr "Redireccionar substituír a xanela" -#: clutter/x11/clutter-x11-texture-pixmap.c:647 +#: ../clutter/x11/clutter-x11-texture-pixmap.c:647 msgid "If this is an override-redirect window" msgstr "De ser unha substitución-redirección da xanela" diff --git a/tests/conform/Makefile.am b/tests/conform/Makefile.am index 0d7b5e442..e1c8161d2 100644 --- a/tests/conform/Makefile.am +++ b/tests/conform/Makefile.am @@ -164,8 +164,8 @@ INCLUDES = \ test_conformance_CPPFLAGS = \ -DG_DISABLE_SINGLE_INCLUDES \ -DCOGL_ENABLE_EXPERIMENTAL_API \ - -DCOGL_DISABLE_DEPRECATED \ - -DCLUTTER_DISABLE_DEPRECATED \ + -DG_DISABLE_DEPRECATION_WARNINGS \ + -DCLUTTER_DISABLE_DEPRECATION_WARNINGS \ -DTESTS_DATADIR=\""$(top_srcdir)/tests/data"\" test_conformance_CFLAGS = -g $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS) diff --git a/tests/conform/test-clutter-cairo-texture.c b/tests/conform/test-clutter-cairo-texture.c index d0700bfb7..a6b73c83b 100644 --- a/tests/conform/test-clutter-cairo-texture.c +++ b/tests/conform/test-clutter-cairo-texture.c @@ -1,4 +1,3 @@ -#undef CLUTTER_DISABLE_DEPRECATED #include #include diff --git a/tests/conform/test-texture-fbo.c b/tests/conform/test-texture-fbo.c index 9ec82cbee..9aa696db5 100644 --- a/tests/conform/test-texture-fbo.c +++ b/tests/conform/test-texture-fbo.c @@ -1,5 +1,3 @@ -#undef CLUTTER_DISABLE_DEPRECATED - #include #include diff --git a/tests/interactive/Makefile.am b/tests/interactive/Makefile.am index d8c717317..76088592d 100644 --- a/tests/interactive/Makefile.am +++ b/tests/interactive/Makefile.am @@ -156,8 +156,8 @@ test_interactive_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS) test_interactive_CPPFLAGS = \ -DTESTS_DATADIR=\""$(abs_top_srcdir)/tests/data"\" \ -DG_DISABLE_SINGLE_INCLUDES \ - -DCOGL_DISABLE_DEPRECATED \ - -DCLUTTER_DISABLE_DEPRECATED + -DGLIB_DISABLE_DEPRECATION_WARNINGS \ + -DCLUTTER_DISABLE_DEPRECATION_WARNINGS test_interactive_LDFLAGS = -export-dynamic test_interactive_LDADD = $(CLUTTER_LIBS) $(common_ldadd) -lm diff --git a/tests/interactive/test-actors.c b/tests/interactive/test-actors.c index f3d7b2348..4ce782aeb 100644 --- a/tests/interactive/test-actors.c +++ b/tests/interactive/test-actors.c @@ -216,8 +216,7 @@ test_actors_main (int argc, char *argv[]) oh->group = clutter_group_new(); clutter_actor_set_name (oh->group, "Group"); g_signal_connect (oh->group, "destroy", G_CALLBACK (on_group_destroy), oh); - clutter_actor_add_constraint (oh->group, clutter_align_constraint_new (stage, CLUTTER_ALIGN_X_AXIS, 0.5)); - clutter_actor_add_constraint (oh->group, clutter_align_constraint_new (stage, CLUTTER_ALIGN_Y_AXIS, 0.5)); + clutter_actor_add_constraint (oh->group, clutter_align_constraint_new (stage, CLUTTER_ALIGN_BOTH, 0.5)); clutter_actor_add_constraint (oh->group, clutter_bind_constraint_new (stage, CLUTTER_BIND_SIZE, 0.0f)); oh->hand = g_new (ClutterActor*, n_hands); diff --git a/tests/interactive/test-cairo-flowers.c b/tests/interactive/test-cairo-flowers.c index b2c0352cb..5dca4577b 100644 --- a/tests/interactive/test-cairo-flowers.c +++ b/tests/interactive/test-cairo-flowers.c @@ -1,8 +1,6 @@ /* * Pretty cairo flower hack. */ - -#undef CLUTTER_DISABLE_DEPRECATED #include #ifndef _MSC_VER diff --git a/tests/interactive/test-constraints.c b/tests/interactive/test-constraints.c index 3e45ce990..0c6a54f8b 100644 --- a/tests/interactive/test-constraints.c +++ b/tests/interactive/test-constraints.c @@ -186,11 +186,8 @@ test_constraints_main (int argc, char *argv[]) clutter_container_add_actor (CLUTTER_CONTAINER (stage), rect); /* align the center rectangle to the center of the stage */ - constraint = clutter_align_constraint_new (stage, CLUTTER_ALIGN_X_AXIS, 0.5); - clutter_actor_add_constraint_with_name (rect, "x-align", constraint); - - constraint = clutter_align_constraint_new (stage, CLUTTER_ALIGN_Y_AXIS, 0.5); - clutter_actor_add_constraint_with_name (rect, "y-align", constraint); + constraint = clutter_align_constraint_new (stage, CLUTTER_ALIGN_BOTH, 0.5); + clutter_actor_add_constraint_with_name (rect, "align", constraint); /* this is the equivalent of the DesaturateEffect; we cannot animate * the factor because the animation API only understands GObject diff --git a/tests/interactive/test-fbo.c b/tests/interactive/test-fbo.c index 115063bdc..5854ad181 100644 --- a/tests/interactive/test-fbo.c +++ b/tests/interactive/test-fbo.c @@ -1,5 +1,3 @@ -#undef CLUTTER_DISABLE_DEPRECATED - #include #include diff --git a/tests/interactive/test-main.c b/tests/interactive/test-main.c index 74bbcd023..cec02cf51 100644 --- a/tests/interactive/test-main.c +++ b/tests/interactive/test-main.c @@ -139,7 +139,7 @@ main (int argc, char **argv) g_print (" - %s:%*s%s\n", test_unit_names[i], - (int) len - strlen (str), " ", + (int) (len - strlen (str)), " ", str); g_free (str); diff --git a/tests/interactive/test-scrolling.c b/tests/interactive/test-scrolling.c index 73ba63ae2..9699d554c 100644 --- a/tests/interactive/test-scrolling.c +++ b/tests/interactive/test-scrolling.c @@ -88,8 +88,7 @@ test_scrolling_main (int argc, char *argv[]) scroll = clutter_group_new (); clutter_container_add_actor (CLUTTER_CONTAINER (stage), scroll); clutter_actor_set_size (scroll, RECT_WIDTH, RECT_HEIGHT); - clutter_actor_add_constraint (scroll, clutter_align_constraint_new (stage, CLUTTER_ALIGN_X_AXIS, 0.5)); - clutter_actor_add_constraint (scroll, clutter_align_constraint_new (stage, CLUTTER_ALIGN_Y_AXIS, 0.5)); + clutter_actor_add_constraint (scroll, clutter_align_constraint_new (stage, CLUTTER_ALIGN_BOTH, 0.5)); clutter_actor_set_clip_to_allocation (scroll, TRUE); /* viewport: the actual container for the children; we scroll it using diff --git a/tests/interactive/test-shader.c b/tests/interactive/test-shader.c index 79a014b88..44ab581ff 100644 --- a/tests/interactive/test-shader.c +++ b/tests/interactive/test-shader.c @@ -1,7 +1,3 @@ -/*#define TEST_GROUP */ - -#undef CLUTTER_DISABLE_DEPRECATED - #include #include diff --git a/tests/interactive/test-snap-constraint.c b/tests/interactive/test-snap-constraint.c index 6ca4e3303..e36350cbc 100644 --- a/tests/interactive/test-snap-constraint.c +++ b/tests/interactive/test-snap-constraint.c @@ -27,8 +27,7 @@ test_snap_constraint_main (int argc, clutter_actor_set_size (layer_a, 100.0, 25.0); /* the first layer is anchored to the middle of the stage */ - clutter_actor_add_constraint (layer_a, clutter_align_constraint_new (stage, CLUTTER_ALIGN_X_AXIS, 0.5)); - clutter_actor_add_constraint (layer_a, clutter_align_constraint_new (stage, CLUTTER_ALIGN_Y_AXIS, 0.5)); + clutter_actor_add_constraint (layer_a, clutter_align_constraint_new (stage, CLUTTER_ALIGN_BOTH, 0.5)); /* second layer, with no implicit size */ layer_b = clutter_rectangle_new_with_color (CLUTTER_COLOR_DarkButter); diff --git a/tests/interactive/test-state-script.c b/tests/interactive/test-state-script.c index 276cd85ff..e777d89bc 100644 --- a/tests/interactive/test-state-script.c +++ b/tests/interactive/test-state-script.c @@ -41,8 +41,7 @@ test_state_script_main (int argc, char *argv[]) button = CLUTTER_ACTOR (clutter_script_get_object (script, "button")); clutter_container_add_actor (CLUTTER_CONTAINER (stage), button); - clutter_actor_add_constraint (button, clutter_align_constraint_new (stage, CLUTTER_ALIGN_X_AXIS, 0.5)); - clutter_actor_add_constraint (button, clutter_align_constraint_new (stage, CLUTTER_ALIGN_Y_AXIS, 0.5)); + clutter_actor_add_constraint (button, clutter_align_constraint_new (stage, CLUTTER_ALIGN_BOTH, 0.5)); clutter_script_connect_signals (script, NULL); diff --git a/tests/interactive/test-threads.c b/tests/interactive/test-threads.c index 72a68a908..01ca8a766 100644 --- a/tests/interactive/test-threads.c +++ b/tests/interactive/test-threads.c @@ -5,6 +5,7 @@ #undef CLUTTER_DISABLE_DEPRECATED #include +/* our thread-specific data */ typedef struct { ClutterActor *stage; @@ -12,8 +13,6 @@ typedef struct ClutterActor *progress; ClutterTimeline *timeline; - - volatile gboolean cancelled; } TestThreadData; static TestThreadData * @@ -27,8 +26,13 @@ test_thread_data_new (void) } static void -test_thread_data_free (TestThreadData *data) +test_thread_data_free (gpointer _data) { + TestThreadData *data = _data; + + if (data == NULL) + return; + g_object_unref (data->progress); g_object_unref (data->label); g_object_unref (data->stage); @@ -52,7 +56,22 @@ test_thread_done_idle (gpointer user_data) return FALSE; } -static GPrivate test_thread_data = G_PRIVATE_INIT (test_thread_data_free); +static void +test_thread_data_done (gpointer _data) +{ + TestThreadData *data = _data; + + /* since the TestThreadData structure references Clutter data structures + * we need to free it from within the same thread that called clutter_main() + * which means using an idle handler in the main loop. + * + * clutter_threads_add_idle() is guaranteed to run the callback passed to + * to it under the Big Clutter Lock. + */ + clutter_threads_add_idle (test_thread_done_idle, data); +} + +static GPrivate test_thread_data = G_PRIVATE_INIT (test_thread_data_done); typedef struct { @@ -68,7 +87,6 @@ update_label_idle (gpointer data) gchar *text; text = g_strdup_printf ("Count to %d", update->count); - clutter_text_set_text (CLUTTER_TEXT (update->thread_data->label), text); clutter_actor_set_width (update->thread_data->label, -1); @@ -94,8 +112,6 @@ do_something_very_slow (void) gint i; data = g_private_get (&test_thread_data); - if (data->cancelled) - return; for (i = 0; i < 100; i++) { @@ -103,13 +119,18 @@ do_something_very_slow (void) msecs = 1 + (int) (100.0 * rand () / ((RAND_MAX + 1.0) / 3)); - /* sleep for a while */ + /* sleep for a while, to emulate some work being done */ g_usleep (msecs * 1000); if ((i % 10) == 0) { TestUpdate *update; + /* update the UI from within the main loop, making sure that the + * Big Clutter Lock is held; only one thread at a time can call + * Clutter API, and it's better to do this from the same thread + * that called clutter_init()/clutter_main(). + */ update = g_new (TestUpdate, 1); update->count = i; update->thread_data = data; @@ -128,12 +149,9 @@ test_thread_func (gpointer user_data) g_private_set (&test_thread_data, data); + /* this function will block */ do_something_very_slow (); - clutter_threads_add_idle_full (G_PRIORITY_DEFAULT + 30, - test_thread_done_idle, - data, NULL); - return NULL; } @@ -162,7 +180,8 @@ on_key_press_event (ClutterStage *stage, data->progress = g_object_ref (progress_rect); data->timeline = g_object_ref (timeline); - g_thread_new ("counter", test_thread_func, data, FALSE, NULL); + /* start the thread that updates the counter and the progress bar */ + g_thread_new ("counter", test_thread_func, data); return TRUE; @@ -256,3 +275,9 @@ test_threads_main (int argc, char *argv[]) return EXIT_SUCCESS; } + +const char * +test_threads_describe (void) +{ + return "Multi-threading programming with Clutter"; +}