GNOME.org
 

[drgeo/goffice: 77/82] fix strings (Rodrigo Marcos Fombellida) [#1444177]. ditto. ditto. ditto.

commit b7b42cdec5c144995427d5e95403c0db10678f4e
Author: Jean Brefort <jean brefort normalesup org>
Date:   Sat Mar 25 08:22:44 2006 +0000

    fix strings (Rodrigo Marcos Fombellida) [#1444177]. ditto. ditto. ditto.
    
    2006-03-25  Jean Brefort  <jean brefort normalesup org>
    
    	* drgenius_main.cc: fix strings (Rodrigo Marcos Fombellida) [#1444177].
    	* drgenius_mdi.cc: ditto.
    	* glade/drgeo2.glade: ditto.
    	* glade/drgeoMDI.glade: ditto.
    	* goffice/drgeo.cc: fix colors use when using cairo.
    	* goffice/drgeo_cairodrawable.cc: ditto.

 ChangeLog                      |    9 ++++++++
 drgenius_main.cc               |    2 +-
 drgenius_mdi.cc                |    6 ++--
 glade/drgeo2.glade             |    8 +++---
 glade/drgeoMDI.glade           |    2 +-
 goffice/drgeo.cc               |   36 +++++++++++++++++++++++++++++++++-
 goffice/drgeo_cairodrawable.cc |   42 ++++++++++++++++++++--------------------
 7 files changed, 74 insertions(+), 31 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index bd39fe2..cc14e3a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,15 @@
 
 	* configure.ac: Added "vi" to ALL_LINGUAS.
 
+2006-03-25  Jean Brefort  <jean brefort normalesup org>
+
+	* drgenius_main.cc: fix strings (Rodrigo Marcos Fombellida) [#1444177].
+	* drgenius_mdi.cc: ditto.
+	* glade/drgeo2.glade: ditto.
+	* glade/drgeoMDI.glade: ditto.
+	* goffice/drgeo.cc: fix colors use when using cairo.
+	* goffice/drgeo_cairodrawable.cc: ditto.
+
 2006-03-14  Jean Brefort  <jean brefort normalesup org>
 
 	* Makefile.am: fix make distcheck.
diff --git a/drgenius_main.cc b/drgenius_main.cc
index 03b1457..3546be0 100644
--- a/drgenius_main.cc
+++ b/drgenius_main.cc
@@ -197,7 +197,7 @@ main_prog (int argc, char *argv[])
 	}
       else
 	{
-	  printf (_ ("\nUnknows command: %s\n"), argv[arg++]);
+	  printf (_ ("\nUnknown command: %s\n"), argv[arg++]);
 	  endBadParameter ();
 	}
     }
diff --git a/drgenius_mdi.cc b/drgenius_mdi.cc
index 9daf7c3..ed048ee 100644
--- a/drgenius_mdi.cc
+++ b/drgenius_mdi.cc
@@ -1462,7 +1462,7 @@ export_figure_to_latex_cb (GtkWidget * widget, gpointer data)
 				    GTK_DIALOG_DESTROY_WITH_PARENT,
 				    GTK_MESSAGE_WARNING,
 				    GTK_BUTTONS_CLOSE,
-				    _("Only geomteric figure\ncan be exported to LaTex!"),
+				    _("Only a geometric figure\ncan be exported to LaTex!"),
 				    NULL, g_strerror (errno));
 
       gtk_dialog_run (GTK_DIALOG (dlg));
@@ -1514,7 +1514,7 @@ export_figure_to_postscript_cb (GtkWidget * widget, gpointer data)
 				    GTK_DIALOG_DESTROY_WITH_PARENT,
 				    GTK_MESSAGE_WARNING,
 				    GTK_BUTTONS_CLOSE,
-				    _("Only geomteric figure\ncan be exported to PostScript!"),
+				    _("Only a geometric figure\ncan be exported to PostScript!"),
 				    NULL, g_strerror (errno));
       gtk_dialog_run (GTK_DIALOG (dlg));
       gtk_widget_destroy (dlg);
