GNOME.org
 

[dia] Bundle alias icons as resources

commit 895d25939d780fef108faa8a960a71b54bd03fe0
Author: Zander Brown <zbrown gnome org>
Date:   Sat May 25 11:20:38 2019 +0100

    Bundle alias icons as resources

 objects/ER/dia-er.gresource.xml                 |   6 ++++
 objects/ER/meson.build                          |   4 +++
 {sheets => objects}/ER/weakentity.png           | Bin
 objects/GRAFCET/dia-grafcet.gresource.xml       |  11 ++++++
 {sheets => objects}/GRAFCET/etapei.png          | Bin
 {sheets => objects}/GRAFCET/etapemc.png         | Bin
 {sheets => objects}/GRAFCET/etapeme.png         | Bin
 {sheets => objects}/GRAFCET/etapems.png         | Bin
 {sheets => objects}/GRAFCET/etapesp.png         | Bin
 objects/GRAFCET/meson.build                     |   4 +++
 {sheets => objects}/GRAFCET/vergent_and.png     | Bin
 {sheets => objects}/Istar/agent.png             | Bin
 {sheets => objects}/Istar/decomposition.png     | Bin
 {sheets => objects}/Istar/dependency.png        | Bin
 objects/Istar/dia-istar.gresource.xml           |  15 ++++++++
 {sheets => objects}/Istar/goal.png              | Bin
 {sheets => objects}/Istar/means_ends.png        | Bin
 objects/Istar/meson.build                       |   4 +++
 {sheets => objects}/Istar/neg_contrib.png       | Bin
 {sheets => objects}/Istar/pos_contrib.png       | Bin
 {sheets => objects}/Istar/position.png          | Bin
 {sheets => objects}/Istar/role.png              | Bin
 {sheets => objects}/Istar/task.png              | Bin
 {sheets => objects}/Jackson/designed_domain.png | Bin
 objects/Jackson/dia-jackson.gresource.xml       |   8 +++++
 {sheets => objects}/Jackson/machine_domain.png  | Bin
 objects/Jackson/meson.build                     |   4 +++
 {sheets => objects}/Jackson/req_phen.png        | Bin
 {sheets => objects}/KAOS/and-complete-ref.png   | Bin
 {sheets => objects}/KAOS/and-ref.png            | Bin
 {sheets => objects}/KAOS/assumption.png         | Bin
 {sheets => objects}/KAOS/capable-of.png         | Bin
 {sheets => objects}/KAOS/conflicts.png          | Bin
 {sheets => objects}/KAOS/controls.png           | Bin
 objects/KAOS/dia-kaos.gresource.xml             |  23 ++++++++++++
 {sheets => objects}/KAOS/input.png              | Bin
 objects/KAOS/meson.build                        |   4 +++
 {sheets => objects}/KAOS/monitors.png           | Bin
 {sheets => objects}/KAOS/obstacle.png           | Bin
 {sheets => objects}/KAOS/obstructs.png          | Bin
 {sheets => objects}/KAOS/op-ref.png             | Bin
 {sheets => objects}/KAOS/or-complete-ref.png    | Bin
 {sheets => objects}/KAOS/or-ref.png             | Bin
 {sheets => objects}/KAOS/output.png             | Bin
 {sheets => objects}/KAOS/performs.png           | Bin
 {sheets => objects}/KAOS/requirement.png        | Bin
 {sheets => objects}/KAOS/responsibility.png     | Bin
 {sheets => objects}/KAOS/softgoal.png           | Bin
 sheets/ER.sheet.in                              |   2 +-
 sheets/GRAFCET.sheet.in                         |  12 +++----
 sheets/Istar.sheet.in                           |  20 +++++------
 sheets/Jackson.sheet.in                         |   6 ++--
 sheets/KAOS.sheet.in                            |  36 +++++++++----------
 sheets/meson.build                              |  46 ------------------------
 54 files changed, 121 insertions(+), 84 deletions(-)
