[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: How to contribute

Lars Clausen <lrclause@cs.uiuc.edu> writes:

> On 30 Aug 2003, Peter Poulsen wrote:
> > Peter Poulsen <peter_poulsen@stofanet.dk> writes:
> >
> >> I have now got that hex-thing I was talking about working. I would like
> >> to contribute it to the development version if that has any interest.
> >>
> >> How is this done best? Should I send a diff file to this list, or could
> >> I get access to the cvs and then commit it? To some extend I would
> >> prefer a diff, as this is the first time I have made anything for Dia,
> >> so it would be nice if somebody would take a quick glance at it to see
> >> if I have broken anybody else's code.
> >> -- 
> >> Yours 
> >> Peter Poulsen
> >>
> > How should I contribute; can I get a login and password to the cvs, or
> > should I send the diff files here on this mailling list?
> 
> Please send them to the list, we'll take a look at them.  I don't think
> they'll go into 0.92, though, I'm about ready to put out 0.92-pre1, and
> would rather not add new features right now.
> 
Sounds like a good idea.

Ok, here it is. Should be applied by standing in the cvs co dir, and
typing pathc -p1 < <path>/hex.patch.

I know it may sound like a weird thing to make hex-grid, but I'm working
on making a sheet (or whatever it's called), inteded for creating maps
which works a lot better with hex-grids.

This is the first time I have coded for Dia or with Gtk, so I'm open to criticism.


diff -Nuar cvs-dia/app/diagram.c dia/app/diagram.c
--- cvs-dia/app/diagram.c	2003-08-21 22:59:37.000000000 +0200
+++ dia/app/diagram.c	2003-08-30 19:39:49.000000000 +0200
@@ -58,6 +58,7 @@
   dia->data = new_diagram_data(&prefs.new_diagram);
   dia->data->grid.width_x = prefs.grid.x;
   dia->data->grid.width_y = prefs.grid.y;
+  dia->data->grid.width_w = prefs.grid.w;
   dia->data->grid.dynamic = prefs.grid.dynamic;
   dia->data->grid.major_lines = prefs.grid.major_lines;
 
diff -Nuar cvs-dia/app/grid.c dia/app/grid.c
--- cvs-dia/app/grid.c	2003-08-21 22:59:37.000000000 +0200
+++ dia/app/grid.c	2003-08-30 19:39:49.000000000 +0200
@@ -50,7 +50,7 @@
   guint major_lines = ddisp->diagram->data->grid.major_lines;
   DiaRenderer *renderer = ddisp->renderer;
   DiaInteractiveRendererInterface *irenderer;
-  int major_count;
+  int major_count = 0;
 
   irenderer = DIA_GET_INTERACTIVE_RENDERER_INTERFACE (renderer);
 
@@ -87,7 +87,7 @@
   guint major_lines = ddisp->diagram->data->grid.major_lines;
   DiaRenderer *renderer = ddisp->renderer;
   DiaInteractiveRendererInterface *irenderer;
-  int major_count;
+  int major_count = 0;
 
   irenderer = DIA_GET_INTERACTIVE_RENDERER_INTERFACE (renderer);
 
@@ -114,6 +114,100 @@
   }
 }
 
