From de7cc34ddeafde0c12aca95e1771d4d8d84d97ad Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 12 May 2006 16:14:48 +0000 Subject: [PATCH] Reinstate the ruler metrics strings, since they are used by glade, pointed 2006-05-12 Matthias Clasen * gtk/gtkruler.c: Reinstate the ruler metrics strings, since they are used by glade, pointed out by Damon Chaplin. --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ gtk/gtkruler.c | 6 +++--- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 39dc429ae..0445a5a62 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-05-12 Matthias Clasen + + * gtk/gtkruler.c: Reinstate the ruler metrics strings, since + they are used by glade, pointed out by Damon Chaplin. + 2006-05-12 Alexander Larsson * gtk/gtkwindow.c: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 39dc429ae..0445a5a62 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2006-05-12 Matthias Clasen + + * gtk/gtkruler.c: Reinstate the ruler metrics strings, since + they are used by glade, pointed out by Damon Chaplin. + 2006-05-12 Alexander Larsson * gtk/gtkwindow.c: diff --git a/gtk/gtkruler.c b/gtk/gtkruler.c index e6a4a0e35..1655d1888 100644 --- a/gtk/gtkruler.c +++ b/gtk/gtkruler.c @@ -57,9 +57,9 @@ static void gtk_ruler_get_property (GObject *object, static const GtkRulerMetric ruler_metrics[] = { - { NULL, NULL, 1.0, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, - { NULL, NULL, 72.0, { 1, 2, 4, 8, 16, 32, 64, 128, 256, 512 }, { 1, 2, 4, 8, 16 }}, - { NULL, NULL, 28.35, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, + { "Pixel", "Pi", 1.0, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, + { "Inches", "In", 72.0, { 1, 2, 4, 8, 16, 32, 64, 128, 256, 512 }, { 1, 2, 4, 8, 16 }}, + { "Centimeters", "Cn", 28.35, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, }; G_DEFINE_TYPE (GtkRuler, gtk_ruler, GTK_TYPE_WIDGET);