GNOME.org
 

[goffice] plot_barcol: embed stuff like plot_xy

commit b4a9d611b49d5d6ad1b000d531c23a0387965870
Author: Morten Welinder <terra gnome org>
Date:   Sat Dec 3 16:47:07 2011 -0500

    plot_barcol: embed stuff like plot_xy

 ChangeLog                                          |    2 +
 pixmaps/Makefile.am                                |   12 ----
 plugins/plot_barcol/.gitignore                     |    1 +
 plugins/plot_barcol/Makefile.am                    |   60 +++++++++++++++++--
 .../plot_barcol}/chart_area_1_1.png                |  Bin 2579 -> 2579 bytes
 .../plot_barcol}/chart_area_1_1.svg                |    0
 .../plot_barcol}/chart_area_1_2.png                |  Bin 2588 -> 2588 bytes
 .../plot_barcol}/chart_area_1_2.svg                |    0
 .../plot_barcol}/chart_area_1_3.png                |  Bin 2105 -> 2105 bytes
 .../plot_barcol}/chart_area_1_3.svg                |    0
 {pixmaps => plugins/plot_barcol}/chart_bar_1_1.png |  Bin 1587 -> 1587 bytes
 {pixmaps => plugins/plot_barcol}/chart_bar_1_1.svg |    0
 {pixmaps => plugins/plot_barcol}/chart_bar_1_2.png |  Bin 1660 -> 1660 bytes
 {pixmaps => plugins/plot_barcol}/chart_bar_1_2.svg |    0
 {pixmaps => plugins/plot_barcol}/chart_bar_1_3.png |  Bin 1739 -> 1739 bytes
 {pixmaps => plugins/plot_barcol}/chart_bar_1_3.svg |    0
 {pixmaps => plugins/plot_barcol}/chart_bar_2_1.png |  Bin 463 -> 463 bytes
 {pixmaps => plugins/plot_barcol}/chart_bar_2_2.png |  Bin 295 -> 295 bytes
 {pixmaps => plugins/plot_barcol}/chart_bar_2_3.png |  Bin 275 -> 275 bytes
 .../plot_barcol}/chart_column_1_1.png              |  Bin 1700 -> 1700 bytes
 .../plot_barcol}/chart_column_1_1.svg              |    0
 .../plot_barcol}/chart_column_1_2.png              |  Bin 1682 -> 1682 bytes
 .../plot_barcol}/chart_column_1_2.svg              |    0
 .../plot_barcol}/chart_column_1_3.png              |  Bin 1749 -> 1749 bytes
 .../plot_barcol}/chart_column_1_3.svg              |    0
 .../plot_barcol}/chart_column_2_1.png              |  Bin 268 -> 268 bytes
 .../plot_barcol}/chart_column_2_2.png              |  Bin 298 -> 298 bytes
 .../plot_barcol}/chart_column_2_3.png              |  Bin 310 -> 310 bytes
 .../plot_barcol}/chart_column_3_1.png              |  Bin 359 -> 359 bytes
 .../plot_barcol}/chart_dropbar_1_1.png             |  Bin 1520 -> 1520 bytes
 .../plot_barcol}/chart_dropbar_1_1.svg             |    0
 .../plot_barcol}/chart_dropbar_1_2.png             |  Bin 1536 -> 1536 bytes
 .../plot_barcol}/chart_dropbar_1_2.svg             |    0
 .../plot_barcol}/chart_line_1_1.png                |  Bin 3494 -> 3494 bytes
 .../plot_barcol}/chart_line_1_1.svg                |    0
 .../plot_barcol}/chart_line_1_2.png                |  Bin 3408 -> 3408 bytes
 .../plot_barcol}/chart_line_1_2.svg                |    0
 .../plot_barcol}/chart_line_1_3.png                |  Bin 2512 -> 2512 bytes
 .../plot_barcol}/chart_line_1_3.svg                |    0
 .../plot_barcol}/chart_line_2_1.png                |  Bin 3424 -> 3424 bytes
 .../plot_barcol}/chart_line_2_1.svg                |    0
 .../plot_barcol}/chart_line_2_2.png                |  Bin 3263 -> 3263 bytes
 .../plot_barcol}/chart_line_2_2.svg                |    0
 .../plot_barcol}/chart_line_2_3.png                |  Bin 2610 -> 2610 bytes
 .../plot_barcol}/chart_line_2_3.svg                |    0
 .../plot_barcol}/chart_line_3_1.png                |  Bin 442 -> 442 bytes
 .../plot_barcol}/chart_minmax_1_1.png              |  Bin 1616 -> 1616 bytes
 .../plot_barcol}/chart_minmax_1_1.svg              |    0
 .../plot_barcol}/chart_minmax_1_2.png              |  Bin 1627 -> 1627 bytes
 .../plot_barcol}/chart_minmax_1_2.svg              |    0
 .../plot_barcol}/chart_minmax_2_1.png              |  Bin 2040 -> 2040 bytes
 .../plot_barcol}/chart_minmax_2_1.svg              |    0
 .../plot_barcol}/chart_minmax_2_2.png              |  Bin 2098 -> 2098 bytes
 .../plot_barcol}/chart_minmax_2_2.svg              |    0
 plugins/plot_barcol/gog-1.5d.c                     |    5 ++
 plugins/plot_barcol/gog-barcol-prefs.c             |    9 +--
 plugins/plot_barcol/gog-dropbar.c                  |   12 +---
 plugins/plot_barcol/gog-line.c                     |   12 +---
 plugins/plot_barcol/gog-minmax.c                   |   10 +--
 plugins/plot_barcol/plot-types.xml.in              |   54 +++++++++---------
 60 files changed, 101 insertions(+), 76 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 7b50d87..cf5fff7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2011-12-03  Morten Welinder  <terra gnome org>
 
