[dia] Let substitute also preserve pattern
- From: Hans Breuer <hans src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [dia] Let substitute also preserve pattern
- Date: Sun, 8 Jun 2014 09:01:14 +0000 (UTC)
commit 0c5c20565ac441bdf01a3872756587d587b67c9f
Author: Hans Breuer <hans breuer org>
Date: Thu Jun 5 19:54:01 2014 +0200
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.
lib/object.c | 1 +
lib/properties.h | 4 ++++
objects/Misc/n_gon.c | 3 +--
objects/standard/beziergon.c | 3 +--
objects/standard/box.c | 3 +--
objects/standard/ellipse.c | 3 +--
objects/standard/polygon.c | 3 +--
7 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/lib/object.c b/lib/object.c
index bdb3200..5e055b9 100644
--- a/lib/object.c
+++ b/lib/object.c
@@ -368,6 +368,7 @@ static PropDescription _style_prop_descs[] = {
PROP_STD_TEXT_HEIGHT,
PROP_STD_TEXT_COLOUR,
PROP_STD_TEXT_FITTING,
+ PROP_STD_PATTERN,
#endif
PROP_DESC_END
};
diff --git a/lib/properties.h b/lib/properties.h
index 435e2e4..8211b01 100644
--- a/lib/properties.h
+++ b/lib/properties.h
@@ -710,6 +710,10 @@ extern PropEnumData prop_std_line_caps_data[];
{ PROP_STDNAME_TEXT_FITTING, PROP_TYPE_ENUM, PROP_FLAG_VISIBLE|PROP_FLAG_OPTIONAL, \
N_("Text fitting"), NULL, prop_std_text_fitting_data }
+#define PROP_STD_PATTERN \
+ { "pattern", PROP_TYPE_PATTERN, PROP_FLAG_VISIBLE|PROP_FLAG_OPTIONAL, \
+ N_("Pattern"), NULL }
+
/* Convenience macros */
#define PROP_NOTEBOOK_BEGIN(name) \
{ "nbook_" name, PROP_TYPE_NOTEBOOK_BEGIN, \
diff --git a/objects/Misc/n_gon.c b/objects/Misc/n_gon.c
index ac92172..b016590 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 6e905c5..0e1fcbb 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 db8165c..9e8b731 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 7fc7e80..1b4a409 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 fbe668e..e4313dd 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
};
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]