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

m-eik at users.sf.net m-eik at users.sf.net
Tue Oct 14 19:59:16 UTC 2014


Revision: 4902
          http://sourceforge.net/p/rkward/code/4902
Author:   m-eik
Date:     2014-10-14 19:59:15 +0000 (Tue, 14 Oct 2014)
Log Message:
-----------
added getter guessing to the skeleton dialog

Modified Paths:
--------------
    trunk/rkward/packages/rkwarddev/DESCRIPTION
    trunk/rkward/packages/rkwarddev/R/rkwarddev-package.R
    trunk/rkward/packages/rkwarddev/demo/skeleton_dialog.R
    trunk/rkward/packages/rkwarddev/inst/NEWS.Rd
    trunk/rkward/packages/rkwarddev/inst/doc/rkwarddev_vignette.pdf
    trunk/rkward/packages/rkwarddev/inst/rkward/RKWardPluginSkeleton.pluginmap
    trunk/rkward/packages/rkwarddev/inst/rkward/plugins/CreateRKWardpluginskeleton.js
    trunk/rkward/packages/rkwarddev/inst/rkward/plugins/CreateRKWardpluginskeleton.rkh
    trunk/rkward/packages/rkwarddev/inst/rkward/plugins/CreateRKWardpluginskeleton.xml
    trunk/rkward/packages/rkwarddev/man/rkwarddev-package.Rd
    trunk/rkward/packages/rkwarddev/man/tf.Rd

Modified: trunk/rkward/packages/rkwarddev/DESCRIPTION
===================================================================
--- trunk/rkward/packages/rkwarddev/DESCRIPTION	2014-10-14 14:12:57 UTC (rev 4901)
+++ trunk/rkward/packages/rkwarddev/DESCRIPTION	2014-10-14 19:59:15 UTC (rev 4902)
@@ -15,7 +15,7 @@
 Authors at R: c(person(given="Meik", family="Michalke",
     email="meik.michalke at hhu.de", role=c("aut", "cre")))
 Version: 0.06-5
-Date: 2014-10-12
+Date: 2014-10-14
 Collate:
     'echo.R'
     'i18n.R'

Modified: trunk/rkward/packages/rkwarddev/R/rkwarddev-package.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rkwarddev-package.R	2014-10-14 14:12:57 UTC (rev 4901)
+++ trunk/rkward/packages/rkwarddev/R/rkwarddev-package.R	2014-10-14 19:59:15 UTC (rev 4902)
@@ -4,7 +4,7 @@
 #' Package: \tab rkwarddev\cr
 #' Type: \tab Package\cr
 #' Version: \tab 0.06-5\cr
-#' Date: \tab 2014-10-12\cr
+#' Date: \tab 2014-10-14\cr
 #' Depends: \tab R (>= 2.9.0),methods,XiMpLe (>= 0.03-21),rkward (>= 0.5.7)\cr
 #' Enhances: \tab rkward\cr
 #' Encoding: \tab UTF-8\cr

Modified: trunk/rkward/packages/rkwarddev/demo/skeleton_dialog.R
===================================================================
--- trunk/rkward/packages/rkwarddev/demo/skeleton_dialog.R	2014-10-14 14:12:57 UTC (rev 4901)
+++ trunk/rkward/packages/rkwarddev/demo/skeleton_dialog.R	2014-10-14 19:59:15 UTC (rev 4902)
@@ -83,6 +83,8 @@
             If you store it in a temporary directory and remove it before the next start of RKWard, the entry will removed again as well."),
         pl.show <- rk.XML.cbox("Show the plugin", chk=FALSE,
           help="If this is checked, the generated plugin will be shown (opened) for you to see what it looks like."),
