[rkward-cvs] SF.net SVN: rkward-code:[4904] trunk/rkward/packages/rkwarddev

[m-eik at users.sf.net]

Revision: 4904
          http://sourceforge.net/p/rkward/code/4904
Author:   m-eik
Date:     2014-10-15 15:10:36 +0000 (Wed, 15 Oct 2014)
Log Message:
-----------
rkwarddev: further work on the script skeleton plugin

Modified Paths:
--------------
    trunk/rkward/packages/rkwarddev/demo/skeleton_dialog.R
    trunk/rkward/packages/rkwarddev/inst/rkward/RKWardPluginSkeleton.pluginmap
    trunk/rkward/packages/rkwarddev/inst/rkward/plugins/CreateRKWardpluginskeleton.js

Modified: trunk/rkward/packages/rkwarddev/demo/skeleton_dialog.R
===================================================================
--- trunk/rkward/packages/rkwarddev/demo/skeleton_dialog.R	2014-10-15 06:43:47 UTC (rev 4903)
+++ trunk/rkward/packages/rkwarddev/demo/skeleton_dialog.R	2014-10-15 15:10:36 UTC (rev 4904)
@@ -241,6 +241,10 @@
     qp("\n\t", js.opt.skel.pluginmap),
     qp("\n\t#pluginmap=list(name=\"\", hierarchy=\"\", require=\"\")")
   ),
+  ite(id(js.frm.dep.opts, " && (", js.opt.about.dep, " || ", dep.optioncol.pckg.name, ")"),
+    qp("\n\tdependencies=plugin.dependencies"),
+    qp("\n\t#dependencies=plugin.dependencies")
+  ),
   ite(pl.tests, qp("\n\ttests=TRUE"), qp("\n\ttests=FALSE")),
   ite(pl.edit, qp("\n\tedit=TRUE"), qp("\n\tedit=FALSE")),
   ite(pl.add, qp("\n\tload=TRUE"), qp("\n\tload=FALSE")),
@@ -282,6 +286,11 @@
       ),
       echo("\n)\n\n"),
     level=3)),
+  echo("# name of the main component, relevant for help page content\nrk.set.comp(\""),
+  ite(pl.hier.name,
+    echo(pl.hier.name, "\")\n\n"),
+    echo(pl.name, "\")\n\n")
+  ),
   echo("############\n## your plugin dialog and JavaScript should be put here\n############\n\n"),
   ite(js.frm.help.text,
     rk.paste.JS(

Modified: trunk/rkward/packages/rkwarddev/inst/rkward/RKWardPluginSkeleton.pluginmap
===================================================================
--- trunk/rkward/packages/rkwarddev/inst/rkward/RKWardPluginSkeleton.pluginmap	2014-10-15 06:43:47 UTC (rev 4903)
+++ trunk/rkward/packages/rkwarddev/inst/rkward/RKWardPluginSkeleton.pluginmap	2014-10-15 15:10:36 UTC (rev 4904)
@@ -15,7 +15,7 @@
 		shortinfo="GUI interface to create RKWard plugin skeletons"
 		longinfo="GUI interface to create RKWard plugin skeletons"
 		version="0.06-5"
-		releasedate="2014-10-14"
+		releasedate="2014-10-15"
 		url="http://rkward.sf.net"
 		license="GPL (>= 3)"
 	>

Modified: trunk/rkward/packages/rkwarddev/inst/rkward/plugins/CreateRKWardpluginskeleton.js
===================================================================
--- trunk/rkward/packages/rkwarddev/inst/rkward/plugins/CreateRKWardpluginskeleton.js	2014-10-15 06:43:47 UTC (rev 4903)
+++ trunk/rkward/packages/rkwarddev/inst/rkward/plugins/CreateRKWardpluginskeleton.js	2014-10-15 15:10:36 UTC (rev 4904)
@@ -224,6 +224,11 @@
 		} else {
 			arrOptSkeleton.push("\n\t#pluginmap=list(name=\"\", hierarchy=\"\", require=\"\")");
 		}
+		if(frmDfndpndnChecked && (optDependencies || ocolOclInpPckgtxt)) {
+			arrOptSkeleton.push("\n\tdependencies=plugin.dependencies");
+		} else {
+			arrOptSkeleton.push("\n\t#dependencies=plugin.dependencies");
+		}
 		if(chcIncldplg) {
 			arrOptSkeleton.push("\n\ttests=TRUE");
 		} else {
@@ -273,6 +278,12 @@
 		}
 		echo("\n)\n\n");
 	}
+	echo("# name of the main component, relevant for help page content\nrk.set.comp(\"");
+	if(inpNmnmnplg) {
+		echo(inpNmnmnplg + "\")\n\n");
+	} else {
+		echo(inpPluginnm + "\")\n\n");
+	}
 	echo("############\n## your plugin dialog and JavaScript should be put here\n############\n\n");
 	if(frmWrthlpflChecked) {
 		echo("############\n## help page\nplugin.summary <- rk.rkh.summary(\n\t");