@@ -1567,7 +1567,7 @@ export_figure_to_png_cb (GtkWidget * widget, gpointer data)
 				    GTK_DIALOG_DESTROY_WITH_PARENT,
 				    GTK_MESSAGE_WARNING,
 				    GTK_BUTTONS_CLOSE,
-				    _("Only geomteric figure\ncan be exported to PNG!"),
+				    _("Only a geometric figure\ncan be exported to PNG!"),
 				    NULL, g_strerror (errno));
       gtk_dialog_run (GTK_DIALOG (dlg));
       gtk_widget_destroy (dlg);
diff --git a/glade/drgeo2.glade b/glade/drgeo2.glade
index 1b19eab..e964ce3 100644
--- a/glade/drgeo2.glade
+++ b/glade/drgeo2.glade
@@ -480,7 +480,7 @@
       <child>
 	<widget class="GtkToolButton" id="circleItem">
 	  <property name="visible">True</property>
-	  <property name="tooltip" translatable="yes">Circle defines by center and point, radius or segment</property>
+	  <property name="tooltip" translatable="yes">Circle defined by a center and a point, radius or segment</property>
 	  <property name="label" translatable="yes"></property>
 	  <property name="use_underline">True</property>
 	  <property name="icon">circle.png</property>
@@ -516,7 +516,7 @@
       <child>
 	<widget class="GtkToolButton" id="locusItem">
 	  <property name="visible">True</property>
-	  <property name="tooltip" translatable="yes">Locus defined by a free point and a relative point</property>
+	  <property name="tooltip" translatable="yes">Locus defined by a free point and a dependent point</property>
 	  <property name="label" translatable="yes"></property>
 	  <property name="use_underline">True</property>
 	  <property name="icon">locus.png</property>
@@ -2190,7 +2190,7 @@
 		      <child>
 			<widget class="GtkToolButton" id="circle">
 			  <property name="visible">True</property>
-			  <property name="tooltip" translatable="yes">Circle defines by center and point, radius or segment</property>
+			  <property name="tooltip" translatable="yes">Circle defined by a center and a point, radius or segment</property>
 			  <property name="label" translatable="yes"></property>
 			  <property name="use_underline">True</property>
 			  <property name="icon">circle.png</property>
@@ -2226,7 +2226,7 @@
 		      <child>
 			<widget class="GtkToolButton" id="locus">
 			  <property name="visible">True</property>
-			  <property name="tooltip" translatable="yes">Locus defined by a free point and a relative point</property>
+			  <property name="tooltip" translatable="yes">Locus defined by a free point and a dependent point</property>
 			  <property name="label" translatable="yes"></property>
 			  <property name="use_underline">True</property>
 			  <property name="icon">locus.png</property>
diff --git a/glade/drgeoMDI.glade b/glade/drgeoMDI.glade
index 5b33301..6ba45f0 100644
--- a/glade/drgeoMDI.glade
+++ b/glade/drgeoMDI.glade
@@ -882,7 +882,7 @@
 	  <child>
 	    <widget class="GtkMenuItem" id="locusItem">
 	      <property name="visible">True</property>
-	      <property name="tooltip" translatable="yes">Locus defined by a free point and a relative point</property>
+	      <property name="tooltip" translatable="yes">Locus defined by a free point and a dependent point</property>
 	      <property name="label" translatable="yes">_Geometric Locus</property>
 	      <property name="use_underline">True</property>
 	      <signal name="activate" handler="drgeo_locus_point_cb" last_modification_time="Tue, 01 Apr 2003 14:30:56 GMT"/>
diff --git a/goffice/drgeo.cc b/goffice/drgeo.cc
index 84b2b8d..b22b9d9 100644
--- a/goffice/drgeo.cc
+++ b/goffice/drgeo.cc
@@ -146,11 +146,42 @@ go_drgeo_component_set_data (GOComponent *component, char const *data, int lengt
 	go_drgeo_component_update_bounds (godrgeo);
 }
 
