[rkward-cvs] [rkward] /: Extract messages from plot plugins.

[Thomas Friedrichsmeier]

Git commit 25ea2ab308722289b9c629f5fcba6d381e6a8c21 by Thomas Friedrichsmeier.
Committed on 09/01/2015 at 14:43.
Pushed by tfry into branch 'master'.

Extract messages from plot plugins.

M  +2    -0    Messages.sh
M  +1    -1    rkward/plugins/plots.pluginmap
M  +1    -1    rkward/plugins/plots/barplot.rkh
M  +1    -1    rkward/plugins/plots/barplot.xml
M  +1    -1    rkward/plugins/plots/box_plot.rkh
M  +1    -1    scripts/update_plugin_messages.py

http://commits.kde.org/rkward/25ea2ab308722289b9c629f5fcba6d381e6a8c21

diff --git a/Messages.sh b/Messages.sh
index 0b36280..5483cdf 100755
--- a/Messages.sh
+++ b/Messages.sh
@@ -16,4 +16,6 @@ python scripts/update_plugin_messages.py --extract-only --outdir=$podir rkward/p
 python scripts/update_plugin_messages.py --extract-only --outdir=$podir rkward/plugins/import_export.pluginmap
 # extract messages from data plugins: >> rkward__data.pot
 python scripts/update_plugin_messages.py --extract-only --outdir=$podir rkward/plugins/data.pluginmap
+# extract messages from data plugins: >> rkward__plots.pot
+python scripts/update_plugin_messages.py --extract-only --outdir=$podir rkward/plugins/plots.pluginmap
 # messages of embedded plugins are extracted implicitly, as part of the above extraction calls: >> rkward__embedded.pot
diff --git a/rkward/plugins/plots.pluginmap b/rkward/plugins/plots.pluginmap
index 38c1573..39e9e7a 100644
--- a/rkward/plugins/plots.pluginmap
+++ b/rkward/plugins/plots.pluginmap
@@ -1,6 +1,6 @@
 <!DOCTYPE rkpluginmap>
 
-<document base_prefix="plots/" namespace="rkward" id="plots">
+<document base_prefix="plots/" namespace="rkward" id="plots" po_id="plots">
 	<include file="pluginmap_meta.inc"/>
 	<about
 		name="Plots"
diff --git a/rkward/plugins/plots/barplot.rkh b/rkward/plugins/plots/barplot.rkh
index 2316bea..8179592 100644
--- a/rkward/plugins/plots/barplot.rkh
+++ b/rkward/plugins/plots/barplot.rkh
@@ -20,7 +20,7 @@ Choose a matrix, vector or a factor to be plotted. Further options are available
 		<setting id="names_mode">Method for assigning labels to the plot. "default" means, the labels are chosen automatically. If no labels are available, this will generally print the values. The other options allow you to specify the labels as literal string, or as an R statement (e.g. if the names are stored in a different variable in the workspace).</setting>
 
 		<caption id="tab_options"/>
-		<setting id="barplot_embed" title="Barplot Options">Since these settings are reused in further plugins, they are documented on a page of their own: See <link href="rkward://component/barplot_embed"/>.</setting>
+		<setting id="barplot_embed">Since these settings are reused in further plugins, they are documented on a page of their own: See <link href="rkward://component/barplot_embed"/>.</setting>
 	</settings>
 	<related>
 		<ul>
diff --git a/rkward/plugins/plots/barplot.xml b/rkward/plugins/plots/barplot.xml
index 6c6b1d8..c950616 100644
--- a/rkward/plugins/plots/barplot.xml
+++ b/rkward/plugins/plots/barplot.xml
@@ -60,7 +60,7 @@
 					<input id="names_custom" label="Labels (separated by ';')" initial="First label;Second label"/>
 				</tab>
 				<tab label="Options" id="tab_options">
-					<embed id="barplot_embed" component="rkward::barplot_embed"/>
+					<embed id="barplot_embed" component="rkward::barplot_embed" label="Barplot Options"/>
 					<stretch/>
 				</tab>
 			</tabbook>
diff --git a/rkward/plugins/plots/box_plot.rkh b/rkward/plugins/plots/box_plot.rkh
index b36cf05..ad34db3 100644
--- a/rkward/plugins/plots/box_plot.rkh
+++ b/rkward/plugins/plots/box_plot.rkh
@@ -16,7 +16,7 @@ Choose numerical data to be plotted. Data can be organized in separate vectors,
 		<setting id="groups">For single(grouped) variable mode: Select one or more vectors by which to group the outcome variable. Group variables should have the same length as the outcome variable.</setting>
 		<setting id="dodges">For single(grouped) variable mode: Doding boxes within one or more groups can be a nice option when the outcome is split by several group variables. This allows you to select, across how many group variables, boxes should be doged ("0" for no dodging, "1" to dodge only the first group variable).</setting>
 		<setting id="names_mode">Method for assigning labels to the plot. "default" means, the labels are chosen automatically. If no labels are available, this will generally print the values. The other options allow you to specify the labels as literal string, or as an R statement (e.g. if the names are stored in a different variable in the workspace).</setting>
-		<setting id="Box width">Allows to change the width of the boxes, relative to the entire plot.</setting>
+		<setting id="boxwex">Allows to change the width of the boxes, relative to the entire plot.</setting>
 		<caption id="tab_options"/>
 		<setting id="orientation">Orientation of the plot: horizontal or vertical.</setting>
 		<setting id="notch">Whether to draw notches</setting>
diff --git a/scripts/update_plugin_messages.py b/scripts/update_plugin_messages.py
index 4deb68b..01d8abb 100755
--- a/scripts/update_plugin_messages.py
+++ b/scripts/update_plugin_messages.py
@@ -125,7 +125,7 @@ def getFileContext (element, attribute=""):
   refer_to = ""
   if ((element.tagName in referring_elements) and (element.hasAttribute ("id"))):
     if (not (element.getAttribute ("id") in infile["id_labels"])):
-      sys.stderr.write ("WARNING in " + infile["infile"] + ": Reference to unknown (or unnamed) element id '" + element.getAttribute ("id") + "'\n")
+      sys.stderr.write ("WARNING in " + infile["infile"] + ", line " + str (getLineOf (element)) + ": Reference to unknown (or unnamed) element id '" + element.getAttribute ("id") + "'\n")
     else:
       refer_to = " (refers to element labelled " + quote (infile["id_labels"][element.getAttribute ("id")]) + ")"
   tag_stack = [getElementShort (element, attribute)]