Patch applied.
2010/6/14 Rob Norris <rw_nor...@hotmail.com>:
> ---
> src/datasource_gc.c | 4 ++--
> src/dialog.c | 8 ++++----
> src/uibuilder.c | 2 +-
> src/vikgeoreflayer.c | 8 ++++----
> src/vikwindow.c | 2 +-
> 5 files changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/src/datasource_gc.c b/src/datasource_gc.c
> index 5351ae7..e6e8194 100644
> --- a/src/datasource_gc.c
> +++ b/src/datasource_gc.c
> @@ -168,11 +168,11 @@ static void datasource_gc_add_setup_widgets ( GtkWidget
> *dialog, VikViewport *vv
> gchar *s_ll;
>
> num_label = gtk_label_new (_("Number geocaches:"));
> - widgets->num_spin = gtk_spin_button_new (
> GTK_ADJUSTMENT(gtk_adjustment_new( 100, 1, 1000, 10, 20, 50 )), 25, 0 );
> + widgets->num_spin = gtk_spin_button_new (
> GTK_ADJUSTMENT(gtk_adjustment_new( 100, 1, 1000, 10, 20, 0 )), 25, 0 );
> center_label = gtk_label_new (_("Centered around:"));
> widgets->center_entry = gtk_entry_new();
> miles_radius_label = gtk_label_new ("Miles Radius:");
> - widgets->miles_radius_spin = gtk_spin_button_new (
> GTK_ADJUSTMENT(gtk_adjustment_new( 100, 1, 1000, 5, 20, 50 )), 25, 2 );
> + widgets->miles_radius_spin = gtk_spin_button_new (
> GTK_ADJUSTMENT(gtk_adjustment_new( 100, 1, 1000, 5, 20, 0 )), 25, 2 );
>
> vik_coord_to_latlon ( vik_viewport_get_center(vvp), &ll );
> s_ll = g_strdup_printf("%f,%f", ll.lat, ll.lon );
> diff --git a/src/dialog.c b/src/dialog.c
> index af527b2..9e55926 100644
> --- a/src/dialog.c
> +++ b/src/dialog.c
> @@ -121,7 +121,7 @@ gboolean a_dialog_goto_utm ( GtkWindow *parent, struct
> UTM *utm, const struct UT
>
> zonehbox = gtk_hbox_new ( FALSE, 0 );
> gtk_box_pack_start ( GTK_BOX(zonehbox), gtk_label_new ( _("Zone:") ),
> FALSE, FALSE, 5 );
> - zonespin = gtk_spin_button_new ( (GtkAdjustment *) gtk_adjustment_new (
> old->zone, 1, 60, 1, 5, 5 ), 1, 0 );
> + zonespin = gtk_spin_button_new ( (GtkAdjustment *) gtk_adjustment_new (
> old->zone, 1, 60, 1, 5, 0 ), 1, 0 );
> gtk_box_pack_start ( GTK_BOX(zonehbox), zonespin, TRUE, TRUE, 5 );
> gtk_box_pack_start ( GTK_BOX(zonehbox), gtk_label_new ( _("Letter:") ),
> FALSE, FALSE, 5 );
> letterentry = gtk_entry_new ();
> @@ -596,8 +596,8 @@ gboolean a_dialog_custom_zoom ( GtkWindow *parent,
> gdouble *xmpp, gdouble *ympp
> xlabel = gtk_label_new ( _("X (easting): "));
> ylabel = gtk_label_new ( _("Y (northing): "));
>
> - pass_along[0] = xspin = gtk_spin_button_new ( (GtkAdjustment *)
> gtk_adjustment_new ( *xmpp, VIK_VIEWPORT_MIN_ZOOM, VIK_VIEWPORT_MAX_ZOOM, 1,
> 5, 5 ), 1, 8 );
> - pass_along[1] = yspin = gtk_spin_button_new ( (GtkAdjustment *)
> gtk_adjustment_new ( *ympp, VIK_VIEWPORT_MIN_ZOOM, VIK_VIEWPORT_MAX_ZOOM, 1,
> 5, 5 ), 1, 8 );
> + pass_along[0] = xspin = gtk_spin_button_new ( (GtkAdjustment *)
> gtk_adjustment_new ( *xmpp, VIK_VIEWPORT_MIN_ZOOM, VIK_VIEWPORT_MAX_ZOOM, 1,
> 5, 0 ), 1, 8 );
> + pass_along[1] = yspin = gtk_spin_button_new ( (GtkAdjustment *)
> gtk_adjustment_new ( *ympp, VIK_VIEWPORT_MIN_ZOOM, VIK_VIEWPORT_MAX_ZOOM, 1,
> 5, 0 ), 1, 8 );
>
> pass_along[2] = samecheck = gtk_check_button_new_with_label ( _("X and Y
> zoom factors must be equal") );
> /* TODO -- same factor */
> @@ -659,7 +659,7 @@ gboolean a_dialog_time_threshold ( GtkWindow *parent,
> gchar *title_text, gchar *
>
> pass_along[0] = t4;
>
> - spin = gtk_spin_button_new ( (GtkAdjustment *) gtk_adjustment_new ( *thr,
> 0, 65536, 1, 5, 5 ), 1, 0 );
> + spin = gtk_spin_button_new ( (GtkAdjustment *) gtk_adjustment_new ( *thr,
> 0, 65536, 1, 5, 0 ), 1, 0 );
>
> gtk_table_attach_defaults ( GTK_TABLE(table), label, 0, 2, 0, 1 );
> gtk_table_attach_defaults ( GTK_TABLE(table), t1, 0, 1, 1, 2 );
> diff --git a/src/uibuilder.c b/src/uibuilder.c
> index bb0ee4c..9c37f18 100644
> --- a/src/uibuilder.c
> +++ b/src/uibuilder.c
> @@ -125,7 +125,7 @@ GtkWidget *a_uibuilder_new_widget ( VikLayerParam *param,
> VikLayerParamData data
> {
> gdouble init_val = (param->type == VIK_LAYER_PARAM_DOUBLE) ? data.d :
> (param->type == VIK_LAYER_PARAM_UINT ? data.u : data.i);
> VikLayerParamScale *scale = (VikLayerParamScale *) param->widget_data;
> - rv = gtk_spin_button_new ( GTK_ADJUSTMENT(gtk_adjustment_new(
> init_val, scale->min, scale->max, scale->step, scale->step, scale->step )),
> scale->step, scale->digits );
> + rv = gtk_spin_button_new ( GTK_ADJUSTMENT(gtk_adjustment_new(
> init_val, scale->min, scale->max, scale->step, scale->step, 0 )),
> scale->step, scale->digits );
> }
> break;
> case VIK_LAYER_WIDGET_ENTRY:
> diff --git a/src/vikgeoreflayer.c b/src/vikgeoreflayer.c
> index accf065..d152f5c 100644
> --- a/src/vikgeoreflayer.c
> +++ b/src/vikgeoreflayer.c
> @@ -452,19 +452,19 @@ static gboolean georef_layer_dialog ( VikGeorefLayer
> **vgl, gpointer vp, GtkWind
> gtk_box_pack_start ( GTK_BOX(wfp_hbox), wfp_button, FALSE, FALSE, 3 );
>
> ce_label = gtk_label_new ( _("Corner pixel easting:") );
> - ce_spin = gtk_spin_button_new ( (GtkAdjustment *) gtk_adjustment_new ( 4,
> 0.0, 1500000.0, 1, 5, 5 ), 1, 4 );
> + ce_spin = gtk_spin_button_new ( (GtkAdjustment *) gtk_adjustment_new ( 4,
> 0.0, 1500000.0, 1, 5, 0 ), 1, 4 );
> gtk_widget_set_tooltip_text ( GTK_WIDGET(ce_spin), _("the UTM \"easting\"
> value of the upper-right corner pixel of the map") );
>
> cn_label = gtk_label_new ( _("Corner pixel northing:") );
> - cn_spin = gtk_spin_button_new ( (GtkAdjustment *) gtk_adjustment_new ( 4,
> 0.0, 9000000.0, 1, 5, 5 ), 1, 4 );
> + cn_spin = gtk_spin_button_new ( (GtkAdjustment *) gtk_adjustment_new ( 4,
> 0.0, 9000000.0, 1, 5, 0 ), 1, 4 );
> gtk_widget_set_tooltip_text ( GTK_WIDGET(cn_spin), _("the UTM \"northing\"
> value of the upper-right corner pixel of the map") );
>
> xlabel = gtk_label_new ( _("X (easting) scale (mpp): "));
> ylabel = gtk_label_new ( _("Y (northing) scale (mpp): "));
>
> - xspin = gtk_spin_button_new ( (GtkAdjustment *) gtk_adjustment_new ( 4,
> VIK_VIEWPORT_MIN_ZOOM, VIK_VIEWPORT_MAX_ZOOM, 1, 5, 5 ), 1, 8 );
> + xspin = gtk_spin_button_new ( (GtkAdjustment *) gtk_adjustment_new ( 4,
> VIK_VIEWPORT_MIN_ZOOM, VIK_VIEWPORT_MAX_ZOOM, 1, 5, 0 ), 1, 8 );
> gtk_widget_set_tooltip_text ( GTK_WIDGET(xspin), _("the scale of the map in
> the X direction (meters per pixel)") );
> - yspin = gtk_spin_button_new ( (GtkAdjustment *) gtk_adjustment_new ( 4,
> VIK_VIEWPORT_MIN_ZOOM, VIK_VIEWPORT_MAX_ZOOM, 1, 5, 5 ), 1, 8 );
> + yspin = gtk_spin_button_new ( (GtkAdjustment *) gtk_adjustment_new ( 4,
> VIK_VIEWPORT_MIN_ZOOM, VIK_VIEWPORT_MAX_ZOOM, 1, 5, 0 ), 1, 8 );
> gtk_widget_set_tooltip_text ( GTK_WIDGET(yspin), _("the scale of the map in
> the Y direction (meters per pixel)") );
>
> imagelabel = gtk_label_new ( _("Map Image:") );
> diff --git a/src/vikwindow.c b/src/vikwindow.c
> index 733dc4c..065e76a 100644
> --- a/src/vikwindow.c
> +++ b/src/vikwindow.c
> @@ -1916,7 +1916,7 @@ static void draw_to_image_file ( VikWindow *vw, const
> gchar *fn, gboolean one_im
>
> zoom_label = gtk_label_new ( _("Zoom (meters per pixel):") );
> /* TODO: separate xzoom and yzoom factors */
> - zoom_spin = gtk_spin_button_new ( GTK_ADJUSTMENT(gtk_adjustment_new (
> vik_viewport_get_xmpp(vw->viking_vvp), VIK_VIEWPORT_MIN_ZOOM,
> VIK_VIEWPORT_MAX_ZOOM/2.0, 1, 100, 3 )), 16, 3);
> + zoom_spin = gtk_spin_button_new ( GTK_ADJUSTMENT(gtk_adjustment_new (
> vik_viewport_get_xmpp(vw->viking_vvp), VIK_VIEWPORT_MIN_ZOOM,
> VIK_VIEWPORT_MAX_ZOOM/2.0, 1, 100, 0 )), 16, 0);
>
> total_size_label = gtk_label_new ( NULL );
>
> --
> 1.7.1
>
>
> ------------------------------------------------------------------------------
> ThinkGeek and WIRED's GeekDad team up for the Ultimate
> GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the
> lucky parental unit. See the prize list and enter to win:
> http://p.sf.net/sfu/thinkgeek-promo
> _______________________________________________
> Viking-devel mailing list
> Viking-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/viking-devel
> Viking home page: http://viking.sf.net/
>
--
Guilhem BONNEFILLE
-=- JID: gu...@im.apinc.org MSN: guilhem_bonnefi...@hotmail.com
-=- mailto:guilhem.bonnefi...@gmail.com
-=- http://nathguil.free.fr/
------------------------------------------------------------------------------
ThinkGeek and WIRED's GeekDad team up for the Ultimate
GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the
lucky parental unit. See the prize list and enter to win:
http://p.sf.net/sfu/thinkgeek-promo
_______________________________________________
Viking-devel mailing list
Viking-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/viking-devel
Viking home page: http://viking.sf.net/
