summaryrefslogtreecommitdiff
path: root/objects
diff options
context:
space:
mode:
authorHans Breuer <hans@breuer.org>2014-06-05 19:54:01 +0200
committerHans Breuer <hans@breuer.org>2014-06-08 10:58:37 +0200
commit0c5c20565ac441bdf01a3872756587d587b67c9f (patch)
tree684546d98d65d12ab096979db8b6f23341d5b255 /objects
parent7e62f6e76dbd9329004b7d96a91dfc48e4133a19 (diff)
downloaddia-0c5c20565ac441bdf01a3872756587d587b67c9f.tar.xz
Let substitute also preserve pattern
With Convert to Path as the main user of object_substitute transfer also the pattern property. Define PROP_STD_PATTERN for the prop description to be shared with objects and the substitute property description.
Diffstat (limited to 'objects')
-rw-r--r--objects/Misc/n_gon.c3
-rw-r--r--objects/standard/beziergon.c3
-rw-r--r--objects/standard/box.c3
-rw-r--r--objects/standard/ellipse.c3
-rw-r--r--objects/standard/polygon.c3
5 files changed, 5 insertions, 10 deletions
diff --git a/objects/Misc/n_gon.c b/objects/Misc/n_gon.c
index ac921722..b0165907 100644
--- a/objects/Misc/n_gon.c
+++ b/objects/Misc/n_gon.c
@@ -130,8 +130,7 @@ static PropDescription _ngon_props[] = {
PROP_STD_LINE_COLOUR,
PROP_STD_FILL_COLOUR,
PROP_STD_SHOW_BACKGROUND,
- { "pattern", PROP_TYPE_PATTERN, PROP_FLAG_VISIBLE|PROP_FLAG_OPTIONAL,
- N_("Pattern"), NULL },
+ PROP_STD_PATTERN,
{ "name", PROP_TYPE_STRING, PROP_FLAG_DONT_SAVE| PROP_FLAG_OPTIONAL | PROP_FLAG_NO_DEFAULTS,
N_("Name"), NULL, NULL },
PROP_DESC_END
diff --git a/objects/standard/beziergon.c b/objects/standard/beziergon.c
index 6e905c53..0e1fcbba 100644
--- a/objects/standard/beziergon.c
+++ b/objects/standard/beziergon.c
@@ -106,8 +106,7 @@ static PropDescription beziergon_props[] = {
PROP_STD_LINE_JOIN_OPTIONAL,
PROP_STD_FILL_COLOUR,
PROP_STD_SHOW_BACKGROUND,
- { "pattern", PROP_TYPE_PATTERN, PROP_FLAG_VISIBLE|PROP_FLAG_OPTIONAL,
- N_("Pattern"), NULL },
+ PROP_STD_PATTERN,
PROP_DESC_END
};
diff --git a/objects/standard/box.c b/objects/standard/box.c
index db8165cc..9e8b7317 100644
--- a/objects/standard/box.c
+++ b/objects/standard/box.c
@@ -144,8 +144,7 @@ static PropDescription box_props[] = {
N_("Corner radius"), NULL, &corner_radius_data },
{ "aspect", PROP_TYPE_ENUM, PROP_FLAG_VISIBLE,
N_("Aspect ratio"), NULL, prop_aspect_data },
- { "pattern", PROP_TYPE_PATTERN, PROP_FLAG_VISIBLE|PROP_FLAG_OPTIONAL,
- N_("Pattern"), NULL },
+ PROP_STD_PATTERN,
PROP_DESC_END
};
diff --git a/objects/standard/ellipse.c b/objects/standard/ellipse.c
index 7fc7e807..1b4a4093 100644
--- a/objects/standard/ellipse.c
+++ b/objects/standard/ellipse.c
@@ -131,8 +131,7 @@ static PropDescription ellipse_props[] = {
PROP_STD_LINE_STYLE,
{ "aspect", PROP_TYPE_ENUM, PROP_FLAG_VISIBLE,
N_("Aspect ratio"), NULL, prop_aspect_data },
- { "pattern", PROP_TYPE_PATTERN, PROP_FLAG_VISIBLE|PROP_FLAG_OPTIONAL,
- N_("Pattern"), NULL },
+ PROP_STD_PATTERN,
PROP_DESC_END
};
diff --git a/objects/standard/polygon.c b/objects/standard/polygon.c
index fbe668e0..e4313dd9 100644
--- a/objects/standard/polygon.c
+++ b/objects/standard/polygon.c
@@ -108,8 +108,7 @@ static PropDescription polygon_props[] = {
PROP_STD_LINE_JOIN_OPTIONAL,
PROP_STD_FILL_COLOUR_OPTIONAL,
PROP_STD_SHOW_BACKGROUND_OPTIONAL,
- { "pattern", PROP_TYPE_PATTERN, PROP_FLAG_VISIBLE|PROP_FLAG_OPTIONAL,
- N_("Pattern"), NULL },
+ PROP_STD_PATTERN,
PROP_DESC_END
};