+        pl.guessgetter <- rk.XML.cbox("Guess getter functions (RKWard >= 0.6.0)", chk=FALSE,
+          help="If this is checked, rkwarddev tries to select the optimal getter functions to get data from the dialog into the R code. The plugin then requires RKWard >= 0.6.0."),
         rk.XML.stretch())
     ),
     rk.XML.frame(
@@ -126,11 +128,16 @@
   rk.XML.row(
     dep.optionset.packages <- rk.XML.optionset(
         content=rk.XML.frame(rk.XML.stretch(before=list(
-          dep.pckg.name <- rk.XML.input("Package",
-          help="The names of R packages required to run this plugin.")#,
-#           dep.pckg.min <- rk.XML.input("min"),
-#           dep.pckg.max <- rk.XML.input("max"),
-#           dep.pckg.repo <- rk.XML.input("Repository")
+          rk.XML.row(
+            dep.pckg.name <- rk.XML.input("Package",
+              help="The names of R packages required to run this plugin.")#,
+#             dep.pckg.min <- rk.XML.input("min",
+#               help="The minimum version number of R packages required to run this plugin."),
+#             dep.pckg.max <- rk.XML.input("max",
+#               help="The maximum version number of R packages required to run this plugin."),
+#             dep.pckg.repo <- rk.XML.input("Repository",
+#               help="The repository to download R packages from required to run this plugin.")
+         )
         )), label="Depends on R packages"),
         optioncolumn=list(
           dep.optioncol.pckg.name <- rk.XML.optioncolumn(connect=dep.pckg.name, modifier="text")#,
@@ -241,12 +248,14 @@
   collapse="")
 
 JS.prepare <- rk.paste.JS(
-  rk.JS.vars(pl.dir, pl.overw),
+  rk.JS.vars(pl.dir, pl.overw, pl.guessgetter),
   echo("rkwarddev.required(\"0.06-5\")"),
   echo("\n\n# define where the plugin should write its files\noutput.dir <- "),
   ite(pl.dir, echo("\"", pl.dir, "\""), echo("tempdir()")),
   echo("\n# overwrite an existing plugin in output.dir?\noverwrite <- "),
   ite(pl.overw, echo("TRUE"), echo("FALSE")),
+  echo("\n# if you set guess.getters to TRUE, the resulting code will need RKWard >= 0.6.0\nguess.getter <- "),
+  ite(pl.guessgetter, echo("TRUE"), echo("FALSE")),
   echo("\n\n"),
   level=2)
   
@@ -268,10 +277,12 @@
       echo("plugin.dependencies <- rk.XML.dependencies("),
       ite(id(js.opt.about.dep), echo(js.opt.about.dep)),
       ite(id(js.opt.about.dep, " && ", dep.optioncol.pckg.name), echo(",")),
-      ite(id(dep.optioncol.pckg.name),
-        echo("\n\tpackage=list(\n\t\tc(name=\"", join(dep.optioncol.pckg.name, by="\"),\n\t\tc(name=\""), "\")\n\t)")),
+      ite(id(dep.optioncol.pckg.name , "!= \"\""),
+        echo("\n\tpackage=list(\n\t\tc(name=\"", join(dep.optioncol.pckg.name, by="\"),\n\t\tc(name=\""), "\")\n\t)"),
+      ),
       echo("\n)\n\n"),
     level=3)),
+  echo("############\n## your plugin dialog and JavaScript should be put here\n############\n\n"),
   ite(js.frm.help.text,
     rk.paste.JS(
       echo("############\n## help page\nplugin.summary <- rk.rkh.summary(\n\t"),
@@ -286,6 +297,7 @@
     "plugin.dir <- rk.plugin.skeleton(\n\tabout=about.plugin,"),
   ite(id(js.frm.dep.opts, " && ", js.opt.about.dep), echo("\n\tdependencies=plugin.dependencies,")),
   echo("\n\tpath=output.dir,",
+    "\n\tguess.getter=guess.getter,",
     "\n\tscan=c(\"var\", \"saveobj\", \"settings\"),",
     "\n\txml=list(\n\t\t#dialog=,\n\t\t#wizard=,\n\t\t#logic=,\n\t\t#snippets=\n\t),",
     "\n\tjs=list(\n\t\t#results.header=FALSE,\n\t\t#load.silencer=,\n\t\t#require=,\n\t\t#variables=,",
@@ -303,6 +315,7 @@
     )
   ),
   echo("\n\toverwrite=overwrite,"),
+  echo("\n\t#components=list(),"),
   echo(js.opt.skeleton),
   echo("\n)\n\n"),
   level=2)