+/* Red and blue are inverted in a pixbuf compared to cairo */
+static void
+cairo_to_pixbuf (unsigned char *p, int width, int height, int rowstride)
+{
+	int i,j;
+	unsigned char a;
+	guint t;
+	
+#define MULT(d,c,a,t) G_STMT_START { t = (a)? c * 255 / a: 0; d = t;} G_STMT_END
+	
+	for (i = 0; i < height; i++) {
+		for (j = 0; j < width; j++) {
+#if G_BYTE_ORDER == G_LITTLE_ENDIAN
+			MULT(a,    p[2], p[3], t);
+			MULT(p[1], p[1], p[3], t);
+			MULT(p[2], p[0], p[3], t);
+			p[0] = a;
+#else	  
+			a = p[3];
+			MULT(p[3], p[2], a, t);
+			MULT(p[2], p[1], a, t);
+			MULT(p[1], p[0], a, t);
+			p[0] = a;
+#endif
+			p += 4;
+		}
+		p += rowstride - width * 4;
+	}
+#undef MULT
+}
+
 static void
 go_drgeo_component_draw (GOComponent *component, int width_pixels, int height_pixels)
 {
 	GODrGeoComponent *godrgeo = GO_DRGEO_COMPONENT (component);
-	gdk_pixbuf_fill (component->pixbuf, 0xffffff00);
+	gdk_pixbuf_fill (component->pixbuf, 0x00000000);
 	cairo_surface_t* surface = cairo_image_surface_create_for_data (
               				gdk_pixbuf_get_pixels (component->pixbuf),
 							CAIRO_FORMAT_ARGB32,
@@ -163,6 +194,9 @@ go_drgeo_component_draw (GOComponent *component, int width_pixels, int height_pi
 	godrgeo->figure->redraw (0);
 	godrgeo->figure->setDrawable (NULL);
 	delete drawable;
+	cairo_to_pixbuf (gdk_pixbuf_get_pixels (component->pixbuf), 
+					width_pixels, height_pixels, 
+					gdk_pixbuf_get_rowstride (component->pixbuf));
 }
 
 static void
diff --git a/goffice/drgeo_cairodrawable.cc b/goffice/drgeo_cairodrawable.cc
index 25d64fa..f39fcc9 100644
--- a/goffice/drgeo_cairodrawable.cc
+++ b/goffice/drgeo_cairodrawable.cc
@@ -36,33 +36,33 @@ static cairo_pattern_t *alphacairoColor[drgeoColorNumber] = {
 drgeoCairoDrawable::drgeoCairoDrawable (drgeoFigure * figure, cairo_surface_t *surface)
 {
 	if (cairoColor[drgeoColorBlack] == NULL) {
-		cairoColor[drgeoColorBlack] = cairo_pattern_create_rgb (0., 0., 0.);
-		cairoColor[drgeoColorDarkGrey] = cairo_pattern_create_rgb (.333333, .333333, .333333);
-		cairoColor[drgeoColorGrey] = cairo_pattern_create_rgb (.666667, .666667, .666667);
-		cairoColor[drgeoColorWhite] = cairo_pattern_create_rgb (1., 1., 1.);
-		cairoColor[drgeoColorDarkGreen] = cairo_pattern_create_rgb (0., .392157, 0.);
-		cairoColor[drgeoColorGreen] = cairo_pattern_create_rgb (0., .921569, 0.);
-		cairoColor[drgeoColorDarkBlue] = cairo_pattern_create_rgb (1., .219608, .176471);
-		cairoColor[drgeoColorBlue] = cairo_pattern_create_rgb (1., .694118, .313725);
-		cairoColor[drgeoColorBordeaux] = cairo_pattern_create_rgb (0., 0., .568627);
-		cairoColor[drgeoColorRed] = cairo_pattern_create_rgb (0., 0., .921569);
-		cairoColor[drgeoColorOrange] = cairo_pattern_create_rgb (.168627, .6, 1.);
-		cairoColor[drgeoColorYellow] = cairo_pattern_create_rgb (.129412, .941176, 1.);
-		cairoColor[drgeoColorTips] = cairo_pattern_create_rgb (.752941, 1., 1.);
-		cairoColor[drgeoColorPrintingArea] = cairo_pattern_create_rgb (.941176, .941176, .941176);
+		cairoColor[drgeoColorBlack] = cairo_pattern_create_rgba (0., 0., 0., 1.);
+		cairoColor[drgeoColorDarkGrey] = cairo_pattern_create_rgba (.333333, .333333, .333333, 1.);
+		cairoColor[drgeoColorGrey] = cairo_pattern_create_rgba (.666667, .666667, .666667, 1.);
+		cairoColor[drgeoColorWhite] = cairo_pattern_create_rgba (1., 1., 1., 1.);
+		cairoColor[drgeoColorDarkGreen] = cairo_pattern_create_rgba (0., .392157, 0., 1.);
+		cairoColor[drgeoColorGreen] = cairo_pattern_create_rgba (0., .921569, 0., 1.);
+		cairoColor[drgeoColorDarkBlue] = cairo_pattern_create_rgba (.176471, .219608, 1., 1.);
+		cairoColor[drgeoColorBlue] = cairo_pattern_create_rgba (.313725, .694118, 1., 1.);
+		cairoColor[drgeoColorBordeaux] = cairo_pattern_create_rgba (.568627, 0., 0., 1.);
+		cairoColor[drgeoColorRed] = cairo_pattern_create_rgba (.921569, 0., 0., 1.);
+		cairoColor[drgeoColorOrange] = cairo_pattern_create_rgba (1., .6, .168627, 1.);
+		cairoColor[drgeoColorYellow] = cairo_pattern_create_rgba (1., .941176, .129412, 1.);
+		cairoColor[drgeoColorTips] = cairo_pattern_create_rgba (1., 1., .752941, 1.);
+		cairoColor[drgeoColorPrintingArea] = cairo_pattern_create_rgba (.941176, .941176, .941176, 1.);
 		alphacairoColor[drgeoColorBlack] = cairo_pattern_create_rgba (0., 0., 0., .5);
 		alphacairoColor[drgeoColorDarkGrey] = cairo_pattern_create_rgba (.333333, .333333, .333333, .5);
 		alphacairoColor[drgeoColorGrey] = cairo_pattern_create_rgba (.666667, .666667, .666667, .5);
 		alphacairoColor[drgeoColorWhite] = cairo_pattern_create_rgba (1., 1., 1., .5);
 		alphacairoColor[drgeoColorDarkGreen] = cairo_pattern_create_rgba (0., .392157, 0., .5);
 		alphacairoColor[drgeoColorGreen] = cairo_pattern_create_rgba (0., .921569, 0., .5);
-		alphacairoColor[drgeoColorDarkBlue] = cairo_pattern_create_rgba (1., .219608, .176471, .5);
-		alphacairoColor[drgeoColorBlue] = cairo_pattern_create_rgba (1., .694118, .313725, .5);
-		alphacairoColor[drgeoColorBordeaux] = cairo_pattern_create_rgba (0., 0., .568627, .5);
-		alphacairoColor[drgeoColorRed] = cairo_pattern_create_rgba (0., 0., .921569, .5);
-		alphacairoColor[drgeoColorOrange] = cairo_pattern_create_rgba (.168627, .6, 1., .5);
-		alphacairoColor[drgeoColorYellow] = cairo_pattern_create_rgba (.129412, .941176, 1., .5);
-		alphacairoColor[drgeoColorTips] = cairo_pattern_create_rgba (.752941, 1., 1., .5);
+		alphacairoColor[drgeoColorDarkBlue] = cairo_pattern_create_rgba (.176471, .219608, 1., .5);
+		alphacairoColor[drgeoColorBlue] = cairo_pattern_create_rgba (.313725, .694118, 1., .5);
+		alphacairoColor[drgeoColorBordeaux] = cairo_pattern_create_rgba (.568627, 0., 0., .5);
+		alphacairoColor[drgeoColorRed] = cairo_pattern_create_rgba (.921569, 0., 0., .5);
+		alphacairoColor[drgeoColorOrange] = cairo_pattern_create_rgba (1., .6, .168627, .5);
+		alphacairoColor[drgeoColorYellow] = cairo_pattern_create_rgba (1., .941176, .129412, .5);
+		alphacairoColor[drgeoColorTips] = cairo_pattern_create_rgba (1., 1., .752941, .5);
 		alphacairoColor[drgeoColorPrintingArea] = cairo_pattern_create_rgba (.941176, .941176, .941176, .5);
 	}
 	setFigure (figure);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]