+	* plugins/plot_barcol: embed stuff like plot_xy.
+
 	* plugins/plot_surface: embed stuff like plot_xy.
 
 2011-12-02  Morten Welinder  <terra gnome org>
diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am
index f8d17fd..9b89cbd 100644
--- a/pixmaps/Makefile.am
+++ b/pixmaps/Makefile.am
@@ -1,11 +1,5 @@
 icondir = $(goffice_icondir)
 dist_icon_DATA = \
-	chart_area_1_1.png	chart_area_1_2.png	chart_area_1_3.png	\
-	chart_bar_1_1.png	chart_bar_1_2.png	chart_bar_1_3.png	\
-	chart_bar_2_1.png	chart_bar_2_2.png	chart_bar_2_3.png	\
-	chart_column_1_1.png	chart_column_1_2.png	chart_column_1_3.png	\
-	chart_column_2_1.png	chart_column_2_2.png	chart_column_2_3.png	\
-	chart_column_3_1.png \
 	chart_cone_1_1.png	chart_cone_1_2.png	chart_cone_1_3.png	\
 	chart_cone_2_1.png	chart_cone_2_2.png	chart_cone_2_3.png	\
 	chart_cone_3_1.png  \
@@ -20,18 +14,12 @@ dist_icon_DATA = \
 	chart_color_polar_1_1.png \
 	chart_stock_1_1.png	chart_stock_1_2.png \
 	chart_stock_2_1.png	chart_stock_2_2.png \
-	chart_line_1_1.png	chart_line_1_2.png	chart_line_1_3.png	\
-	chart_line_2_1.png	chart_line_2_2.png	chart_line_2_3.png	\
-	chart_line_3_1.png \
 	chart_pie_1_1.png	chart_pie_1_2.png	chart_pie_1_3.png	\
 	chart_pie_2_1.png	chart_pie_2_2.png	chart_pie_2_3.png	\
 	chart_pie_3_1.png	chart_pie_3_2.png	\
 	chart_ring_1_1.png 	chart_ring_1_2.png \
 	chart_boxplot_1_1.png	chart_boxplot_1_2.png \
 	chart_boxplot_2_1.png	chart_boxplot_2_2.png \
-	chart_dropbar_1_1.png	chart_dropbar_1_2.png \
-	chart_minmax_1_1.png	chart_minmax_1_2.png \
-	chart_minmax_2_1.png	chart_minmax_2_2.png \
 	chart_histogram_1_1.png chart_histogram_2_1.png \
 	chart_histogram_1_3.png chart_histogram_1_4.png \
 	chart_prob_1_1.png \
diff --git a/plugins/plot_barcol/.gitignore b/plugins/plot_barcol/.gitignore
index 51eb861..2b4cdcd 100644
--- a/plugins/plot_barcol/.gitignore
+++ b/plugins/plot_barcol/.gitignore
@@ -7,3 +7,4 @@ plugin.xml
 *.loT
 *.la
 .libs
+embedded-stuff.c
diff --git a/plugins/plot_barcol/Makefile.am b/plugins/plot_barcol/Makefile.am
index 0207b1f..4b4c21e 100644
--- a/plugins/plot_barcol/Makefile.am
+++ b/plugins/plot_barcol/Makefile.am
@@ -1,6 +1,5 @@
 goffice_graph_barcoldir = $(goffice_plugindir)/plot_barcol
 xmldir	 = $(goffice_graph_barcoldir)
-uidir = $(goffice_graph_barcoldir)
 
 goffice_graph_barcol_LTLIBRARIES = barcol.la
 barcol_la_LDFLAGS = -module $(GOFFICE_PLUGIN_FLAGS)
@@ -23,18 +22,65 @@ xml_DATA = $(xml_in_files:.xml.in=.xml)
 @INTLTOOL_XML_RULE@
 
 if WITH_GTK
-dist_ui_DATA =	\
-	gog-barcol-prefs.ui	\
-	gog-minmax-prefs.ui	\
-	gog-area-prefs.ui
 barcol_la_SOURCES += gog-barcol-prefs.c
 endif
 
-# do not use the intl-tool stuff to merge the text back
-# its simpler to just use gettext directly
+# Do not use the intl-tool stuff to merge the text back;
+# it's simpler to just use gettext directly
 plot-types.xml : plot-types.xml.in
 	cp $< $@
 