Modified: trunk/rkward/packages/rkwarddev/inst/NEWS.Rd
===================================================================
--- trunk/rkward/packages/rkwarddev/inst/NEWS.Rd	2014-10-14 14:12:57 UTC (rev 4901)
+++ trunk/rkward/packages/rkwarddev/inst/NEWS.Rd	2014-10-14 19:59:15 UTC (rev 4902)
@@ -8,6 +8,8 @@
       \item scanning plugin XML code for JS and help related content didn't work as expected in \code{rk.plugin.component()}
       \item \code{rk.rkh.scan()} now also recognises <optioncolumn> and <matrix> nodes
       \item a logical bug prevented \code{rk.plugin.component()} to run with default values for XML
+      \item internal function \code{paste.JS.options()}, used by \code{rk.JS.options()}, was only working correctly for the \code{"then"}
+        part if \code{ite()} statements in arrays; now also produces usable code for an \code{"else"} part, if available
     }
   }
   \subsection{added}{

Modified: trunk/rkward/packages/rkwarddev/inst/doc/rkwarddev_vignette.pdf
===================================================================
(Binary files differ)

Modified: trunk/rkward/packages/rkwarddev/inst/rkward/RKWardPluginSkeleton.pluginmap
===================================================================
--- trunk/rkward/packages/rkwarddev/inst/rkward/RKWardPluginSkeleton.pluginmap	2014-10-14 14:12:57 UTC (rev 4901)
+++ trunk/rkward/packages/rkwarddev/inst/rkward/RKWardPluginSkeleton.pluginmap	2014-10-14 19:59:15 UTC (rev 4902)
@@ -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-12"
+		releasedate="2014-10-14"
 		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-14 14:12:57 UTC (rev 4901)
+++ trunk/rkward/packages/rkwarddev/inst/rkward/plugins/CreateRKWardpluginskeleton.js	2014-10-14 19:59:15 UTC (rev 4902)
@@ -9,6 +9,7 @@
 
 	var brwDTEMPDIR = getValue("brw_DTEMPDIR");
 	var chcOvrwrtxs = getValue("chc_Ovrwrtxs");
+	var chcGsRKW060 = getValue("chc_GsRKW060");
 	echo("rkwarddev.required(\"0.06-5\")");
 	echo("\n\n# define where the plugin should write its files\noutput.dir <- ");
 	if(brwDTEMPDIR) {
@@ -22,12 +23,18 @@
 	} else {
 		echo("FALSE");
 	}
+	echo("\n# if you set guess.getters to TRUE, the resulting code will need RKWard >= 0.6.0\nguess.getter <- ");
+	if(chcGsRKW060) {
+		echo("TRUE");
+	} else {
+		echo("FALSE");
+	}
 	echo("\n\n");
 }
 
 function calculate(){
 	// read in variables from dialog
-	var ocolOclInpPckgtxt = getList("ost_frmlDRDRPP.ocl_inpPckgtxt");
+	var ocolOclInpPckgtxt = getList("ost_frDRDRPPPP.ocl_inpPckgtxt");
 	var inpPluginnm = getString("inp_Pluginnm");
 	var inpLicense = getString("inp_License");
 	var inpShrtdscr = getString("inp_Shrtdscr");
@@ -47,7 +54,9 @@
 	var chcOpnflsfr = getBoolean("chc_Opnflsfr");
 	var chcAddplRKW = getBoolean("chc_AddplRKW");
 	var chcShwthplg = getBoolean("chc_Shwthplg");
+	var chcGsRKW060 = getBoolean("chc_GsRKW060");
 	var drpPlcntpmn = getString("drp_Plcntpmn");
+	var inpNmnmnplg = getString("inp_Nmnmnplg");
 	var inpRKWardmn = getString("inp_RKWardmn");
 	var inpRKWardmx = getString("inp_RKWardmx");
 	var inpRmin = getString("inp_Rmin");
@@ -62,9 +71,13 @@
 	var arrOptAuthorRole = new Array();
 		if(chcAuthor) {
 			arrOptAuthorRole.push("\"aut\"");
+		} else {
+			arrOptAuthorRole.push();
 		}
 		if(chcMaintanr) {
 			arrOptAuthorRole.push("\"cre\"");
+		} else {
+			arrOptAuthorRole.push();
 		}
 	// clean array arrOptAuthorRole from empty strings
 	arrOptAuthorRole = arrOptAuthorRole.filter(String);
@@ -79,15 +92,23 @@
 	var arrOptAuthor = new Array();
 		if(inpGivennam) {
 			arrOptAuthor.push("given=\"" + inpGivennam + "\"");
+		} else {
+			arrOptAuthor.push();
 		}
 		if(inpFamilynm) {
 			arrOptAuthor.push("family=\"" + inpFamilynm + "\"");
+		} else {
+			arrOptAuthor.push();
 		}
 		if(inpEmail) {
 			arrOptAuthor.push("email=\"" + inpEmail + "\"");
+		} else {
+			arrOptAuthor.push();
 		}
 		if(optAuthorRole) {
 			arrOptAuthor.push(optAuthorRole);
+		} else {
+			arrOptAuthor.push();
 		}
 	// clean array arrOptAuthor from empty strings
 	arrOptAuthor = arrOptAuthor.filter(String);
@@ -102,21 +123,33 @@
 	var arrOptAbout = new Array();
 		if(inpShrtdscr) {
 			arrOptAbout.push("desc=\"" + inpShrtdscr + "\"");
+		} else {
+			arrOptAbout.push();
 		}
 		if(inpVrsnnmbr) {
 			arrOptAbout.push("version=\"" + inpVrsnnmbr + "\"");
+		} else {
+			arrOptAbout.push();
 		}
 		if(inpRlsdtmpt) {
 			arrOptAbout.push("date=\"" + inpRlsdtmpt + "\"");
+		} else {
+			arrOptAbout.push();
 		}
 		if(inpHomepage) {
 			arrOptAbout.push("url=\"" + inpHomepage + "\"");
+		} else {
+			arrOptAbout.push();
 		}
 		if(inpLicense) {
 			arrOptAbout.push("license=\"" + inpLicense + "\"");
+		} else {
+			arrOptAbout.push();
 		}
 		if(inpCategory) {
 			arrOptAbout.push("category=\"" + inpCategory + "\"");
+		} else {
+			arrOptAbout.push();
 		}
 	// clean array arrOptAbout from empty strings
 	arrOptAbout = arrOptAbout.filter(String);
@@ -131,15 +164,23 @@
 	var arrOptDependencies = new Array();
 		if(frmDfndpndnChecked && inpRKWardmn) {
 			arrOptDependencies.push("rkward.min=\"" + inpRKWardmn + "\"");
+		} else {
+			arrOptDependencies.push();
 		}
 		if(frmDfndpndnChecked && inpRKWardmx) {
 			arrOptDependencies.push("rkward.max=\"" + inpRKWardmx + "\"");
+		} else {
+			arrOptDependencies.push();
 		}
 		if(frmDfndpndnChecked && inpRmin) {
 			arrOptDependencies.push("R.min=\"" + inpRmin + "\"");
+		} else {
+			arrOptDependencies.push();
 		}
 		if(frmDfndpndnChecked && inpRmax) {
 			arrOptDependencies.push("R.max=\"" + inpRmax + "\"");
+		} else {
+			arrOptDependencies.push();
 		}
 	// clean array arrOptDependencies from empty strings
 	arrOptDependencies = arrOptDependencies.filter(String);
@@ -152,8 +193,15 @@
 
 	// define the array arrOptPluginmap for values of R option "pluginmap"
 	var arrOptPluginmap = new Array();
-		if(drpPlcntpmn!= "test") {
+		if(inpNmnmnplg) {
+			arrOptPluginmap.push("name=\"" + inpNmnmnplg + "\"");
+		} else {
+			arrOptPluginmap.push("name=\"" + inpPluginnm + "\"");
+		}
+		if(drpPlcntpmn) {
 			arrOptPluginmap.push("hierarchy=\"" + drpPlcntpmn + "\"");
+		} else {
+			arrOptPluginmap.push();
 		}
 	// clean array arrOptPluginmap from empty strings
 	arrOptPluginmap = arrOptPluginmap.filter(String);
@@ -168,21 +216,33 @@
 	var arrOptSkeleton = new Array();
 		if(chcAddwzrds) {
 			arrOptSkeleton.push("\n\tprovides=c(\"logic\", \"dialog\", \"wizard\")");
+		} else {
+			arrOptSkeleton.push("\n\t#provides=c(\"logic\", \"dialog\")");
 		}
 		if(optPluginmap) {
 			arrOptSkeleton.push("\n\t" + optPluginmap);
+		} else {
+			arrOptSkeleton.push("\n\t#pluginmap=list(name=\"\", hierarchy=\"\", require=\"\")");
 		}
 		if(chcIncldplg) {
 			arrOptSkeleton.push("\n\ttests=TRUE");
+		} else {
+			arrOptSkeleton.push("\n\ttests=FALSE");
 		}
 		if(chcOpnflsfr) {
 			arrOptSkeleton.push("\n\tedit=TRUE");
+		} else {
+			arrOptSkeleton.push("\n\tedit=FALSE");
 		}
 		if(chcAddplRKW) {
 			arrOptSkeleton.push("\n\tload=TRUE");
+		} else {
+			arrOptSkeleton.push("\n\tload=FALSE");
 		}
 		if(chcShwthplg) {
 			arrOptSkeleton.push("\n\tshow=TRUE");
+		} else {
+			arrOptSkeleton.push("\n\tshow=FALSE");
 		}
 	// clean array arrOptSkeleton from empty strings
 	arrOptSkeleton = arrOptSkeleton.filter(String);
@@ -208,11 +268,12 @@
 		if(optDependencies && ocolOclInpPckgtxt) {
 			echo(",");
 		}
-		if(ocolOclInpPckgtxt) {
+		if(ocolOclInpPckgtxt!= "") {
 			echo("\n\tpackage=list(\n\t\tc(name=\"" + ocolOclInpPckgtxt.join("\"),\n\t\tc(name=\"") + "\")\n\t)");
 		}
 		echo("\n)\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");
 		if(inpSummary) {
@@ -226,21 +287,23 @@
 	if(frmDfndpndnChecked && optDependencies) {
 		echo("\n\tdependencies=plugin.dependencies,");
 	}
-	echo("\n\tpath=output.dir,");
-	echo("\n\toverwrite=overwrite,");
+	echo("\n\tpath=output.dir," + "\n\tguess.getter=guess.getter," + "\n\tscan=c(\"var\", \"saveobj\", \"settings\")," + "\n\txml=list(\n\t\t#dialog=,\n\t\t#wizard=,\n\t\t#logic=,\n\t\t#snippets=\n\t)," + "\n\tjs=list(\n\t\t#results.header=FALSE,\n\t\t#load.silencer=,\n\t\t#require=,\n\t\t#variables=," + "\n\t\t#globals=,\n\t\t#preprocess=,\n\t\t#calculate=,\n\t\t#printout=,\n\t\t#doPrintout=\n\t),");
 	if(frmWrthlpflChecked) {
-		echo("\n\trkh=list(\n\t\tsummary=plugin.summary,\n\t\tusage=plugin.usage\n\t)," + "\n\tcreate=c(\"pmap\", \"xml\", \"js\", \"desc\", \"rkh\"),");
+		echo("\n\trkh=list(\n\t\tsummary=plugin.summary,\n\t\tusage=plugin.usage#," + "\n\t\t#sections=,\n\t\t#settings=,\n\t\t#related=,\n\t\t#technical=\n\t)," + "\n\tcreate=c(\"pmap\", \"xml\", \"js\", \"desc\", \"rkh\"),");
 	} else {
-		echo("\n\tcreate=c(\"pmap\", \"xml\", \"js\", \"desc\"),");
+		echo("\n\trkh=list(" + "\n\t\t#summary=,\n\t\t#usage=," + "\n\t\t#sections=,\n\t\t#settings=,\n\t\t#related=,\n\t\t#technical=\n\t)," + "\n\tcreate=c(\"pmap\", \"xml\", \"js\", \"desc\"),");
 	}
+	echo("\n\toverwrite=overwrite,");
+	echo("\n\t#components=list(),");
 	echo(optSkeleton);
 	echo("\n)\n\n");
 }
 
 function printout(){
 	// printout the results
-	echo("rk.header(\"Create RKWard plugin skeleton results\")\n");
-echo("rk.print(\"\")\n");
 
+
+
+
 }
 

Modified: trunk/rkward/packages/rkwarddev/inst/rkward/plugins/CreateRKWardpluginskeleton.rkh
===================================================================
--- trunk/rkward/packages/rkwarddev/inst/rkward/plugins/CreateRKWardpluginskeleton.rkh	2014-10-14 14:12:57 UTC (rev 4901)
+++ trunk/rkward/packages/rkwarddev/inst/rkward/plugins/CreateRKWardpluginskeleton.rkh	2014-10-14 19:59:15 UTC (rev 4902)
@@ -80,9 +80,16 @@
 		<setting id="chc_Shwthplg">
 			If this is checked, the generated plugin will be shown (opened) for you to see what it looks like.
 		</setting>
+		<setting id="chc_GsRKW060">
+			If this is checked, rkwarddev tries to select the optimal getter functions to get data from the dialog into the R code. The plugin then requires RKWard >= 0.6.0.
+		</setting>
+		<caption id="frm_rPPTFEVWRD" />
 		<setting id="drp_Plcntpmn">
 			Specify where the plugin should appear in RKWard's top menus.
 		</setting>
+		<setting id="inp_Nmnmnplg">
+			You can set the exact entry name of your main component in the menu here. If left empty, the plugin name will be used as default.
+		</setting>
 		<caption id="frm_Dfndpndn" />
 		<caption id="frm_DpndsRKW" />
 		<setting id="inp_RKWardmn">

Modified: trunk/rkward/packages/rkwarddev/inst/rkward/plugins/CreateRKWardpluginskeleton.xml
===================================================================
--- trunk/rkward/packages/rkwarddev/inst/rkward/plugins/CreateRKWardpluginskeleton.xml	2014-10-14 14:12:57 UTC (rev 4901)
+++ trunk/rkward/packages/rkwarddev/inst/rkward/plugins/CreateRKWardpluginskeleton.xml	2014-10-14 19:59:15 UTC (rev 4902)
@@ -65,26 +65,30 @@
 								<checkbox id="chc_Opnflsfr" label="Open files for editing" value="true" checked="true" />
 								<checkbox id="chc_AddplRKW" label="Add plugin to RKWard configuration" value="true" checked="true" />
 								<checkbox id="chc_Shwthplg" label="Show the plugin" value="true" />
+								<checkbox id="chc_GsRKW060" label="Guess getter functions (RKWard >= 0.6.0)" value="true" />
 								<stretch />
 							</column>
 						</row>
-						<row id="row_dPPTFEVWRD">
-							<dropdown id="drp_Plcntpmn" label="Place in top menu">
-								<option label="Test (created if needed)" value="test" checked="true" />
-								<option label="File" value="file" />
-								<option label="Edit" value="edit" />
-								<option label="View" value="view" />
-								<option label="Workspace" value="workspace" />
-								<option label="Run" value="run" />
-								<option label="Data" value="data" />
-								<option label="Analysis" value="analysis" />
-								<option label="Plots" value="plots" />
-								<option label="Distributions" value="distributions" />
-								<option label="Windows" value="windows" />
-								<option label="Settings" value="settings" />
-								<option label="Help" value="help" />
-							</dropdown>
-						</row>
+						<frame id="frm_rPPTFEVWRD">
+							<row id="row_dPPTFEVWRD">
+								<dropdown id="drp_Plcntpmn" label="Place in top menu">
+									<option label="Test (created if needed)" value="test" checked="true" />
+									<option label="File" value="file" />
+									<option label="Edit" value="edit" />
+									<option label="View" value="view" />
+									<option label="Workspace" value="workspace" />
+									<option label="Run" value="run" />
+									<option label="Data" value="data" />
+									<option label="Analysis" value="analysis" />
+									<option label="Plots" value="plots" />
+									<option label="Distributions" value="distributions" />
+									<option label="Windows" value="windows" />
+									<option label="Settings" value="settings" />
+									<option label="Help" value="help" />
+								</dropdown>
+								<input label="Name in menu (plugin name if empty)" id="inp_Nmnmnplg" />
+							</row>
+						</frame>
 					</frame>
 					<frame label="Define dependencies" checkable="true" checked="false" id="frm_Dfndpndn">
 						<row id="row_fDRKWDRKWR">
@@ -99,12 +103,14 @@
 								<stretch />
 							</frame>
 						</row>
-						<row id="row_oDRDRPPDRD">
-							<optionset id="ost_frmlDRDRPP">
+						<row id="row_oDRDRPPPPD">
+							<optionset id="ost_frDRDRPPPP">
 								<content>
 									<optiondisplay />
 									<frame label="Depends on R packages" id="frm_DpndsnRp">
-										<input label="Package" id="inp_Package" />
+										<row id="row_inptlblPcP">
+											<input label="Package" id="inp_Package" />
+										</row>
 										<stretch />
 									</frame>
 								</content>

Modified: trunk/rkward/packages/rkwarddev/man/rkwarddev-package.Rd
===================================================================
--- trunk/rkward/packages/rkwarddev/man/rkwarddev-package.Rd	2014-10-14 14:12:57 UTC (rev 4901)
+++ trunk/rkward/packages/rkwarddev/man/rkwarddev-package.Rd	2014-10-14 19:59:15 UTC (rev 4902)
@@ -11,7 +11,7 @@
 Package: \tab rkwarddev\cr
 Type: \tab Package\cr
 Version: \tab 0.06-5\cr
-Date: \tab 2014-10-12\cr
+Date: \tab 2014-10-14\cr
 Depends: \tab R (>= 2.9.0),methods,XiMpLe (>= 0.03-21),rkward (>= 0.5.7)\cr
 Enhances: \tab rkward\cr
 Encoding: \tab UTF-8\cr

Modified: trunk/rkward/packages/rkwarddev/man/tf.Rd
===================================================================
--- trunk/rkward/packages/rkwarddev/man/tf.Rd	2014-10-14 14:12:57 UTC (rev 4901)
+++ trunk/rkward/packages/rkwarddev/man/tf.Rd	2014-10-14 19:59:15 UTC (rev 4902)
@@ -7,7 +7,7 @@
   opt = NULL, prefix = ",\\n", level = 3, indent.by = "\\t")
 }
 \arguments{
-\item{cbox}{An obkect of class \code{XiMpLe.node} containing a \code{<checkbox>} node,
+\item{cbox}{An object of class \code{XiMpLe.node} containing a \code{<checkbox>} node,
       as generated
 by \code{\link[rkwarddev:rk.XML.cbox]{rk.XML.cbox}}.}
 





More information about the rkward-tracker mailing list