[rkward-cvs] SF.net SVN: rkward:[4250] trunk/rkward/packages/rkwarddev
m-eik at users.sourceforge.net
m-eik at users.sourceforge.net
Thu May 10 08:55:15 UTC 2012
Revision: 4250
http://rkward.svn.sourceforge.net/rkward/?rev=4250&view=rev
Author: m-eik
Date: 2012-05-10 08:55:14 +0000 (Thu, 10 May 2012)
Log Message:
-----------
rkwarddev: added "recommended" attribute to rk.XML.dialog() as well
Modified Paths:
--------------
trunk/rkward/packages/rkwarddev/ChangeLog
trunk/rkward/packages/rkwarddev/DESCRIPTION
trunk/rkward/packages/rkwarddev/R/rk.XML.dialog.R
trunk/rkward/packages/rkwarddev/R/rk.XML.wizard.R
trunk/rkward/packages/rkwarddev/R/rkwarddev-package.R
trunk/rkward/packages/rkwarddev/inst/NEWS.Rd
trunk/rkward/packages/rkwarddev/inst/doc/rkwarddev_vignette.pdf
trunk/rkward/packages/rkwarddev/man/rk.XML.dialog.Rd
trunk/rkward/packages/rkwarddev/man/rk.XML.wizard.Rd
trunk/rkward/packages/rkwarddev/man/rkwarddev-package.Rd
Modified: trunk/rkward/packages/rkwarddev/ChangeLog
===================================================================
--- trunk/rkward/packages/rkwarddev/ChangeLog 2012-05-09 15:43:34 UTC (rev 4249)
+++ trunk/rkward/packages/rkwarddev/ChangeLog 2012-05-10 08:55:14 UTC (rev 4250)
@@ -1,8 +1,8 @@
ChangeLog for package rkwarddev
-changes in version 0.05-6 (2012-05-08)
+changes in version 0.05-6 (2012-05-10)
added:
- - rk.XML.wizard() can now set the "recommended" attribute
+ - rk.XML.wizard() and rk.XML.dialog() can now set the "recommended" attribute
changes in version 0.05-5 (2012-04-19)
added:
Modified: trunk/rkward/packages/rkwarddev/DESCRIPTION
===================================================================
--- trunk/rkward/packages/rkwarddev/DESCRIPTION 2012-05-09 15:43:34 UTC (rev 4249)
+++ trunk/rkward/packages/rkwarddev/DESCRIPTION 2012-05-10 08:55:14 UTC (rev 4250)
@@ -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.05-6
-Date: 2012-05-08
+Date: 2012-05-10
Collate:
'echo.R'
'id.R'
Modified: trunk/rkward/packages/rkwarddev/R/rk.XML.dialog.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rk.XML.dialog.R 2012-05-09 15:43:34 UTC (rev 4249)
+++ trunk/rkward/packages/rkwarddev/R/rk.XML.dialog.R 2012-05-10 08:55:14 UTC (rev 4250)
@@ -6,6 +6,9 @@
#'
#' @param ... Objects of class \code{XiMpLe.node}.
#' @param label Character string, a text label for this plugin element.
+#' @param recommended Logical, whether the dialog should be the recommended interface (unless the user has configured
+#' RKWard to default to a specific interface). This attribute currently has no effect, as it is implicitly "true",
+#' unless the wizard is recommended.
#' @return An object of class \code{XiMpLe.node}.
#' @export
#' @seealso
@@ -20,7 +23,7 @@
#' test.dialog <- rk.XML.dialog(rk.XML.col(test.input, test.cbox1, test.cbox2))
#' cat(pasteXML(test.dialog))
-rk.XML.dialog <- function(..., label=NULL){
+rk.XML.dialog <- function(..., label=NULL, recommended=FALSE){
nodes <- list(...)
# check the node names and allow only valid ones
@@ -32,6 +35,10 @@
attr.list <- list()
}
+ if(isTRUE(recommended)){
+ attr.list[["recommended"]] <- "true"
+ } else {}
+
node <- XMLNode("dialog",
attrs=attr.list,
.children=child.list(nodes, empty=FALSE)
Modified: trunk/rkward/packages/rkwarddev/R/rk.XML.wizard.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rk.XML.wizard.R 2012-05-09 15:43:34 UTC (rev 4249)
+++ trunk/rkward/packages/rkwarddev/R/rk.XML.wizard.R 2012-05-10 08:55:14 UTC (rev 4250)
@@ -6,7 +6,8 @@
#'
#' @param ... Objects of class \code{XiMpLe.node}
#' @param label Character string, a text label for this plugin element.
-#' @param recommended Logical, whether the wizard should be the recommended appearance of the dialog.
+#' @param recommended Logical, whether the wizard should be the recommended interface (unless the user has configured
+#' RKWard to default to a specific interface).
#' @return An object of class \code{XiMpLe.node}.
#' @export
#' @seealso
Modified: trunk/rkward/packages/rkwarddev/R/rkwarddev-package.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rkwarddev-package.R 2012-05-09 15:43:34 UTC (rev 4249)
+++ trunk/rkward/packages/rkwarddev/R/rkwarddev-package.R 2012-05-10 08:55:14 UTC (rev 4250)
@@ -4,7 +4,7 @@
#' Package: \tab rkwarddev\cr
#' Type: \tab Package\cr
#' Version: \tab 0.05-6\cr
-#' Date: \tab 2012-05-08\cr
+#' Date: \tab 2012-05-10\cr
#' Depends: \tab R (>= 2.9.0),methods,XiMpLe (>= 0.03-12),rkward (>= 0.5.6)\cr
#' Enhances: \tab rkward\cr
#' Encoding: \tab UTF-8\cr
Modified: trunk/rkward/packages/rkwarddev/inst/NEWS.Rd
===================================================================
--- trunk/rkward/packages/rkwarddev/inst/NEWS.Rd 2012-05-09 15:43:34 UTC (rev 4249)
+++ trunk/rkward/packages/rkwarddev/inst/NEWS.Rd 2012-05-10 08:55:14 UTC (rev 4250)
@@ -1,10 +1,10 @@
\name{NEWS}
\title{News for Package 'rkwarddev'}
\encoding{UTF-8}
-\section{Changes in rkwarddev version 0.05-6 (2012-05-08)}{
+\section{Changes in rkwarddev version 0.05-6 (2012-05-10)}{
\subsection{added}{
\itemize{
- \item \code{rk.XML.wizard()} can now set the \code{"recommended"} attribute
+ \item \code{rk.XML.wizard()} and \code{rk.XML.dialog()} can now set the \code{"recommended"} attribute
}
}
}
Modified: trunk/rkward/packages/rkwarddev/inst/doc/rkwarddev_vignette.pdf
===================================================================
(Binary files differ)
Modified: trunk/rkward/packages/rkwarddev/man/rk.XML.dialog.Rd
===================================================================
--- trunk/rkward/packages/rkwarddev/man/rk.XML.dialog.Rd 2012-05-09 15:43:34 UTC (rev 4249)
+++ trunk/rkward/packages/rkwarddev/man/rk.XML.dialog.Rd 2012-05-10 08:55:14 UTC (rev 4250)
@@ -2,13 +2,19 @@
\alias{rk.XML.dialog}
\title{Create XML dialog section for RKWard plugins}
\usage{
- rk.XML.dialog(..., label = NULL)
+ rk.XML.dialog(..., label = NULL, recommended = FALSE)
}
\arguments{
\item{...}{Objects of class \code{XiMpLe.node}.}
\item{label}{Character string, a text label for this
plugin element.}
+
+ \item{recommended}{Logical, whether the dialog should be
+ the recommended interface (unless the user has configured
+ RKWard to default to a specific interface). This
+ attribute currently has no effect, as it is implicitly
+ "true", unless the wizard is recommended.}
}
\value{
An object of class \code{XiMpLe.node}.
Modified: trunk/rkward/packages/rkwarddev/man/rk.XML.wizard.Rd
===================================================================
--- trunk/rkward/packages/rkwarddev/man/rk.XML.wizard.Rd 2012-05-09 15:43:34 UTC (rev 4249)
+++ trunk/rkward/packages/rkwarddev/man/rk.XML.wizard.Rd 2012-05-10 08:55:14 UTC (rev 4250)
@@ -11,7 +11,8 @@
plugin element.}
\item{recommended}{Logical, whether the wizard should be
- the recommended appearance of the dialog.}
+ the recommended interface (unless the user has configured
+ RKWard to default to a specific interface).}
}
\value{
An object of class \code{XiMpLe.node}.
Modified: trunk/rkward/packages/rkwarddev/man/rkwarddev-package.Rd
===================================================================
--- trunk/rkward/packages/rkwarddev/man/rkwarddev-package.Rd 2012-05-09 15:43:34 UTC (rev 4249)
+++ trunk/rkward/packages/rkwarddev/man/rkwarddev-package.Rd 2012-05-10 08:55:14 UTC (rev 4250)
@@ -9,7 +9,7 @@
\details{
\tabular{ll}{ Package: \tab rkwarddev\cr Type: \tab
Package\cr Version: \tab 0.05-6\cr Date: \tab
- 2012-05-08\cr Depends: \tab R (>= 2.9.0),methods,XiMpLe
+ 2012-05-10\cr Depends: \tab R (>= 2.9.0),methods,XiMpLe
(>= 0.03-12),rkward (>= 0.5.6)\cr Enhances: \tab
rkward\cr Encoding: \tab UTF-8\cr License: \tab GPL (>=
3)\cr LazyLoad: \tab yes\cr URL: \tab
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the rkward-tracker
mailing list