[rkward-cvs] [rkward] packages/rkwarddev/inst/rkward: updated skeleton dialog
m.eik michalke
meik.michalke at uni-duesseldorf.de
Sat Jan 31 03:28:35 UTC 2015
Git commit 1d2dd5e70df6f9aec5b37b5d6b99cba35e78095a by m.eik michalke.
Committed on 31/01/2015 at 03:27.
Pushed by meikm into branch 'master'.
updated skeleton dialog
M +5 -3 packages/rkwarddev/inst/rkward/RKWardPluginSkeleton.pluginmap
M +70 -62 packages/rkwarddev/inst/rkward/plugins/CreateRKWardpluginskeleton.js
M +8 -11 packages/rkwarddev/inst/rkward/plugins/CreateRKWardpluginskeleton.rkh
M +38 -14 packages/rkwarddev/inst/rkward/plugins/CreateRKWardpluginskeleton.xml
M +8 -2 packages/rkwarddev/inst/rkward/rkwarddev.pluginmap
http://commits.kde.org/rkward/1d2dd5e70df6f9aec5b37b5d6b99cba35e78095a
diff --git a/packages/rkwarddev/inst/rkward/RKWardPluginSkeleton.pluginmap b/packages/rkwarddev/inst/rkward/RKWardPluginSkeleton.pluginmap
index 8c608f8..91c66f9 100644
--- a/packages/rkwarddev/inst/rkward/RKWardPluginSkeleton.pluginmap
+++ b/packages/rkwarddev/inst/rkward/RKWardPluginSkeleton.pluginmap
@@ -1,7 +1,9 @@
<!DOCTYPE rkpluginmap >
<document
+ base_prefix=""
namespace="CreateRKWardpluginskeleton"
- id="CreateRKWardpluginskeleton__rkward"
+ id="CreateRKWardpluginskeleton_rkward"
+ po_id="CreateRKWardpluginskeleton_rkward"
priority="medium"
>
<!--
@@ -15,7 +17,7 @@
shortinfo="GUI interface to create RKWard plugin skeletons"
longinfo="GUI interface to create RKWard plugin skeletons"
version="0.06-5"
- releasedate="2014-10-19"
+ releasedate="2015-01-30"
url="http://rkward.kde.org"
license="GPL (>= 3)"
>
@@ -38,7 +40,7 @@
<hierarchy>
<menu
id="file"
- label.file="File"
+ label="File"
>
<menu
id="export"
diff --git a/packages/rkwarddev/inst/rkward/plugins/CreateRKWardpluginskeleton.js b/packages/rkwarddev/inst/rkward/plugins/CreateRKWardpluginskeleton.js
index 94be83c..194522d 100644
--- a/packages/rkwarddev/inst/rkward/plugins/CreateRKWardpluginskeleton.js
+++ b/packages/rkwarddev/inst/rkward/plugins/CreateRKWardpluginskeleton.js
@@ -34,6 +34,7 @@ function preprocess(){
function calculate(){
// read in variables from dialog
+
var inpPluginnm = getString("inp_Pluginnm");
var inpLicense = getString("inp_License");
var inpShrtdscr = getString("inp_Shrtdscr");
@@ -44,16 +45,13 @@ function calculate(){
var inpGivennam = getString("inp_Givennam");
var inpFamilynm = getString("inp_Familynm");
var inpEmail = getString("inp_Email");
- var chcAuthor = getBoolean("chc_Author");
- var chcMaintanr = getBoolean("chc_Maintanr");
+ var ocolOclInpGvnnmtx = getList("ost_fPPPPGGFFE.ocl_inpGvnnmtx");
+ var ocolOclInpFmlynmt = getList("ost_fPPPPGGFFE.ocl_inpFmlynmt");
+ var ocolOclInpEmaltxt = getList("ost_fPPPPGGFFE.ocl_inpEmaltxt");
+ var ocolOclChcAthrstt = getList("ost_fPPPPGGFFE.ocl_chcAthrstt");
+ var ocolOclChcMntnrst = getList("ost_fPPPPGGFFE.ocl_chcMntnrst");
+ var ocolOclChcCntrbtr = getList("ost_fPPPPGGFFE.ocl_chcCntrbtr");
var brwDTEMPDIR = getString("brw_DTEMPDIR");
- var chcOvrwrtxs = getBoolean("chc_Ovrwrtxs");
- var chcAddwzrds = getBoolean("chc_Addwzrds");
- var chcIncldplg = getBoolean("chc_Incldplg");
- 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");
@@ -70,62 +68,20 @@ function calculate(){
var ocolOclInpRpstryt = getList("ost_fDRDRPPRRP.ocl_inpRpstryt");
var inpSummary = getString("inp_Summary");
var inpUsage = getString("inp_Usage");
+ var chcAuthor = getBoolean("chc_Author.state");
+ var chcMaintanr = getBoolean("chc_Maintanr.state");
+ var chcContrbtr = getBoolean("chc_Contrbtr.state");
+ var chcOvrwrtxs = getBoolean("chc_Ovrwrtxs.state");
+ var chcAddwzrds = getBoolean("chc_Addwzrds.state");
+ var chcIncldplg = getBoolean("chc_Incldplg.state");
+ var chcOpnflsfr = getBoolean("chc_Opnflsfr.state");
+ var chcAddplRKW = getBoolean("chc_AddplRKW.state");
+ var chcShwthplg = getBoolean("chc_Shwthplg.state");
+ var chcGsRKW060 = getBoolean("chc_GsRKW060.state");
var frmDfndpndnChecked = getBoolean("frm_Dfndpndn.checked");
var frmWrthlpflChecked = getBoolean("frm_Wrthlpfl.checked");
// the R code to be evaluated
- // define the array arrOptAuthorRole for values of R option "role"
- 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);
- // set the actual variable optAuthorRole with all values for R option "role"
- if(arrOptAuthorRole.length > 0) {
- var optAuthorRole = "role=c(" + arrOptAuthorRole.join(", ") + ")";
- } else {
- var optAuthorRole = "";
- }
-
- // define the array arrOptAuthor for values of R option "author"
- 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);
- // set the actual variable optAuthor with all values for R option "author"
- if(arrOptAuthor.length > 0) {
- var optAuthor = ",\n\tauthor=person(" + arrOptAuthor.join(", ") + ")";
- } else {
- var optAuthor = "";
- }
-
// define the array arrOptAbout for values of R option "about"
var arrOptAbout = new Array();
if(inpShrtdscr) {
@@ -269,7 +225,59 @@ function calculate(){
if(inpPluginnm) {
echo("\n\tname=\"" + inpPluginnm + "\"");
}
- echo(optAuthor);
+ var ocolOclInpGvnnmtx = getList("ost_fPPPPGGFFE.ocl_inpGvnnmtx");
+ var ocolOclInpFmlynmt = getList("ost_fPPPPGGFFE.ocl_inpFmlynmt");
+ var ocolOclInpEmaltxt = getList("ost_fPPPPGGFFE.ocl_inpEmaltxt");
+ var ocolOclChcAthrstt = getList("ost_fPPPPGGFFE.ocl_chcAthrstt");
+ var ocolOclChcMntnrst = getList("ost_fPPPPGGFFE.ocl_chcMntnrst");
+ var ocolOclChcCntrbtr = getList("ost_fPPPPGGFFE.ocl_chcCntrbtr");
+ if(ocolOclInpGvnnmtx != "") {
+ echo("\tauthor=\"c(\n\t\t\t");
+ for (var i = 0; i < ocolOclInpGvnnmtx.length; ++i){
+ // define the array arrOptAuthorRole for values of R option "role"
+ var arrOptAuthorRole = new Array();
+ if(ocolOclChcAthrstt[i] == 1) {
+ arrOptAuthorRole.push("\\\"aut\\\"");
+ } else {
+ arrOptAuthorRole.push();
+ }
+ if(ocolOclChcMntnrst[i] == 1) {
+ arrOptAuthorRole.push("\\\"cre\\\"");
+ } else {
+ arrOptAuthorRole.push();
+ }
+ if(ocolOclChcCntrbtr[i] == 1) {
+ arrOptAuthorRole.push("\\\"ctb\\\"");
+ } else {
+ arrOptAuthorRole.push();
+ }
+ // clean array arrOptAuthorRole from empty strings
+ arrOptAuthorRole = arrOptAuthorRole.filter(String);
+ // set the actual variable optAuthorRole with all values for R option "role"
+ if(arrOptAuthorRole.length > 0) {
+ var optAuthorRole = "role=c(" + arrOptAuthorRole.join(", ") + ")";
+ } else {
+ var optAuthorRole = "";
+ }
+
+ echo("person(");
+ echo("given=\\\"" + ocolOclInpGvnnmtx[i] + "\\\"");
+ if(ocolOclInpFmlynmt[i]) {
+ echo(", family=\\\"" + ocolOclInpFmlynmt[i] + "\\\"");
+ }
+ if(ocolOclInpEmaltxt[i]) {
+ echo(", email=\\\"" + ocolOclInpEmaltxt[i] + "\\\"");
+ }
+ if(optAuthorRole) {
+ echo(", " + optAuthorRole);
+ }
+ echo(")");
+ if(i + 1 < ocolOclInpGvnnmtx.length) {
+ echo(",\n\t\t\t");
+ }
+ }
+ echo("\n\t\t)\",\n");
+ }
echo(optAbout);
echo("\n)\n\n");
if(frmDfndpndnChecked && (optDependencies || ocolOclInpPckgtxt)) {
diff --git a/packages/rkwarddev/inst/rkward/plugins/CreateRKWardpluginskeleton.rkh b/packages/rkwarddev/inst/rkward/plugins/CreateRKWardpluginskeleton.rkh
index 2fc6e21..6196c93 100644
--- a/packages/rkwarddev/inst/rkward/plugins/CreateRKWardpluginskeleton.rkh
+++ b/packages/rkwarddev/inst/rkward/plugins/CreateRKWardpluginskeleton.rkh
@@ -40,6 +40,8 @@
A category for your plugin. This infromation is currently ignored by RKWard.
</setting>
<caption id="frm_Plugnthr" />
+ <caption id="frm_Pckgthrs" />
+ <caption id="frm_Packgthr" />
<setting id="inp_Givennam">
First name of the package author.
</setting>
@@ -49,12 +51,15 @@
<setting id="inp_Email">
The authors e-mail address, important for bug reports and receiving a myriad of thank yous...
</setting>
- <caption id="frm_Authrrls" />
+ <caption id="frm_Roles" />
<setting id="chc_Author">
- Check this if you are the author of the plugin code.
+ Check this if this person is the author of the plugin code.
</setting>
<setting id="chc_Maintanr">
- Check this if you maintain the plugin package.
+ Check this if this person maintains the plugin package.
+ </setting>
+ <setting id="chc_Contrbtr">
+ Check this if this person is a contributor to the plugin code (e.g., translations).
</setting>
<caption id="tab_Cretptns" />
<caption id="frm_rDTEMPDIRD" />
@@ -118,14 +123,6 @@
<setting id="inp_Repostry">
The repository to download R packages from required to run this plugin.
</setting>
- <setting id="ost_fDRDRPPRRP.ocl_inpPckgtxt">
- </setting>
- <setting id="ost_fDRDRPPRRP.ocl_inpmintext">
- </setting>
- <setting id="ost_fDRDRPPRRP.ocl_inpmaxtext">
- </setting>
- <setting id="ost_fDRDRPPRRP.ocl_inpRpstryt">
- </setting>
<caption id="tab_Helppage" />
<caption id="frm_Wrthlpfl" />
<setting id="inp_Summary">
diff --git a/packages/rkwarddev/inst/rkward/plugins/CreateRKWardpluginskeleton.xml b/packages/rkwarddev/inst/rkward/plugins/CreateRKWardpluginskeleton.xml
index 4b8e8c6..b1cfc71 100644
--- a/packages/rkwarddev/inst/rkward/plugins/CreateRKWardpluginskeleton.xml
+++ b/packages/rkwarddev/inst/rkward/plugins/CreateRKWardpluginskeleton.xml
@@ -30,20 +30,44 @@
</row>
</frame>
<frame label="Plugin author" id="frm_Plugnthr">
- <row id="row_cGGFFEEGGF">
- <column id="clm_inptGGFFEE">
- <input label="Given name" id="inp_Givennam" required="true" />
- <input label="Family name" id="inp_Familynm" required="true" />
- <input label="E-mail" id="inp_Email" required="true" />
- <stretch />
- </column>
- <column id="clm_frmlAAAAMM">
- <frame label="Author roles" id="frm_Authrrls">
- <checkbox id="chc_Author" label="Author" value="true" checked="true" />
- <checkbox id="chc_Maintanr" label="Maintainer" value="true" checked="true" />
- <stretch />
- </frame>
- </column>
+ <row id="row_oPPPPGGFFE">
+ <optionset id="ost_fPPPPGGFFE">
+ <logic>
+ <connect governor="chc_Maintanr.state" client="inp_Email.required" />
+ </logic>
+ <content>
+ <optiondisplay />
+ <frame label="Package authors" id="frm_Pckgthrs">
+ <row id="row_fPPGGFFEEG">
+ <frame label="Package author" id="frm_Packgthr">
+ <row id="row_cGGFFEEGGF">
+ <column id="clm_inptGGFFEE">
+ <input label="Given name" id="inp_Givennam" required="true" />
+ <input label="Family name" id="inp_Familynm" required="true" />
+ <input label="E-mail" id="inp_Email" />
+ <stretch />
+ </column>
+ <column id="clm_frRRAAMMCC">
+ <frame label="Roles" id="frm_Roles">
+ <checkbox id="chc_Author" label="Author" value="true" checked="true" />
+ <checkbox id="chc_Maintanr" label="Maintainer" value="true" checked="true" />
+ <checkbox id="chc_Contrbtr" label="Contributor" value="true" />
+ <stretch />
+ </frame>
+ </column>
+ </row>
+ </frame>
+ </row>
+ <stretch />
+ </frame>
+ </content>
+ <optioncolumn id="ocl_inpGvnnmtx" connect="inp_Givennam.text" label="Given name" />
+ <optioncolumn id="ocl_inpFmlynmt" connect="inp_Familynm.text" label="Family name" />
+ <optioncolumn id="ocl_inpEmaltxt" connect="inp_Email.text" label="E-mail" />
+ <optioncolumn id="ocl_chcAthrstt" connect="chc_Author.state" label="Author" />
+ <optioncolumn id="ocl_chcMntnrst" connect="chc_Maintanr.state" label="Maintainer" />
+ <optioncolumn id="ocl_chcCntrbtr" connect="chc_Contrbtr.state" label="Contributor" />
+ </optionset>
</row>
</frame>
</column>
diff --git a/packages/rkwarddev/inst/rkward/rkwarddev.pluginmap b/packages/rkwarddev/inst/rkward/rkwarddev.pluginmap
index f27e2d3..3f01929 100644
--- a/packages/rkwarddev/inst/rkward/rkwarddev.pluginmap
+++ b/packages/rkwarddev/inst/rkward/rkwarddev.pluginmap
@@ -1,5 +1,11 @@
<!DOCTYPE rkpluginmap>
-<document base_prefix="" namespace="rkward">
- <require file="RKWardPluginSkeleton.pluginmap" />
+<document
+ base_prefix=""
+ namespace="CreateRKWardpluginskeleton"
+ id="CreateRKWardpluginskeleton_rkward"
+ po_id="CreateRKWardpluginskeleton_rkward"
+ priority="medium"
+>
+ <include file="RKWardPluginSkeleton.pluginmap" />
</document>
------------------------------------------------------------------------------
Dive into the World of Parallel Programming. The Go Parallel Website,
sponsored by Intel and developed in partnership with Slashdot Media, is your
hub for all things parallel software development, from weekly thought
leadership blogs to news, videos, case studies, tutorials and more. Take a
look and join the conversation now. http://goparallel.sourceforge.net/
_______________________________________________
rkward-cvs mailing list
rkward-cvs at lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/rkward-cvs
More information about the rkward-tracker
mailing list