+embedded_stuff_raw = \
+	chart_area_1_1.png	\
+	chart_area_1_2.png	\
+	chart_area_1_3.png	\
+	chart_bar_1_1.png	\
+	chart_bar_1_2.png	\
+	chart_bar_1_3.png	\
+	chart_bar_2_1.png	\
+	chart_bar_2_2.png	\
+	chart_bar_2_3.png	\
+	chart_column_1_1.png	\
+	chart_column_1_2.png	\
+	chart_column_1_3.png	\
+	chart_column_2_1.png	\
+	chart_column_2_2.png	\
+	chart_column_2_3.png	\
+	chart_column_3_1.png	\
+	chart_dropbar_1_1.png	\
+	chart_dropbar_1_2.png	\
+	chart_line_1_1.png	\
+	chart_line_1_2.png	\
+	chart_line_1_3.png	\
+	chart_line_2_1.png	\
+	chart_line_2_2.png	\
+	chart_line_2_3.png	\
+	chart_line_3_1.png	\
+	chart_minmax_1_1.png	\
+	chart_minmax_1_2.png	\
+	chart_minmax_2_1.png	\
+	chart_minmax_2_2.png
+
+embedded_stuff_compress = \
+	gog-barcol-prefs.ui	\
+	gog-minmax-prefs.ui	\
+	gog-area-prefs.ui
+
+embedded_stuff = $(embedded_stuff_compress) $(embedded_stuff_raw)
+
+embedded-stuff.c: $(top_srcdir)/tools/embedder $(embedded_stuff)
+	cd $(srcdir) && @PERL@ $(abs_top_srcdir)/tools/embedder \
+		--id-prefix=go:plot_barcol/ \
+		--static \
+		--register-function=register_embedded_stuff \
+		--unregister-function=unregister_embedded_stuff \
+		NOCOMPRESS $(embedded_stuff_raw) \
+		COMPRESS $(embedded_stuff_compress) \
+		>$(abs_builddir)/$@
+
+BUILT_SOURCES =	embedded-stuff.c
+CLEANFILES = $(BUILT_SOURCES)
+
 EXTRA_DIST = $(xml_in_files)
 DISTCLEANFILES = $(xml_in_files:.xml.in=.xml)
 