+static void
+grid_draw_hex(DDisplay *ddisp, Rectangle *update, real length)
+{
+  real horiz_pos, vert_pos;
+  int to_x, to_y, x, y;
+  DiaRenderer *renderer = ddisp->renderer;
+  DiaInteractiveRendererInterface *irenderer;
+
+  irenderer = DIA_GET_INTERACTIVE_RENDERER_INTERFACE (renderer);
+
+  /* First horizontal lines: */
+  vert_pos = ceil( update->top / (length * sqrt(3)) ) * length * sqrt(3);
+  while (vert_pos <= update->bottom) {
+    horiz_pos = ceil( (update->left) / (3 * length) ) * length * 3 - length * 2.5;
+    while (horiz_pos <= update->right) {
+      ddisplay_transform_coords(ddisp, horiz_pos, vert_pos, &x, &y);
+      ddisplay_transform_coords(ddisp, horiz_pos + length, vert_pos, &to_x, &y);
+	  
+      irenderer->draw_pixel_line(renderer,
+				 x, y, to_x, y,
+				 &ddisp->diagram->data->grid.colour);
+      horiz_pos += 3 * length;
+    }
+	
+    vert_pos += sqrt(3) * length;
+  }
+
+  /*  Second horizontal lines: */
+  vert_pos = ceil( update->top / (length * sqrt(3)) ) * length * sqrt(3) - 0.5 * sqrt(3) * length;
+  while (vert_pos <= update->bottom) {
+    horiz_pos = ceil( (update->left) / (3 * length) ) * length * 3 - length;
+    while (horiz_pos <= update->right) {
+      ddisplay_transform_coords(ddisp, horiz_pos, vert_pos, &x, &y);
+      ddisplay_transform_coords(ddisp, horiz_pos+length, vert_pos, &to_x, &y);
+	  
+      irenderer->draw_pixel_line(renderer,
+				 x, y, to_x, y,
+				 &ddisp->diagram->data->grid.colour);
+      horiz_pos += 3 * length;
+    }
+	
+    vert_pos += sqrt(3) * length;
+  }
+
+  /* First \'s and /'s */
+  vert_pos = ceil( update->top / (length * sqrt(3)) ) * length * sqrt(3) - length * sqrt(3);
+  while (vert_pos <= update->bottom) {
+    horiz_pos = ceil( (update->left) / (3 * length) ) * length * 3 - length * 2.5;
+    while (horiz_pos <= update->right) {
+      ddisplay_transform_coords(ddisp, horiz_pos + length, vert_pos, &x, &y);
+      ddisplay_transform_coords(ddisp, horiz_pos + 1.5 * length, vert_pos + length * sqrt(3) * 0.5, &to_x, &to_y);
+	  
+      irenderer->draw_pixel_line(renderer,
+				 x, y, to_x, to_y,
+				 &ddisp->diagram->data->grid.colour);
+
+      ddisplay_transform_coords(ddisp, horiz_pos, vert_pos, &x, &y);
+      ddisplay_transform_coords(ddisp, horiz_pos - 0.5 * length, vert_pos + length * sqrt(3) * 0.5, &to_x, &to_y);
+	  
+      irenderer->draw_pixel_line(renderer,
+				 x, y, to_x, to_y,
+				 &ddisp->diagram->data->grid.colour);
+      horiz_pos += 3 * length;
+    }
+	
+    vert_pos += sqrt(3) * length;
+  }
+
+  /*  Second \'s and /'s */
+  vert_pos = ceil( update->top / (length * sqrt(3)) ) * length * sqrt(3) - 0.5 * sqrt(3) * length;
+  while (vert_pos <= update->bottom) {
+    horiz_pos = ceil( (update->left) / (3 * length) ) * length * 3 - length;
+    while (horiz_pos <= update->right) {
+      ddisplay_transform_coords(ddisp, horiz_pos, vert_pos, &x, &y);
+      ddisplay_transform_coords(ddisp, horiz_pos - 0.5 * length, vert_pos + 0.5 * sqrt(3) * length, &to_x, &to_y);
+	  
+      irenderer->draw_pixel_line(renderer,
+				 x, y, to_x, to_y,
+				 &ddisp->diagram->data->grid.colour);
+
+      ddisplay_transform_coords(ddisp, horiz_pos + length, vert_pos, &x, &y);
+      ddisplay_transform_coords(ddisp, horiz_pos + 1.5 * length, vert_pos + 0.5 * sqrt(3) * length, &to_x, &to_y);
+	  
+      irenderer->draw_pixel_line(renderer,
+				 x, y, to_x, to_y,
+				 &ddisp->diagram->data->grid.colour);
+      horiz_pos += 3 * length;
+    }
+	
+    vert_pos += sqrt(3) * length;
+  }
+
+}
+
 void
 grid_draw(DDisplay *ddisp, Rectangle *update)
 {
@@ -127,6 +221,7 @@
     /* distance between visible grid lines */
     real width_x = ddisp->diagram->data->grid.width_x;
     real width_y = ddisp->diagram->data->grid.width_y;
+    real width_w = ddisp->diagram->data->grid.width_w;
     if (ddisp->diagram->data->grid.dynamic) {
       width_x = width_y = calculate_dynamic_grid(ddisp, &width_x, &width_y);
     } else {
@@ -140,12 +235,16 @@
     DIA_RENDERER_GET_CLASS(renderer)->set_dashlength(renderer,
 						     ddisplay_untransform_length(ddisp, 31));
     
-    if (ddisplay_transform_length(ddisp, width_y) >= 2.0 &&
-	ddisplay_transform_length(ddisp, width_x) >= 2.0) {
-      /* Vertical lines: */
-      grid_draw_vertical_lines(ddisp, update, width_x);
-      /* Horizontal lines: */
-      grid_draw_horizontal_lines(ddisp, update, width_y);
+    if (prefs.grid.hex) {
+      grid_draw_hex(ddisp, update, width_w);
+    } else {
+      if (ddisplay_transform_length(ddisp, width_y) >= 2.0 &&
+	  ddisplay_transform_length(ddisp, width_x) >= 2.0) {
+	/* Vertical lines: */
+	grid_draw_vertical_lines(ddisp, update, width_x);
+	/* Horizontal lines: */
+	grid_draw_horizontal_lines(ddisp, update, width_y);
+      }
     }
   }
 }
@@ -205,12 +304,37 @@
 snap_to_grid(DDisplay *ddisp, coord *x, coord *y)
 {
   if (ddisp->grid.snap) {
-    real width_x = ddisp->diagram->data->grid.width_x;
-    real width_y = ddisp->diagram->data->grid.width_y;
-    if (prefs.grid.dynamic) {
-      calculate_dynamic_grid(ddisp, &width_x, &width_y);
+    if (prefs.grid.hex) {
+      real width_x = ddisp->diagram->data->grid.width_w;
+      real x_mod = (*x - 1*width_x) - floor((*x - 1*width_x) / (3*width_x)) * 3 * width_x;
+      real y_mod = (*y - 0.25*sqrt(3) * width_x) -
+	floor((*y - 0.25 * sqrt(3) * width_x) / (sqrt(3)*width_x)) * sqrt(3) * width_x;
+
+      if ( x_mod < (1.5 * width_x) ) {
+	if ( y_mod < 0.5 * sqrt(3) * width_x ) {
+	  *x = floor((*x + 0.5*width_x) / (3*width_x)) * 3 * width_x + 2 * width_x;
+	  *y = floor((*y - 0.25 * sqrt(3) * width_x) / (sqrt(3)*width_x)) * sqrt(3) * width_x + 0.5 * sqrt(3) * width_x;
+	} else {
+	  *x = floor((*x + 0.5*width_x) / (3*width_x)) * 3 * width_x + 1.5 * width_x;
+	  *y = floor((*y - 0.25 * sqrt(3) * width_x) / (sqrt(3)*width_x)) * sqrt(3) * width_x + sqrt(3) * width_x;
+	}
+      } else {
+	if ( y_mod < 0.5 * sqrt(3) * width_x ) {
+	  *x = floor((*x + 0.5*width_x) / (3*width_x)) * 3 * width_x ;
+	  *y = floor((*y - 0.25 * sqrt(3) * width_x) / (sqrt(3)*width_x)) * sqrt(3) * width_x + 0.5 * sqrt(3) * width_x;
+	} else {
+	  *x = floor((*x + 0.5*width_x) / (3*width_x)) * 3 * width_x + 0.5 * width_x;
+	  *y = floor((*y - 0.25 * sqrt(3) * width_x) / (sqrt(3)*width_x)) * sqrt(3) * width_x + sqrt(3) * width_x;
+	}
+      }
+    } else {
+      real width_x = ddisp->diagram->data->grid.width_x;
+      real width_y = ddisp->diagram->data->grid.width_y;
+      if (prefs.grid.dynamic) {
+	calculate_dynamic_grid(ddisp, &width_x, &width_y);
+      }
+      *x = ROUND((*x) / width_x) * width_x;
+      *y = ROUND((*y) / width_y) * width_y;
     }
-    *x = ROUND((*x) / width_x) * width_x;
-    *y = ROUND((*y) / width_y) * width_y;
   }
 }
diff -Nuar cvs-dia/app/preferences.c dia/app/preferences.c
--- cvs-dia/app/preferences.c	2003-08-27 16:14:49.000000000 +0200
+++ dia/app/preferences.c	2003-08-30 19:39:49.000000000 +0200
@@ -157,6 +157,9 @@
   { "grid_y", PREF_UREAL, PREF_OFFSET(grid.y), &default_real_one, 3, N_("Y Size:") },
   { "grid_colour", PREF_COLOUR, PREF_OFFSET(new_diagram.grid_color), &default_colour, 3, N_("Colour:") },
   { "grid_major", PREF_UINT, PREF_OFFSET(grid.major_lines), &default_major_lines, 3, N_("Lines per major line") },
+  { "grid_hex", PREF_BOOLEAN, PREF_OFFSET(grid.hex), &default_false, 3, N_("Hex grid") },
+  { "grid_w", PREF_UREAL, PREF_OFFSET(grid.w), &default_real_one, 3, N_("Hex Size:")
+ },
   /*  { "grid_solid", PREF_BOOLEAN, PREF_OFFSET(grid.solid), &default_true, 3, N_("Solid lines:") },  */
 
   { "render_bounding_boxes", PREF_BOOLEAN,PREF_OFFSET(render_bounding_boxes),
diff -Nuar cvs-dia/app/preferences.h dia/app/preferences.h
--- cvs-dia/app/preferences.h	2003-08-23 08:28:18.000000000 +0200
+++ dia/app/preferences.h	2003-08-30 19:39:50.000000000 +0200
@@ -34,6 +34,8 @@
     real x;
     real y;
     int major_lines;
+    int hex;
+    real w;
   } grid;
   
   struct {
diff -Nuar cvs-dia/lib/diagramdata.c dia/lib/diagramdata.c
--- cvs-dia/lib/diagramdata.c	2003-08-25 23:44:37.000000000 +0200
+++ dia/lib/diagramdata.c	2003-08-30 19:39:50.000000000 +0200
@@ -50,6 +50,7 @@
 	data->grid.dynamic = TRUE;
 	data->grid.width_x = 1.0;
 	data->grid.width_y = 1.0;
+	data->grid.width_w = 1.0;
 	data->grid.visible_x = 1;
 	data->grid.visible_y = 1;
 	data->grid.colour = prefs->grid_color;
diff -Nuar cvs-dia/lib/diagramdata.h dia/lib/diagramdata.h
--- cvs-dia/lib/diagramdata.h	2003-08-25 19:34:09.000000000 +0200
+++ dia/lib/diagramdata.h	2003-08-30 19:39:51.000000000 +0200
@@ -50,7 +50,7 @@
 
   struct  {
     /* grid line intervals */
-    real width_x, width_y;
+    real width_x, width_y, width_w;
     /* the interval between visible grid lines */
     guint visible_x, visible_y;
     /* the interval between major lines (non-stippled).
diff -Nuar cvs-dia/po/ChangeLog dia/po/ChangeLog
--- cvs-dia/po/ChangeLog	2003-08-29 22:10:19.000000000 +0200
+++ dia/po/ChangeLog	2003-08-30 19:39:55.000000000 +0200
@@ -1,8 +1,3 @@
-2003-08-29  Pablo Gonzalo del Campo  <pablodc@bigfoot.com>
-
-        * es.po: Revision of Spanish translation by
-                 Francisco Javier F. Serrador <serrador@arrakis.es>.
-
 2003-08-27  Pablo Gonzalo del Campo  <pablodc@bigfoot.com>
 
         * es.po: Revision of Spanish translation by
diff -Nuar cvs-dia/po/es.po dia/po/es.po
--- cvs-dia/po/es.po	2003-08-29 22:10:19.000000000 +0200
+++ dia/po/es.po	2003-08-30 19:39:55.000000000 +0200
@@ -12,8 +12,8 @@
 msgstr ""
 "Project-Id-Version: dia.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-08-29 03:27+0200\n"
-"PO-Revision-Date: 2003-08-29 07:04+0200\n"
+"POT-Creation-Date: 2003-08-21 19:28+0200\n"
+"PO-Revision-Date: 2003-08-22 00:27+0200\n"
 "Last-Translator: Francisco Javier F. Serrador <serrador@arrakis.es>\n"
 "Language-Team: Spanish <traductores@es.gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -190,7 +190,7 @@
 msgid "No existing object to paste.\n"
 msgstr "No hay objetos que pegar.\n"
 
-#: app/commands.c:470 app/commands.c:508
+#: app/commands.c:470 app/commands.c:498
 msgid "Could not find help directory"
 msgstr "No se pudo encontrar el directorio de ayuda"
 
@@ -208,21 +208,21 @@
 #. * which will give them credit in the About box.
 #. * E.g. "Fulano de Tal <fulano@detal.com>"
 #.
-#: app/commands.c:547
+#: app/commands.c:536
 msgid "translator_credits-PLEASE_ADD_YOURSELF_HERE"
 msgstr ""
 "Juan Manuel García Molina <juanma_gm@wanadoo.es>\n"
 "Revisión de Francisco Vila <fravd@wanadoo.es>"
 
-#: app/commands.c:561 dia.desktop.in.h:1
+#: app/commands.c:550 dia.desktop.in.h:1
 msgid "Dia"
 msgstr "Dia"
 
-#: app/commands.c:563
+#: app/commands.c:552
 msgid "Copyright (C) 1998-2002 The Free Software Foundation and the authors"
 msgstr "Copyright © 1998-2002 la Free Software Foundation y los autores"
 
-#: app/commands.c:564
+#: app/commands.c:553
 msgid ""
 "Dia is a program for drawing structured diagrams.\n"
 "Please visit http://www.lysator.liu.se/~alla/dia for more information."
@@ -230,25 +230,25 @@
 "Dia es un programa para dibujar diagramas estructurados.\n"
 "Visite http://www.lysator.liu.se/~alla/dia para más información."
 
-#: app/commands.c:603
+#: app/commands.c:592
 msgid "About Dia"
 msgstr "Acerca de Dia"
 
-#: app/commands.c:646
+#: app/commands.c:635
 #, c-format
 msgid "Dia v %s by Alexander Larsson"
 msgstr "Dia versión %s por Alexander Larsson"
 
 #. Exact spelling is Ch&eacute;p&eacute;lov (using *ML entities)
-#: app/commands.c:652
+#: app/commands.c:641
 msgid "Maintainers: Lars Clausen and Cyrille Chepelov"
 msgstr "Encargados: Lars Clausen y Cyrille Chepelov"
 
-#: app/commands.c:656
+#: app/commands.c:645
 msgid "Please visit http://www.lysator.liu.se/~alla/dia for more information"
 msgstr "Visite http://www.lysator.liu.se/~alla/dia para más información"
 
-#: app/commands.c:661
+#: app/commands.c:650
 msgid "Contributors:"
 msgstr "Contribuciones:"
 
@@ -264,52 +264,40 @@
 msgid "Defaults: "
 msgstr "Predeterminados: "
 
-#: app/dia-props.c:75
+#: app/dia-props.c:61
 msgid "Diagram Properties"
 msgstr "Propiedades del diagrama"
 
-#: app/dia-props.c:110
-msgid "Dynamic grid"
-msgstr "Rejilla dinámica"
-
-#: app/dia-props.c:118
+#: app/dia-props.c:96
 msgid "x"
 msgstr "x"
 
-#: app/dia-props.c:122
+#: app/dia-props.c:100
 msgid "y"
 msgstr "y"
 
-#: app/dia-props.c:127
+#: app/dia-props.c:105
 msgid "Spacing"
 msgstr "Espaciado"
 
-#: app/dia-props.c:147
+#: app/dia-props.c:125
 msgid "Visible spacing"
 msgstr "Espaciado visible"
 
-#: app/dia-props.c:167
+#: app/dia-props.c:145
 msgid "Grid"
 msgstr "Cuadrícula"
 
-#: app/dia-props.c:178 lib/diagramdata.c:62
+#: app/dia-props.c:156
+msgid "Background Colour"
+msgstr "Color de fondo"
+
+#: app/dia-props.c:167 lib/diagramdata.c:58
 msgid "Background"
 msgstr "Fondo"
 
-#: app/dia-props.c:189 app/preferences.c:103
-msgid "Grid Lines"
-msgstr "Línea de cuadrícula"
-
-#: app/dia-props.c:200
-msgid "Page Breaks"
-msgstr "Saltos de página"
-
-#: app/dia-props.c:211
-msgid "Colours"
-msgstr "Colores"
-
 #. Can we be sure that the filename is the 'proper title'?
-#: app/dia-props.c:230
+#: app/dia-props.c:185
 #, c-format
 msgid "Diagram Properties: %s"
 msgstr "Propiedades del diagrama: %s"
@@ -522,7 +510,7 @@
 msgid "Page Setup"
 msgstr "Configurar página"
 
-#: app/disp_callbacks.c:78 app/properties.c:144
+#: app/disp_callbacks.c:77 app/properties.c:141
 msgid ""
 "This object doesn't support Undo/Redo.\n"
 "Undo information erased."
@@ -530,11 +518,11 @@
 "Este objeto no soporta deshacer/rehacer.\n"
 "Información para deshacer borrada."
 
-#: app/disp_callbacks.c:220
+#: app/disp_callbacks.c:219
 msgid "No object menu"
 msgstr "No hay menú objeto"
 
-#: app/disp_callbacks.c:865
+#: app/disp_callbacks.c:864
 msgid ""
 "The object you dropped cannot fit into its parent. \n"
 "Either expand the parent object, or drop the object elsewhere."
@@ -567,7 +555,7 @@
 msgid "Discard Changes"
 msgstr "Descartar los cambios"
 
-#: app/export_png.c:116 app/load_save.c:806 app/render_eps.c:83
+#: app/export_png.c:116 app/load_save.c:779 app/render_eps.c:83
 #: plug-ins/cgm/cgm.c:1157 plug-ins/dxf/dxf-export.c:505
 #: plug-ins/hpgl/hpgl.c:732 plug-ins/metapost/render_metapost.c:807
 #: plug-ins/pstricks/render_pstricks.c:757 plug-ins/shape/shape-export.c:135
@@ -611,23 +599,23 @@
 msgid "Portable Network Graphics"
 msgstr "Portable Network Graphics"
 
-#: app/filedlg.c:113 app/filedlg.c:383
+#: app/filedlg.c:102 app/filedlg.c:370
 msgid "By extension"
 msgstr "Por extensión"
 
-#: app/filedlg.c:172
+#: app/filedlg.c:161
 msgid "Open Diagram"
 msgstr "Abrir diagrama"
 
-#: app/filedlg.c:200
+#: app/filedlg.c:189
 msgid "Open Options"
 msgstr "Abrir opciones"
 
-#: app/filedlg.c:208 app/filedlg.c:498
+#: app/filedlg.c:197 app/filedlg.c:485
 msgid "Determine file type:"
 msgstr "Determinar tipo de archivo:"
 
-#: app/filedlg.c:245
+#: app/filedlg.c:234
 msgid ""
 "Some characters in the filename are neither UTF-8 nor your local encoding.\n"
 "Some things will break."
@@ -636,7 +624,7 @@
 "codificación local.\n"
 "Algunas cosas no funcionarán."
 
-#: app/filedlg.c:251 app/filedlg.c:425
+#: app/filedlg.c:240 app/filedlg.c:412
 #, c-format
 msgid ""
 "The file '%s' already exists.\n"
@@ -645,21 +633,21 @@
 "El archivo «%s» ya existe.\n"
 "¿Quiere sobreescribirlo?"
 
-#: app/filedlg.c:259 app/filedlg.c:431
+#: app/filedlg.c:248 app/filedlg.c:418
 msgid "File already exists"
 msgstr "El archivo ya existe"
 
-#: app/filedlg.c:292
+#: app/filedlg.c:283
 msgid "Save Diagram"
 msgstr "Guardar diagrama"
 
 #. Need better way to make it a reasonable size.  Isn't there some
 #. standard look for them (or is that just Gnome?)
-#: app/filedlg.c:300
+#: app/filedlg.c:291
 msgid "Compress diagram files"
 msgstr "Comprimir archivos del diagrama"
 
-#: app/filedlg.c:309
+#: app/filedlg.c:298
 msgid ""
 "Compression reduces file size to less than 1/10th size and speeds up loading "
 "and saving.  Some text programs cannot manipulate compressed files."
@@ -668,7 +656,7 @@
 "incrementa la velocidad del cargado y el guardado. Algunos programas de "
 "texto no pueden manipular archivos comprimidos."
 
-#: app/filedlg.c:450
+#: app/filedlg.c:437
 #, c-format
 msgid ""
 "Could not determine which export filter\n"
@@ -677,11 +665,11 @@
 "No se pudo determinar qué filtro de exportación\n"
 "usar para guardar «%s»"
 
-#: app/filedlg.c:468
+#: app/filedlg.c:455
 msgid "Export Diagram"
 msgstr "Exportar diagrama"
 
-#: app/filedlg.c:490
+#: app/filedlg.c:477
 msgid "Export Options"
 msgstr "Exportar opciones"
 
@@ -922,17 +910,17 @@
 "Error cargando diagrama.\n"
 "No existe manejador de conexión."
 
-#: app/load_save.c:276
+#: app/load_save.c:275
 msgid "You must specify a file, not a directory.\n"
 msgstr "Debe especificar un archivo, no un directorio.\n"
 
-#: app/load_save.c:283 plug-ins/dxf/dxf-import.c:1304 plug-ins/wpg/wpg.c:1169
+#: app/load_save.c:282 plug-ins/dxf/dxf-import.c:1304 plug-ins/wpg/wpg.c:1169
 #: plug-ins/xfig/xfig-import.c:1505 plug-ins/xslt/xslt.c:78
 #, c-format
 msgid "Couldn't open: '%s' for reading.\n"
 msgstr "No se pudo abrir: «%s» para lectura.\n"
 
-#: app/load_save.c:300 app/load_save.c:305
+#: app/load_save.c:291 app/load_save.c:296
 #, c-format
 msgid ""
 "Error loading diagram %s.\n"
@@ -941,7 +929,7 @@
 "Error cargando el diagrama %s.\n"
 "Tipo de archivo desconocido."
 
-#: app/load_save.c:312
+#: app/load_save.c:303
 #, c-format
 msgid ""
 "Error loading diagram %s.\n"
@@ -950,7 +938,7 @@
 "Error cargando el diagrama %s.\n"
 "No es un archivo de Dia."
 
-#: app/load_save.c:509
+#: app/load_save.c:489
 #, c-format
 msgid ""
 "Error loading diagram:\n"
@@ -961,12 +949,12 @@
 "%s.\n"
 "Un archivo válido de Dia define al menos una capa."
 
-#: app/load_save.c:839
+#: app/load_save.c:812
 #, c-format
 msgid "Failed to save file '%s'.\n"
 msgstr "Fallo al cargar el archivo «%s».\n"
 
-#: app/load_save.c:909 app/load_save.c:914
+#: app/load_save.c:882 app/load_save.c:887
 msgid "Native Dia Diagram"
 msgstr "Diagrama nativo de Dia"
 
@@ -1109,7 +1097,7 @@
 msgid "All"
 msgstr "Todo"
 
-#: app/menus.c:170 lib/arrows.c:38 objects/UML/association.c:1135
+#: app/menus.c:170 lib/arrows.c:38 objects/UML/association.c:1134
 msgid "None"
 msgstr "Nada"
 
@@ -1765,6 +1753,10 @@
 msgid "View Defaults"
 msgstr "Ver opciones por defecto"
 
+#: app/preferences.c:103
+msgid "Grid Lines"
+msgstr "Línea de cuadrícula"
+
 #: app/preferences.c:104
 msgid "Diagram Tree"
 msgstr "Árbol del diagrama"
@@ -1813,90 +1805,86 @@
 msgid "Paper type:"
 msgstr "Tipo de papel:"
 
-#: app/preferences.c:133
-msgid "Background Colour:"
-msgstr "Color de fondo:"
-
-#: app/preferences.c:136
+#: app/preferences.c:134
 msgid "New window:"
 msgstr "Ventana nueva:"
 
-#: app/preferences.c:137
+#: app/preferences.c:135
 msgid "Width:"
 msgstr "Ancho:"
 
-#: app/preferences.c:138
+#: app/preferences.c:136
 msgid "Height:"
 msgstr "Alto:"
 
-#: app/preferences.c:139
+#: app/preferences.c:137
 msgid "Magnify:"
 msgstr "Magnificar:"
 
-#: app/preferences.c:142
+#: app/preferences.c:140
 msgid "Connection Points:"
 msgstr "Puntos de conexión:"
 
 #. { NULL, PREF_NONE, 0, NULL, 3, N_("Grid:") },
-#: app/preferences.c:143 app/preferences.c:147 app/preferences.c:153
+#: app/preferences.c:141 app/preferences.c:145 app/preferences.c:151
 msgid "Visible"
 msgstr "Visible"
 
-#: app/preferences.c:146
+#: app/preferences.c:144
 msgid "Page breaks:"
 msgstr "Divisiones de páginas:"
 
-#: app/preferences.c:148 app/preferences.c:158
+#: app/preferences.c:146 app/preferences.c:156
 msgid "Colour:"
 msgstr "Color:"
 
-#: app/preferences.c:149
+#: app/preferences.c:147
 msgid "Solid lines"
 msgstr "Líneas sólidas"
 
-#: app/preferences.c:154
+#: app/preferences.c:152
 msgid "Snap to"
 msgstr "Ajustar a"
 
-#: app/preferences.c:155
+#: app/preferences.c:153
 msgid "Dynamic grid resizing"
 msgstr "Redimensionado de rejilla dinámico"
 
-#: app/preferences.c:156
+#: app/preferences.c:154
 msgid "X Size:"
 msgstr "Tamaño X:"
 
-#: app/preferences.c:157
+#: app/preferences.c:155
 msgid "Y Size:"
 msgstr "Tamaño Y:"
 
-#: app/preferences.c:159
+#: app/preferences.c:157
 msgid "Lines per major line"
 msgstr "Líneas por cada línea principal"
 
-#: app/preferences.c:177
+#: app/preferences.c:172
 msgid "Diagram tree window:"
 msgstr "Ventana del árbol del diagrama"
 
-#: app/preferences.c:179
+#: app/preferences.c:174
 msgid "Save hidden object types"
 msgstr "Guardar tipos de objetos ocultos"
 
-#: app/preferences.c:308
+#: app/preferences.c:303
 #, c-format
 msgid "Could not open `%s' for writing"
 msgstr "No se pudo abrir «%s» para escritura"
 
-#: app/preferences.c:586 lib/prop_inttypes.c:151
+#: app/preferences.c:583 lib/prop_inttypes.c:151
 msgid "Yes"
 msgstr "Sí"
 
-#: app/preferences.c:586 app/preferences.c:597 lib/prop_inttypes.c:153
+#: app/preferences.c:583 app/preferences.c:594 lib/prop_inttypes.c:153
 #: lib/prop_inttypes.c:179
 msgid "No"
 msgstr "No"
 
-#: app/preferences.c:699
+#: app/preferences.c:696
 msgid "Preferences"
 msgstr "Preferencias"
 
@@ -1908,11 +1896,11 @@
 msgid "This object has no properties."
 msgstr "Este objeto no tiene propiedades."
 
-#: app/properties.c:194
+#: app/properties.c:191
 msgid "Properties: "
 msgstr "Propiedades: "
 
-#: app/properties.c:198
+#: app/properties.c:195
 msgid "Object properties:"
 msgstr "Propiedades del objeto:"
 
@@ -2010,9 +1998,9 @@
 msgid "Revert"
 msgstr "Invertir"
 
-#: app/sheets_dialog.c:354 objects/UML/class_dialog.c:829
-#: objects/UML/class_dialog.c:1753 objects/UML/class_dialog.c:1981
-#: objects/UML/class_dialog.c:2500
+#: app/sheets_dialog.c:354 objects/UML/class_dialog.c:828
+#: objects/UML/class_dialog.c:1752 objects/UML/class_dialog.c:1980
+#: objects/UML/class_dialog.c:2499
 msgid "New"
 msgstr "Nuevo"
 
@@ -2054,8 +2042,8 @@
 msgstr "Descripción:"
 
 #: app/sheets_dialog.c:618 objects/FS/flow-ortho.c:168 objects/FS/flow.c:146
-#: objects/UML/class_dialog.c:878 objects/UML/class_dialog.c:1805
-#: objects/UML/class_dialog.c:2035 objects/UML/class_dialog.c:2549
+#: objects/UML/class_dialog.c:877 objects/UML/class_dialog.c:1804
+#: objects/UML/class_dialog.c:2034 objects/UML/class_dialog.c:2548
 msgid "Type:"
 msgstr "Tipo:"
 
@@ -2065,9 +2053,9 @@
 
 #: app/sheets_dialog.c:672 objects/ER/attribute.c:151 objects/ER/entity.c:130
 #: objects/ER/relationship.c:138 objects/UML/association.c:199
-#: objects/UML/association.c:1112 objects/UML/class_dialog.c:866
-#: objects/UML/class_dialog.c:1793 objects/UML/class_dialog.c:2023
-#: objects/UML/class_dialog.c:2537 objects/UML/dependency.c:128
+#: objects/UML/association.c:1112 objects/UML/class_dialog.c:865
+#: objects/UML/class_dialog.c:1792 objects/UML/class_dialog.c:2022
+#: objects/UML/class_dialog.c:2536 objects/UML/dependency.c:128
 #: objects/UML/generalization.c:124 objects/UML/realizes.c:125
 msgid "Name:"
 msgstr "Nombre:"
@@ -2493,7 +2481,7 @@
 # Creí que era Tipografía como en otros msgs. FVD
 #: lib/properties.c:79 lib/properties.h:508 objects/GRAFCET/condition.c:132
 #: objects/GRAFCET/step.c:165 objects/GRAFCET/transition.c:142
-#: objects/UML/class_dialog.c:328 objects/chronogram/chronoline.c:183
+#: objects/UML/class_dialog.c:327 objects/chronogram/chronoline.c:183
 #: objects/chronogram/chronoref.c:164
 msgid "Font"
 msgstr "Fuente"
@@ -3834,7 +3822,7 @@
 msgstr "Figuras variadas"
 
 #. property rows
-#: objects/SADT/arrow.c:134 objects/UML/class_dialog.c:334
+#: objects/SADT/arrow.c:134 objects/UML/class_dialog.c:333
 msgid "Normal"
 msgstr "Normal"
 
@@ -3910,46 +3898,46 @@
 msgid "Actor"
 msgstr "Actor"
 
-#: objects/UML/association.c:1125 objects/UML/class_dialog.c:2071
+#: objects/UML/association.c:1124 objects/UML/class_dialog.c:2070
 msgid "Direction:"
 msgstr "Dirección:"
 
-#: objects/UML/association.c:1142
+#: objects/UML/association.c:1141
 msgid "From A to B"
 msgstr "De A a B"
 
-#: objects/UML/association.c:1149
+#: objects/UML/association.c:1148
 msgid "From B to A"
 msgstr "De B a A"
 
-#: objects/UML/association.c:1173 objects/UML/association.c:1181
+#: objects/UML/association.c:1172 objects/UML/association.c:1180
 msgid "Side A"
 msgstr "Lado A"
 
-#: objects/UML/association.c:1175 objects/UML/association.c:1183
+#: objects/UML/association.c:1174 objects/UML/association.c:1182
 msgid "Side B"
 msgstr "Lado B"
 
-#: objects/UML/association.c:1189
+#: objects/UML/association.c:1188
 msgid "Role:"
 msgstr "Papel:"
 
-#: objects/UML/association.c:1201
+#: objects/UML/association.c:1200
 msgid "Multiplicity:"
 msgstr "Multiplicidad:"
 
 #. Show arrow:
-#: objects/UML/association.c:1212
+#: objects/UML/association.c:1211
 msgid "Show arrow"
 msgstr "Mostrar flecha"
 
 #. Aggregate
-#: objects/UML/association.c:1218
+#: objects/UML/association.c:1217
 msgid "Aggregate"
 msgstr "Agregar"
 
 #. Composition
-#: objects/UML/association.c:1226
+#: objects/UML/association.c:1225
 msgid "Composition"
 msgstr "Composición"
 
@@ -3959,17 +3947,17 @@
 msgid "Stereotype"
 msgstr "Estereotipo"
 
-#: objects/UML/class.c:110 objects/UML/class_dialog.c:359
+#: objects/UML/class.c:110 objects/UML/class_dialog.c:358
 #: sheets/SDL.sheet.in.h:3
 msgid "Comment"
 msgstr "Comentario"
 
-#: objects/UML/class.c:112 objects/UML/class_dialog.c:291
-#: objects/UML/class_dialog.c:344 objects/UML/class_dialog.c:1894
+#: objects/UML/class.c:112 objects/UML/class_dialog.c:290
+#: objects/UML/class_dialog.c:343 objects/UML/class_dialog.c:1893
 msgid "Abstract"
 msgstr "Resumen"
 
-#: objects/UML/class.c:114 objects/UML/class_dialog.c:300
+#: objects/UML/class.c:114 objects/UML/class_dialog.c:299
 msgid "Suppress Attributes"
 msgstr "Suprimir atributos"
 
@@ -3990,13 +3978,13 @@
 msgstr "Comentarios visibles"
 
 #. Attributes page:
-#: objects/UML/class.c:125 objects/UML/class_dialog.c:801
+#: objects/UML/class.c:125 objects/UML/class_dialog.c:800
 #: objects/UML/object.c:148
 msgid "Attributes"
 msgstr "Atributos"
 
 #. Operations page:
-#: objects/UML/class.c:127 objects/UML/class_dialog.c:1725
+#: objects/UML/class.c:127 objects/UML/class_dialog.c:1724
 msgid "Operations"
 msgstr "Operaciones"
 
@@ -4018,168 +4006,168 @@
 msgid "Class name:"
 msgstr "Nombre de la clase:"
 
-#: objects/UML/class_dialog.c:273 objects/UML/class_dialog.c:1817
+#: objects/UML/class_dialog.c:272 objects/UML/class_dialog.c:1816
 #: objects/UML/dependency.c:130 objects/UML/generalization.c:126
 #: objects/UML/realizes.c:127
 msgid "Stereotype:"
 msgstr "Estereotipo:"
 
-#: objects/UML/class_dialog.c:282 objects/UML/class_dialog.c:902
-#: objects/UML/class_dialog.c:1935 objects/UML/class_dialog.c:2059
+#: objects/UML/class_dialog.c:281 objects/UML/class_dialog.c:901
+#: objects/UML/class_dialog.c:1934 objects/UML/class_dialog.c:2058
 msgid "Comment:"
 msgstr "Comentario:"
 
-#: objects/UML/class_dialog.c:297
+#: objects/UML/class_dialog.c:296
 msgid "Attributes visible"
 msgstr "Atributos visibles"
 
-#: objects/UML/class_dialog.c:306
+#: objects/UML/class_dialog.c:305
 msgid "Operations visible"
 msgstr "Operaciones visibles"
 
-#: objects/UML/class_dialog.c:309
+#: objects/UML/class_dialog.c:308
 msgid "Suppress operations"
 msgstr "Suprimir operaciones"
 
-#: objects/UML/class_dialog.c:315
+#: objects/UML/class_dialog.c:314
 msgid "Comments visible"
 msgstr "Comentarios visibles"
 
 #. head line
-#: objects/UML/class_dialog.c:325
+#: objects/UML/class_dialog.c:324
 msgid "Kind"
 msgstr "Tipo"
 
-#: objects/UML/class_dialog.c:330
+#: objects/UML/class_dialog.c:329
 msgid "Size"
 msgstr "Tamaño"
 
-#: objects/UML/class_dialog.c:339
+#: objects/UML/class_dialog.c:338
 msgid "Polymorphic"
 msgstr "Polimórfico"
 
-#: objects/UML/class_dialog.c:349
+#: objects/UML/class_dialog.c:348
 msgid "Class Name"
 msgstr "Nombre de la clase"
 
-#: objects/UML/class_dialog.c:354
+#: objects/UML/class_dialog.c:353
 msgid "Abstract Class"
 msgstr "Clase abstracta"
 
 #. should probably be refactored too.
-#: objects/UML/class_dialog.c:371
+#: objects/UML/class_dialog.c:370
 msgid "Foreground Color"
 msgstr "Color de primer plano"
 
-#: objects/UML/class_dialog.c:379
+#: objects/UML/class_dialog.c:378
 msgid "Background Color"
 msgstr "Color de fondo"
 
-#: objects/UML/class_dialog.c:835 objects/UML/class_dialog.c:1759
-#: objects/UML/class_dialog.c:1988 objects/UML/class_dialog.c:2506
+#: objects/UML/class_dialog.c:834 objects/UML/class_dialog.c:1758
+#: objects/UML/class_dialog.c:1987 objects/UML/class_dialog.c:2505
 msgid "Delete"
 msgstr "Borrar"
 
-#: objects/UML/class_dialog.c:841 objects/UML/class_dialog.c:1765
-#: objects/UML/class_dialog.c:1995 objects/UML/class_dialog.c:2512
+#: objects/UML/class_dialog.c:840 objects/UML/class_dialog.c:1764
+#: objects/UML/class_dialog.c:1994 objects/UML/class_dialog.c:2511
 msgid "Move up"
 msgstr "Mover arriba"
 
-#: objects/UML/class_dialog.c:847 objects/UML/class_dialog.c:1771
-#: objects/UML/class_dialog.c:2002 objects/UML/class_dialog.c:2518
+#: objects/UML/class_dialog.c:846 objects/UML/class_dialog.c:1770
+#: objects/UML/class_dialog.c:2001 objects/UML/class_dialog.c:2517
 msgid "Move down"
 msgstr "Mover abajo"
 
-#: objects/UML/class_dialog.c:858
+#: objects/UML/class_dialog.c:857
 msgid "Attribute data"
 msgstr "Datos de atributo"
 
-#: objects/UML/class_dialog.c:890
+#: objects/UML/class_dialog.c:889
 msgid "Value:"
 msgstr "Valor:"
 
-#: objects/UML/class_dialog.c:915 objects/UML/class_dialog.c:1830
+#: objects/UML/class_dialog.c:914 objects/UML/class_dialog.c:1829
 msgid "Visibility:"
 msgstr "Visibilidad:"
 
-#: objects/UML/class_dialog.c:924 objects/UML/class_dialog.c:1839
+#: objects/UML/class_dialog.c:923 objects/UML/class_dialog.c:1838
 msgid "Public"
 msgstr "Público"
 
-#: objects/UML/class_dialog.c:932 objects/UML/class_dialog.c:1847
+#: objects/UML/class_dialog.c:931 objects/UML/class_dialog.c:1846
 msgid "Private"
 msgstr "Privado"
 
-#: objects/UML/class_dialog.c:940 objects/UML/class_dialog.c:1855
+#: objects/UML/class_dialog.c:939 objects/UML/class_dialog.c:1854
 msgid "Protected"
 msgstr "Protegido"
 
-#: objects/UML/class_dialog.c:948 objects/UML/class_dialog.c:1863
+#: objects/UML/class_dialog.c:947 objects/UML/class_dialog.c:1862
 msgid "Implementation"
 msgstr "Implementación"
 
-#: objects/UML/class_dialog.c:964 objects/UML/class_dialog.c:1879
+#: objects/UML/class_dialog.c:963 objects/UML/class_dialog.c:1878
 msgid "Class scope"
 msgstr "Vista de clase"
 
-#: objects/UML/class_dialog.c:1783
+#: objects/UML/class_dialog.c:1782
 msgid "Operation data"
 msgstr "Datos de operación"
 
-#: objects/UML/class_dialog.c:1885
+#: objects/UML/class_dialog.c:1884
 msgid "Inheritance type:"
 msgstr "Tipo de herencia:"
 
-#: objects/UML/class_dialog.c:1902
+#: objects/UML/class_dialog.c:1901
 msgid "Polymorphic (virtual)"
 msgstr "Polimórfico (virtual)"
 
-#: objects/UML/class_dialog.c:1910
+#: objects/UML/class_dialog.c:1909
 msgid "Leaf (final)"
 msgstr "Hoja (final)"
 
-#: objects/UML/class_dialog.c:1928
+#: objects/UML/class_dialog.c:1927
 msgid "Query"
 msgstr "Consulta"
 
-#: objects/UML/class_dialog.c:1952
+#: objects/UML/class_dialog.c:1951
 msgid "Parameters:"
 msgstr "Parámetros:"
 
-#: objects/UML/class_dialog.c:2014
+#: objects/UML/class_dialog.c:2013
 msgid "Parameter data"
 msgstr "Datos de parámetros"
 
-#: objects/UML/class_dialog.c:2047
+#: objects/UML/class_dialog.c:2046
 msgid "Def. value:"
 msgstr "Valor por defecto:"
 
-#: objects/UML/class_dialog.c:2080
+#: objects/UML/class_dialog.c:2079
 msgid "Undefined"
 msgstr "No definido"
 
-#: objects/UML/class_dialog.c:2088
+#: objects/UML/class_dialog.c:2087
 msgid "In"
 msgstr "Entrada"
 
-#: objects/UML/class_dialog.c:2097
+#: objects/UML/class_dialog.c:2096
 msgid "Out"
 msgstr "Salida"
 
-#: objects/UML/class_dialog.c:2106
+#: objects/UML/class_dialog.c:2105
 msgid "In & Out"
 msgstr "Entrada y salida"
 
 #. Templates page:
-#: objects/UML/class_dialog.c:2466
+#: objects/UML/class_dialog.c:2465
 msgid "Templates"
 msgstr "Plantillas"
 
-#: objects/UML/class_dialog.c:2472 sheets/UML.sheet.in.h:29
+#: objects/UML/class_dialog.c:2471 sheets/UML.sheet.in.h:29
 msgid "Template class"
 msgstr "Clase de plantilla"
 
-#: objects/UML/class_dialog.c:2529
+#: objects/UML/class_dialog.c:2528
 msgid "Formal parameter data"
 msgstr "Datos de parámetros formales"
 


Yours
Peter Poulsen
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index] Mail converted by Mofo Magic and the Flying D

 
All trademarks and copyrights are the property of their respective owners.

Other Directory Sites: SeekWonder | Directory Owners Forum

GuideSMACK