---
diff --git a/objects/ER/dia-er.gresource.xml b/objects/ER/dia-er.gresource.xml
new file mode 100644
index 00000000..3dbcaba2
--- /dev/null
+++ b/objects/ER/dia-er.gresource.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/Dia/ER">
+    <file>weakentity.png</file>
+  </gresource>
+</gresources>
diff --git a/objects/ER/meson.build b/objects/ER/meson.build
index d6c91199..20a6771e 100644
--- a/objects/ER/meson.build
+++ b/objects/ER/meson.build
@@ -6,6 +6,10 @@ sources = files(
     'er.c'
 )
 
+sources += gnome.compile_resources('dia-er-resources', 'dia-er.gresource.xml',
+                                   source_dir : '.',
+                                   c_name : 'dia_er')
+
 dia_object_desc += {
     'name': 'er_objects',
     'sources': sources,
diff --git a/sheets/ER/weakentity.png b/objects/ER/weakentity.png
similarity index 100%
rename from sheets/ER/weakentity.png
rename to objects/ER/weakentity.png
diff --git a/objects/GRAFCET/dia-grafcet.gresource.xml b/objects/GRAFCET/dia-grafcet.gresource.xml
new file mode 100644
index 00000000..e175304b
--- /dev/null
+++ b/objects/GRAFCET/dia-grafcet.gresource.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/Dia/GRAFCET">
+    <file>etapei.png</file>
+    <file>etapemc.png</file>
+    <file>etapeme.png</file>
+    <file>etapems.png</file>
+    <file>etapesp.png</file>
+    <file>vergent_and.png</file>
+  </gresource>
+</gresources>
diff --git a/sheets/GRAFCET/etapei.png b/objects/GRAFCET/etapei.png
similarity index 100%
rename from sheets/GRAFCET/etapei.png
rename to objects/GRAFCET/etapei.png
diff --git a/sheets/GRAFCET/etapemc.png b/objects/GRAFCET/etapemc.png
similarity index 100%
rename from sheets/GRAFCET/etapemc.png
rename to objects/GRAFCET/etapemc.png
diff --git a/sheets/GRAFCET/etapeme.png b/objects/GRAFCET/etapeme.png
similarity index 100%
rename from sheets/GRAFCET/etapeme.png
rename to objects/GRAFCET/etapeme.png
diff --git a/sheets/GRAFCET/etapems.png b/objects/GRAFCET/etapems.png
similarity index 100%
rename from sheets/GRAFCET/etapems.png
rename to objects/GRAFCET/etapems.png
diff --git a/sheets/GRAFCET/etapesp.png b/objects/GRAFCET/etapesp.png
similarity index 100%
rename from sheets/GRAFCET/etapesp.png
rename to objects/GRAFCET/etapesp.png
diff --git a/objects/GRAFCET/meson.build b/objects/GRAFCET/meson.build
index d11c7d1b..977472b3 100644
--- a/objects/GRAFCET/meson.build
+++ b/objects/GRAFCET/meson.build
@@ -10,6 +10,10 @@ sources = files(
     'vector.c'
 )
 
+sources += gnome.compile_resources('dia-grafcet-resources', 'dia-grafcet.gresource.xml',
+                                   source_dir : '.',
+                                   c_name : 'dia_grafcet')
+
 dia_object_desc += {
     'name': 'grafcet_objects',
     'sources': sources,
diff --git a/sheets/GRAFCET/vergent_and.png b/objects/GRAFCET/vergent_and.png
similarity index 100%
rename from sheets/GRAFCET/vergent_and.png
rename to objects/GRAFCET/vergent_and.png
diff --git a/sheets/Istar/agent.png b/objects/Istar/agent.png
similarity index 100%
rename from sheets/Istar/agent.png
rename to objects/Istar/agent.png
diff --git a/sheets/Istar/decomposition.png b/objects/Istar/decomposition.png
similarity index 100%
rename from sheets/Istar/decomposition.png
rename to objects/Istar/decomposition.png
diff --git a/sheets/Istar/dependency.png b/objects/Istar/dependency.png
similarity index 100%
rename from sheets/Istar/dependency.png
rename to objects/Istar/dependency.png
diff --git a/objects/Istar/dia-istar.gresource.xml b/objects/Istar/dia-istar.gresource.xml
new file mode 100644
index 00000000..a1cd3e8a
--- /dev/null
+++ b/objects/Istar/dia-istar.gresource.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/Dia/Istar">
+    <file>agent.png</file>
+    <file>dependency.png</file>
+    <file>means_ends.png</file>
+    <file>pos_contrib.png</file>
+    <file>role.png</file>
+    <file>decomposition.png</file>
+    <file>goal.png</file>
+    <file>neg_contrib.png</file>
+    <file>position.png</file>
+    <file>task.png</file>
+  </gresource>
+</gresources>
diff --git a/sheets/Istar/goal.png b/objects/Istar/goal.png
similarity index 100%
rename from sheets/Istar/goal.png
rename to objects/Istar/goal.png
diff --git a/sheets/Istar/means_ends.png b/objects/Istar/means_ends.png
similarity index 100%
rename from sheets/Istar/means_ends.png
rename to objects/Istar/means_ends.png
diff --git a/objects/Istar/meson.build b/objects/Istar/meson.build
index 46eb3824..df33ed5c 100644
--- a/objects/Istar/meson.build
+++ b/objects/Istar/meson.build
@@ -6,6 +6,10 @@ sources = files(
     'link.c'
 )
 
+sources += gnome.compile_resources('dia-istar-resources', 'dia-istar.gresource.xml',
+                                   source_dir : '.',
+                                   c_name : 'dia_istar')
+
 dia_object_desc += {
     'name': 'istar_objects',
     'sources': sources,
diff --git a/sheets/Istar/neg_contrib.png b/objects/Istar/neg_contrib.png
similarity index 100%
rename from sheets/Istar/neg_contrib.png
rename to objects/Istar/neg_contrib.png
diff --git a/sheets/Istar/pos_contrib.png b/objects/Istar/pos_contrib.png
similarity index 100%
rename from sheets/Istar/pos_contrib.png
rename to objects/Istar/pos_contrib.png
diff --git a/sheets/Istar/position.png b/objects/Istar/position.png
similarity index 100%
rename from sheets/Istar/position.png
rename to objects/Istar/position.png
diff --git a/sheets/Istar/role.png b/objects/Istar/role.png
similarity index 100%
rename from sheets/Istar/role.png
rename to objects/Istar/role.png
diff --git a/sheets/Istar/task.png b/objects/Istar/task.png
similarity index 100%
rename from sheets/Istar/task.png
rename to objects/Istar/task.png
diff --git a/sheets/Jackson/designed_domain.png b/objects/Jackson/designed_domain.png
similarity index 100%
rename from sheets/Jackson/designed_domain.png
rename to objects/Jackson/designed_domain.png
diff --git a/objects/Jackson/dia-jackson.gresource.xml b/objects/Jackson/dia-jackson.gresource.xml
new file mode 100644
index 00000000..f932374c
--- /dev/null
+++ b/objects/Jackson/dia-jackson.gresource.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/Dia/Jackson">
+    <file>designed_domain.png</file>
+    <file>machine_domain.png</file>
+    <file>req_phen.png</file>
+  </gresource>
+</gresources>
diff --git a/sheets/Jackson/machine_domain.png b/objects/Jackson/machine_domain.png
similarity index 100%
rename from sheets/Jackson/machine_domain.png
rename to objects/Jackson/machine_domain.png
diff --git a/objects/Jackson/meson.build b/objects/Jackson/meson.build
index 0bc8fe7a..e83104e5 100644
--- a/objects/Jackson/meson.build
+++ b/objects/Jackson/meson.build
@@ -5,6 +5,10 @@ sources = files(
     'phenomenon.c'
 )
 
+sources += gnome.compile_resources('dia-jackson-resources', 'dia-jackson.gresource.xml',
+                                   source_dir : '.',
+                                   c_name : 'dia_jackson')
+
 dia_object_desc += {
     'name': 'jackson_objects',
     'sources': sources,
diff --git a/sheets/Jackson/req_phen.png b/objects/Jackson/req_phen.png
similarity index 100%
rename from sheets/Jackson/req_phen.png
rename to objects/Jackson/req_phen.png
diff --git a/sheets/KAOS/and-complete-ref.png b/objects/KAOS/and-complete-ref.png
similarity index 100%
rename from sheets/KAOS/and-complete-ref.png
rename to objects/KAOS/and-complete-ref.png
diff --git a/sheets/KAOS/and-ref.png b/objects/KAOS/and-ref.png
similarity index 100%
rename from sheets/KAOS/and-ref.png
rename to objects/KAOS/and-ref.png
diff --git a/sheets/KAOS/assumption.png b/objects/KAOS/assumption.png
similarity index 100%
rename from sheets/KAOS/assumption.png
rename to objects/KAOS/assumption.png
diff --git a/sheets/KAOS/capable-of.png b/objects/KAOS/capable-of.png
similarity index 100%
rename from sheets/KAOS/capable-of.png
rename to objects/KAOS/capable-of.png
diff --git a/sheets/KAOS/conflicts.png b/objects/KAOS/conflicts.png
similarity index 100%
rename from sheets/KAOS/conflicts.png
rename to objects/KAOS/conflicts.png
diff --git a/sheets/KAOS/controls.png b/objects/KAOS/controls.png
similarity index 100%
rename from sheets/KAOS/controls.png
rename to objects/KAOS/controls.png
diff --git a/objects/KAOS/dia-kaos.gresource.xml b/objects/KAOS/dia-kaos.gresource.xml
new file mode 100644
index 00000000..1c0bc81a
--- /dev/null
+++ b/objects/KAOS/dia-kaos.gresource.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/Dia/KAOS">
+    <file>and-complete-ref.png</file>
+    <file>controls.png</file>
+    <file>op-ref.png</file>
+    <file>requirement.png</file>
+    <file>and-ref.png</file>
+    <file>input.png</file>
+    <file>or-complete-ref.png</file>
+    <file>responsibility.png</file>
+    <file>assumption.png</file>
+    <file>monitors.png</file>
+    <file>or-ref.png</file>
+    <file>softgoal.png</file>
+    <file>capable-of.png</file>
+    <file>obstacle.png</file>
+    <file>output.png</file>
+    <file>conflicts.png</file>
+    <file>obstructs.png</file>
+    <file>performs.png</file>
+  </gresource>
+</gresources>
diff --git a/sheets/KAOS/input.png b/objects/KAOS/input.png
similarity index 100%
rename from sheets/KAOS/input.png
rename to objects/KAOS/input.png
diff --git a/objects/KAOS/meson.build b/objects/KAOS/meson.build
index 19dab0cb..1e61fed8 100644
--- a/objects/KAOS/meson.build
+++ b/objects/KAOS/meson.build
@@ -6,6 +6,10 @@ sources = files(
     'metaandorrel.c'
 )
 
+sources += gnome.compile_resources('dia-kaos-resources', 'dia-kaos.gresource.xml',
+                                   source_dir : '.',
+                                   c_name : 'dia_kaos')
+
 dia_object_desc += {
     'name': 'kaos_objects',
     'sources': sources,
diff --git a/sheets/KAOS/monitors.png b/objects/KAOS/monitors.png
similarity index 100%
rename from sheets/KAOS/monitors.png
rename to objects/KAOS/monitors.png
diff --git a/sheets/KAOS/obstacle.png b/objects/KAOS/obstacle.png
similarity index 100%
rename from sheets/KAOS/obstacle.png
rename to objects/KAOS/obstacle.png
diff --git a/sheets/KAOS/obstructs.png b/objects/KAOS/obstructs.png
similarity index 100%
rename from sheets/KAOS/obstructs.png
rename to objects/KAOS/obstructs.png
diff --git a/sheets/KAOS/op-ref.png b/objects/KAOS/op-ref.png
similarity index 100%
rename from sheets/KAOS/op-ref.png
rename to objects/KAOS/op-ref.png
diff --git a/sheets/KAOS/or-complete-ref.png b/objects/KAOS/or-complete-ref.png
similarity index 100%
rename from sheets/KAOS/or-complete-ref.png
rename to objects/KAOS/or-complete-ref.png
diff --git a/sheets/KAOS/or-ref.png b/objects/KAOS/or-ref.png
similarity index 100%
rename from sheets/KAOS/or-ref.png
rename to objects/KAOS/or-ref.png
diff --git a/sheets/KAOS/output.png b/objects/KAOS/output.png
similarity index 100%
rename from sheets/KAOS/output.png
rename to objects/KAOS/output.png
diff --git a/sheets/KAOS/performs.png b/objects/KAOS/performs.png
similarity index 100%
rename from sheets/KAOS/performs.png
rename to objects/KAOS/performs.png
diff --git a/sheets/KAOS/requirement.png b/objects/KAOS/requirement.png
similarity index 100%
rename from sheets/KAOS/requirement.png
rename to objects/KAOS/requirement.png
diff --git a/sheets/KAOS/responsibility.png b/objects/KAOS/responsibility.png
similarity index 100%
rename from sheets/KAOS/responsibility.png
rename to objects/KAOS/responsibility.png
diff --git a/sheets/KAOS/softgoal.png b/objects/KAOS/softgoal.png
similarity index 100%
rename from sheets/KAOS/softgoal.png
rename to objects/KAOS/softgoal.png
diff --git a/sheets/ER.sheet.in b/sheets/ER.sheet.in
index d02819e0..661c60ab 100644
--- a/sheets/ER.sheet.in
+++ b/sheets/ER.sheet.in
@@ -8,7 +8,7 @@
     </object>
     <object name="ER - Entity" intdata="1">
       <_description>Weak entity</_description>
-      <icon>ER/weakentity.png</icon>
+      <icon>res:/org/gnome/Dia/ER/weakentity.png</icon>
     </object>
     <object name="ER - Relationship">
       <_description>Relationship</_description>
diff --git a/sheets/GRAFCET.sheet.in b/sheets/GRAFCET.sheet.in
index da70ff0a..1ff687ab 100644
--- a/sheets/GRAFCET.sheet.in
+++ b/sheets/GRAFCET.sheet.in
@@ -8,23 +8,23 @@
     </object>
     <object name="GRAFCET - Step" intdata="1">
       <_description>Initial step</_description>
-      <icon>GRAFCET/etapei.png</icon>
+      <icon>res:/org/gnome/Dia/GRAFCET/etapei.png</icon>
     </object>
     <object name="GRAFCET - Step" intdata="2">
       <_description>Macro entry step</_description>
-      <icon>GRAFCET/etapeme.png</icon>
+      <icon>res:/org/gnome/Dia/GRAFCET/etapeme.png</icon>
     </object>
     <object name="GRAFCET - Step" intdata="3">
       <_description>Macro exit step</_description>
-      <icon>GRAFCET/etapems.png</icon>
+      <icon>res:/org/gnome/Dia/GRAFCET/etapems.png</icon>
     </object>
     <object name="GRAFCET - Step" intdata="4">
       <_description>Macro call step</_description>
-      <icon>GRAFCET/etapemc.png</icon>
+      <icon>res:/org/gnome/Dia/GRAFCET/etapemc.png</icon>
     </object>
     <object name="GRAFCET - Step" intdata="5">
       <_description>Macro sub-program call step</_description>
-      <icon>GRAFCET/etapesp.png</icon>
+      <icon>res:/org/gnome/Dia/GRAFCET/etapesp.png</icon>
     </object>
     <br/>
     <object name="GRAFCET - Action">
@@ -42,7 +42,7 @@
     </object>
     <object name="GRAFCET - Vergent" intdata="1">
       <_description>AND vergent</_description>
-      <icon>GRAFCET/vergent_and.png</icon>
+      <icon>res:/org/gnome/Dia/GRAFCET/vergent_and.png</icon>
     </object>
     <br/>
     <object name="GRAFCET - Arc">
diff --git a/sheets/Istar.sheet.in b/sheets/Istar.sheet.in
index d13c5e62..9634d7f4 100644
--- a/sheets/Istar.sheet.in
+++ b/sheets/Istar.sheet.in
@@ -8,52 +8,52 @@
     </object>
     <object name="Istar - goal" intdata="2">
       <_description>An i* goal</_description>
-      <icon>Istar/goal.png</icon>
+      <icon>res:/org/gnome/Dia/Istar/goal.png</icon>
     </object>
     <object name="Istar - other" intdata="1">
       <_description>An i* resource</_description>
     </object>
     <object name="Istar - other" intdata="2">
       <_description>An i* task</_description>
-      <icon>Istar/task.png</icon>
+      <icon>res:/org/gnome/Dia/Istar/task.png</icon>
     </object>
     <object name="Istar - actor" intdata="1">
       <_description>An i* unspecified actor</_description>
     </object>
     <object name="Istar - actor" intdata="2">
       <_description>An i* agent</_description>
-      <icon>Istar/agent.png</icon>
+      <icon>res:/org/gnome/Dia/Istar/agent.png</icon>
     </object>
     <object name="Istar - actor" intdata="3">
       <_description>An i* position</_description>
-      <icon>Istar/position.png</icon>
+      <icon>res:/org/gnome/Dia/Istar/position.png</icon>
     </object>
     <object name="Istar - actor" intdata="4">
       <_description>An i* role</_description>
-      <icon>Istar/role.png</icon>
+      <icon>res:/org/gnome/Dia/Istar/role.png</icon>
     </object>
     <object name="Istar - link" intdata="1">
       <_description>An i* unspecified link</_description>
     </object>
     <object name="Istar - link" intdata="2">
       <_description>An i* positive contribution</_description>
-      <icon>Istar/pos_contrib.png</icon>
+      <icon>res:/org/gnome/Dia/Istar/pos_contrib.png</icon>
     </object>
     <object name="Istar - link" intdata="3">
       <_description>An i* negative contribution</_description>
-      <icon>Istar/neg_contrib.png</icon>
+      <icon>res:/org/gnome/Dia/Istar/neg_contrib.png</icon>
     </object>
     <object name="Istar - link" intdata="4">
       <_description>An i* dependency link</_description>
-      <icon>Istar/dependency.png</icon>
+      <icon>res:/org/gnome/Dia/Istar/dependency.png</icon>
     </object>
     <object name="Istar - link" intdata="5">
       <_description>An i* decomposition link</_description>
-      <icon>Istar/decomposition.png</icon>
+      <icon>res:/org/gnome/Dia/Istar/decomposition.png</icon>
     </object>
     <object name="Istar - link" intdata="6">
       <_description>An i* means-ends link</_description>
-      <icon>Istar/means_ends.png</icon>
+      <icon>res:/org/gnome/Dia/Istar/means_ends.png</icon>
     </object>
   </contents>
 </sheet>
diff --git a/sheets/Jackson.sheet.in b/sheets/Jackson.sheet.in
index 79a127c2..728f532c 100644
--- a/sheets/Jackson.sheet.in
+++ b/sheets/Jackson.sheet.in
@@ -8,11 +8,11 @@
     </object>
     <object name="Jackson - domain" intdata="2">
       <_description>A Jackson designed domain</_description>
-      <icon>Jackson/designed_domain.png</icon>
+      <icon>res:/org/gnome/Dia/Jackson/designed_domain.png</icon>
     </object>
     <object name="Jackson - domain" intdata="3">
       <_description>A Jackson machine domain</_description>
-      <icon>Jackson/machine_domain.png</icon>
+      <icon>res:/org/gnome/Dia/Jackson/machine_domain.png</icon>
     </object>
     <object name="Jackson - requirement" intdata="1">
       <_description>A Jackson requirement</_description>
@@ -22,7 +22,7 @@
     </object>
     <object name="Jackson - phenomenon" intdata="2">
       <_description>A Jackson requirement phenomenon</_description>
-      <icon>Jackson/req_phen.png</icon>
+      <icon>res:/org/gnome/Dia/Jackson/req_phen.png</icon>
     </object>
   </contents>
 </sheet>
diff --git a/sheets/KAOS.sheet.in b/sheets/KAOS.sheet.in
index a57ba361..9e03b436 100644
--- a/sheets/KAOS.sheet.in
+++ b/sheets/KAOS.sheet.in
@@ -5,84 +5,84 @@
   <contents>
     <object name="KAOS - goal" intdata="2">
       <_description>A KAOS softgoal</_description>
-      <icon>KAOS/softgoal.png</icon>
+      <icon>res:/org/gnome/Dia/KAOS/softgoal.png</icon>
     </object>
     <object name="KAOS - goal" intdata="1">
       <_description>A KAOS goal</_description>
     </object>
     <object name="KAOS - goal" intdata="3">
       <_description>A KAOS requirement</_description>
-      <icon>KAOS/requirement.png</icon>
+      <icon>res:/org/gnome/Dia/KAOS/requirement.png</icon>
     </object>
     <object name="KAOS - goal" intdata="4">
       <_description>A KAOS assumption</_description>
-      <icon>KAOS/assumption.png</icon>
+      <icon>res:/org/gnome/Dia/KAOS/assumption.png</icon>
     </object>
     <object name="KAOS - goal" intdata="5">
       <_description>A KAOS obstacle</_description>
-      <icon>KAOS/obstacle.png</icon>
+      <icon>res:/org/gnome/Dia/KAOS/obstacle.png</icon>
     </object>
     <object name="KAOS - maor" intdata="1">
       <_description>A KAOS AND refinement</_description>
-      <icon>KAOS/and-ref.png</icon>
+      <icon>res:/org/gnome/Dia/KAOS/and-ref.png</icon>
     </object>
     <object name="KAOS - maor" intdata="2">
       <_description>A KAOS complete AND refinement</_description>
-      <icon>KAOS/and-complete-ref.png</icon>
+      <icon>res:/org/gnome/Dia/KAOS/and-complete-ref.png</icon>
     </object>
     <object name="KAOS - maor" intdata="3">
       <_description>A KAOS OR refinement</_description>
-      <icon>KAOS/or-ref.png</icon>
+      <icon>res:/org/gnome/Dia/KAOS/or-ref.png</icon>
     </object>
     <object name="KAOS - maor" intdata="4">
       <_description>A KAOS complete OR refinement</_description>
-      <icon>KAOS/or-complete-ref.png</icon>
+      <icon>res:/org/gnome/Dia/KAOS/or-complete-ref.png</icon>
     </object>
     <object name="KAOS - maor" intdata="5">
       <_description>A KAOS operationalization</_description>
-      <icon>KAOS/op-ref.png</icon>
+      <icon>res:/org/gnome/Dia/KAOS/op-ref.png</icon>
     </object>
     <object name="KAOS - mbr" intdata="1">
       <_description>A KAOS contribution</_description>
     </object>
     <object name="KAOS - mbr" intdata="2">
       <_description>A KAOS obstruction</_description>
-      <icon>KAOS/obstructs.png</icon>
+      <icon>res:/org/gnome/Dia/KAOS/obstructs.png</icon>
     </object>
     <object name="KAOS - mbr" intdata="3">
       <_description>A KAOS binary conflict</_description>
-      <icon>KAOS/conflicts.png</icon>
+      <icon>res:/org/gnome/Dia/KAOS/conflicts.png</icon>
     </object>
     <object name="KAOS - other" intdata="1">
       <_description>A KAOS agent</_description>
     </object>
     <object name="KAOS - mbr" intdata="4">
       <_description>A KAOS responsibility</_description>
-      <icon>KAOS/responsibility.png</icon>
+      <icon>res:/org/gnome/Dia/KAOS/responsibility.png</icon>
     </object>
     <object name="KAOS - mbr" intdata="5">
       <_description>A KAOS monitor link</_description>
-      <icon>KAOS/monitors.png</icon>
+      <icon>res:/org/gnome/Dia/KAOS/monitors.png</icon>
     </object>
     <object name="KAOS - mbr" intdata="6">
       <_description>A KAOS control link</_description>
-      <icon>KAOS/controls.png</icon>
+      <icon>res:/org/gnome/Dia/KAOS/controls.png</icon>
     </object>
     <object name="KAOS - mbr" intdata="7">
       <_description>A KAOS capable-of</_description>
-      <icon>KAOS/capable-of.png</icon>
+      <icon>res:/org/gnome/Dia/KAOS/capable-of.png</icon>
     </object>
     <object name="KAOS - mbr" intdata="8">
       <_description>A KAOS performs</_description>
-      <icon>KAOS/performs.png</icon>
+      <icon>res:/org/gnome/Dia/KAOS/performs.png</icon>
     </object>
     <object name="KAOS - mbr" intdata="9">
       <_description>A KAOS input</_description>
-      <icon>KAOS/input.png</icon>
+      <icon>res:/org/gnome/Dia/KAOS/input.png</icon>
     </object>
     <object name="KAOS - mbr" intdata="10">
       <_description>A KAOS output</_description>
-      <icon>KAOS/output.png</icon>
+      <icon>res:/org/gnome/Dia/KAOS/output.png</icon>
     </object>
   </contents>
 </sheet>
diff --git a/sheets/meson.build b/sheets/meson.build
index 7346bf7d..48d3ed86 100644
--- a/sheets/meson.build
+++ b/sheets/meson.build
@@ -1,51 +1,5 @@
 sheetsdir = join_paths(pkgdatadir, 'sheets')
 
-sheet_icons_sources = [
-    'ER/weakentity.png',
-    'GRAFCET/etapei.png',
-    'GRAFCET/etapems.png',
-    'GRAFCET/etapeme.png',
-    'GRAFCET/etapemc.png',
-    'GRAFCET/etapesp.png',
-    'GRAFCET/vergent_and.png',
-    'Jackson/designed_domain.png',
-    'Jackson/machine_domain.png',
-    'Jackson/req_phen.png',
-    'Istar/agent.png',
-    'Istar/decomposition.png',
-    'Istar/dependency.png',
-    'Istar/goal.png',
-    'Istar/means_ends.png',
-    'Istar/neg_contrib.png',
-    'Istar/pos_contrib.png',
-    'Istar/position.png',
-    'Istar/role.png',
-    'Istar/task.png',
-    'KAOS/and-complete-ref.png',
-    'KAOS/and-ref.png',
-    'KAOS/assumption.png',
-    'KAOS/capable-of.png',
-    'KAOS/conflicts.png',
-    'KAOS/controls.png',
-    'KAOS/input.png',
-    'KAOS/monitors.png',
-    'KAOS/obstacle.png',
-    'KAOS/obstructs.png',
-    'KAOS/op-ref.png',
-    'KAOS/or-complete-ref.png',
-    'KAOS/or-ref.png',
-    'KAOS/output.png',
-    'KAOS/performs.png',
-    'KAOS/requirement.png',
-    'KAOS/responsibility.png',
-    'KAOS/softgoal.png'
-]
-
-foreach icon : sheet_icons_sources
-    rel_path = icon.split('/')
-    install_data(icon, install_dir: join_paths(sheetsdir, rel_path[0]))
-endforeach
-
 sheet_files = [
     'UML.sheet',
     'ER.sheet',
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]