diff --git a/pixmaps/chart_area_1_1.png b/plugins/plot_barcol/chart_area_1_1.png
similarity index 100%
rename from pixmaps/chart_area_1_1.png
rename to plugins/plot_barcol/chart_area_1_1.png
diff --git a/pixmaps/chart_area_1_1.svg b/plugins/plot_barcol/chart_area_1_1.svg
similarity index 100%
rename from pixmaps/chart_area_1_1.svg
rename to plugins/plot_barcol/chart_area_1_1.svg
diff --git a/pixmaps/chart_area_1_2.png b/plugins/plot_barcol/chart_area_1_2.png
similarity index 100%
rename from pixmaps/chart_area_1_2.png
rename to plugins/plot_barcol/chart_area_1_2.png
diff --git a/pixmaps/chart_area_1_2.svg b/plugins/plot_barcol/chart_area_1_2.svg
similarity index 100%
rename from pixmaps/chart_area_1_2.svg
rename to plugins/plot_barcol/chart_area_1_2.svg
diff --git a/pixmaps/chart_area_1_3.png b/plugins/plot_barcol/chart_area_1_3.png
similarity index 100%
rename from pixmaps/chart_area_1_3.png
rename to plugins/plot_barcol/chart_area_1_3.png
diff --git a/pixmaps/chart_area_1_3.svg b/plugins/plot_barcol/chart_area_1_3.svg
similarity index 100%
rename from pixmaps/chart_area_1_3.svg
rename to plugins/plot_barcol/chart_area_1_3.svg
diff --git a/pixmaps/chart_bar_1_1.png b/plugins/plot_barcol/chart_bar_1_1.png
similarity index 100%
rename from pixmaps/chart_bar_1_1.png
rename to plugins/plot_barcol/chart_bar_1_1.png
diff --git a/pixmaps/chart_bar_1_1.svg b/plugins/plot_barcol/chart_bar_1_1.svg
similarity index 100%
rename from pixmaps/chart_bar_1_1.svg
rename to plugins/plot_barcol/chart_bar_1_1.svg
diff --git a/pixmaps/chart_bar_1_2.png b/plugins/plot_barcol/chart_bar_1_2.png
similarity index 100%
rename from pixmaps/chart_bar_1_2.png
rename to plugins/plot_barcol/chart_bar_1_2.png
diff --git a/pixmaps/chart_bar_1_2.svg b/plugins/plot_barcol/chart_bar_1_2.svg
similarity index 100%
rename from pixmaps/chart_bar_1_2.svg
rename to plugins/plot_barcol/chart_bar_1_2.svg
diff --git a/pixmaps/chart_bar_1_3.png b/plugins/plot_barcol/chart_bar_1_3.png
similarity index 100%
rename from pixmaps/chart_bar_1_3.png
rename to plugins/plot_barcol/chart_bar_1_3.png
diff --git a/pixmaps/chart_bar_1_3.svg b/plugins/plot_barcol/chart_bar_1_3.svg
similarity index 100%
rename from pixmaps/chart_bar_1_3.svg
rename to plugins/plot_barcol/chart_bar_1_3.svg
diff --git a/pixmaps/chart_bar_2_1.png b/plugins/plot_barcol/chart_bar_2_1.png
similarity index 100%
rename from pixmaps/chart_bar_2_1.png
rename to plugins/plot_barcol/chart_bar_2_1.png
diff --git a/pixmaps/chart_bar_2_2.png b/plugins/plot_barcol/chart_bar_2_2.png
similarity index 100%
rename from pixmaps/chart_bar_2_2.png
rename to plugins/plot_barcol/chart_bar_2_2.png
diff --git a/pixmaps/chart_bar_2_3.png b/plugins/plot_barcol/chart_bar_2_3.png
similarity index 100%
rename from pixmaps/chart_bar_2_3.png
rename to plugins/plot_barcol/chart_bar_2_3.png
diff --git a/pixmaps/chart_column_1_1.png b/plugins/plot_barcol/chart_column_1_1.png
similarity index 100%
rename from pixmaps/chart_column_1_1.png
rename to plugins/plot_barcol/chart_column_1_1.png
diff --git a/pixmaps/chart_column_1_1.svg b/plugins/plot_barcol/chart_column_1_1.svg
similarity index 100%
rename from pixmaps/chart_column_1_1.svg
rename to plugins/plot_barcol/chart_column_1_1.svg
diff --git a/pixmaps/chart_column_1_2.png b/plugins/plot_barcol/chart_column_1_2.png
similarity index 100%
rename from pixmaps/chart_column_1_2.png
rename to plugins/plot_barcol/chart_column_1_2.png
diff --git a/pixmaps/chart_column_1_2.svg b/plugins/plot_barcol/chart_column_1_2.svg
similarity index 100%
rename from pixmaps/chart_column_1_2.svg
rename to plugins/plot_barcol/chart_column_1_2.svg
diff --git a/pixmaps/chart_column_1_3.png b/plugins/plot_barcol/chart_column_1_3.png
similarity index 100%
rename from pixmaps/chart_column_1_3.png
rename to plugins/plot_barcol/chart_column_1_3.png
diff --git a/pixmaps/chart_column_1_3.svg b/plugins/plot_barcol/chart_column_1_3.svg
similarity index 100%
rename from pixmaps/chart_column_1_3.svg
rename to plugins/plot_barcol/chart_column_1_3.svg
diff --git a/pixmaps/chart_column_2_1.png b/plugins/plot_barcol/chart_column_2_1.png
similarity index 100%
rename from pixmaps/chart_column_2_1.png
rename to plugins/plot_barcol/chart_column_2_1.png
diff --git a/pixmaps/chart_column_2_2.png b/plugins/plot_barcol/chart_column_2_2.png
similarity index 100%
rename from pixmaps/chart_column_2_2.png
rename to plugins/plot_barcol/chart_column_2_2.png
diff --git a/pixmaps/chart_column_2_3.png b/plugins/plot_barcol/chart_column_2_3.png
similarity index 100%
rename from pixmaps/chart_column_2_3.png
rename to plugins/plot_barcol/chart_column_2_3.png
diff --git a/pixmaps/chart_column_3_1.png b/plugins/plot_barcol/chart_column_3_1.png
similarity index 100%
rename from pixmaps/chart_column_3_1.png
rename to plugins/plot_barcol/chart_column_3_1.png
diff --git a/pixmaps/chart_dropbar_1_1.png b/plugins/plot_barcol/chart_dropbar_1_1.png
similarity index 100%
rename from pixmaps/chart_dropbar_1_1.png
rename to plugins/plot_barcol/chart_dropbar_1_1.png
diff --git a/pixmaps/chart_dropbar_1_1.svg b/plugins/plot_barcol/chart_dropbar_1_1.svg
similarity index 100%
rename from pixmaps/chart_dropbar_1_1.svg
rename to plugins/plot_barcol/chart_dropbar_1_1.svg
diff --git a/pixmaps/chart_dropbar_1_2.png b/plugins/plot_barcol/chart_dropbar_1_2.png
similarity index 100%
rename from pixmaps/chart_dropbar_1_2.png
rename to plugins/plot_barcol/chart_dropbar_1_2.png
diff --git a/pixmaps/chart_dropbar_1_2.svg b/plugins/plot_barcol/chart_dropbar_1_2.svg
similarity index 100%
rename from pixmaps/chart_dropbar_1_2.svg
rename to plugins/plot_barcol/chart_dropbar_1_2.svg
diff --git a/pixmaps/chart_line_1_1.png b/plugins/plot_barcol/chart_line_1_1.png
similarity index 100%
rename from pixmaps/chart_line_1_1.png
rename to plugins/plot_barcol/chart_line_1_1.png
diff --git a/pixmaps/chart_line_1_1.svg b/plugins/plot_barcol/chart_line_1_1.svg
similarity index 100%
rename from pixmaps/chart_line_1_1.svg
rename to plugins/plot_barcol/chart_line_1_1.svg
diff --git a/pixmaps/chart_line_1_2.png b/plugins/plot_barcol/chart_line_1_2.png
similarity index 100%
rename from pixmaps/chart_line_1_2.png
rename to plugins/plot_barcol/chart_line_1_2.png
diff --git a/pixmaps/chart_line_1_2.svg b/plugins/plot_barcol/chart_line_1_2.svg
similarity index 100%
rename from pixmaps/chart_line_1_2.svg
rename to plugins/plot_barcol/chart_line_1_2.svg
diff --git a/pixmaps/chart_line_1_3.png b/plugins/plot_barcol/chart_line_1_3.png
similarity index 100%
rename from pixmaps/chart_line_1_3.png
rename to plugins/plot_barcol/chart_line_1_3.png
diff --git a/pixmaps/chart_line_1_3.svg b/plugins/plot_barcol/chart_line_1_3.svg
similarity index 100%
rename from pixmaps/chart_line_1_3.svg
rename to plugins/plot_barcol/chart_line_1_3.svg
diff --git a/pixmaps/chart_line_2_1.png b/plugins/plot_barcol/chart_line_2_1.png
similarity index 100%
rename from pixmaps/chart_line_2_1.png
rename to plugins/plot_barcol/chart_line_2_1.png
diff --git a/pixmaps/chart_line_2_1.svg b/plugins/plot_barcol/chart_line_2_1.svg
similarity index 100%
rename from pixmaps/chart_line_2_1.svg
rename to plugins/plot_barcol/chart_line_2_1.svg
diff --git a/pixmaps/chart_line_2_2.png b/plugins/plot_barcol/chart_line_2_2.png
similarity index 100%
rename from pixmaps/chart_line_2_2.png
rename to plugins/plot_barcol/chart_line_2_2.png
diff --git a/pixmaps/chart_line_2_2.svg b/plugins/plot_barcol/chart_line_2_2.svg
similarity index 100%
rename from pixmaps/chart_line_2_2.svg
rename to plugins/plot_barcol/chart_line_2_2.svg
diff --git a/pixmaps/chart_line_2_3.png b/plugins/plot_barcol/chart_line_2_3.png
similarity index 100%
rename from pixmaps/chart_line_2_3.png
rename to plugins/plot_barcol/chart_line_2_3.png
diff --git a/pixmaps/chart_line_2_3.svg b/plugins/plot_barcol/chart_line_2_3.svg
similarity index 100%
rename from pixmaps/chart_line_2_3.svg
rename to plugins/plot_barcol/chart_line_2_3.svg
diff --git a/pixmaps/chart_line_3_1.png b/plugins/plot_barcol/chart_line_3_1.png
similarity index 100%
rename from pixmaps/chart_line_3_1.png
rename to plugins/plot_barcol/chart_line_3_1.png
diff --git a/pixmaps/chart_minmax_1_1.png b/plugins/plot_barcol/chart_minmax_1_1.png
similarity index 100%
rename from pixmaps/chart_minmax_1_1.png
rename to plugins/plot_barcol/chart_minmax_1_1.png
diff --git a/pixmaps/chart_minmax_1_1.svg b/plugins/plot_barcol/chart_minmax_1_1.svg
similarity index 100%
rename from pixmaps/chart_minmax_1_1.svg
rename to plugins/plot_barcol/chart_minmax_1_1.svg
diff --git a/pixmaps/chart_minmax_1_2.png b/plugins/plot_barcol/chart_minmax_1_2.png
similarity index 100%
rename from pixmaps/chart_minmax_1_2.png
rename to plugins/plot_barcol/chart_minmax_1_2.png
diff --git a/pixmaps/chart_minmax_1_2.svg b/plugins/plot_barcol/chart_minmax_1_2.svg
similarity index 100%
rename from pixmaps/chart_minmax_1_2.svg
rename to plugins/plot_barcol/chart_minmax_1_2.svg
diff --git a/pixmaps/chart_minmax_2_1.png b/plugins/plot_barcol/chart_minmax_2_1.png
similarity index 100%
rename from pixmaps/chart_minmax_2_1.png
rename to plugins/plot_barcol/chart_minmax_2_1.png
diff --git a/pixmaps/chart_minmax_2_1.svg b/plugins/plot_barcol/chart_minmax_2_1.svg
similarity index 100%
rename from pixmaps/chart_minmax_2_1.svg
rename to plugins/plot_barcol/chart_minmax_2_1.svg
diff --git a/pixmaps/chart_minmax_2_2.png b/plugins/plot_barcol/chart_minmax_2_2.png
similarity index 100%
rename from pixmaps/chart_minmax_2_2.png
rename to plugins/plot_barcol/chart_minmax_2_2.png
diff --git a/pixmaps/chart_minmax_2_2.svg b/plugins/plot_barcol/chart_minmax_2_2.svg
similarity index 100%
rename from pixmaps/chart_minmax_2_2.svg
rename to plugins/plot_barcol/chart_minmax_2_2.svg
diff --git a/plugins/plot_barcol/gog-1.5d.c b/plugins/plot_barcol/gog-1.5d.c
index 8a06c26..d7541e4 100644
--- a/plugins/plot_barcol/gog-1.5d.c
+++ b/plugins/plot_barcol/gog-1.5d.c
@@ -42,6 +42,8 @@
 #include <glib/gi18n-lib.h>
 #include <gsf/gsf-impl-utils.h>
 
