Hello community, here is the log from the commit of package libchamplain for openSUSE:Factory checked in at 2015-03-19 21:04:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libchamplain (Old) and /work/SRC/openSUSE:Factory/.libchamplain.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libchamplain" Changes: -------- --- /work/SRC/openSUSE:Factory/libchamplain/libchamplain.changes 2014-09-30 19:38:35.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libchamplain.new/libchamplain.changes 2015-03-19 21:04:31.000000000 +0100 @@ -1,0 +2,12 @@ +Wed Mar 18 10:56:42 UTC 2015 - zai...@opensuse.org + +- Update to version 0.12.10: + + Improve key-press event handling to better support custom + keybindings. + + Add a simple demo demonstrating custom keybindings. + + Handle CLUTTER_SCROLL_SMOOTH to fix moouse-wheel zooming with + newer clutter versions. + + Make ChamplainLabel shadow optional. + + Emit animation-completed::zoom signal when zoom ends. + +------------------------------------------------------------------- Old: ---- libchamplain-0.12.9.tar.xz New: ---- libchamplain-0.12.10.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libchamplain.spec ++++++ --- /var/tmp/diff_new_pack.u0K00t/_old 2015-03-19 21:04:32.000000000 +0100 +++ /var/tmp/diff_new_pack.u0K00t/_new 2015-03-19 21:04:32.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libchamplain # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: libchamplain -Version: 0.12.9 +Version: 0.12.10 Release: 0 Summary: Library to display maps License: LGPL-2.1+ ++++++ libchamplain-0.12.9.tar.xz -> libchamplain-0.12.10.tar.xz ++++++ ++++ 1649 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libchamplain-0.12.9/ChangeLog new/libchamplain-0.12.10/ChangeLog --- old/libchamplain-0.12.9/ChangeLog 2014-09-18 00:22:23.000000000 +0200 +++ new/libchamplain-0.12.10/ChangeLog 2015-03-18 11:44:23.000000000 +0100 @@ -1,5 +1,114 @@ # Generated by Makefile. Do not edit. +commit e0386f80647b0bf0b00b8b2f3a276fcd4165e133 +Author: Jiří Techet <tec...@gmail.com> +Date: Wed Mar 18 11:41:10 2015 +0100 + + 0.12.10 + +commit eb2cff0f429ad542d7eba55232c33579e5cceddd +Author: Jiří Techet <tec...@gmail.com> +Date: Wed Mar 18 10:49:58 2015 +0100 + + Fix warning + +commit 1a34b284750d966cd5fce59be3d03bb263dd184a +Author: Jonas Danielsson <jo...@threetimestwo.org> +Date: Mon Mar 16 17:42:44 2015 +0100 + + ChamplainView: Handle CLUTTER_SCROLL_SMOOTH + + In latest Clutter more devices reports scroll using + the CLUTTER_SCROLL_SMOOTH direction. This means that the + scroll to zoom functionality stopped working for Maps. + + Not handling the CLUTTER_SCROLL_SMOOTH in Champlain has + always been a buglet. It gets more serious now that we + get CLUTTER_SCROLL_SMOOTH more often. + + https://bugzilla.gnome.org/show_bug.cgi?id=746127 + +commit 10c74dd5ec9430a501f702b7ff02a1d90858674f +Author: Jonas Danielsson <jo...@threetimestwo.org> +Date: Sun Jan 18 13:48:48 2015 +0100 + + Revert "Increase the maximum zoom level of Mapquest to 19" + + This reverts commit 08c9ea88e4a9fe19adc81da2329066f53b2332c5. + + https://bugzilla.gnome.org/show_bug.cgi?id=743121 + +commit adf500d71116ddc90255b0d5ec6bec961ee5122e +Author: Jonas Danielsson <jo...@threetimestwo.org> +Date: Tue Nov 4 20:57:31 2014 +0100 + + ChamplainView: Emit animation-completed::zoom + + https://bugzilla.gnome.org/show_bug.cgi?id=739641 + +commit 08c9ea88e4a9fe19adc81da2329066f53b2332c5 +Author: Jiří Techet <tec...@gmail.com> +Date: Thu Oct 30 14:49:30 2014 +0100 + + Increase the maximum zoom level of Mapquest to 19 + +commit e1a1af44f90c1c65e81a4c7b65a6a92b79b6e125 +Author: Jiří Techet <tec...@gmail.com> +Date: Mon Oct 20 20:04:38 2014 +0200 + + Whitespace change + +commit 4776e790091f7b3ffab2a4e462b1f4e7825b1366 +Author: Jonas Danielsson <jonas.daniels...@threetimestwo.org> +Date: Mon Oct 20 05:14:05 2014 -0400 + + GtkChamplainEmbed: Propagate key-press to view + + Make sure the GtkChamplainEmbed widget gives focus to the + GtkClutterEmbed widget. And also propagates the key press + events to the ChamplainView actor. + + https://bugzilla.gnome.org/show_bug.cgi?id=738849 + +commit 1fd0ba0f0b87b64ead0a7f0c8c83c9761bf05f79 +Author: Jonas Danielsson <jonas.daniels...@threetimestwo.org> +Date: Mon Oct 20 05:14:19 2014 -0400 + + ChamplainView: Move the key-press event to view + + Bind the key-press event to the view actor instead + of the kinetic_scroll actor. This will allow users + of GtkChamplainEmbed to use the pan and zoom bindings + from their application. + + https://bugzilla.gnome.org/show_bug.cgi?id=738849 + +commit b470dc9d12f6fe301d21f4d9504d27ca1301b246 +Author: Jiří Techet <tec...@gmail.com> +Date: Sun Oct 19 21:41:16 2014 +0200 + + Use view height for computing y delta in the keyboard mapping demo + +commit c16cbc9279aef8d720a7e559f4bbaed1d328de83 +Author: Jiří Techet <tec...@gmail.com> +Date: Sat Oct 18 20:35:26 2014 +0200 + + Add demo demonstrating custom keyboard mapping for various map actions + +commit a64f8a8f9a0f2d0640be468c8192f366c133f27f +Author: Jiří Techet <tec...@gmail.com> +Date: Wed Oct 15 21:38:02 2014 +0200 + + Make ChamplainLabel shadow optional + + Thanks to Chris Mayo for providing the patch. + +commit 294c03a6792d0f9112a66147e267f3d08674d135 +Author: Jiří Techet <tec...@gmail.com> +Date: Thu Sep 18 00:30:47 2014 +0200 + + Post release version bump + commit 11e76ac28fd77379f2a13e4f678679ef10372792 Author: Jiří Techet <tec...@gmail.com> Date: Thu Sep 18 00:14:28 2014 +0200 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libchamplain-0.12.9/NEWS new/libchamplain-0.12.10/NEWS --- old/libchamplain-0.12.9/NEWS 2014-09-18 00:11:32.000000000 +0200 +++ new/libchamplain-0.12.10/NEWS 2015-03-18 11:29:48.000000000 +0100 @@ -1,3 +1,18 @@ +libchamplain 0.12.10 (2015-03-18) +================================= + +Stable release + +Changes: + +* Improve key-press event handling to better support custom keybindings + (Jonas Danielsson) +* Add a simple demo demonstrating custom keybindings (Jiří Techet) +* Handle CLUTTER_SCROLL_SMOOTH to fix moouse-wheel zooming with newer clutter + versions (Jonas Danielsson) +* Make ChamplainLabel shadow optional (Chris Mayo) +* Emit animation-completed::zoom signal when zoom ends (Jonas Danielsson) + libchamplain 0.12.9 (2014-09-18) ================================ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libchamplain-0.12.9/champlain/champlain-0.12.vapi new/libchamplain-0.12.10/champlain/champlain-0.12.vapi --- old/libchamplain-0.12.9/champlain/champlain-0.12.vapi 2014-09-17 23:31:40.000000000 +0200 +++ new/libchamplain-0.12.10/champlain/champlain-0.12.vapi 2015-03-18 11:36:16.000000000 +0100 @@ -113,6 +113,7 @@ public Pango.AttrList get_attributes (); public Clutter.Color? get_color (); public bool get_draw_background (); + public bool get_draw_shadow (); public Pango.EllipsizeMode get_ellipsize (); public unowned string get_font_name (); public unowned Clutter.Actor get_image (); @@ -126,6 +127,7 @@ public void set_attributes (Pango.AttrList list); public void set_color (Clutter.Color? color); public void set_draw_background (bool background); + public void set_draw_shadow (bool shadow); public void set_ellipsize (Pango.EllipsizeMode mode); public void set_font_name (string? font_name); public void set_image (Clutter.Actor? image); @@ -142,6 +144,7 @@ public Pango.Alignment alignment { get; set; } public Clutter.Color color { get; set; } public bool draw_background { get; set; } + public bool draw_shadow { get; set; } public Pango.EllipsizeMode ellipsize { get; set; } public string font_name { get; set; } public Clutter.Actor image { get; set; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libchamplain-0.12.9/champlain/champlain-label.c new/libchamplain-0.12.10/champlain/champlain-label.c --- old/libchamplain-0.12.9/champlain/champlain-label.c 2014-09-17 23:30:38.000000000 +0200 +++ new/libchamplain-0.12.10/champlain/champlain-label.c 2014-10-17 11:57:16.000000000 +0200 @@ -79,7 +79,8 @@ PROP_WRAP, PROP_WRAP_MODE, PROP_SINGLE_LINE_MODE, - PROP_DRAW_BACKGROUND + PROP_DRAW_BACKGROUND, + PROP_DRAW_SHADOW }; /* static guint champlain_label_signals[LAST_SIGNAL] = { 0, }; */ @@ -99,6 +100,7 @@ gboolean single_line_mode; PangoEllipsizeMode ellipsize; gboolean draw_background; + gboolean draw_shadow; guint redraw_id; gint total_width; @@ -164,6 +166,10 @@ g_value_set_boolean (value, priv->draw_background); break; + case PROP_DRAW_SHADOW: + g_value_set_boolean (value, priv->draw_shadow); + break; + case PROP_ELLIPSIZE: g_value_set_enum (value, priv->ellipsize); break; @@ -232,6 +238,10 @@ champlain_label_set_draw_background (label, g_value_get_boolean (value)); break; + case PROP_DRAW_SHADOW: + champlain_label_set_draw_shadow (label, g_value_get_boolean (value)); + break; + case PROP_SINGLE_LINE_MODE: champlain_label_set_single_line_mode (label, g_value_get_boolean (value)); break; @@ -511,6 +521,20 @@ TRUE, CHAMPLAIN_PARAM_READWRITE)); +/** + * ChamplainLabel:draw-shadow: + * + * If the label background has a shadow + * + * Since: 0.12.10 + */ + g_object_class_install_property (object_class, PROP_DRAW_SHADOW, + g_param_spec_boolean ("draw-shadow", + "Draw Shadow", + "The label background has a shadow", + TRUE, + CHAMPLAIN_PARAM_READWRITE)); + /** * ChamplainLabel:single-line-mode: * @@ -737,17 +761,20 @@ clutter_content_invalidate (canvas); g_object_unref (canvas); - canvas = clutter_canvas_new (); - clutter_canvas_set_size (CLUTTER_CANVAS (canvas), total_width + get_shadow_slope_width (label), total_height + priv->point); - g_signal_connect (canvas, "draw", G_CALLBACK (draw_shadow), label); - - shadow = clutter_actor_new (); - clutter_actor_set_size (shadow, total_width + get_shadow_slope_width (label), total_height + priv->point); - clutter_actor_set_content (shadow, canvas); - clutter_actor_add_child (CLUTTER_ACTOR (label), shadow); - clutter_actor_set_position (shadow, 0, total_height / 2.0); - clutter_content_invalidate (canvas); - g_object_unref (canvas); + if (priv->draw_shadow) + { + canvas = clutter_canvas_new (); + clutter_canvas_set_size (CLUTTER_CANVAS (canvas), total_width + get_shadow_slope_width (label), total_height + priv->point); + g_signal_connect (canvas, "draw", G_CALLBACK (draw_shadow), label); + + shadow = clutter_actor_new (); + clutter_actor_set_size (shadow, total_width + get_shadow_slope_width (label), total_height + priv->point); + clutter_actor_set_content (shadow, canvas); + clutter_actor_add_child (CLUTTER_ACTOR (label), shadow); + clutter_actor_set_position (shadow, 0, total_height / 2.0); + clutter_content_invalidate (canvas); + g_object_unref (canvas); + } } if (text_actor != NULL && background != NULL) @@ -837,6 +864,7 @@ priv->single_line_mode = TRUE; priv->ellipsize = PANGO_ELLIPSIZE_NONE; priv->draw_background = TRUE; + priv->draw_shadow = TRUE; priv->redraw_id = 0; priv->total_width = 0; priv->total_height = 0; @@ -1332,6 +1360,26 @@ /** + * champlain_label_set_draw_shadow: + * @label: a #ChamplainLabel + * @shadow: value. + * + * Sets if the label's background has a shadow. + * + * Since: 0.12.10 + */ +void +champlain_label_set_draw_shadow (ChamplainLabel *label, + gboolean shadow) +{ + g_return_if_fail (CHAMPLAIN_IS_LABEL (label)); + + label->priv->draw_shadow = shadow; + g_object_notify (G_OBJECT (label), "draw-shadow"); + champlain_label_queue_redraw (label); +} + +/** * champlain_label_get_image: * @label: a #ChamplainLabel * @@ -1546,7 +1594,7 @@ * * Checks whether the label has a background. * - * Returns: if the label's has a background. + * Returns: if the label has a background. * * Since: 0.10 */ @@ -1559,6 +1607,25 @@ } +/** + * champlain_label_get_draw_shadow: + * @label: a #ChamplainLabel + * + * Checks whether the label's background has a shadow. + * + * Returns: if the label's background has a shadow. + * + * Since: 0.12.10 + */ +gboolean +champlain_label_get_draw_shadow (ChamplainLabel *label) +{ + g_return_val_if_fail (CHAMPLAIN_IS_LABEL (label), FALSE); + + return label->priv->draw_shadow; +} + + /** * champlain_label_get_attributes: * @label: a #ChamplainLabel diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libchamplain-0.12.9/champlain/champlain-label.h new/libchamplain-0.12.10/champlain/champlain-label.h --- old/libchamplain-0.12.9/champlain/champlain-label.h 2014-09-17 23:30:38.000000000 +0200 +++ new/libchamplain-0.12.10/champlain/champlain-label.h 2014-10-17 11:57:16.000000000 +0200 @@ -116,6 +116,8 @@ PangoEllipsizeMode mode); void champlain_label_set_draw_background (ChamplainLabel *label, gboolean background); +void champlain_label_set_draw_shadow (ChamplainLabel *label, + gboolean shadow); gboolean champlain_label_get_use_markup (ChamplainLabel *label); const gchar *champlain_label_get_text (ChamplainLabel *label); @@ -129,6 +131,7 @@ PangoEllipsizeMode champlain_label_get_ellipsize (ChamplainLabel *label); gboolean champlain_label_get_single_line_mode (ChamplainLabel *label); gboolean champlain_label_get_draw_background (ChamplainLabel *label); +gboolean champlain_label_get_draw_shadow (ChamplainLabel *label); PangoAttrList *champlain_label_get_attributes (ChamplainLabel *label); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libchamplain-0.12.9/champlain/champlain-version.h new/libchamplain-0.12.10/champlain/champlain-version.h --- old/libchamplain-0.12.9/champlain/champlain-version.h 2014-09-18 00:21:41.000000000 +0200 +++ new/libchamplain-0.12.10/champlain/champlain-version.h 2015-03-18 11:44:06.000000000 +0100 @@ -49,14 +49,14 @@ * * The micro version of libchamplain (3, if %CHAMPLAIN_VERSION is 1.2.3) */ -#define CHAMPLAIN_MICRO_VERSION (9) +#define CHAMPLAIN_MICRO_VERSION (10) /** * CHAMPLAIN_VERSION: * * The full version of libchamplain, like 1.2.3 */ -#define CHAMPLAIN_VERSION 0.12.9 +#define CHAMPLAIN_VERSION 0.12.10 /** * CHAMPLAIN_VERSION_S: @@ -64,7 +64,7 @@ * The full version of libchamplain, in string form (suited for * string concatenation) */ -#define CHAMPLAIN_VERSION_S "0.12.9" +#define CHAMPLAIN_VERSION_S "0.12.10" /** * CHAMPLAIN_VERSION_HEX: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libchamplain-0.12.9/champlain/champlain-view.c new/libchamplain-0.12.10/champlain/champlain-view.c --- old/libchamplain-0.12.9/champlain/champlain-view.c 2014-09-17 23:30:38.000000000 +0200 +++ new/libchamplain-0.12.10/champlain/champlain-view.c 2015-03-18 10:48:11.000000000 +0100 @@ -242,9 +242,8 @@ static void tile_state_notify (ChamplainTile *tile, G_GNUC_UNUSED GParamSpec *pspec, ChamplainView *view); -static gboolean kinetic_scroll_key_press_cb (ClutterActor *actor, - ClutterKeyEvent *event, - ChamplainView *view); +static gboolean kinetic_scroll_key_press_cb (ChamplainView *view, + ClutterKeyEvent *event); static void champlain_view_go_to_with_duration (ChamplainView *view, gdouble latitude, gdouble longitude, @@ -387,7 +386,22 @@ zoom_level = priv->zoom_level + 1; else if (event->direction == CLUTTER_SCROLL_DOWN) zoom_level = priv->zoom_level - 1; - + else if (event->direction == CLUTTER_SCROLL_SMOOTH) + { + gdouble dx, dy; + + clutter_event_get_scroll_delta ((ClutterEvent *)event, &dx, &dy); + + /* Use a threshhold value to avoid jitter */ + if (fabs(dy) < 0.75) + return FALSE; + + if (dy > 0) + zoom_level = priv->zoom_level - 1; + else + zoom_level = priv->zoom_level + 1; + } + return view_set_zoom_level_at (view, zoom_level, TRUE, event->x, event->y); } @@ -976,7 +990,7 @@ * The #ChamplainView::animation-completed signal is emitted when any animation in the view * ends. This is a detailed signal. For example, if you want to be signaled * only for go-to animation, you should connect to - * "animation-completed::go-to". + * "animation-completed::go-to". And for zoom, connect to "animation-completed::zoom". * * Since: 0.4 */ @@ -1179,13 +1193,13 @@ G_CALLBACK (panning_completed), view); g_signal_connect (priv->kinetic_scroll, "button-press-event", G_CALLBACK (kinetic_scroll_button_press_cb), view); - g_signal_connect (priv->kinetic_scroll, "key-press-event", - G_CALLBACK (kinetic_scroll_key_press_cb), view); /* Setup stage */ clutter_actor_add_child (CLUTTER_ACTOR (view), priv->kinetic_scroll); priv->zoom_overlay_actor = clutter_actor_new (); clutter_actor_add_child (CLUTTER_ACTOR (view), priv->zoom_overlay_actor); + g_signal_connect (view, "key-press-event", + G_CALLBACK (kinetic_scroll_key_press_cb), NULL); /* Setup license */ priv->license_actor = champlain_license_new (); @@ -1288,9 +1302,8 @@ static gboolean -kinetic_scroll_key_press_cb (G_GNUC_UNUSED ClutterActor *actor, - ClutterKeyEvent *event, - ChamplainView *view) +kinetic_scroll_key_press_cb (ChamplainView *view, + ClutterKeyEvent *event) { DEBUG_LOG () @@ -2538,6 +2551,7 @@ clutter_actor_show (priv->user_layers); g_signal_handlers_disconnect_by_func (actor, zoom_animation_completed, view); + g_signal_emit_by_name (view, "animation-completed::zoom", NULL); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libchamplain-0.12.9/champlain-gtk/gtk-champlain-embed.c new/libchamplain-0.12.10/champlain-gtk/gtk-champlain-embed.c --- old/libchamplain-0.12.9/champlain-gtk/gtk-champlain-embed.c 2014-09-17 23:30:38.000000000 +0200 +++ new/libchamplain-0.12.10/champlain-gtk/gtk-champlain-embed.c 2014-10-20 19:55:49.000000000 +0200 @@ -92,6 +92,11 @@ GtkChamplainEmbed *view); static void view_realize_cb (GtkWidget *widget, GtkChamplainEmbed *view); +static gboolean embed_focus_cb (GtkChamplainEmbed *embed, + GdkEvent *event); +static gboolean stage_key_press_cb (ClutterActor *actor, + ClutterEvent *event, + GtkChamplainEmbed *embed); G_DEFINE_TYPE (GtkChamplainEmbed, gtk_champlain_embed, GTK_TYPE_ALIGNMENT); @@ -218,6 +223,7 @@ gtk_champlain_embed_init (GtkChamplainEmbed *embed) { GtkChamplainEmbedPrivate *priv = GET_PRIVATE (embed); + ClutterActor *stage; embed->priv = priv; @@ -246,6 +252,16 @@ priv->view = NULL; set_view (embed, CHAMPLAIN_VIEW (champlain_view_new ())); + /* Setup focus/key-press events */ + g_signal_connect (embed, "focus-in-event", + G_CALLBACK (embed_focus_cb), + NULL); + stage = gtk_clutter_embed_get_stage (GTK_CLUTTER_EMBED (priv->clutter_embed)); + g_signal_connect (stage, "key-press-event", + G_CALLBACK (stage_key_press_cb), + embed); + gtk_widget_set_can_focus (GTK_WIDGET (embed), TRUE); + gtk_container_add (GTK_CONTAINER (embed), priv->clutter_embed); } @@ -372,6 +388,26 @@ return FALSE; } +static gboolean +embed_focus_cb (GtkChamplainEmbed *embed, + GdkEvent *event) +{ + GtkChamplainEmbedPrivate *priv = embed->priv; + + gtk_widget_grab_focus (priv->clutter_embed); + return TRUE; +} + +static gboolean +stage_key_press_cb (ClutterActor *actor, + ClutterEvent *event, + GtkChamplainEmbed *embed) +{ + ChamplainView *view = gtk_champlain_embed_get_view (embed); + + clutter_actor_event (CLUTTER_ACTOR (view), event, FALSE); + return TRUE; +} /** * gtk_champlain_embed_new: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libchamplain-0.12.9/configure.ac new/libchamplain-0.12.10/configure.ac --- old/libchamplain-0.12.9/configure.ac 2014-09-17 23:58:23.000000000 +0200 +++ new/libchamplain-0.12.10/configure.ac 2015-03-18 11:08:48.000000000 +0100 @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. m4_define([champlain_major_version], [0]) m4_define([champlain_minor_version], [12]) -m4_define([champlain_micro_version], [9]) +m4_define([champlain_micro_version], [10]) m4_define([champlain_version], [champlain_major_version.champlain_minor_version.champlain_micro_version]) m4_define([champlain_minor_api_version], [m4_eval(champlain_minor_version + champlain_minor_version%2)]) @@ -36,7 +36,7 @@ # - If binary compatibility has been broken (eg removed or changed interfaces) # change to C+1:0:0 # - If the interface is the same as the previous version, change to C:R+1:A -LIBRARY_VERSION=4:4:4 +LIBRARY_VERSION=5:4:5 CHAMPLAIN_API_VERSION=champlain_api_version CHAMPLAIN_API_VERSION_NORM=champlain_major_version[_]champlain_minor_api_version CHAMPLAIN_MAJOR_VERSION=champlain_major_version diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libchamplain-0.12.9/demos/Makefile.am new/libchamplain-0.12.10/demos/Makefile.am --- old/libchamplain-0.12.9/demos/Makefile.am 2014-09-17 23:30:38.000000000 +0200 +++ new/libchamplain-0.12.10/demos/Makefile.am 2014-10-18 20:33:26.000000000 +0200 @@ -58,5 +58,5 @@ $(top_builddir)/champlain/libchamplain-@CHAMPLAIN_API_VERSION@.la endif -EXTRA_DIST = markers.h launcher.js minimal.py launcher-gtk.py polygons.py default-rules.xml high-contrast.xml las_palmas.osm schaffhausen.osm +EXTRA_DIST = markers.h launcher.js minimal.py launcher-gtk.py polygons.py keyboard-mapping.py default-rules.xml high-contrast.xml las_palmas.osm schaffhausen.osm diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libchamplain-0.12.9/demos/keyboard-mapping.py new/libchamplain-0.12.10/demos/keyboard-mapping.py --- old/libchamplain-0.12.9/demos/keyboard-mapping.py 1970-01-01 01:00:00.000000000 +0100 +++ new/libchamplain-0.12.10/demos/keyboard-mapping.py 2014-10-19 21:38:38.000000000 +0200 @@ -0,0 +1,61 @@ +#!/usr/bin/env python + +# To run this example, you need to set the GI_TYPELIB_PATH environment +# variable to point to the gir directory: +# +# export GI_TYPELIB_PATH=$GI_TYPELIB_PATH:/usr/local/lib/girepository-1.0/ + +from gi.repository import GtkClutter +from gi.repository import GObject, Gtk, Gdk, GtkChamplain + +class KeyboardMapping: + + def __init__(self): + GtkClutter.init([]) + + window = Gtk.Window(type=Gtk.WindowType.TOPLEVEL) + window.connect("destroy", Gtk.main_quit) + window.connect("key-press-event", self.on_key_press) + + self.widget = GtkChamplain.Embed() + self.widget.set_size_request(640, 480) + self.view = self.widget.get_view() + + window.add(self.widget) + window.show_all() + + def on_key_press(self, widget, ev): + deltax = self.widget.get_allocation().width / 4 + deltay = self.widget.get_allocation().height / 4 + if ev.keyval == Gdk.KEY_Left: + self.scroll(-deltax, 0) + elif ev.keyval == Gdk.KEY_Right: + self.scroll(deltax, 0) + elif ev.keyval == Gdk.KEY_Up: + self.scroll(0, -deltay) + elif ev.keyval == Gdk.KEY_Down: + self.scroll(0, deltay) + elif ev.keyval == Gdk.KEY_plus or ev.keyval == Gdk.KEY_KP_Add: + self.view.zoom_in() + elif ev.keyval == Gdk.KEY_minus or ev.keyval == Gdk.KEY_KP_Subtract: + self.view.zoom_out() + else: + return False + return True + + def scroll(self, deltax, deltay): + lat = self.view.get_center_latitude() + lon = self.view.get_center_longitude() + + x = self.view.longitude_to_x(lon) + deltax + y = self.view.latitude_to_y(lat) + deltay + + lon = self.view.x_to_longitude(x) + lat = self.view.y_to_latitude(y) + + self.view.center_on(lat, lon) + #self.view.go_to(lat, lon) + +if __name__ == "__main__": + KeyboardMapping() + Gtk.main() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libchamplain-0.12.9/docs/reference/html/ChamplainImageRenderer.html new/libchamplain-0.12.10/docs/reference/html/ChamplainImageRenderer.html --- old/libchamplain-0.12.9/docs/reference/html/ChamplainImageRenderer.html 2014-09-18 00:22:23.000000000 +0200 +++ new/libchamplain-0.12.10/docs/reference/html/ChamplainImageRenderer.html 2015-03-18 11:44:23.000000000 +0100 @@ -73,8 +73,8 @@ <div class="refsect1"> <a name="ChamplainImageRenderer.description"></a><h2>Description</h2> <p><a class="link" href="ChamplainImageRenderer.html" title="ChamplainImageRenderer"><span class="type">ChamplainImageRenderer</span></a> renders tiles from binary image data. The rendering -is performed using <span class="type">GdkPixbufLoader</span> so the set of supported image -formats is equal to the set of formats supported by <span class="type">GdkPixbufLoader</span>.</p> +is performed using <a href="http://library.gnome.org/devel/gdk-pixbuf/unstable/GdkPixbufLoader.html";><span class="type">GdkPixbufLoader</span></a> so the set of supported image +formats is equal to the set of formats supported by <a href="http://library.gnome.org/devel/gdk-pixbuf/unstable/GdkPixbufLoader.html";><span class="type">GdkPixbufLoader</span></a>.</p> </div> <div class="refsect1"> <a name="ChamplainImageRenderer.functions_details"></a><h2>Functions</h2> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libchamplain-0.12.9/docs/reference/html/ChamplainLabel.html new/libchamplain-0.12.10/docs/reference/html/ChamplainLabel.html --- old/libchamplain-0.12.9/docs/reference/html/ChamplainLabel.html 2014-09-18 00:22:23.000000000 +0200 +++ new/libchamplain-0.12.10/docs/reference/html/ChamplainLabel.html 2015-03-18 11:44:23.000000000 +0100 @@ -188,6 +188,14 @@ </tr> <tr> <td class="function_type"> +<span class="returnvalue">void</span> +</td> +<td class="function_name"> +<a class="link" href="ChamplainLabel.html#champlain-label-set-draw-shadow" title="champlain_label_set_draw_shadow ()">champlain_label_set_draw_shadow</a> <span class="c_punctuation">()</span> +</td> +</tr> +<tr> +<td class="function_type"> <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean";><span class="returnvalue">gboolean</span></a> </td> <td class="function_name"> @@ -288,6 +296,14 @@ <a class="link" href="ChamplainLabel.html#champlain-label-get-attributes" title="champlain_label_get_attributes ()">champlain_label_get_attributes</a> <span class="c_punctuation">()</span> </td> </tr> +<tr> +<td class="function_type"> +<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean";><span class="returnvalue">gboolean</span></a> +</td> +<td class="function_name"> +<a class="link" href="ChamplainLabel.html#champlain-label-get-draw-shadow" title="champlain_label_get_draw_shadow ()">champlain_label_get_draw_shadow</a> <span class="c_punctuation">()</span> +</td> +</tr> </tbody> </table></div> </div> @@ -317,6 +333,11 @@ <td class="property_flags">Read / Write</td> </tr> <tr> +<td class="property_type"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean";><span class="type">gboolean</span></a></td> +<td class="property_name"><a class="link" href="ChamplainLabel.html#ChamplainLabel--draw-shadow" title="The “draw-shadow” property">draw-shadow</a></td> +<td class="property_flags">Read / Write</td> +</tr> +<tr> <td class="property_type"><a href="/usr/share/gtk-doc/html/pango/pango-Layout-Objects.html#PangoEllipsizeMode"><span class="type">PangoEllipsizeMode</span></a></td> <td class="property_name"><a class="link" href="ChamplainLabel.html#ChamplainLabel--ellipsize" title="The “ellipsize” property">ellipsize</a></td> <td class="property_flags">Read / Write</td> @@ -983,12 +1004,43 @@ </div> <hr> <div class="refsect2"> +<a name="champlain-label-set-draw-shadow"></a><h3>champlain_label_set_draw_shadow ()</h3> +<pre class="programlisting"><span class="returnvalue">void</span> +champlain_label_set_draw_shadow (<em class="parameter"><code><a class="link" href="ChamplainLabel.html" title="ChamplainLabel"><span class="type">ChamplainLabel</span></a> *label</code></em>, + <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean";><span class="type">gboolean</span></a> shadow</code></em>);</pre> +<p>Sets if the label's background has a shadow.</p> +<div class="refsect3"> +<a name="id-1.3.3.3.9.20.5"></a><h4>Parameters</h4> +<div class="informaltable"><table width="100%" border="0"> +<colgroup> +<col width="150px" class="parameters_name"> +<col class="parameters_description"> +<col width="200px" class="parameters_annotations"> +</colgroup> +<tbody> +<tr> +<td class="parameter_name"><p>label</p></td> +<td class="parameter_description"><p>a <a class="link" href="ChamplainLabel.html" title="ChamplainLabel"><span class="type">ChamplainLabel</span></a></p></td> +<td class="parameter_annotations"> </td> +</tr> +<tr> +<td class="parameter_name"><p>shadow</p></td> +<td class="parameter_description"><p>value.</p></td> +<td class="parameter_annotations"> </td> +</tr> +</tbody> +</table></div> +</div> +<p class="since">Since 0.12.10</p> +</div> +<hr> +<div class="refsect2"> <a name="champlain-label-get-use-markup"></a><h3>champlain_label_get_use_markup ()</h3> <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean";><span class="returnvalue">gboolean</span></a> champlain_label_get_use_markup (<em class="parameter"><code><a class="link" href="ChamplainLabel.html" title="ChamplainLabel"><span class="type">ChamplainLabel</span></a> *label</code></em>);</pre> <p>Check whether the label uses markup.</p> <div class="refsect3"> -<a name="id-1.3.3.3.9.20.5"></a><h4>Parameters</h4> +<a name="id-1.3.3.3.9.21.5"></a><h4>Parameters</h4> <div class="informaltable"><table width="100%" border="0"> <colgroup> <col width="150px" class="parameters_name"> @@ -1003,7 +1055,7 @@ </table></div> </div> <div class="refsect3"> -<a name="id-1.3.3.3.9.20.6"></a><h4>Returns</h4> +<a name="id-1.3.3.3.9.21.6"></a><h4>Returns</h4> <p> if the label's text contains markup.</p> <p></p> </div> @@ -1016,7 +1068,7 @@ champlain_label_get_text (<em class="parameter"><code><a class="link" href="ChamplainLabel.html" title="ChamplainLabel"><span class="type">ChamplainLabel</span></a> *label</code></em>);</pre> <p>Get the label's text.</p> <div class="refsect3"> -<a name="id-1.3.3.3.9.21.5"></a><h4>Parameters</h4> +<a name="id-1.3.3.3.9.22.5"></a><h4>Parameters</h4> <div class="informaltable"><table width="100%" border="0"> <colgroup> <col width="150px" class="parameters_name"> @@ -1031,7 +1083,7 @@ </table></div> </div> <div class="refsect3"> -<a name="id-1.3.3.3.9.21.6"></a><h4>Returns</h4> +<a name="id-1.3.3.3.9.22.6"></a><h4>Returns</h4> <p> the label's text.</p> <p></p> </div> @@ -1044,7 +1096,7 @@ champlain_label_get_image (<em class="parameter"><code><a class="link" href="ChamplainLabel.html" title="ChamplainLabel"><span class="type">ChamplainLabel</span></a> *label</code></em>);</pre> <p>Get the label's image.</p> <div class="refsect3"> -<a name="id-1.3.3.3.9.22.5"></a><h4>Parameters</h4> +<a name="id-1.3.3.3.9.23.5"></a><h4>Parameters</h4> <div class="informaltable"><table width="100%" border="0"> <colgroup> <col width="150px" class="parameters_name"> @@ -1059,7 +1111,7 @@ </table></div> </div> <div class="refsect3"> -<a name="id-1.3.3.3.9.22.6"></a><h4>Returns</h4> +<a name="id-1.3.3.3.9.23.6"></a><h4>Returns</h4> <p> the label's image. </p> <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p> </div> @@ -1072,7 +1124,7 @@ champlain_label_get_alignment (<em class="parameter"><code><a class="link" href="ChamplainLabel.html" title="ChamplainLabel"><span class="type">ChamplainLabel</span></a> *label</code></em>);</pre> <p>Get the label's text alignment.</p> <div class="refsect3"> -<a name="id-1.3.3.3.9.23.5"></a><h4>Parameters</h4> +<a name="id-1.3.3.3.9.24.5"></a><h4>Parameters</h4> <div class="informaltable"><table width="100%" border="0"> <colgroup> <col width="150px" class="parameters_name"> @@ -1087,7 +1139,7 @@ </table></div> </div> <div class="refsect3"> -<a name="id-1.3.3.3.9.23.6"></a><h4>Returns</h4> +<a name="id-1.3.3.3.9.24.6"></a><h4>Returns</h4> <p> the label's text alignment.</p> <p></p> </div> @@ -1100,7 +1152,7 @@ champlain_label_get_color (<em class="parameter"><code><a class="link" href="ChamplainLabel.html" title="ChamplainLabel"><span class="type">ChamplainLabel</span></a> *label</code></em>);</pre> <p>Gets the label's background color.</p> <div class="refsect3"> -<a name="id-1.3.3.3.9.24.5"></a><h4>Parameters</h4> +<a name="id-1.3.3.3.9.25.5"></a><h4>Parameters</h4> <div class="informaltable"><table width="100%" border="0"> <colgroup> <col width="150px" class="parameters_name"> @@ -1115,7 +1167,7 @@ </table></div> </div> <div class="refsect3"> -<a name="id-1.3.3.3.9.24.6"></a><h4>Returns</h4> +<a name="id-1.3.3.3.9.25.6"></a><h4>Returns</h4> <p> the label's background color.</p> <p></p> </div> @@ -1128,7 +1180,7 @@ champlain_label_get_text_color (<em class="parameter"><code><a class="link" href="ChamplainLabel.html" title="ChamplainLabel"><span class="type">ChamplainLabel</span></a> *label</code></em>);</pre> <p>Gets the label's text color.</p> <div class="refsect3"> -<a name="id-1.3.3.3.9.25.5"></a><h4>Parameters</h4> +<a name="id-1.3.3.3.9.26.5"></a><h4>Parameters</h4> <div class="informaltable"><table width="100%" border="0"> <colgroup> <col width="150px" class="parameters_name"> @@ -1143,7 +1195,7 @@ </table></div> </div> <div class="refsect3"> -<a name="id-1.3.3.3.9.25.6"></a><h4>Returns</h4> +<a name="id-1.3.3.3.9.26.6"></a><h4>Returns</h4> <p> the label's text color.</p> <p></p> </div> @@ -1156,7 +1208,7 @@ champlain_label_get_font_name (<em class="parameter"><code><a class="link" href="ChamplainLabel.html" title="ChamplainLabel"><span class="type">ChamplainLabel</span></a> *label</code></em>);</pre> <p>Gets the label's font name.</p> <div class="refsect3"> -<a name="id-1.3.3.3.9.26.5"></a><h4>Parameters</h4> +<a name="id-1.3.3.3.9.27.5"></a><h4>Parameters</h4> <div class="informaltable"><table width="100%" border="0"> <colgroup> <col width="150px" class="parameters_name"> @@ -1171,7 +1223,7 @@ </table></div> </div> <div class="refsect3"> -<a name="id-1.3.3.3.9.26.6"></a><h4>Returns</h4> +<a name="id-1.3.3.3.9.27.6"></a><h4>Returns</h4> <p> the label's font name.</p> <p></p> </div> @@ -1184,7 +1236,7 @@ champlain_label_get_wrap (<em class="parameter"><code><a class="link" href="ChamplainLabel.html" title="ChamplainLabel"><span class="type">ChamplainLabel</span></a> *label</code></em>);</pre> <p>Checks whether the label text wraps.</p> <div class="refsect3"> -<a name="id-1.3.3.3.9.27.5"></a><h4>Parameters</h4> +<a name="id-1.3.3.3.9.28.5"></a><h4>Parameters</h4> <div class="informaltable"><table width="100%" border="0"> <colgroup> <col width="150px" class="parameters_name"> @@ -1199,7 +1251,7 @@ </table></div> </div> <div class="refsect3"> -<a name="id-1.3.3.3.9.27.6"></a><h4>Returns</h4> +<a name="id-1.3.3.3.9.28.6"></a><h4>Returns</h4> <p> if the label's text wraps.</p> <p></p> </div> @@ -1212,7 +1264,7 @@ champlain_label_get_wrap_mode (<em class="parameter"><code><a class="link" href="ChamplainLabel.html" title="ChamplainLabel"><span class="type">ChamplainLabel</span></a> *label</code></em>);</pre> <p>Gets the label's text wrap mode.</p> <div class="refsect3"> -<a name="id-1.3.3.3.9.28.5"></a><h4>Parameters</h4> +<a name="id-1.3.3.3.9.29.5"></a><h4>Parameters</h4> <div class="informaltable"><table width="100%" border="0"> <colgroup> <col width="150px" class="parameters_name"> @@ -1227,7 +1279,7 @@ </table></div> </div> <div class="refsect3"> -<a name="id-1.3.3.3.9.28.6"></a><h4>Returns</h4> +<a name="id-1.3.3.3.9.29.6"></a><h4>Returns</h4> <p> the label's text wrap mode.</p> <p></p> </div> @@ -1240,7 +1292,7 @@ champlain_label_get_ellipsize (<em class="parameter"><code><a class="link" href="ChamplainLabel.html" title="ChamplainLabel"><span class="type">ChamplainLabel</span></a> *label</code></em>);</pre> <p>Gets the label's text ellipsize mode.</p> <div class="refsect3"> -<a name="id-1.3.3.3.9.29.5"></a><h4>Parameters</h4> +<a name="id-1.3.3.3.9.30.5"></a><h4>Parameters</h4> <div class="informaltable"><table width="100%" border="0"> <colgroup> <col width="150px" class="parameters_name"> @@ -1255,7 +1307,7 @@ </table></div> </div> <div class="refsect3"> -<a name="id-1.3.3.3.9.29.6"></a><h4>Returns</h4> +<a name="id-1.3.3.3.9.30.6"></a><h4>Returns</h4> <p> the label's text ellipsize mode.</p> <p></p> </div> @@ -1268,7 +1320,7 @@ champlain_label_get_single_line_mode (<em class="parameter"><code><a class="link" href="ChamplainLabel.html" title="ChamplainLabel"><span class="type">ChamplainLabel</span></a> *label</code></em>);</pre> <p>Checks the label's single line mode.</p> <div class="refsect3"> -<a name="id-1.3.3.3.9.30.5"></a><h4>Parameters</h4> +<a name="id-1.3.3.3.9.31.5"></a><h4>Parameters</h4> <div class="informaltable"><table width="100%" border="0"> <colgroup> <col width="150px" class="parameters_name"> @@ -1283,7 +1335,7 @@ </table></div> </div> <div class="refsect3"> -<a name="id-1.3.3.3.9.30.6"></a><h4>Returns</h4> +<a name="id-1.3.3.3.9.31.6"></a><h4>Returns</h4> <p> the label's text single line mode.</p> <p></p> </div> @@ -1296,7 +1348,7 @@ champlain_label_get_draw_background (<em class="parameter"><code><a class="link" href="ChamplainLabel.html" title="ChamplainLabel"><span class="type">ChamplainLabel</span></a> *label</code></em>);</pre> <p>Checks whether the label has a background.</p> <div class="refsect3"> -<a name="id-1.3.3.3.9.31.5"></a><h4>Parameters</h4> +<a name="id-1.3.3.3.9.32.5"></a><h4>Parameters</h4> <div class="informaltable"><table width="100%" border="0"> <colgroup> <col width="150px" class="parameters_name"> @@ -1311,8 +1363,8 @@ </table></div> </div> <div class="refsect3"> -<a name="id-1.3.3.3.9.31.6"></a><h4>Returns</h4> -<p> if the label's has a background.</p> +<a name="id-1.3.3.3.9.32.6"></a><h4>Returns</h4> +<p> if the label has a background.</p> <p></p> </div> <p class="since">Since 0.10</p> @@ -1324,7 +1376,7 @@ champlain_label_get_attributes (<em class="parameter"><code><a class="link" href="ChamplainLabel.html" title="ChamplainLabel"><span class="type">ChamplainLabel</span></a> *label</code></em>);</pre> <p>Gets the label's text attributes.</p> <div class="refsect3"> -<a name="id-1.3.3.3.9.32.5"></a><h4>Parameters</h4> +<a name="id-1.3.3.3.9.33.5"></a><h4>Parameters</h4> <div class="informaltable"><table width="100%" border="0"> <colgroup> <col width="150px" class="parameters_name"> @@ -1339,12 +1391,40 @@ </table></div> </div> <div class="refsect3"> -<a name="id-1.3.3.3.9.32.6"></a><h4>Returns</h4> +<a name="id-1.3.3.3.9.33.6"></a><h4>Returns</h4> <p> the label's text attributes.</p> <p></p> </div> <p class="since">Since 0.10</p> </div> +<hr> +<div class="refsect2"> +<a name="champlain-label-get-draw-shadow"></a><h3>champlain_label_get_draw_shadow ()</h3> +<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean";><span class="returnvalue">gboolean</span></a> +champlain_label_get_draw_shadow (<em class="parameter"><code><a class="link" href="ChamplainLabel.html" title="ChamplainLabel"><span class="type">ChamplainLabel</span></a> *label</code></em>);</pre> +<p>Checks whether the label's background has a shadow.</p> +<div class="refsect3"> +<a name="id-1.3.3.3.9.34.5"></a><h4>Parameters</h4> +<div class="informaltable"><table width="100%" border="0"> +<colgroup> +<col width="150px" class="parameters_name"> +<col class="parameters_description"> +<col width="200px" class="parameters_annotations"> +</colgroup> +<tbody><tr> +<td class="parameter_name"><p>label</p></td> +<td class="parameter_description"><p>a <a class="link" href="ChamplainLabel.html" title="ChamplainLabel"><span class="type">ChamplainLabel</span></a></p></td> +<td class="parameter_annotations"> </td> +</tr></tbody> +</table></div> +</div> +<div class="refsect3"> +<a name="id-1.3.3.3.9.34.6"></a><h4>Returns</h4> +<p> if the label's background has a shadow.</p> +<p></p> +</div> +<p class="since">Since 0.12.10</p> +</div> </div> <div class="refsect1"> <a name="ChamplainLabel.other_details"></a><h2>Types and Values</h2> @@ -1385,6 +1465,15 @@ </div> <hr> <div class="refsect2"> +<a name="ChamplainLabel--draw-shadow"></a><h3>The <code class="literal">“draw-shadow”</code> property</h3> +<pre class="programlisting"> “draw-shadow” <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean";><span class="type">gboolean</span></a></pre> +<p>If the label background has a shadow</p> +<p>Flags: Read / Write</p> +<p>Default value: TRUE</p> +<p class="since">Since 0.12.10</p> +</div> +<hr> +<div class="refsect2"> <a name="ChamplainLabel--ellipsize"></a><h3>The <code class="literal">“ellipsize”</code> property</h3> <pre class="programlisting"> “ellipsize” <a href="/usr/share/gtk-doc/html/pango/pango-Layout-Objects.html#PangoEllipsizeMode"><span class="type">PangoEllipsizeMode</span></a></pre> <p>The label's ellipsize mode</p> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libchamplain-0.12.9/docs/reference/html/ChamplainPathLayer.html new/libchamplain-0.12.10/docs/reference/html/ChamplainPathLayer.html --- old/libchamplain-0.12.9/docs/reference/html/ChamplainPathLayer.html 2014-09-18 00:22:23.000000000 +0200 +++ new/libchamplain-0.12.10/docs/reference/html/ChamplainPathLayer.html 2015-03-18 11:44:23.000000000 +0100 @@ -922,7 +922,7 @@ <pre class="programlisting"><span class="returnvalue">void</span> champlain_path_layer_set_dash (<em class="parameter"><code><a class="link" href="ChamplainPathLayer.html" title="ChamplainPathLayer"><span class="type">ChamplainPathLayer</span></a> *layer</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList";><span class="type">GList</span></a> *dash_pattern</code></em>);</pre> -<p>Sets dashed line pattern in a way similar to <code class="function">cairo_set_dash()</code> of cairo. This +<p>Sets dashed line pattern in a way similar to <a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-t.html#cairo-set-dash"><code class="function">cairo_set_dash()</code></a> of cairo. This method supports only integer values for segment lengths. The values have to be passed inside the data pointer of the list (using the GUINT_TO_POINTER conversion)</p> <p>Pass NULL to use solid line.</p> @@ -943,7 +943,7 @@ <tr> <td class="parameter_name"><p>dash_pattern</p></td> <td class="parameter_description"><p> list of integer values representing lengths -of dashes/spaces (see cairo documentation of <code class="function">cairo_set_dash()</code>). </p></td> +of dashes/spaces (see cairo documentation of <a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-t.html#cairo-set-dash"><code class="function">cairo_set_dash()</code></a>). </p></td> <td class="parameter_annotations"><span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> guint]</span></td> </tr> </tbody> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libchamplain-0.12.9/docs/reference/html/ChamplainView.html new/libchamplain-0.12.10/docs/reference/html/ChamplainView.html --- old/libchamplain-0.12.9/docs/reference/html/ChamplainView.html 2014-09-18 00:22:23.000000000 +0200 +++ new/libchamplain-0.12.10/docs/reference/html/ChamplainView.html 2015-03-18 11:44:23.000000000 +0100 @@ -2166,7 +2166,7 @@ <p>The <a class="link" href="ChamplainView.html#ChamplainView-animation-completed" title="The “animation-completed” signal"><span class="type">“animation-completed”</span></a> signal is emitted when any animation in the view ends. This is a detailed signal. For example, if you want to be signaled only for go-to animation, you should connect to -"animation-completed::go-to".</p> +"animation-completed::go-to". And for zoom, connect to "animation-completed::zoom".</p> <div class="refsect3"> <a name="id-1.2.2.13.2.5"></a><h4>Parameters</h4> <div class="informaltable"><table width="100%" border="0"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libchamplain-0.12.9/docs/reference/html/index.html new/libchamplain-0.12.10/docs/reference/html/index.html --- old/libchamplain-0.12.9/docs/reference/html/index.html 2014-09-18 00:22:23.000000000 +0200 +++ new/libchamplain-0.12.10/docs/reference/html/index.html 2015-03-18 11:44:23.000000000 +0100 @@ -16,7 +16,7 @@ <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">libchamplain Reference Manual</p></th></tr></table></div> <div> <p class="releaseinfo"> - for libchamplain 0.12.9 + for libchamplain 0.12.10 </p> <p> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libchamplain-0.12.9/docs/reference/html/index.sgml new/libchamplain-0.12.10/docs/reference/html/index.sgml --- old/libchamplain-0.12.9/docs/reference/html/index.sgml 2014-09-18 00:22:23.000000000 +0200 +++ new/libchamplain-0.12.10/docs/reference/html/index.sgml 2015-03-18 11:44:23.000000000 +0100 @@ -216,6 +216,7 @@ <ANCHOR id="champlain-label-set-single-line-mode" href="libchamplain/ChamplainLabel.html#champlain-label-set-single-line-mode"> <ANCHOR id="champlain-label-set-ellipsize" href="libchamplain/ChamplainLabel.html#champlain-label-set-ellipsize"> <ANCHOR id="champlain-label-set-draw-background" href="libchamplain/ChamplainLabel.html#champlain-label-set-draw-background"> +<ANCHOR id="champlain-label-set-draw-shadow" href="libchamplain/ChamplainLabel.html#champlain-label-set-draw-shadow"> <ANCHOR id="champlain-label-get-use-markup" href="libchamplain/ChamplainLabel.html#champlain-label-get-use-markup"> <ANCHOR id="champlain-label-get-text" href="libchamplain/ChamplainLabel.html#champlain-label-get-text"> <ANCHOR id="champlain-label-get-image" href="libchamplain/ChamplainLabel.html#champlain-label-get-image"> @@ -229,12 +230,14 @@ <ANCHOR id="champlain-label-get-single-line-mode" href="libchamplain/ChamplainLabel.html#champlain-label-get-single-line-mode"> <ANCHOR id="champlain-label-get-draw-background" href="libchamplain/ChamplainLabel.html#champlain-label-get-draw-background"> <ANCHOR id="champlain-label-get-attributes" href="libchamplain/ChamplainLabel.html#champlain-label-get-attributes"> +<ANCHOR id="champlain-label-get-draw-shadow" href="libchamplain/ChamplainLabel.html#champlain-label-get-draw-shadow"> <ANCHOR id="ChamplainLabel.other_details" href="libchamplain/ChamplainLabel.html#ChamplainLabel.other_details"> <ANCHOR id="ChamplainLabel-struct" href="libchamplain/ChamplainLabel.html#ChamplainLabel-struct"> <ANCHOR id="ChamplainLabel.property-details" href="libchamplain/ChamplainLabel.html#ChamplainLabel.property-details"> <ANCHOR id="ChamplainLabel--alignment" href="libchamplain/ChamplainLabel.html#ChamplainLabel--alignment"> <ANCHOR id="ChamplainLabel--color" href="libchamplain/ChamplainLabel.html#ChamplainLabel--color"> <ANCHOR id="ChamplainLabel--draw-background" href="libchamplain/ChamplainLabel.html#ChamplainLabel--draw-background"> +<ANCHOR id="ChamplainLabel--draw-shadow" href="libchamplain/ChamplainLabel.html#ChamplainLabel--draw-shadow"> <ANCHOR id="ChamplainLabel--ellipsize" href="libchamplain/ChamplainLabel.html#ChamplainLabel--ellipsize"> <ANCHOR id="ChamplainLabel--font-name" href="libchamplain/ChamplainLabel.html#ChamplainLabel--font-name"> <ANCHOR id="ChamplainLabel--image" href="libchamplain/ChamplainLabel.html#ChamplainLabel--image"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libchamplain-0.12.9/docs/reference/html/ix01.html new/libchamplain-0.12.10/docs/reference/html/ix01.html --- old/libchamplain-0.12.9/docs/reference/html/ix01.html 2014-09-18 00:22:23.000000000 +0200 +++ new/libchamplain-0.12.10/docs/reference/html/ix01.html 2015-03-18 11:44:23.000000000 +0100 @@ -127,6 +127,8 @@ </dt> <dt>ChamplainLabel:draw-background, <a class="indexterm" href="ChamplainLabel.html#ChamplainLabel--draw-background">The “draw-background” property</a> </dt> +<dt>ChamplainLabel:draw-shadow, <a class="indexterm" href="ChamplainLabel.html#ChamplainLabel--draw-shadow">The “draw-shadow” property</a> +</dt> <dt>ChamplainLabel:ellipsize, <a class="indexterm" href="ChamplainLabel.html#ChamplainLabel--ellipsize">The “ellipsize” property</a> </dt> <dt>ChamplainLabel:font-name, <a class="indexterm" href="ChamplainLabel.html#ChamplainLabel--font-name">The “font-name” property</a> @@ -153,6 +155,8 @@ </dt> <dt>champlain_label_get_draw_background, <a class="indexterm" href="ChamplainLabel.html#champlain-label-get-draw-background">champlain_label_get_draw_background ()</a> </dt> +<dt>champlain_label_get_draw_shadow, <a class="indexterm" href="ChamplainLabel.html#champlain-label-get-draw-shadow">champlain_label_get_draw_shadow ()</a> +</dt> <dt>champlain_label_get_ellipsize, <a class="indexterm" href="ChamplainLabel.html#champlain-label-get-ellipsize">champlain_label_get_ellipsize ()</a> </dt> <dt>champlain_label_get_font_name, <a class="indexterm" href="ChamplainLabel.html#champlain-label-get-font-name">champlain_label_get_font_name ()</a> @@ -189,6 +193,8 @@ </dt> <dt>champlain_label_set_draw_background, <a class="indexterm" href="ChamplainLabel.html#champlain-label-set-draw-background">champlain_label_set_draw_background ()</a> </dt> +<dt>champlain_label_set_draw_shadow, <a class="indexterm" href="ChamplainLabel.html#champlain-label-set-draw-shadow">champlain_label_set_draw_shadow ()</a> +</dt> <dt>champlain_label_set_ellipsize, <a class="indexterm" href="ChamplainLabel.html#champlain-label-set-ellipsize">champlain_label_set_ellipsize ()</a> </dt> <dt>champlain_label_set_font_name, <a class="indexterm" href="ChamplainLabel.html#champlain-label-set-font-name">champlain_label_set_font_name ()</a> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libchamplain-0.12.9/docs/reference/html/libchamplain-ChamplainVersion.html new/libchamplain-0.12.10/docs/reference/html/libchamplain-ChamplainVersion.html --- old/libchamplain-0.12.9/docs/reference/html/libchamplain-ChamplainVersion.html 2014-09-18 00:22:23.000000000 +0200 +++ new/libchamplain-0.12.10/docs/reference/html/libchamplain-ChamplainVersion.html 2015-03-18 11:44:23.000000000 +0100 @@ -112,7 +112,7 @@ <hr> <div class="refsect2"> <a name="CHAMPLAIN-MICRO-VERSION:CAPS"></a><h3>CHAMPLAIN_MICRO_VERSION</h3> -<pre class="programlisting">#define CHAMPLAIN_MICRO_VERSION (9) +<pre class="programlisting">#define CHAMPLAIN_MICRO_VERSION (10) </pre> <p>The micro version of libchamplain (3, if <a class="link" href="libchamplain-ChamplainVersion.html#CHAMPLAIN-VERSION:CAPS" title="CHAMPLAIN_VERSION"><code class="literal">CHAMPLAIN_VERSION</code></a> is 1.2.3)</p> </div> @@ -164,14 +164,14 @@ <a name="libchamplain-ChamplainVersion.other_details"></a><h2>Types and Values</h2> <div class="refsect2"> <a name="CHAMPLAIN-VERSION:CAPS"></a><h3>CHAMPLAIN_VERSION</h3> -<pre class="programlisting">#define CHAMPLAIN_VERSION 0.12.9 +<pre class="programlisting">#define CHAMPLAIN_VERSION 0.12.10 </pre> <p>The full version of libchamplain, like 1.2.3</p> </div> <hr> <div class="refsect2"> <a name="CHAMPLAIN-VERSION-S:CAPS"></a><h3>CHAMPLAIN_VERSION_S</h3> -<pre class="programlisting">#define CHAMPLAIN_VERSION_S "0.12.9" +<pre class="programlisting">#define CHAMPLAIN_VERSION_S "0.12.10" </pre> <p>The full version of libchamplain, in string form (suited for string concatenation)</p> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libchamplain-0.12.9/docs/reference/html/libchamplain.devhelp2 new/libchamplain-0.12.10/docs/reference/html/libchamplain.devhelp2 --- old/libchamplain-0.12.9/docs/reference/html/libchamplain.devhelp2 2014-09-18 00:22:23.000000000 +0200 +++ new/libchamplain-0.12.10/docs/reference/html/libchamplain.devhelp2 2015-03-18 11:44:23.000000000 +0100 @@ -228,6 +228,7 @@ <keyword type="function" name="champlain_label_set_single_line_mode ()" link="ChamplainLabel.html#champlain-label-set-single-line-mode" since="0.10"/> <keyword type="function" name="champlain_label_set_ellipsize ()" link="ChamplainLabel.html#champlain-label-set-ellipsize" since="0.10"/> <keyword type="function" name="champlain_label_set_draw_background ()" link="ChamplainLabel.html#champlain-label-set-draw-background" since="0.10"/> + <keyword type="function" name="champlain_label_set_draw_shadow ()" link="ChamplainLabel.html#champlain-label-set-draw-shadow" since="0.12.10"/> <keyword type="function" name="champlain_label_get_use_markup ()" link="ChamplainLabel.html#champlain-label-get-use-markup" since="0.10"/> <keyword type="function" name="champlain_label_get_text ()" link="ChamplainLabel.html#champlain-label-get-text" since="0.10"/> <keyword type="function" name="champlain_label_get_image ()" link="ChamplainLabel.html#champlain-label-get-image" since="0.10"/> @@ -241,10 +242,12 @@ <keyword type="function" name="champlain_label_get_single_line_mode ()" link="ChamplainLabel.html#champlain-label-get-single-line-mode" since="0.10"/> <keyword type="function" name="champlain_label_get_draw_background ()" link="ChamplainLabel.html#champlain-label-get-draw-background" since="0.10"/> <keyword type="function" name="champlain_label_get_attributes ()" link="ChamplainLabel.html#champlain-label-get-attributes" since="0.10"/> + <keyword type="function" name="champlain_label_get_draw_shadow ()" link="ChamplainLabel.html#champlain-label-get-draw-shadow" since="0.12.10"/> <keyword type="struct" name="struct ChamplainLabel" link="ChamplainLabel.html#ChamplainLabel-struct"/> <keyword type="property" name="The “alignment” property" link="ChamplainLabel.html#ChamplainLabel--alignment"/> <keyword type="property" name="The “color” property" link="ChamplainLabel.html#ChamplainLabel--color"/> <keyword type="property" name="The “draw-background” property" link="ChamplainLabel.html#ChamplainLabel--draw-background"/> + <keyword type="property" name="The “draw-shadow” property" link="ChamplainLabel.html#ChamplainLabel--draw-shadow"/> <keyword type="property" name="The “ellipsize” property" link="ChamplainLabel.html#ChamplainLabel--ellipsize"/> <keyword type="property" name="The “font-name” property" link="ChamplainLabel.html#ChamplainLabel--font-name"/> <keyword type="property" name="The “image” property" link="ChamplainLabel.html#ChamplainLabel--image"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libchamplain-0.12.9/docs/reference/libchamplain-sections.txt new/libchamplain-0.12.10/docs/reference/libchamplain-sections.txt --- old/libchamplain-0.12.9/docs/reference/libchamplain-sections.txt 2014-09-18 00:22:23.000000000 +0200 +++ new/libchamplain-0.12.10/docs/reference/libchamplain-sections.txt 2015-03-18 11:44:23.000000000 +0100 @@ -58,6 +58,7 @@ champlain_label_set_single_line_mode champlain_label_set_ellipsize champlain_label_set_draw_background +champlain_label_set_draw_shadow champlain_label_get_use_markup champlain_label_get_text champlain_label_get_image @@ -71,6 +72,7 @@ champlain_label_get_single_line_mode champlain_label_get_draw_background champlain_label_get_attributes +champlain_label_get_draw_shadow <SUBSECTION Standard> CHAMPLAIN_LABEL CHAMPLAIN_IS_LABEL diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libchamplain-0.12.9/docs/reference/tmpl/champlain-label.sgml new/libchamplain-0.12.10/docs/reference/tmpl/champlain-label.sgml --- old/libchamplain-0.12.9/docs/reference/tmpl/champlain-label.sgml 2014-09-18 00:22:23.000000000 +0200 +++ new/libchamplain-0.12.10/docs/reference/tmpl/champlain-label.sgml 2015-03-18 11:44:23.000000000 +0100 @@ -41,6 +41,11 @@ </para> +<!-- ##### ARG ChamplainLabel:draw-shadow ##### --> +<para> + +</para> + <!-- ##### ARG ChamplainLabel:ellipsize ##### --> <para> @@ -253,6 +258,15 @@ @background: +<!-- ##### FUNCTION champlain_label_set_draw_shadow ##### --> +<para> + +</para> + +@label: +@shadow: + + <!-- ##### FUNCTION champlain_label_get_use_markup ##### --> <para> @@ -365,6 +379,15 @@ <para> </para> + +@label: +@Returns: + + +<!-- ##### FUNCTION champlain_label_get_draw_shadow ##### --> +<para> + +</para> @label: @Returns: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libchamplain-0.12.9/docs/reference/tmpl/champlain-memphis-renderer.sgml new/libchamplain-0.12.10/docs/reference/tmpl/champlain-memphis-renderer.sgml --- old/libchamplain-0.12.9/docs/reference/tmpl/champlain-memphis-renderer.sgml 1970-01-01 01:00:00.000000000 +0100 +++ new/libchamplain-0.12.10/docs/reference/tmpl/champlain-memphis-renderer.sgml 2015-03-18 11:44:23.000000000 +0100 @@ -0,0 +1,22 @@ +<!-- ##### SECTION Title ##### --> +ChamplainMemphisRenderer + +<!-- ##### SECTION Short_Description ##### --> + + +<!-- ##### SECTION Long_Description ##### --> +<para> + +</para> + +<!-- ##### SECTION See_Also ##### --> +<para> + +</para> + +<!-- ##### SECTION Stability_Level ##### --> + + +<!-- ##### SECTION Image ##### --> + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libchamplain-0.12.9/docs/reference/tmpl/libchamplain-unused.sgml new/libchamplain-0.12.10/docs/reference/tmpl/libchamplain-unused.sgml --- old/libchamplain-0.12.9/docs/reference/tmpl/libchamplain-unused.sgml 2014-09-18 00:22:23.000000000 +0200 +++ new/libchamplain-0.12.10/docs/reference/tmpl/libchamplain-unused.sgml 2015-03-18 11:44:23.000000000 +0100 @@ -0,0 +1,184 @@ +<!-- ##### SECTION ./tmpl/champlain-memphis-renderer.sgml:Image ##### --> + + + +<!-- ##### SECTION ./tmpl/champlain-memphis-renderer.sgml:Long_Description ##### --> +<para> + +</para> + + +<!-- ##### SECTION ./tmpl/champlain-memphis-renderer.sgml:See_Also ##### --> +<para> + +</para> + + +<!-- ##### SECTION ./tmpl/champlain-memphis-renderer.sgml:Short_Description ##### --> + + + +<!-- ##### SECTION ./tmpl/champlain-memphis-renderer.sgml:Stability_Level ##### --> + + + +<!-- ##### SECTION ./tmpl/champlain-memphis-renderer.sgml:Title ##### --> +ChamplainMemphisRenderer + + +<!-- ##### MACRO CHAMPLAIN_MAP_SOURCE_MEMPHIS_LOCAL ##### --> +<para> + +</para> + + +<!-- ##### MACRO CHAMPLAIN_MAP_SOURCE_MEMPHIS_NETWORK ##### --> +<para> + +</para> + + +<!-- ##### STRUCT ChamplainMemphisRenderer ##### --> +<para> + +</para> + + +<!-- ##### ARG ChamplainMemphisRenderer:bounding-box ##### --> +<para> + +</para> + + +<!-- ##### ARG ChamplainMemphisRenderer:tile-size ##### --> +<para> + +</para> + + +<!-- ##### STRUCT ChamplainMemphisRule ##### --> +<para> + +</para> + +@keys: +@values: +@type: +@polygon: +@line: +@border: +@text: + +<!-- ##### STRUCT ChamplainMemphisRuleAttr ##### --> +<para> + +</para> + +@z_min: +@z_max: +@color_red: +@color_green: +@color_blue: +@color_alpha: +@style: +@size: + +<!-- ##### ENUM ChamplainMemphisRuleType ##### --> +<para> + +</para> + +@CHAMPLAIN_MEMPHIS_RULE_TYPE_UNKNOWN: +@CHAMPLAIN_MEMPHIS_RULE_TYPE_NODE: +@CHAMPLAIN_MEMPHIS_RULE_TYPE_WAY: +@CHAMPLAIN_MEMPHIS_RULE_TYPE_RELATION: + +<!-- ##### FUNCTION champlain_memphis_renderer_get_background_color ##### --> +<para> + +</para> + +@renderer: +@Returns: + +<!-- ##### FUNCTION champlain_memphis_renderer_get_bounding_box ##### --> +<para> + +</para> + +@renderer: +@Returns: + +<!-- ##### FUNCTION champlain_memphis_renderer_get_rule ##### --> +<para> + +</para> + +@renderer: +@id: +@Returns: + +<!-- ##### FUNCTION champlain_memphis_renderer_get_rule_ids ##### --> +<para> + +</para> + +@renderer: +@Returns: + +<!-- ##### FUNCTION champlain_memphis_renderer_get_tile_size ##### --> +<para> + +</para> + +@renderer: +@Returns: + +<!-- ##### FUNCTION champlain_memphis_renderer_load_rules ##### --> +<para> + +</para> + +@renderer: +@rules_path: + +<!-- ##### FUNCTION champlain_memphis_renderer_new_full ##### --> +<para> + +</para> + +@tile_size: +@Returns: + +<!-- ##### FUNCTION champlain_memphis_renderer_remove_rule ##### --> +<para> + +</para> + +@renderer: +@id: + +<!-- ##### FUNCTION champlain_memphis_renderer_set_background_color ##### --> +<para> + +</para> + +@renderer: +@color: + +<!-- ##### FUNCTION champlain_memphis_renderer_set_rule ##### --> +<para> + +</para> + +@renderer: +@rule: + +<!-- ##### FUNCTION champlain_memphis_renderer_set_tile_size ##### --> +<para> + +</para> + +@renderer: +@size: + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libchamplain-0.12.9/docs/reference/version.xml new/libchamplain-0.12.10/docs/reference/version.xml --- old/libchamplain-0.12.9/docs/reference/version.xml 2014-09-18 00:21:41.000000000 +0200 +++ new/libchamplain-0.12.10/docs/reference/version.xml 2015-03-18 11:44:06.000000000 +0100 @@ -1 +1 @@ -0.12.9 +0.12.10 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libchamplain-0.12.9/docs/reference-gtk/html/GtkChamplainEmbed.html new/libchamplain-0.12.10/docs/reference-gtk/html/GtkChamplainEmbed.html --- old/libchamplain-0.12.9/docs/reference-gtk/html/GtkChamplainEmbed.html 2014-09-18 00:22:23.000000000 +0200 +++ new/libchamplain-0.12.10/docs/reference-gtk/html/GtkChamplainEmbed.html 2015-03-18 11:44:23.000000000 +0100 @@ -44,7 +44,7 @@ <tbody> <tr> <td class="function_type"> -<a href="http://developer.gnome.org/gtk2/GtkWidget.html";><span class="returnvalue">GtkWidget</span></a> * +<a href="http://library.gnome.org/devel/gtk3/GtkWidget.html";><span class="returnvalue">GtkWidget</span></a> * </td> <td class="function_name"> <a class="link" href="GtkChamplainEmbed.html#gtk-champlain-embed-new" title="gtk_champlain_embed_new ()">gtk_champlain_embed_new</a> <span class="c_punctuation">()</span> @@ -94,10 +94,10 @@ <a name="GtkChamplainEmbed.object-hierarchy"></a><h2>Object Hierarchy</h2> <pre class="screen"> <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject";>GObject</a> <span class="lineart">╰──</span> <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GInitiallyUnowned";>GInitiallyUnowned</a> - <span class="lineart">╰──</span> <a href="http://developer.gnome.org/gtk2/GtkWidget.html";>GtkWidget</a> - <span class="lineart">╰──</span> <a href="http://developer.gnome.org/gtk2/GtkContainer.html";>GtkContainer</a> - <span class="lineart">╰──</span> <a href="http://developer.gnome.org/gtk2/GtkBin.html";>GtkBin</a> - <span class="lineart">╰──</span> <a href="http://developer.gnome.org/gtk2/GtkAlignment.html";>GtkAlignment</a> + <span class="lineart">╰──</span> <a href="http://library.gnome.org/devel/gtk3/GtkWidget.html";>GtkWidget</a> + <span class="lineart">╰──</span> <a href="http://library.gnome.org/devel/gtk3/GtkContainer.html";>GtkContainer</a> + <span class="lineart">╰──</span> <a href="http://library.gnome.org/devel/gtk3/GtkBin.html";>GtkBin</a> + <span class="lineart">╰──</span> <a href="http://library.gnome.org/devel/gtk3/GtkAlignment.html";>GtkAlignment</a> <span class="lineart">╰──</span> GtkChamplainEmbed </pre> </div> @@ -105,7 +105,7 @@ <a name="GtkChamplainEmbed.implemented-interfaces"></a><h2>Implemented Interfaces</h2> <p> GtkChamplainEmbed implements - AtkImplementorIface and <a href="http://developer.gnome.org/gtk2/GtkBuildable.html";>GtkBuildable</a>.</p> + AtkImplementorIface and <a href="http://library.gnome.org/devel/gtk3/GtkBuildable.html";>GtkBuildable</a>.</p> </div> <div class="refsect1"> <a name="GtkChamplainEmbed.description"></a><h2>Description</h2> @@ -118,12 +118,12 @@ <a name="GtkChamplainEmbed.functions_details"></a><h2>Functions</h2> <div class="refsect2"> <a name="gtk-champlain-embed-new"></a><h3>gtk_champlain_embed_new ()</h3> -<pre class="programlisting"><a href="http://developer.gnome.org/gtk2/GtkWidget.html";><span class="returnvalue">GtkWidget</span></a> * +<pre class="programlisting"><a href="http://library.gnome.org/devel/gtk3/GtkWidget.html";><span class="returnvalue">GtkWidget</span></a> * gtk_champlain_embed_new (<em class="parameter"><code><span class="type">void</span></code></em>);</pre> <p>Creates an instance of <a class="link" href="GtkChamplainEmbed.html" title="GtkChamplainEmbed"><span class="type">GtkChamplainEmbed</span></a>.</p> <div class="refsect3"> <a name="id-1.2.2.9.2.5"></a><h4>Returns</h4> -<p> a new <a class="link" href="GtkChamplainEmbed.html" title="GtkChamplainEmbed"><span class="type">GtkChamplainEmbed</span></a> ready to be used as a <a href="http://developer.gnome.org/gtk2/GtkWidget.html";><span class="type">GtkWidget</span></a>.</p> +<p> a new <a class="link" href="GtkChamplainEmbed.html" title="GtkChamplainEmbed"><span class="type">GtkChamplainEmbed</span></a> ready to be used as a <a href="http://library.gnome.org/devel/gtk3/GtkWidget.html";><span class="type">GtkWidget</span></a>.</p> <p></p> </div> <p class="since">Since 0.4</p> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libchamplain-0.12.9/docs/reference-gtk/html/index.html new/libchamplain-0.12.10/docs/reference-gtk/html/index.html --- old/libchamplain-0.12.9/docs/reference-gtk/html/index.html 2014-09-18 00:22:23.000000000 +0200 +++ new/libchamplain-0.12.10/docs/reference-gtk/html/index.html 2015-03-18 11:44:23.000000000 +0100 @@ -16,7 +16,7 @@ <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">libchamplain-gtk Reference Manual</p></th></tr></table></div> <div> <p class="releaseinfo"> - for libchamplain-gtk 0.12.9 + for libchamplain-gtk 0.12.10 </p> <p> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libchamplain-0.12.9/docs/reference-gtk/tmpl/gtk-champlain-embed.sgml new/libchamplain-0.12.10/docs/reference-gtk/tmpl/gtk-champlain-embed.sgml --- old/libchamplain-0.12.9/docs/reference-gtk/tmpl/gtk-champlain-embed.sgml 2014-09-18 00:22:23.000000000 +0200 +++ new/libchamplain-0.12.10/docs/reference-gtk/tmpl/gtk-champlain-embed.sgml 2015-03-18 11:44:23.000000000 +0100 @@ -9,13 +9,11 @@ </para> - <!-- ##### SECTION See_Also ##### --> <para> </para> - <!-- ##### SECTION Stability_Level ##### --> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libchamplain-0.12.9/docs/reference-gtk/version.xml new/libchamplain-0.12.10/docs/reference-gtk/version.xml --- old/libchamplain-0.12.9/docs/reference-gtk/version.xml 2014-09-18 00:21:41.000000000 +0200 +++ new/libchamplain-0.12.10/docs/reference-gtk/version.xml 2015-03-18 11:44:06.000000000 +0100 @@ -1 +1 @@ -0.12.9 +0.12.10 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
