Attaching a patch for the new macros PROP_STDNAME_LINE_WIDTH and
PROP_STDTYPE_LINE_WIDTH ...
Also noticed two files that use the string "font_height":
./objects/ER/relationship.c: data_add_real(new_attribute(obj_node,
"font_height"),
./objects/ER/relationship.c: attr = object_find_attribute(obj_node,
"font_height");
./objects/ER/attribute.c: data_add_real(new_attribute(obj_node, "font_height"),
./objects/ER/attribute.c: attr = object_find_attribute (obj_node,
"font_height");
./objects/ER/entity.c: data_add_real(new_attribute(obj_node, "font_height"),
./objects/ER/entity.c: attr = object_find_attribute(obj_node, "font_height");
Is this supposed to mean "text_height"? Should this be changed to use
the new macros? The concerned usage calls "data_add_real" ... I wonder
if this has anything to do with the actual data saved in a dia file.
In that case, changing "font_height" to the standard name
"text_height" might break all existing files.
Sameer.
--
Research Scholar, KReSIT, IIT Bombay
http://www.it.iitb.ac.in/~sameerds/
Index: objects/network/radiocell.c
===================================================================
--- objects/network/radiocell.c (revision 3687)
+++ objects/network/radiocell.c (working copy)
@@ -142,7 +142,7 @@
static PropOffset radiocell_offsets[] = {
POLYSHAPE_COMMON_PROPERTIES_OFFSETS,
{ "radius", PROP_TYPE_REAL, offsetof(RadioCell, radius) },
- { "line_width", PROP_TYPE_REAL, offsetof(RadioCell, line_width) },
+ { PROP_STDNAME_LINE_WIDTH, PROP_STDTYPE_LINE_WIDTH, offsetof(RadioCell, line_width) },
{ "line_colour", PROP_TYPE_COLOUR, offsetof(RadioCell, line_colour) },
{ "line_style", PROP_TYPE_LINESTYLE,
offsetof(RadioCell, line_style), offsetof(RadioCell, dashlength) },
Index: objects/flowchart/parallelogram.c
===================================================================
--- objects/flowchart/parallelogram.c (revision 3687)
+++ objects/flowchart/parallelogram.c (working copy)
@@ -171,7 +171,7 @@
static PropOffset pgram_offsets[] = {
ELEMENT_COMMON_PROPERTIES_OFFSETS,
- { "line_width", PROP_TYPE_REAL, offsetof(Pgram, border_width) },
+ { PROP_STDNAME_LINE_WIDTH, PROP_STDTYPE_LINE_WIDTH, offsetof(Pgram, border_width) },
{ "line_colour", PROP_TYPE_COLOUR, offsetof(Pgram, border_color) },
{ "fill_colour", PROP_TYPE_COLOUR, offsetof(Pgram, inner_color) },
{ "show_background", PROP_TYPE_BOOL, offsetof(Pgram, show_background) },
Index: objects/flowchart/box.c
===================================================================
--- objects/flowchart/box.c (revision 3687)
+++ objects/flowchart/box.c (working copy)
@@ -169,7 +169,7 @@
static PropOffset box_offsets[] = {
ELEMENT_COMMON_PROPERTIES_OFFSETS,
- { "line_width", PROP_TYPE_REAL, offsetof(Box, border_width) },
+ { PROP_STDNAME_LINE_WIDTH, PROP_STDTYPE_LINE_WIDTH, offsetof(Box, border_width) },
{ "line_colour", PROP_TYPE_COLOUR, offsetof(Box, border_color) },
{ "fill_colour", PROP_TYPE_COLOUR, offsetof(Box, inner_color) },
{ "show_background", PROP_TYPE_BOOL, offsetof(Box, show_background) },
Index: objects/flowchart/diamond.c
===================================================================
--- objects/flowchart/diamond.c (revision 3687)
+++ objects/flowchart/diamond.c (working copy)
@@ -167,7 +167,7 @@
static PropOffset diamond_offsets[] = {
ELEMENT_COMMON_PROPERTIES_OFFSETS,
- { "line_width", PROP_TYPE_REAL, offsetof(Diamond, border_width) },
+ { PROP_STDNAME_LINE_WIDTH, PROP_STDTYPE_LINE_WIDTH, offsetof(Diamond, border_width) },
{ "line_colour", PROP_TYPE_COLOUR, offsetof(Diamond, border_color) },
{ "fill_colour", PROP_TYPE_COLOUR, offsetof(Diamond, inner_color) },
{ "show_background", PROP_TYPE_BOOL, offsetof(Diamond, show_background) },
Index: objects/flowchart/ellipse.c
===================================================================
--- objects/flowchart/ellipse.c (revision 3687)
+++ objects/flowchart/ellipse.c (working copy)
@@ -166,7 +166,7 @@
static PropOffset ellipse_offsets[] = {
ELEMENT_COMMON_PROPERTIES_OFFSETS,
- { "line_width", PROP_TYPE_REAL, offsetof(Ellipse, border_width) },
+ { PROP_STDNAME_LINE_WIDTH, PROP_STDTYPE_LINE_WIDTH, offsetof(Ellipse, border_width) },
{ "line_colour", PROP_TYPE_COLOUR, offsetof(Ellipse, border_color) },
{ "fill_colour", PROP_TYPE_COLOUR, offsetof(Ellipse, inner_color) },
{ "show_background", PROP_TYPE_BOOL, offsetof(Ellipse, show_background) },
Index: objects/SISSI/sissi.c
===================================================================
--- objects/SISSI/sissi.c (revision 3687)
+++ objects/SISSI/sissi.c (working copy)
@@ -148,7 +148,7 @@
data_add_real (new_attribute (obj_node, "radius"), object_sissi->radius);
data_add_real (new_attribute (obj_node, "dashlength"), object_sissi->dashlength);
data_add_real (new_attribute (obj_node, "border_width"), object_sissi->border_width);
- data_add_real (new_attribute (obj_node, "line_width"), object_sissi->line_width);
+ data_add_real (new_attribute (obj_node, PROP_STDNAME_LINE_WIDTH), object_sissi->line_width);
data_add_string(new_attribute(obj_node, "file_image"), object_sissi->file);
data_add_string(new_attribute(obj_node, "confidentiality"), object_sissi->confidentiality);
data_add_string(new_attribute(obj_node, "integrity"), object_sissi->integrity);
@@ -647,7 +647,7 @@
if (attr_node != NULL)
object_sissi->border_width = data_real(attribute_first_data(attr_node));
- attr_node = object_find_attribute(obj_node, "line_width");
+ attr_node = object_find_attribute(obj_node, PROP_STDNAME_LINE_WIDTH);
if (attr_node != NULL)
object_sissi->line_width = data_real(attribute_first_data(attr_node));
Index: objects/Misc/analog_clock.c
===================================================================
--- objects/Misc/analog_clock.c (revision 3687)
+++ objects/Misc/analog_clock.c (working copy)
@@ -159,7 +159,7 @@
static PropOffset analog_clock_offsets[] = {
ELEMENT_COMMON_PROPERTIES_OFFSETS,
- { "line_width", PROP_TYPE_REAL, offsetof(Analog_Clock, border_line_width) },
+ { PROP_STDNAME_LINE_WIDTH, PROP_STDTYPE_LINE_WIDTH, offsetof(Analog_Clock, border_line_width) },
{ "line_colour", PROP_TYPE_COLOUR, offsetof(Analog_Clock, border_color) },
{ "fill_colour", PROP_TYPE_COLOUR, offsetof(Analog_Clock,inner_color) },
{ "show_background", PROP_TYPE_BOOL,offsetof(Analog_Clock,show_background) },
Index: objects/standard/zigzagline.c
===================================================================
--- objects/standard/zigzagline.c (revision 3687)
+++ objects/standard/zigzagline.c (working copy)
@@ -141,7 +141,7 @@
static PropOffset zigzagline_offsets[] = {
ORTHCONN_COMMON_PROPERTIES_OFFSETS,
- { "line_width", PROP_TYPE_REAL, offsetof(Zigzagline, line_width) },
+ { PROP_STDNAME_LINE_WIDTH, PROP_STDTYPE_LINE_WIDTH, offsetof(Zigzagline, line_width) },
{ "line_colour", PROP_TYPE_COLOUR, offsetof(Zigzagline, line_color) },
{ "line_style", PROP_TYPE_LINESTYLE,
offsetof(Zigzagline, line_style), offsetof(Zigzagline, dashlength) },
@@ -383,7 +383,7 @@
&zigzagline->line_color);
if (zigzagline->line_width != 0.1)
- data_add_real(new_attribute(obj_node, "line_width"),
+ data_add_real(new_attribute(obj_node, PROP_STDNAME_LINE_WIDTH),
zigzagline->line_width);
if (zigzagline->line_style != LINESTYLE_SOLID)
@@ -434,7 +434,7 @@
data_color(attribute_first_data(attr), &zigzagline->line_color);
zigzagline->line_width = 0.1;
- attr = object_find_attribute(obj_node, "line_width");
+ attr = object_find_attribute(obj_node, PROP_STDNAME_LINE_WIDTH);
if (attr != NULL)
zigzagline->line_width = data_real(attribute_first_data(attr));
Index: objects/standard/arc.c
===================================================================
--- objects/standard/arc.c (revision 3687)
+++ objects/standard/arc.c (working copy)
@@ -151,7 +151,7 @@
static PropOffset arc_offsets[] = {
OBJECT_COMMON_PROPERTIES_OFFSETS,
- { "line_width", PROP_TYPE_REAL, offsetof(Arc, line_width) },
+ { PROP_STDNAME_LINE_WIDTH, PROP_STDTYPE_LINE_WIDTH, offsetof(Arc, line_width) },
{ "line_colour", PROP_TYPE_COLOUR, offsetof(Arc, arc_color) },
{ "line_style", PROP_TYPE_LINESTYLE,
offsetof(Arc, line_style), offsetof(Arc, dashlength) },
@@ -833,7 +833,7 @@
arc->curve_distance);
if (arc->line_width != 0.1)
- data_add_real(new_attribute(obj_node, "line_width"),
+ data_add_real(new_attribute(obj_node, PROP_STDNAME_LINE_WIDTH),
arc->line_width);
if (arc->line_style != LINESTYLE_SOLID)
@@ -885,7 +885,7 @@
arc->curve_distance = data_real(attribute_first_data(attr));
arc->line_width = 0.1;
- attr = object_find_attribute(obj_node, "line_width");
+ attr = object_find_attribute(obj_node, PROP_STDNAME_LINE_WIDTH);
if (attr != NULL)
arc->line_width = data_real(attribute_first_data(attr));
Index: objects/standard/bezier.c
===================================================================
--- objects/standard/bezier.c (revision 3687)
+++ objects/standard/bezier.c (working copy)
@@ -153,7 +153,7 @@
static PropOffset bezierline_offsets[] = {
BEZCONN_COMMON_PROPERTIES_OFFSETS,
- { "line_width", PROP_TYPE_REAL, offsetof(Bezierline, line_width) },
+ { PROP_STDNAME_LINE_WIDTH, PROP_STDTYPE_LINE_WIDTH, offsetof(Bezierline, line_width) },
{ "line_colour", PROP_TYPE_COLOUR, offsetof(Bezierline, line_color) },
{ "line_style", PROP_TYPE_LINESTYLE,
offsetof(Bezierline, line_style), offsetof(Bezierline, dashlength) },
@@ -557,7 +557,7 @@
&bezierline->line_color);
if (bezierline->line_width != 0.1)
- data_add_real(new_attribute(obj_node, "line_width"),
+ data_add_real(new_attribute(obj_node, PROP_STDNAME_LINE_WIDTH),
bezierline->line_width);
if (bezierline->line_style != LINESTYLE_SOLID)
@@ -615,7 +615,7 @@
data_color(attribute_first_data(attr), &bezierline->line_color);
bezierline->line_width = 0.1;
- attr = object_find_attribute(obj_node, "line_width");
+ attr = object_find_attribute(obj_node, PROP_STDNAME_LINE_WIDTH);
if (attr != NULL)
bezierline->line_width = data_real(attribute_first_data(attr));
Index: objects/standard/image.c
===================================================================
--- objects/standard/image.c (revision 3687)
+++ objects/standard/image.c (working copy)
@@ -153,7 +153,7 @@
{ "image_file", PROP_TYPE_FILE, offsetof(Image, file) },
{ "show_border", PROP_TYPE_BOOL, offsetof(Image, draw_border) },
{ "keep_aspect", PROP_TYPE_BOOL, offsetof(Image, keep_aspect) },
- { "line_width", PROP_TYPE_REAL, offsetof(Image, border_width) },
+ { PROP_STDNAME_LINE_WIDTH, PROP_STDTYPE_LINE_WIDTH, offsetof(Image, border_width) },
{ "line_colour", PROP_TYPE_COLOUR, offsetof(Image, border_color) },
{ "line_style", PROP_TYPE_LINESTYLE,
offsetof(Image, line_style), offsetof(Image, dashlength) },
Index: objects/standard/beziergon.c
===================================================================
--- objects/standard/beziergon.c (revision 3687)
+++ objects/standard/beziergon.c (working copy)
@@ -145,7 +145,7 @@
static PropOffset beziergon_offsets[] = {
BEZSHAPE_COMMON_PROPERTIES_OFFSETS,
- { "line_width", PROP_TYPE_REAL, offsetof(Beziergon, line_width) },
+ { PROP_STDNAME_LINE_WIDTH, PROP_STDTYPE_LINE_WIDTH, offsetof(Beziergon, line_width) },
{ "line_colour", PROP_TYPE_COLOUR, offsetof(Beziergon, line_color) },
{ "line_style", PROP_TYPE_LINESTYLE,
offsetof(Beziergon, line_style), offsetof(Beziergon, dashlength) },
@@ -361,7 +361,7 @@
&beziergon->line_color);
if (beziergon->line_width != 0.1)
- data_add_real(new_attribute(obj_node, "line_width"),
+ data_add_real(new_attribute(obj_node, PROP_STDNAME_LINE_WIDTH),
beziergon->line_width);
if (!color_equals(&beziergon->inner_color, &color_white))
@@ -406,7 +406,7 @@
data_color(attribute_first_data(attr), &beziergon->line_color);
beziergon->line_width = 0.1;
- attr = object_find_attribute(obj_node, "line_width");
+ attr = object_find_attribute(obj_node, PROP_STDNAME_LINE_WIDTH);
if (attr != NULL)
beziergon->line_width = data_real(attribute_first_data(attr));
Index: objects/standard/polygon.c
===================================================================
--- objects/standard/polygon.c (revision 3687)
+++ objects/standard/polygon.c (working copy)
@@ -148,7 +148,7 @@
static PropOffset polygon_offsets[] = {
POLYSHAPE_COMMON_PROPERTIES_OFFSETS,
- { "line_width", PROP_TYPE_REAL, offsetof(Polygon, line_width) },
+ { PROP_STDNAME_LINE_WIDTH, PROP_STDTYPE_LINE_WIDTH, offsetof(Polygon, line_width) },
{ "line_colour", PROP_TYPE_COLOUR, offsetof(Polygon, line_color) },
{ "line_style", PROP_TYPE_LINESTYLE,
offsetof(Polygon, line_style), offsetof(Polygon, dashlength) },
@@ -347,7 +347,7 @@
&polygon->line_color);
if (polygon->line_width != 0.1)
- data_add_real(new_attribute(obj_node, "line_width"),
+ data_add_real(new_attribute(obj_node, PROP_STDNAME_LINE_WIDTH),
polygon->line_width);
if (!color_equals(&polygon->inner_color, &color_white))
@@ -392,7 +392,7 @@
data_color(attribute_first_data(attr), &polygon->line_color);
polygon->line_width = 0.1;
- attr = object_find_attribute(obj_node, "line_width");
+ attr = object_find_attribute(obj_node, PROP_STDNAME_LINE_WIDTH);
if (attr != NULL)
polygon->line_width = data_real(attribute_first_data(attr));
Index: objects/standard/line.c
===================================================================
--- objects/standard/line.c (revision 3687)
+++ objects/standard/line.c (working copy)
@@ -158,7 +158,7 @@
static PropOffset line_offsets[] = {
OBJECT_COMMON_PROPERTIES_OFFSETS,
- { "line_width", PROP_TYPE_REAL, offsetof(Line, line_width) },
+ { PROP_STDNAME_LINE_WIDTH, PROP_STDTYPE_LINE_WIDTH, offsetof(Line, line_width) },
{ "line_colour", PROP_TYPE_COLOUR, offsetof(Line, line_color) },
{ "line_style", PROP_TYPE_LINESTYLE,
offsetof(Line, line_style), offsetof(Line, dashlength) },
@@ -565,7 +565,7 @@
&line->line_color);
if (line->line_width != 0.1)
- data_add_real(new_attribute(obj_node, "line_width"),
+ data_add_real(new_attribute(obj_node, PROP_STDNAME_LINE_WIDTH),
line->line_width);
if (line->line_style != LINESTYLE_SOLID)
@@ -618,7 +618,7 @@
data_color(attribute_first_data(attr), &line->line_color);
line->line_width = 0.1;
- attr = object_find_attribute(obj_node, "line_width");
+ attr = object_find_attribute(obj_node, PROP_STDNAME_LINE_WIDTH);
if (attr != NULL)
line->line_width = data_real(attribute_first_data(attr));
Index: objects/standard/box.c
===================================================================
--- objects/standard/box.c (revision 3687)
+++ objects/standard/box.c (working copy)
@@ -163,7 +163,7 @@
static PropOffset box_offsets[] = {
ELEMENT_COMMON_PROPERTIES_OFFSETS,
- { "line_width", PROP_TYPE_REAL, offsetof(Box, border_width) },
+ { PROP_STDNAME_LINE_WIDTH, PROP_STDTYPE_LINE_WIDTH, offsetof(Box, border_width) },
{ "line_colour", PROP_TYPE_COLOUR, offsetof(Box, border_color) },
{ "fill_colour", PROP_TYPE_COLOUR, offsetof(Box, inner_color) },
{ "show_background", PROP_TYPE_BOOL, offsetof(Box, show_background) },
Index: objects/standard/polyline.c
===================================================================
--- objects/standard/polyline.c (revision 3687)
+++ objects/standard/polyline.c (working copy)
@@ -151,7 +151,7 @@
static PropOffset polyline_offsets[] = {
POLYCONN_COMMON_PROPERTIES_OFFSETS,
- { "line_width", PROP_TYPE_REAL, offsetof(Polyline, line_width) },
+ { PROP_STDNAME_LINE_WIDTH, PROP_STDTYPE_LINE_WIDTH, offsetof(Polyline, line_width) },
{ "line_colour", PROP_TYPE_COLOUR, offsetof(Polyline, line_color) },
{ "line_style", PROP_TYPE_LINESTYLE,
offsetof(Polyline, line_style), offsetof(Polyline, dashlength) },
@@ -442,7 +442,7 @@
&polyline->line_color);
if (polyline->line_width != 0.1)
- data_add_real(new_attribute(obj_node, "line_width"),
+ data_add_real(new_attribute(obj_node, PROP_STDNAME_LINE_WIDTH),
polyline->line_width);
if (polyline->line_style != LINESTYLE_SOLID)
@@ -500,7 +500,7 @@
data_color(attribute_first_data(attr), &polyline->line_color);
polyline->line_width = 0.1;
- attr = object_find_attribute(obj_node, "line_width");
+ attr = object_find_attribute(obj_node, PROP_STDNAME_LINE_WIDTH);
if (attr != NULL)
polyline->line_width = data_real(attribute_first_data(attr));
Index: objects/standard/ellipse.c
===================================================================
--- objects/standard/ellipse.c (revision 3687)
+++ objects/standard/ellipse.c (working copy)
@@ -155,7 +155,7 @@
static PropOffset ellipse_offsets[] = {
ELEMENT_COMMON_PROPERTIES_OFFSETS,
- { "line_width", PROP_TYPE_REAL, offsetof(Ellipse, border_width) },
+ { PROP_STDNAME_LINE_WIDTH, PROP_STDTYPE_LINE_WIDTH, offsetof(Ellipse, border_width) },
{ "line_colour", PROP_TYPE_COLOUR, offsetof(Ellipse, border_color) },
{ "fill_colour", PROP_TYPE_COLOUR, offsetof(Ellipse, inner_color) },
{ "show_background", PROP_TYPE_BOOL, offsetof(Ellipse, show_background) },
Index: objects/ER/relationship.c
===================================================================
--- objects/ER/relationship.c (revision 3687)
+++ objects/ER/relationship.c (working copy)
@@ -169,7 +169,7 @@
{ "right_cardinality", PROP_TYPE_STRING, offsetof(Relationship, right_cardinality) },
{ "rotate", PROP_TYPE_BOOL, offsetof(Relationship, rotate) },
{ "identifying", PROP_TYPE_BOOL, offsetof(Relationship, identifying) },
- { "line_width", PROP_TYPE_LENGTH, offsetof(Relationship, border_width) },
+ { PROP_STDNAME_LINE_WIDTH, PROP_STDTYPE_LINE_WIDTH, offsetof(Relationship, border_width) },
{ "line_colour", PROP_TYPE_COLOUR, offsetof(Relationship, border_color) },
{ "fill_colour", PROP_TYPE_COLOUR, offsetof(Relationship, inner_color) },
{ "text_font", PROP_TYPE_FONT, offsetof (Relationship, font) },
Index: objects/ER/attribute.c
===================================================================
--- objects/ER/attribute.c (revision 3687)
+++ objects/ER/attribute.c (working copy)
@@ -182,7 +182,7 @@
{ "weakkey", PROP_TYPE_BOOL, offsetof(Attribute, weakkey) },
{ "derived", PROP_TYPE_BOOL, offsetof(Attribute, derived) },
{ "multivalue", PROP_TYPE_BOOL, offsetof(Attribute, multivalue) },
- { "line_width", PROP_TYPE_LENGTH, offsetof(Attribute, border_width) },
+ { PROP_STDNAME_LINE_WIDTH, PROP_STDTYPE_LINE_WIDTH, offsetof(Attribute, border_width) },
{ "line_colour", PROP_TYPE_COLOUR, offsetof(Attribute, border_color) },
{ "fill_colour", PROP_TYPE_COLOUR, offsetof(Attribute, inner_color) },
{ "text_font", PROP_TYPE_FONT, offsetof(Attribute, font) },
Index: objects/ER/entity.c
===================================================================
--- objects/ER/entity.c (revision 3687)
+++ objects/ER/entity.c (working copy)
@@ -158,7 +158,7 @@
{ "name", PROP_TYPE_STRING, offsetof(Entity, name) },
{ "weak", PROP_TYPE_BOOL, offsetof(Entity, weak) },
{ "associative", PROP_TYPE_BOOL, offsetof(Entity, associative) },
- { "line_width", PROP_TYPE_LENGTH, offsetof(Entity, border_width) },
+ { PROP_STDNAME_LINE_WIDTH, PROP_STDTYPE_LINE_WIDTH, offsetof(Entity, border_width) },
{ "line_colour", PROP_TYPE_COLOUR, offsetof(Entity, border_color) },
{ "fill_colour", PROP_TYPE_COLOUR, offsetof(Entity, inner_color) },
{ "text_font", PROP_TYPE_FONT, offsetof (Entity, font) },
Index: objects/custom/custom_object.c
===================================================================
--- objects/custom/custom_object.c (revision 3687)
+++ objects/custom/custom_object.c (working copy)
@@ -208,7 +208,7 @@
static PropOffset custom_offsets[] = {
ELEMENT_COMMON_PROPERTIES_OFFSETS,
- { "line_width", PROP_TYPE_LENGTH, offsetof(Custom, border_width) },
+ { PROP_STDNAME_LINE_WIDTH, PROP_STDTYPE_LINE_WIDTH, offsetof(Custom, border_width) },
{ "line_colour", PROP_TYPE_COLOUR, offsetof(Custom, border_color) },
{ "fill_colour", PROP_TYPE_COLOUR, offsetof(Custom, inner_color) },
{ "show_background", PROP_TYPE_BOOL, offsetof(Custom, show_background) },
@@ -221,7 +221,7 @@
static PropOffset custom_offsets_text[] = {
ELEMENT_COMMON_PROPERTIES_OFFSETS,
- { "line_width", PROP_TYPE_LENGTH, offsetof(Custom, border_width) },
+ { PROP_STDNAME_LINE_WIDTH, PROP_STDTYPE_LINE_WIDTH, offsetof(Custom, border_width) },
{ "line_colour", PROP_TYPE_COLOUR, offsetof(Custom, border_color) },
{ "fill_colour", PROP_TYPE_COLOUR, offsetof(Custom, inner_color) },
{ "show_background", PROP_TYPE_BOOL, offsetof(Custom, show_background) },
Index: lib/properties.h
===================================================================
--- lib/properties.h (revision 3687)
+++ lib/properties.h (working copy)
@@ -476,11 +476,13 @@
extern PropEnumData prop_std_text_align_data[];
#endif
+#define PROP_STDNAME_LINE_WIDTH "line_width"
+#define PROP_STDTYPE_LINE_WIDTH PROP_TYPE_LENGTH
#define PROP_STD_LINE_WIDTH \
- { "line_width", PROP_TYPE_LENGTH, PROP_FLAG_VISIBLE|PROP_FLAG_STANDARD, \
+ { PROP_STDNAME_LINE_WIDTH, PROP_STDTYPE_LINE_WIDTH, PROP_FLAG_VISIBLE|PROP_FLAG_STANDARD, \
N_("Line width"), NULL, &prop_std_line_width_data }
#define PROP_STD_LINE_WIDTH_OPTIONAL \
- { "line_width", PROP_TYPE_LENGTH, PROP_FLAG_VISIBLE|PROP_FLAG_STANDARD|PROP_FLAG_OPTIONAL, \
+ { PROP_STDNAME_LINE_WIDTH, PROP_STDTYPE_LINE_WIDTH, PROP_FLAG_VISIBLE|PROP_FLAG_STANDARD|PROP_FLAG_OPTIONAL, \
N_("Line width"), NULL, &prop_std_line_width_data }
#define PROP_STD_LINE_COLOUR \
{ "line_colour", PROP_TYPE_COLOUR, PROP_FLAG_VISIBLE|PROP_FLAG_STANDARD, \
Index: plug-ins/dxf/dxf-import.c
===================================================================
--- plug-ins/dxf/dxf-import.c (revision 3687)
+++ plug-ins/dxf/dxf-import.c (working copy)
@@ -139,7 +139,7 @@
{ "start_point", PROP_TYPE_POINT },
{ "end_point", PROP_TYPE_POINT },
{ "line_colour", PROP_TYPE_COLOUR },
- { "line_width", PROP_TYPE_REAL },
+ { PROP_STDNAME_LINE_WIDTH, PROP_STDTYPE_LINE_WIDTH },
{ "line_style", PROP_TYPE_LINESTYLE},
PROP_DESC_END};
@@ -231,7 +231,7 @@
static PropDescription dxf_solid_prop_descs[] = {
{ "line_colour", PROP_TYPE_COLOUR },
- { "line_width", PROP_TYPE_REAL },
+ { PROP_STDNAME_LINE_WIDTH, PROP_STDTYPE_LINE_WIDTH },
{ "line_style", PROP_TYPE_LINESTYLE },
{ "fill_colour", PROP_TYPE_COLOUR },
{ "show_background", PROP_TYPE_BOOL },
@@ -373,7 +373,7 @@
static PropDescription dxf_polyline_prop_descs[] = {
{ "line_colour", PROP_TYPE_COLOUR },
- { "line_width", PROP_TYPE_REAL },
+ { PROP_STDNAME_LINE_WIDTH, PROP_STDTYPE_LINE_WIDTH },
{ "line_style", PROP_TYPE_LINESTYLE },
PROP_DESC_END};
@@ -591,7 +591,7 @@
{ "elem_width", PROP_TYPE_REAL },
{ "elem_height", PROP_TYPE_REAL },
{ "line_colour", PROP_TYPE_COLOUR },
- { "line_width", PROP_TYPE_REAL },
+ { PROP_STDNAME_LINE_WIDTH, PROP_STDTYPE_LINE_WIDTH },
{ "show_background", PROP_TYPE_BOOL},
PROP_DESC_END};
@@ -681,7 +681,7 @@
{ "end_point", PROP_TYPE_POINT },
{ "curve_distance", PROP_TYPE_REAL },
{ "line_colour", PROP_TYPE_COLOUR },
- { "line_width", PROP_TYPE_REAL },
+ { PROP_STDNAME_LINE_WIDTH, PROP_STDTYPE_LINE_WIDTH },
PROP_DESC_END};
/* reads a circle entity from the dxf file and creates a circle object in dia*/
Index: plug-ins/xfig/xfig-import.c
===================================================================
--- plug-ins/xfig/xfig-import.c (revision 3687)
+++ plug-ins/xfig/xfig-import.c (working copy)
@@ -144,7 +144,7 @@
static PropDescription xfig_simple_prop_descs_line[] = {
- { "line_width", PROP_TYPE_REAL },
+ { PROP_STDNAME_LINE_WIDTH, PROP_STDTYPE_LINE_WIDTH },
{ "line_colour", PROP_TYPE_COLOUR },
PROP_DESC_END};
Index: plug-ins/svg/svg-import.c
===================================================================
--- plug-ins/svg/svg-import.c (revision 3687)
+++ plug-ins/svg/svg-import.c (working copy)
@@ -83,7 +83,7 @@
static PropDescription svg_style_prop_descs[] = {
{ "line_colour", PROP_TYPE_COLOUR },
- { "line_width", PROP_TYPE_REAL },
+ { PROP_STDNAME_LINE_WIDTH, PROP_STDTYPE_LINE_WIDTH },
{ "line_style", PROP_TYPE_LINESTYLE},
{ "fill_colour", PROP_TYPE_COLOUR },
{ "show_background", PROP_TYPE_BOOL },
Index: plug-ins/vdx/vdx-import.c
===================================================================
--- plug-ins/vdx/vdx-import.c (revision 3687)
+++ plug-ins/vdx/vdx-import.c (working copy)
@@ -165,7 +165,7 @@
/* These are for later */
static PropDescription vdx_simple_prop_descs_line[] = {
- { "line_width", PROP_TYPE_REAL },
+ { PROP_STDNAME_LINE_WIDTH, PROP_STDTYPE_LINE_WIDTH },
{ "line_colour", PROP_TYPE_COLOUR },
PROP_DESC_END};
_______________________________________________
Dia-list mailing list
[email protected]
http://mail.gnome.org/mailman/listinfo/dia-list
FAQ at http://live.gnome.org/Dia/Faq
Main page at http://live.gnome.org/Dia