+#include "embedded-stuff.c"
+
 GOFFICE_PLUGIN_MODULE_HEADER;
 
 enum {
@@ -726,9 +728,12 @@ go_plugin_init (GOPlugin *plugin, GOCmdContext *cc)
 	gog_minmax_series_register_type (module);
 	gog_minmax_plot_register_type (module);
 	gog_minmax_view_register_type (module);
+
+	register_embedded_stuff ();
 }
 
 G_MODULE_EXPORT void
 go_plugin_shutdown (GOPlugin *plugin, GOCmdContext *cc)
 {
+	unregister_embedded_stuff ();
 }
diff --git a/plugins/plot_barcol/gog-barcol-prefs.c b/plugins/plot_barcol/gog-barcol-prefs.c
index 34075f5..38235ff 100644
--- a/plugins/plot_barcol/gog-barcol-prefs.c
+++ b/plugins/plot_barcol/gog-barcol-prefs.c
@@ -48,12 +48,9 @@ GtkWidget *
 gog_barcol_plot_pref (GogBarColPlot *barcol, GOCmdContext *cc)
 {
 	GtkWidget  *w;
-	char const *dir = go_plugin_get_dir_name (
-		go_plugins_get_plugin_by_id ("GOffice_plot_barcol"));
-	char	 *path = g_build_filename (dir, "gog-barcol-prefs.ui", NULL);
-	GtkBuilder *gui = go_gtk_builder_new (path, GETTEXT_PACKAGE, cc);
-
-	g_free (path);
+	GtkBuilder *gui =
+		go_gtk_builder_new ("res:go:plot_barcol/gog-barcol-prefs.ui",
+				    GETTEXT_PACKAGE, cc);
         if (gui == NULL)
                 return NULL;
 
diff --git a/plugins/plot_barcol/gog-dropbar.c b/plugins/plot_barcol/gog-dropbar.c
index 830b007..cfb5e0f 100644
--- a/plugins/plot_barcol/gog-dropbar.c
+++ b/plugins/plot_barcol/gog-dropbar.c
@@ -87,15 +87,9 @@ gog_dropbar_populate_editor (GogObject *obj,
                              GOCmdContext *cc)
 {
 #ifdef GOFFICE_WITH_GTK
-	GtkBuilder *gui;
-	char const *dir;
-	char *path;
-
-	dir = go_plugin_get_dir_name (go_plugins_get_plugin_by_id ("GOffice_plot_barcol"));
-	path = g_build_filename (dir, "gog-area-prefs.ui", NULL);
-	gui = go_gtk_builder_new (path, GETTEXT_PACKAGE, cc);
-	g_free (path);
-
+	GtkBuilder *gui =
+		go_gtk_builder_new ("res:go:plot_barcol/gog-area-prefs.ui",
+				    GETTEXT_PACKAGE, cc);
 	if (gui != NULL) {
 		GtkWidget *w = go_gtk_builder_get_widget (gui, "before-grid");
 		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (w),
diff --git a/plugins/plot_barcol/gog-line.c b/plugins/plot_barcol/gog-line.c
index 0e368c2..bccf2d2 100644
--- a/plugins/plot_barcol/gog-line.c
+++ b/plugins/plot_barcol/gog-line.c
@@ -408,15 +408,9 @@ gog_area_plot_populate_editor (GogObject *obj,
                              GOCmdContext *cc)
 {
 #ifdef GOFFICE_WITH_GTK
-	GtkBuilder *gui;
-	char const *dir;
-	char *path;
-
-	dir = go_plugin_get_dir_name (go_plugins_get_plugin_by_id ("GOffice_plot_barcol"));
-	path = g_build_filename (dir, "gog-area-prefs.ui", NULL);
-	gui = go_gtk_builder_new (path, GETTEXT_PACKAGE, cc);
-	g_free (path);
-
+	GtkBuilder *gui =
+		go_gtk_builder_new ("res:go:plot_barcol/gog-area-prefs.ui",
+				    GETTEXT_PACKAGE, cc);
 	if (gui != NULL) {
 		GtkWidget *w = go_gtk_builder_get_widget (gui, "before-grid");
 		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (w),
diff --git a/plugins/plot_barcol/gog-minmax.c b/plugins/plot_barcol/gog-minmax.c
index 868ea6b..4fb86cf 100644
--- a/plugins/plot_barcol/gog-minmax.c
+++ b/plugins/plot_barcol/gog-minmax.c
@@ -176,14 +176,12 @@ gog_minmax_plot_populate_editor (GogObject *item,
 				 G_GNUC_UNUSED GogDataAllocator *dalloc,
 				 GOCmdContext *cc)
 {
-	GtkWidget  *w;
 	GogMinMaxPlot *minmax = GOG_MINMAX_PLOT (item);
-	char const *dir = go_plugin_get_dir_name (
-		go_plugins_get_plugin_by_id ("GOffice_plot_barcol"));
-	char	 *path = g_build_filename (dir, "gog-minmax-prefs.ui", NULL);
-	GtkBuilder *gui = go_gtk_builder_new (path, GETTEXT_PACKAGE, cc);
+	GtkBuilder *gui =
+		go_gtk_builder_new ("res:go:plot_barcol/gog-minmax-prefs.ui",
+				    GETTEXT_PACKAGE, cc);
+	GtkWidget  *w;
 
-	g_free (path);
 	if (gui == NULL)
 		return;
 
diff --git a/plugins/plot_barcol/plot-types.xml.in b/plugins/plot_barcol/plot-types.xml.in
index c9e119e..9e56799 100644
--- a/plugins/plot_barcol/plot-types.xml.in
+++ b/plugins/plot_barcol/plot-types.xml.in
@@ -10,7 +10,7 @@
 	<Type _name="Unmarked Lines" row="1" col="1"
 		engine="GogLinePlot" family="Line"
 		_description="Unmarked line plot."
-		sample_image_file="chart_line_1_1.png">
+		sample_image_file="res:go:plot_barcol/chart_line_1_1.png">
 		<property name="type">normal</property>
 		<property name="default-style-has-markers">FALSE</property>
 		<property name="guru-hints">backplane</property>
@@ -18,7 +18,7 @@
 	<Type _name="Unmarked Stacked Lines" row="1" col="2"
 		engine="GogLinePlot" family="Line"
 		_description="Unmarked stacked line plot."
-		sample_image_file="chart_line_1_2.png">
+		sample_image_file="res:go:plot_barcol/chart_line_1_2.png">
 		<property name="type">stacked</property>
 		<property name="default-style-has-markers">FALSE</property>
 		<property name="guru-hints">backplane</property>
@@ -26,7 +26,7 @@
 	<Type _name="Unmarked Percentage Lines" row="1" col="3"
 		engine="GogLinePlot" family="Line"
 		_description="Unmarked percentage line plot."
-		sample_image_file="chart_line_1_3.png">
+		sample_image_file="res:go:plot_barcol/chart_line_1_3.png">
 		<property name="type">as_percentage</property>
 		<property name="default-style-has-markers">FALSE</property>
 		<property name="guru-hints">backplane</property>
@@ -35,21 +35,21 @@
 	<Type _name="Lines" row="2" col="1"
 		engine="GogLinePlot" family="Line"
 		_description="Line plot with markers."
-		sample_image_file="chart_line_2_1.png">
+		sample_image_file="res:go:plot_barcol/chart_line_2_1.png">
 		<property name="type">normal</property>
 		<property name="guru-hints">backplane</property>
 	</Type>
 	<Type _name="Stacked Lines" row="2" col="2"
 		engine="GogLinePlot" family="Line"
 		_description="Stacked line plot with markers."
-		sample_image_file="chart_line_2_2.png">
+		sample_image_file="res:go:plot_barcol/chart_line_2_2.png">
 		<property name="type">stacked</property>
 		<property name="guru-hints">backplane</property>
 	</Type>
 	<Type _name="Percentage Lines" row="2" col="3"
 		engine="GogLinePlot" family="Line"
 		_description="Percentage line plot with markers."
-		sample_image_file="chart_line_2_3.png">
+		sample_image_file="res:go:plot_barcol/chart_line_2_3.png">
 		<property name="type">as_percentage</property>
 		<property name="guru-hints">backplane</property>
 	</Type>
@@ -57,14 +57,14 @@
 	<Type _name="Areas" row="1" col="1"
 		engine="GogAreaPlot" family="Area"
 		_description="Area plot."
-		sample_image_file="chart_area_1_1.png">
+		sample_image_file="res:go:plot_barcol/chart_area_1_1.png">
 		<property name="type">normal</property>
 		<property name="guru-hints">backplane</property>
 	</Type>
 	<Type _name="Stacked Areas" row="1" col="2"
 		engine="GogAreaPlot" family="Area"
 		_description="Stacked area plot."
-		sample_image_file="chart_area_1_2.png">
+		sample_image_file="res:go:plot_barcol/chart_area_1_2.png">
 		<property name="type">stacked</property>
 		<property name="guru-hints">backplane</property>
 	</Type>
@@ -72,14 +72,14 @@
 	<Type _name="Percentage Areas" row="1" col="3"
 		engine="GogAreaPlot" family="Area"
 		_description="Percentage area plot."
-		sample_image_file="chart_area_1_3.png">
+		sample_image_file="res:go:plot_barcol/chart_area_1_3.png">
 		<property name="type">as_percentage</property>
 		<property name="guru-hints">backplane</property>
 	</Type>
 	<Type _name="Adjacent Bars" row="1" col="1"
 		engine="GogBarColPlot" family="Bar"
 		_description="Adjacent horizontal bars grouped by major and minor categories."
-		sample_image_file="chart_bar_1_1.png">
+		sample_image_file="res:go:plot_barcol/chart_bar_1_1.png">
 		<property name="horizontal">True</property>
 		<property name="type">normal</property>
 		<property name="guru-hints">backplane</property>
@@ -88,7 +88,7 @@
 	<Type _name="Stacked Bars" row="1" col="2"
 		engine="GogBarColPlot" family="Bar"
 		_description="Minor categories stacked in horizontal bars grouped by major category."
-		sample_image_file="chart_bar_1_2.png">
+		sample_image_file="res:go:plot_barcol/chart_bar_1_2.png">
 		<property name="horizontal">True</property>
 		<property name="type">stacked</property>
 		<property name="overlap_percentage">100</property>
@@ -98,7 +98,7 @@
 	<Type _name="Percentage Bars" row="1" col="3"
 		engine="GogBarColPlot" family="Bar"
 		_description="Minor categories stacked as percentages of the minor total, in horizontal bars, grouped by major category."
-		sample_image_file="chart_bar_1_3.png">
+		sample_image_file="res:go:plot_barcol/chart_bar_1_3.png">
 		<property name="horizontal">True</property>
 		<property name="type">as_percentage</property>
 		<property name="overlap_percentage">100</property>
@@ -109,7 +109,7 @@
 	<Type _name="3D Adjacent Bars" row="2" col="1"
 		engine="GogBarColPlot" family="Bar"
 		_description="Adjacent horizontal 3D bars grouped by major and minor categories."
-		sample_image_file="chart_bar_2_1.png">
+		sample_image_file="res:go:plot_barcol/chart_bar_2_1.png">
 		<property name="horizontal">True</property>
 		<property name="type">normal</property>
 		<property name="in_3d"/>
@@ -118,7 +118,7 @@
 	<Type _name="3D Stacked Bars" row="2" col="2"
 		engine="GogBarColPlot" family="Bar"
 		_description="Minor categories stacked in horizontal 3D bars, grouped by major category."
-		sample_image_file="chart_bar_2_2.png">
+		sample_image_file="res:go:plot_barcol/chart_bar_2_2.png">
 		<property name="horizontal">True</property>
 		<property name="type">stacked</property>
 		<property name="overlap_percentage">100</property>
@@ -128,7 +128,7 @@
 	<Type _name="3D Percentage Bars" row="2" col="3"
 		engine="GogBarColPlot" family="Bar"
 		_description="Minor categories stacked as percentages of the minor total, in 3D horizontal bars, grouped by major category."
-		sample_image_file="chart_bar_2_3.png">
+		sample_image_file="res:go:plot_barcol/chart_bar_2_3.png">
 		<property name="horizontal">True</property>
 		<property name="type">as_percentage</property>
 		<property name="overlap_percentage">100</property>
@@ -139,7 +139,7 @@
 	<Type _name="Adjacent Columns" row="1" col="1"
 		engine="GogBarColPlot" family="Column"
 		_description="Adjacent vertical columns grouped by major and minor categories."
-		sample_image_file="chart_column_1_1.png">
+		sample_image_file="res:go:plot_barcol/chart_column_1_1.png">
 		<property name="horizontal">False</property>
 		<property name="type">normal</property>
 		<property name="guru-hints">backplane</property>
@@ -148,7 +148,7 @@
 	<Type _name="Stacked Columns" row="1" col="2"
 		engine="GogBarColPlot" family="Column"
 		_description="Minor categories stacked in vertical columns grouped by major category."
-		sample_image_file="chart_column_1_2.png">
+		sample_image_file="res:go:plot_barcol/chart_column_1_2.png">
 		<property name="horizontal">False</property>
 		<property name="type">stacked</property>
 		<property name="overlap_percentage">100</property>
@@ -158,7 +158,7 @@
 	<Type _name="Percentage Columns" row="1" col="3"
 		engine="GogBarColPlot" family="Column"
 		_description="Minor categories stacked as percentages of the minor total, in vertical columns, grouped by major category."
-		sample_image_file="chart_column_1_3.png">
+		sample_image_file="res:go:plot_barcol/chart_column_1_3.png">
 		<property name="horizontal">False</property>
 		<property name="type">as_percentage</property>
 		<property name="overlap_percentage">100</property>
@@ -168,7 +168,7 @@
 	<Type _name="Vertical Drop Bars" row="1" col="1"
 		engine="GogDropBarPlot" family="DropBar"
 		_description="Vertical drop bars."
-		sample_image_file="chart_dropbar_1_1.png">
+		sample_image_file="res:go:plot_barcol/chart_dropbar_1_1.png">
 		<property name="horizontal">False</property>
 		<property name="type">normal</property>
 		<property name="guru-hints">backplane</property>
@@ -180,7 +180,7 @@
 	<Type _name="Horizontal Drop Bars" row="1" col="2"
 		engine="GogDropBarPlot" family="DropBar"
 		_description="Horizontal drop bars."
-		sample_image_file="chart_dropbar_1_2.png">
+		sample_image_file="res:go:plot_barcol/chart_dropbar_1_2.png">
 		<property name="horizontal">True</property>
 		<property name="type">normal</property>
 		<property name="guru-hints">backplane</property>
@@ -189,7 +189,7 @@
 	<Type _name="Vertical Min Max Lines" row="1" col="1"
 		engine="GogMinMaxPlot" family="MinMax"
 		_description="Vertical min max lines."
-		sample_image_file="chart_minmax_1_1.png">
+		sample_image_file="res:go:plot_barcol/chart_minmax_1_1.png">
 		<property name="horizontal">False</property>
 		<property name="type">normal</property>
 		<property name="default-style-has-markers">False</property>
@@ -199,7 +199,7 @@
 	<Type _name="Marked Vertical Min Max Lines" row="2" col="1"
 		engine="GogMinMaxPlot" family="MinMax"
 		_description="Vertical min max lines with markers."
-		sample_image_file="chart_minmax_2_1.png">
+		sample_image_file="res:go:plot_barcol/chart_minmax_2_1.png">
 		<property name="horizontal">False</property>
 		<property name="type">normal</property>
 		<property name="default-style-has-markers">True</property>
@@ -209,7 +209,7 @@
 	<Type _name="Horizontal Min Max Lines" row="1" col="2"
 		engine="GogMinMaxPlot" family="MinMax"
 		_description="Horizontal min max lines."
-		sample_image_file="chart_minmax_1_2.png">
+		sample_image_file="res:go:plot_barcol/chart_minmax_1_2.png">
 		<property name="horizontal">True</property>
 		<property name="type">normal</property>
 		<property name="default-style-has-markers">False</property>
@@ -219,7 +219,7 @@
 	<Type _name="Marked Horizontal Min Max Lines" row="2" col="2"
 		engine="GogMinMaxPlot" family="MinMax"
 		_description="Horizontal min max lines with markers."
-		sample_image_file="chart_minmax_2_2.png">
+		sample_image_file="res:go:plot_barcol/chart_minmax_2_2.png">
 		<property name="horizontal">True</property>
 		<property name="type">normal</property>
 		<property name="default-style-has-markers">True</property>
@@ -230,7 +230,7 @@
 	<Type _name="3D Adjacent Columns" row="2" col="1"
 		engine="GogBarColPlot" family="Column"
 		_description="Adjacent vertical 3D columns grouped by major and minor categories."
-		sample_image_file="chart_column_2_1.png">
+		sample_image_file="res:go:plot_barcol/chart_column_2_1.png">
 		<property name="horizontal">False</property>
 		<property name="type">normal</property>
 		<property name="in_3d"/>
@@ -239,7 +239,7 @@
 	<Type _name="3D Stacked Columns" row="2" col="2"
 		engine="GogBarColPlot" family="Column"
 		_description="Minor categories stacked in vertical 3D columns, grouped by major category."
-		sample_image_file="chart_column_2_2.png">
+		sample_image_file="res:go:plot_barcol/chart_column_2_2.png">
 		<property name="horizontal">False</property>
 		<property name="type">stacked</property>
 		<property name="overlap_percentage">100</property>
@@ -249,7 +249,7 @@
 	<Type _name="3D Percentage Columns" row="2" col="3"
 		engine="GogBarColPlot" family="Column"
 		_description="Minor categories stacked as percentages of the minor total, in 3D vertical bars, grouped by major category."
-		sample_image_file="chart_column_2_3.png">
+		sample_image_file="res:go:plot_barcol/chart_column_2_3.png">
 		<property name="horizontal">False</property>
 		<property name="type">as_percentage</property>
 		<property name="overlap_percentage">100</property>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]