Menu
▾
▴
rkward-cvs — Mailing list for CVS/SVN commit messages
This list is closed, nobody may subscribe to it.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(13) |
Nov
(40) |
Dec
(2) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
|
Feb
(17) |
Mar
(25) |
Apr
(144) |
May
(18) |
Jun
|
Jul
(1) |
Aug
|
Sep
(130) |
Oct
(134) |
Nov
(72) |
Dec
(14) |
| 2006 |
Jan
|
Feb
(17) |
Mar
(90) |
Apr
(169) |
May
(21) |
Jun
(16) |
Jul
(1) |
Aug
(16) |
Sep
(125) |
Oct
(131) |
Nov
(64) |
Dec
(47) |
| 2007 |
Jan
(249) |
Feb
(247) |
Mar
(254) |
Apr
(86) |
May
(64) |
Jun
(10) |
Jul
(4) |
Aug
(17) |
Sep
(58) |
Oct
(144) |
Nov
(124) |
Dec
(13) |
| 2008 |
Jan
(58) |
Feb
|
Mar
(5) |
Apr
(19) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(24) |
Dec
|
| 2009 |
Jan
(1) |
Feb
(10) |
Mar
(29) |
Apr
(14) |
May
(62) |
Jun
(48) |
Jul
(27) |
Aug
(43) |
Sep
(44) |
Oct
(34) |
Nov
(10) |
Dec
(10) |
| 2010 |
Jan
(1) |
Feb
(26) |
Mar
(53) |
Apr
(41) |
May
(19) |
Jun
(52) |
Jul
(36) |
Aug
(24) |
Sep
(114) |
Oct
(73) |
Nov
(48) |
Dec
(139) |
| 2011 |
Jan
(54) |
Feb
(48) |
Mar
(45) |
Apr
(32) |
May
(121) |
Jun
(46) |
Jul
(3) |
Aug
(19) |
Sep
(146) |
Oct
(142) |
Nov
(48) |
Dec
(77) |
| 2012 |
Jan
(17) |
Feb
(5) |
Mar
(39) |
Apr
(31) |
May
(37) |
Jun
(7) |
Jul
|
Aug
(23) |
Sep
(40) |
Oct
(68) |
Nov
(68) |
Dec
(13) |
| 2013 |
Jan
(32) |
Feb
(47) |
Mar
(86) |
Apr
(82) |
May
(23) |
Jun
(1) |
Jul
(3) |
Aug
(1) |
Sep
|
Oct
(4) |
Nov
(3) |
Dec
(3) |
| 2014 |
Jan
|
Feb
|
Mar
(10) |
Apr
(8) |
May
(4) |
Jun
(1) |
Jul
|
Aug
(2) |
Sep
(65) |
Oct
(119) |
Nov
(82) |
Dec
(84) |
| 2015 |
Jan
(94) |
Feb
(46) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(3) |
| 2016 |
Jan
(4) |
Feb
(4) |
Mar
(2) |
Apr
(1) |
May
(2) |
Jun
|
Jul
(3) |
Aug
(1) |
Sep
|
Oct
|
Nov
(1) |
Dec
|
|
From: SAVE U. <Vav...@em...> - 2016-08-29 17:36:09
|
They kill with wars, alcohol and abortions. Save us!!! |
|
From: Thomas F. <tho...@ru...> - 2015-02-18 11:41:27
|
Git commit 3aea786d66b5b402eb49c3290fe262149006f1b7 by Thomas Friedrichsmeier. Committed on 18/02/2015 at 11:33. Pushed by tfry into branch 'releases/0.6.3'. Some more replacements of "lists.sourceforge.net" M +2 -2 rkward/rbackend/rpackages/rkward/R/public_graphics.R M +1 -1 rkward/rbackend/rpackages/rkward/R/rk.KDE_GUI-functions.R M +1 -1 rkward/rbackend/rpackages/rkward/R/rk.demo.R M +1 -1 rkward/rbackend/rpackages/rkward/R/rk.edit-functions.R M +1 -1 rkward/rbackend/rpackages/rkward/R/rk.filename-functions.R M +1 -1 rkward/rbackend/rpackages/rkward/R/rk.label-functions.R M +3 -3 rkward/rbackend/rpackages/rkward/R/rk.plugin-functions.R M +1 -1 rkward/rbackend/rpackages/rkward/R/rk.print-functions.R M +1 -1 rkward/rbackend/rpackages/rkward/R/rk.replace.function.R M +1 -1 rkward/rbackend/rpackages/rkward/R/rk.sessionInfo.R M +1 -1 rkward/rbackend/rpackages/rkward/R/rk.sync-functions.R M +2 -2 rkward/rbackend/rpackages/rkward/R/rk.utility-functions.R M +1 -1 rkward/rbackend/rpackages/rkward/R/rk.workspace-functions.R http://commits.kde.org/rkward/3aea786d66b5b402eb49c3290fe262149006f1b7 diff --git a/rkward/rbackend/rpackages/rkward/R/public_graphics.R b/rkward/rbackend/rpackages/rkward/R/public_graphics.R index ff5d0f3..e56b08b 100644 --- a/rkward/rbackend/rpackages/rkward/R/public_graphics.R +++ b/rkward/rbackend/rpackages/rkward/R/public_graphics.R @@ -17,7 +17,7 @@ #' \bold{Warning}: It is advised to use \code{rk.graph.off} and \bold{not} \code{dev.off} to close the device opened by #' \code{rk.graph.on}. \code{dev.print(device = rk.graph.on)} is a \bold{wrong} usage for this "device," and will result in errors. #' -#' @author Thomas Friedrichsmeier \email{rkward-devel@@lists.sourceforge.net} +#' @author Thomas Friedrichsmeier \email{rkward-devel@@kde.org} #' #' @seealso \link{rk.results} \link{rk.print} \link{rk.get.output.html.file} \link{dev.off} \link{svg} \link{png} \link{jpg} #' @@ -235,7 +235,7 @@ #' #' @param ... arguments are passed to \code{\link{postscript}} #' @return Returns the name of the underlying temporary file, invisibly. -#' @author Thomas Friedrichsmeier \email{rkward-devel@@lists.sourceforge.net} +#' @author Thomas Friedrichsmeier \email{rkward-devel@@kde.org} #' @seealso \code{\link{postscript}}, \code{\link{dev.print}}, #' \code{\link{rk.graph.on}} #' @keywords utilities device diff --git a/rkward/rbackend/rpackages/rkward/R/rk.KDE_GUI-functions.R b/rkward/rbackend/rpackages/rkward/R/rk.KDE_GUI-functions.R index f6e2816..8092ea2 100644 --- a/rkward/rbackend/rpackages/rkward/R/rk.KDE_GUI-functions.R +++ b/rkward/rbackend/rpackages/rkward/R/rk.KDE_GUI-functions.R @@ -37,7 +37,7 @@ #' \bold{No}, and \code{NULL} for \bold{Cancel} actions. #' #' \code{rk.select.list} returns the value of \code{\link{select.list}}. -#' @author Thomas Friedrichsmeier \email{rkward-devel@@lists.sourceforge.net} +#' @author Thomas Friedrichsmeier \email{rkward-devel@@kde.org} #' @seealso \code{\link{system}}, \code{\link{select.list}} #' @keywords utilities #' @rdname rk.show.messages diff --git a/rkward/rbackend/rpackages/rkward/R/rk.demo.R b/rkward/rbackend/rpackages/rkward/R/rk.demo.R index 1a6f9bc..0c203a6 100644 --- a/rkward/rbackend/rpackages/rkward/R/rk.demo.R +++ b/rkward/rbackend/rpackages/rkward/R/rk.demo.R @@ -9,7 +9,7 @@ #' currently loaded packages are searched. #' @param lib.loc Library locations. #' @return Return \code{NULL}, unconditionally. -#' @author Thomas Friedrichsmeier \email{rkward-devel@@lists.sourceforge.net} +#' @author Thomas Friedrichsmeier \email{rkward-devel@@kde.org} #' @seealso \code{\link{rk.edit.files}}, \code{\link{rk.show.files}}, #' \code{\link{demo}} #' @keywords utilities IO diff --git a/rkward/rbackend/rpackages/rkward/R/rk.edit-functions.R b/rkward/rbackend/rpackages/rkward/R/rk.edit-functions.R index c925384..6d7b025 100644 --- a/rkward/rbackend/rpackages/rkward/R/rk.edit-functions.R +++ b/rkward/rbackend/rpackages/rkward/R/rk.edit-functions.R @@ -27,7 +27,7 @@ #' deleted after closing. #' @return All functions described on this page return \code{NULL}, #' unconditionally. -#' @author Thomas Friedrichsmeier \email{rkward-devel@@lists.sourceforge.net} +#' @author Thomas Friedrichsmeier \email{rkward-devel@@kde.org} #' @seealso \code{\link{edit}}, \code{\link{file.edit}}, #' \code{\link{file.show}}, \code{\link{browseURL}} #' @keywords utilities IO diff --git a/rkward/rbackend/rpackages/rkward/R/rk.filename-functions.R b/rkward/rbackend/rpackages/rkward/R/rk.filename-functions.R index aa40c2d..05ef5dc 100644 --- a/rkward/rbackend/rpackages/rkward/R/rk.filename-functions.R +++ b/rkward/rbackend/rpackages/rkward/R/rk.filename-functions.R @@ -34,7 +34,7 @@ #' @return \code{rk.get.tempfile.name}, \code{rk.get.output.html.file}, and #' \code{rk.get.workspace.url} return a string while #' \code{rk.set.output.html.file} returns \code{NULL}. -#' @author Thomas Friedrichsmeier \email{rkward-devel@@lists.sourceforge.net} +#' @author Thomas Friedrichsmeier \email{rkward-devel@@kde.org} #' @seealso \url{rkward://page/rkward_output}, \link{tempfile}, \link{file}, #' \link{rk.print} #' @keywords utilities IO diff --git a/rkward/rbackend/rpackages/rkward/R/rk.label-functions.R b/rkward/rbackend/rpackages/rkward/R/rk.label-functions.R index 165f9a3..77a1918 100644 --- a/rkward/rbackend/rpackages/rkward/R/rk.label-functions.R +++ b/rkward/rbackend/rpackages/rkward/R/rk.label-functions.R @@ -38,7 +38,7 @@ #' @param is.substitute a logical (not NA). See Details. #' @return \code{rk.set.label} returns the result of the evaluation of "setting #' the label" while the others return a character vector. -#' @author Thomas Friedrichsmeier \email{rkward-devel@@lists.sourceforge.net} +#' @author Thomas Friedrichsmeier \email{rkward-devel@@kde.org} #' @keywords utilities #' @rdname rk.label #' @examples diff --git a/rkward/rbackend/rpackages/rkward/R/rk.plugin-functions.R b/rkward/rbackend/rpackages/rkward/R/rk.plugin-functions.R index eaef8d4..674a1b6 100644 --- a/rkward/rbackend/rpackages/rkward/R/rk.plugin-functions.R +++ b/rkward/rbackend/rpackages/rkward/R/rk.plugin-functions.R @@ -36,7 +36,7 @@ #' an error. #' @return \code{rk.call.plugin} returns \code{TRUE} invisibly. #' -#' @author Thomas Friedrichsmeier \email{rkward-devel@@lists.sourceforge.net} +#' @author Thomas Friedrichsmeier \email{rkward-devel@@kde.org} #' @seealso \code{\link{rk.results}}, \url{rkward://page/rkward_output} #' @keywords utilities #' @examples @@ -103,7 +103,7 @@ #' plugin (e.g. after modifying the dialog), as plugins are not kept in memory after closing. #' Any currently opened plugins are not affected by this function. #' -#' @author Thomas Friedrichsmeier \email{rkward-devel@@lists.sourceforge.net} +#' @author Thomas Friedrichsmeier \email{rkward-devel@@kde.org} #' @seealso \code{\link{rk.call.plugin}}, @seealso \code{\link{rkwarddev::rk.plugin.skeleton}} #' @keywords utilities #' @@ -149,7 +149,7 @@ #' In this case, make sure to do all changes in \bold{one} call to \code{rk.set.plugin.status}, #' rather than many separate calls. #' -#' @author Thomas Friedrichsmeier \email{rkward-devel@@lists.sourceforge.net} +#' @author Thomas Friedrichsmeier \email{rkward-devel@@kde.org} #' @keywords utilities #' #' @seealso \code{\link{rk.call.plugin}} for invoking a plugin, programatically diff --git a/rkward/rbackend/rpackages/rkward/R/rk.print-functions.R b/rkward/rbackend/rpackages/rkward/R/rk.print-functions.R index 1506719..31e7931 100644 --- a/rkward/rbackend/rpackages/rkward/R/rk.print-functions.R +++ b/rkward/rbackend/rpackages/rkward/R/rk.print-functions.R @@ -48,7 +48,7 @@ #' they are plain row numbers. #' @return \code{rk.describe.alternatives} returns a string while all other #' functions return \code{NULL}, invisibly. -#' @author Thomas Friedrichsmeier \email{rkward-devel@@lists.sourceforge.net} +#' @author Thomas Friedrichsmeier \email{rkward-devel@@kde.org} #' @seealso \code{\link{HTML}}, \code{\link{rk.get.output.html.file}}, #' \code{\link{rk.get.description}}, \code{\link{rk.call.plugin}}, #' \url{rkward://page/rkward_output} diff --git a/rkward/rbackend/rpackages/rkward/R/rk.replace.function.R b/rkward/rbackend/rpackages/rkward/R/rk.replace.function.R index 3ad59ec..13d77e4 100644 --- a/rkward/rbackend/rpackages/rkward/R/rk.replace.function.R +++ b/rkward/rbackend/rpackages/rkward/R/rk.replace.function.R @@ -23,7 +23,7 @@ #' @param copy.formals logical; whether to copy the \code{\link{formals}} from #' the original function. #' @return Returns \code{NULL}, invisibly, unconditionally. -#' @author Thomas Friedrichsmeier \email{rkward-devel@@lists.sourceforge.net} +#' @author Thomas Friedrichsmeier \email{rkward-devel@@kde.org} #' @seealso \code{\link{assignInNamespace}}, \code{\link{debug}} #' @keywords utilities IO #' @export diff --git a/rkward/rbackend/rpackages/rkward/R/rk.sessionInfo.R b/rkward/rbackend/rpackages/rkward/R/rk.sessionInfo.R index ea97cc5..26b1d68 100644 --- a/rkward/rbackend/rpackages/rkward/R/rk.sessionInfo.R +++ b/rkward/rbackend/rpackages/rkward/R/rk.sessionInfo.R @@ -9,7 +9,7 @@ #' #' @return Returns the object created by \code{sessionInfo()}, invisibly. Note #' that this includes only the information on the R portion of the session. -#' @author Thomas Friedrichsmeier \email{rkward-devel@@lists.sourceforge.net} +#' @author Thomas Friedrichsmeier \email{rkward-devel@@kde.org} #' @seealso \code{\link{sessionInfo}} #' @keywords utilities misc #' @export diff --git a/rkward/rbackend/rpackages/rkward/R/rk.sync-functions.R b/rkward/rbackend/rpackages/rkward/R/rk.sync-functions.R index 11370eb..2e38d6b 100644 --- a/rkward/rbackend/rpackages/rkward/R/rk.sync-functions.R +++ b/rkward/rbackend/rpackages/rkward/R/rk.sync-functions.R @@ -17,7 +17,7 @@ #' @aliases rk.sync rk.sync.global #' @param x any R object to sync #' @return \code{NULL}, invisibly. -#' @author Thomas Friedrichsmeier \email{rkward-devel@@lists.sourceforge.net} +#' @author Thomas Friedrichsmeier \email{rkward-devel@@kde.org} #' @seealso \url{rkward://page/rkward_workspace_browser} #' @keywords utilities misc #' @rdname rk.sync diff --git a/rkward/rbackend/rpackages/rkward/R/rk.utility-functions.R b/rkward/rbackend/rpackages/rkward/R/rk.utility-functions.R index 80770e7..d4863cb 100644 --- a/rkward/rbackend/rpackages/rkward/R/rk.utility-functions.R +++ b/rkward/rbackend/rpackages/rkward/R/rk.utility-functions.R @@ -25,7 +25,7 @@ #' #' \code{rk.select.CRAN.mirror} returns the URL of the chosen mirror, as a #' string. -#' @author Thomas Friedrichsmeier \email{rkward-devel@@lists.sourceforge.net} +#' @author Thomas Friedrichsmeier \email{rkward-devel@@kde.org} #' @keywords attribute misc utilities #' @rdname rk.misc #' @examples @@ -107,7 +107,7 @@ #' #' @return a character vector of packages which are really old #' -#' @author Thomas Friedrichsmeier \email{rkward-devel@@lists.sourceforge.net} +#' @author Thomas Friedrichsmeier \email{rkward-devel@@kde.org} #' @keywords attribute misc utilities #' @rdname rk.old.packages #' @examples diff --git a/rkward/rbackend/rpackages/rkward/R/rk.workspace-functions.R b/rkward/rbackend/rpackages/rkward/R/rk.workspace-functions.R index ffd77da..722792c 100644 --- a/rkward/rbackend/rpackages/rkward/R/rk.workspace-functions.R +++ b/rkward/rbackend/rpackages/rkward/R/rk.workspace-functions.R @@ -24,7 +24,7 @@ #' @param close.windows a logical; whether current windows should be closed #' before restoring. #' @return Both functions return \code{NULL}. -#' @author Thomas Friedrichsmeier \email{rkward-devel@@lists.sourceforge.net} +#' @author Thomas Friedrichsmeier \email{rkward-devel@@kde.org} #' @seealso \url{rkward://page/rkward_for_r_users}, \link{rk.get.workspace.url} #' @keywords utilities #' @rdname rk.workplace |
|
From: Thomas F. <tho...@ru...> - 2015-02-18 11:34:53
|
Git commit 151e9f9fb520b395b81559aa09b5a954e9e2c638 by Thomas Friedrichsmeier. Committed on 18/02/2015 at 11:33. Pushed by tfry into branch 'master'. Some more replacements of "lists.sourceforge.net" M +2 -2 rkward/rbackend/rpackages/rkward/R/public_graphics.R M +1 -1 rkward/rbackend/rpackages/rkward/R/rk.KDE_GUI-functions.R M +1 -1 rkward/rbackend/rpackages/rkward/R/rk.demo.R M +1 -1 rkward/rbackend/rpackages/rkward/R/rk.edit-functions.R M +1 -1 rkward/rbackend/rpackages/rkward/R/rk.filename-functions.R M +1 -1 rkward/rbackend/rpackages/rkward/R/rk.label-functions.R M +3 -3 rkward/rbackend/rpackages/rkward/R/rk.plugin-functions.R M +1 -1 rkward/rbackend/rpackages/rkward/R/rk.print-functions.R M +1 -1 rkward/rbackend/rpackages/rkward/R/rk.replace.function.R M +1 -1 rkward/rbackend/rpackages/rkward/R/rk.sessionInfo.R M +1 -1 rkward/rbackend/rpackages/rkward/R/rk.sync-functions.R M +2 -2 rkward/rbackend/rpackages/rkward/R/rk.utility-functions.R M +1 -1 rkward/rbackend/rpackages/rkward/R/rk.workspace-functions.R http://commits.kde.org/rkward/151e9f9fb520b395b81559aa09b5a954e9e2c638 diff --git a/rkward/rbackend/rpackages/rkward/R/public_graphics.R b/rkward/rbackend/rpackages/rkward/R/public_graphics.R index ff5d0f3..e56b08b 100644 --- a/rkward/rbackend/rpackages/rkward/R/public_graphics.R +++ b/rkward/rbackend/rpackages/rkward/R/public_graphics.R @@ -17,7 +17,7 @@ #' \bold{Warning}: It is advised to use \code{rk.graph.off} and \bold{not} \code{dev.off} to close the device opened by #' \code{rk.graph.on}. \code{dev.print(device = rk.graph.on)} is a \bold{wrong} usage for this "device," and will result in errors. #' -#' @author Thomas Friedrichsmeier \email{rkward-devel@@lists.sourceforge.net} +#' @author Thomas Friedrichsmeier \email{rkward-devel@@kde.org} #' #' @seealso \link{rk.results} \link{rk.print} \link{rk.get.output.html.file} \link{dev.off} \link{svg} \link{png} \link{jpg} #' @@ -235,7 +235,7 @@ #' #' @param ... arguments are passed to \code{\link{postscript}} #' @return Returns the name of the underlying temporary file, invisibly. -#' @author Thomas Friedrichsmeier \email{rkward-devel@@lists.sourceforge.net} +#' @author Thomas Friedrichsmeier \email{rkward-devel@@kde.org} #' @seealso \code{\link{postscript}}, \code{\link{dev.print}}, #' \code{\link{rk.graph.on}} #' @keywords utilities device diff --git a/rkward/rbackend/rpackages/rkward/R/rk.KDE_GUI-functions.R b/rkward/rbackend/rpackages/rkward/R/rk.KDE_GUI-functions.R index f6e2816..8092ea2 100644 --- a/rkward/rbackend/rpackages/rkward/R/rk.KDE_GUI-functions.R +++ b/rkward/rbackend/rpackages/rkward/R/rk.KDE_GUI-functions.R @@ -37,7 +37,7 @@ #' \bold{No}, and \code{NULL} for \bold{Cancel} actions. #' #' \code{rk.select.list} returns the value of \code{\link{select.list}}. -#' @author Thomas Friedrichsmeier \email{rkward-devel@@lists.sourceforge.net} +#' @author Thomas Friedrichsmeier \email{rkward-devel@@kde.org} #' @seealso \code{\link{system}}, \code{\link{select.list}} #' @keywords utilities #' @rdname rk.show.messages diff --git a/rkward/rbackend/rpackages/rkward/R/rk.demo.R b/rkward/rbackend/rpackages/rkward/R/rk.demo.R index 1a6f9bc..0c203a6 100644 --- a/rkward/rbackend/rpackages/rkward/R/rk.demo.R +++ b/rkward/rbackend/rpackages/rkward/R/rk.demo.R @@ -9,7 +9,7 @@ #' currently loaded packages are searched. #' @param lib.loc Library locations. #' @return Return \code{NULL}, unconditionally. -#' @author Thomas Friedrichsmeier \email{rkward-devel@@lists.sourceforge.net} +#' @author Thomas Friedrichsmeier \email{rkward-devel@@kde.org} #' @seealso \code{\link{rk.edit.files}}, \code{\link{rk.show.files}}, #' \code{\link{demo}} #' @keywords utilities IO diff --git a/rkward/rbackend/rpackages/rkward/R/rk.edit-functions.R b/rkward/rbackend/rpackages/rkward/R/rk.edit-functions.R index c925384..6d7b025 100644 --- a/rkward/rbackend/rpackages/rkward/R/rk.edit-functions.R +++ b/rkward/rbackend/rpackages/rkward/R/rk.edit-functions.R @@ -27,7 +27,7 @@ #' deleted after closing. #' @return All functions described on this page return \code{NULL}, #' unconditionally. -#' @author Thomas Friedrichsmeier \email{rkward-devel@@lists.sourceforge.net} +#' @author Thomas Friedrichsmeier \email{rkward-devel@@kde.org} #' @seealso \code{\link{edit}}, \code{\link{file.edit}}, #' \code{\link{file.show}}, \code{\link{browseURL}} #' @keywords utilities IO diff --git a/rkward/rbackend/rpackages/rkward/R/rk.filename-functions.R b/rkward/rbackend/rpackages/rkward/R/rk.filename-functions.R index aa40c2d..05ef5dc 100644 --- a/rkward/rbackend/rpackages/rkward/R/rk.filename-functions.R +++ b/rkward/rbackend/rpackages/rkward/R/rk.filename-functions.R @@ -34,7 +34,7 @@ #' @return \code{rk.get.tempfile.name}, \code{rk.get.output.html.file}, and #' \code{rk.get.workspace.url} return a string while #' \code{rk.set.output.html.file} returns \code{NULL}. -#' @author Thomas Friedrichsmeier \email{rkward-devel@@lists.sourceforge.net} +#' @author Thomas Friedrichsmeier \email{rkward-devel@@kde.org} #' @seealso \url{rkward://page/rkward_output}, \link{tempfile}, \link{file}, #' \link{rk.print} #' @keywords utilities IO diff --git a/rkward/rbackend/rpackages/rkward/R/rk.label-functions.R b/rkward/rbackend/rpackages/rkward/R/rk.label-functions.R index 165f9a3..77a1918 100644 --- a/rkward/rbackend/rpackages/rkward/R/rk.label-functions.R +++ b/rkward/rbackend/rpackages/rkward/R/rk.label-functions.R @@ -38,7 +38,7 @@ #' @param is.substitute a logical (not NA). See Details. #' @return \code{rk.set.label} returns the result of the evaluation of "setting #' the label" while the others return a character vector. -#' @author Thomas Friedrichsmeier \email{rkward-devel@@lists.sourceforge.net} +#' @author Thomas Friedrichsmeier \email{rkward-devel@@kde.org} #' @keywords utilities #' @rdname rk.label #' @examples diff --git a/rkward/rbackend/rpackages/rkward/R/rk.plugin-functions.R b/rkward/rbackend/rpackages/rkward/R/rk.plugin-functions.R index eaef8d4..674a1b6 100644 --- a/rkward/rbackend/rpackages/rkward/R/rk.plugin-functions.R +++ b/rkward/rbackend/rpackages/rkward/R/rk.plugin-functions.R @@ -36,7 +36,7 @@ #' an error. #' @return \code{rk.call.plugin} returns \code{TRUE} invisibly. #' -#' @author Thomas Friedrichsmeier \email{rkward-devel@@lists.sourceforge.net} +#' @author Thomas Friedrichsmeier \email{rkward-devel@@kde.org} #' @seealso \code{\link{rk.results}}, \url{rkward://page/rkward_output} #' @keywords utilities #' @examples @@ -103,7 +103,7 @@ #' plugin (e.g. after modifying the dialog), as plugins are not kept in memory after closing. #' Any currently opened plugins are not affected by this function. #' -#' @author Thomas Friedrichsmeier \email{rkward-devel@@lists.sourceforge.net} +#' @author Thomas Friedrichsmeier \email{rkward-devel@@kde.org} #' @seealso \code{\link{rk.call.plugin}}, @seealso \code{\link{rkwarddev::rk.plugin.skeleton}} #' @keywords utilities #' @@ -149,7 +149,7 @@ #' In this case, make sure to do all changes in \bold{one} call to \code{rk.set.plugin.status}, #' rather than many separate calls. #' -#' @author Thomas Friedrichsmeier \email{rkward-devel@@lists.sourceforge.net} +#' @author Thomas Friedrichsmeier \email{rkward-devel@@kde.org} #' @keywords utilities #' #' @seealso \code{\link{rk.call.plugin}} for invoking a plugin, programatically diff --git a/rkward/rbackend/rpackages/rkward/R/rk.print-functions.R b/rkward/rbackend/rpackages/rkward/R/rk.print-functions.R index 1506719..31e7931 100644 --- a/rkward/rbackend/rpackages/rkward/R/rk.print-functions.R +++ b/rkward/rbackend/rpackages/rkward/R/rk.print-functions.R @@ -48,7 +48,7 @@ #' they are plain row numbers. #' @return \code{rk.describe.alternatives} returns a string while all other #' functions return \code{NULL}, invisibly. -#' @author Thomas Friedrichsmeier \email{rkward-devel@@lists.sourceforge.net} +#' @author Thomas Friedrichsmeier \email{rkward-devel@@kde.org} #' @seealso \code{\link{HTML}}, \code{\link{rk.get.output.html.file}}, #' \code{\link{rk.get.description}}, \code{\link{rk.call.plugin}}, #' \url{rkward://page/rkward_output} diff --git a/rkward/rbackend/rpackages/rkward/R/rk.replace.function.R b/rkward/rbackend/rpackages/rkward/R/rk.replace.function.R index 3ad59ec..13d77e4 100644 --- a/rkward/rbackend/rpackages/rkward/R/rk.replace.function.R +++ b/rkward/rbackend/rpackages/rkward/R/rk.replace.function.R @@ -23,7 +23,7 @@ #' @param copy.formals logical; whether to copy the \code{\link{formals}} from #' the original function. #' @return Returns \code{NULL}, invisibly, unconditionally. -#' @author Thomas Friedrichsmeier \email{rkward-devel@@lists.sourceforge.net} +#' @author Thomas Friedrichsmeier \email{rkward-devel@@kde.org} #' @seealso \code{\link{assignInNamespace}}, \code{\link{debug}} #' @keywords utilities IO #' @export diff --git a/rkward/rbackend/rpackages/rkward/R/rk.sessionInfo.R b/rkward/rbackend/rpackages/rkward/R/rk.sessionInfo.R index ea97cc5..26b1d68 100644 --- a/rkward/rbackend/rpackages/rkward/R/rk.sessionInfo.R +++ b/rkward/rbackend/rpackages/rkward/R/rk.sessionInfo.R @@ -9,7 +9,7 @@ #' #' @return Returns the object created by \code{sessionInfo()}, invisibly. Note #' that this includes only the information on the R portion of the session. -#' @author Thomas Friedrichsmeier \email{rkward-devel@@lists.sourceforge.net} +#' @author Thomas Friedrichsmeier \email{rkward-devel@@kde.org} #' @seealso \code{\link{sessionInfo}} #' @keywords utilities misc #' @export diff --git a/rkward/rbackend/rpackages/rkward/R/rk.sync-functions.R b/rkward/rbackend/rpackages/rkward/R/rk.sync-functions.R index 11370eb..2e38d6b 100644 --- a/rkward/rbackend/rpackages/rkward/R/rk.sync-functions.R +++ b/rkward/rbackend/rpackages/rkward/R/rk.sync-functions.R @@ -17,7 +17,7 @@ #' @aliases rk.sync rk.sync.global #' @param x any R object to sync #' @return \code{NULL}, invisibly. -#' @author Thomas Friedrichsmeier \email{rkward-devel@@lists.sourceforge.net} +#' @author Thomas Friedrichsmeier \email{rkward-devel@@kde.org} #' @seealso \url{rkward://page/rkward_workspace_browser} #' @keywords utilities misc #' @rdname rk.sync diff --git a/rkward/rbackend/rpackages/rkward/R/rk.utility-functions.R b/rkward/rbackend/rpackages/rkward/R/rk.utility-functions.R index 80770e7..d4863cb 100644 --- a/rkward/rbackend/rpackages/rkward/R/rk.utility-functions.R +++ b/rkward/rbackend/rpackages/rkward/R/rk.utility-functions.R @@ -25,7 +25,7 @@ #' #' \code{rk.select.CRAN.mirror} returns the URL of the chosen mirror, as a #' string. -#' @author Thomas Friedrichsmeier \email{rkward-devel@@lists.sourceforge.net} +#' @author Thomas Friedrichsmeier \email{rkward-devel@@kde.org} #' @keywords attribute misc utilities #' @rdname rk.misc #' @examples @@ -107,7 +107,7 @@ #' #' @return a character vector of packages which are really old #' -#' @author Thomas Friedrichsmeier \email{rkward-devel@@lists.sourceforge.net} +#' @author Thomas Friedrichsmeier \email{rkward-devel@@kde.org} #' @keywords attribute misc utilities #' @rdname rk.old.packages #' @examples diff --git a/rkward/rbackend/rpackages/rkward/R/rk.workspace-functions.R b/rkward/rbackend/rpackages/rkward/R/rk.workspace-functions.R index ffd77da..722792c 100644 --- a/rkward/rbackend/rpackages/rkward/R/rk.workspace-functions.R +++ b/rkward/rbackend/rpackages/rkward/R/rk.workspace-functions.R @@ -24,7 +24,7 @@ #' @param close.windows a logical; whether current windows should be closed #' before restoring. #' @return Both functions return \code{NULL}. -#' @author Thomas Friedrichsmeier \email{rkward-devel@@lists.sourceforge.net} +#' @author Thomas Friedrichsmeier \email{rkward-devel@@kde.org} #' @seealso \url{rkward://page/rkward_for_r_users}, \link{rk.get.workspace.url} #' @keywords utilities #' @rdname rk.workplace |
|
From: m.eik m. <mei...@un...> - 2015-02-11 15:31:29
|
Git commit 853f2dfdc4cc9fc1853aea7e3482d23c2a916ff6 by m.eik michalke. Committed on 11/02/2015 at 15:31. Pushed by meikm into branch 'master'. bundle script looked for the binary bundle in the wrong place M +1 -0 macports/update_bundle.sh http://commits.kde.org/rkward/853f2dfdc4cc9fc1853aea7e3482d23c2a916ff6 diff --git a/macports/update_bundle.sh b/macports/update_bundle.sh index 86ea51a..e388729 100755 --- a/macports/update_bundle.sh +++ b/macports/update_bundle.sh @@ -83,6 +83,7 @@ while getopts ":DdbflLprmscxXF:" OPT; do PNSUFFX="${PNSUFFX}-debug" >&2 ;; b) BINARY=TRUE >&2 PTARGET=${PTARGET}-binary >&2 + WORKDIR="/opt/ports/kde/rkward-devel/work" >&2 PNSUFFX="${PNSUFFX}-binary" >&2 ;; F) FRESHMCP=TRUE >&2 MCPVERS=$OPTARG >&2 ;; |
|
From: m.eik m. <mei...@un...> - 2015-02-10 15:31:00
|
Git commit 8cbaeb4db529310bcf58d0ab9c8ccb660d947c3d by m.eik michalke. Committed on 10/02/2015 at 15:30. Pushed by meikm into branch 'master'. get better commit info for the bundle script. admittedly, it's quite a hack M +27 -1 macports/update_bundle.sh http://commits.kde.org/rkward/8cbaeb4db529310bcf58d0ab9c8ccb660d947c3d diff --git a/macports/update_bundle.sh b/macports/update_bundle.sh index 9e934d5..86ea51a 100755 --- a/macports/update_bundle.sh +++ b/macports/update_bundle.sh @@ -235,7 +235,33 @@ if [[ $COPYMDMD ]] ; then if [[ $DEVEL ]] ; then # we moved to git # TARGETVERS=${PORTVERS}$(svn info "$SVNREPO" | grep "^Revision:" | sed "s/[^[:digit:]]*//") - TARGETVERS=${PORTVERS}$(git ls-remote http://anongit.kde.org/rkward | grep HEAD$ | cut -c 1-7) + # + # this one-liner would give us the latest commit hash, but no date -- bad for humans and sorting: + # TARGETVERS=${PORTVERS}$(git ls-remote http://anongit.kde.org/rkward master | cut -c 1-7) + # + # so here's something a little more elaborate... + if [[ $(hostname) == "RKWard-iMac.local" ]] ; then + TEMPFILE=$(mktemp /tmp/git_rev.XXXXXX || exit 1) + else + TEMPFILE=$(mktemp || exit 1) + fi + if ! [[ $(which wget) == "" ]] ; then + wget -q -O "${TEMPFILE}" "http://quickgit.kde.org/?p=rkward.git" || exit 1 + GOTQUICKGIT=true + elif ! [[ $(which curl) == "" ]] ; then + curl -s -o "${TEMPFILE}" "http://quickgit.kde.org/?p=rkward.git" || exit 1 + GOTQUICKGIT=true + else + echo "neither wget nor curl can be found, only commit has can be used!" + TARGETVERS=${PORTVERS}-git$(git ls-remote http://anongit.kde.org/rkward master | cut -c 1-7) + GOTQUICKGIT=false + fi + if [[ ${GOTQUICKGIT} ]] ; then + CHANGEDATE=$(grep "last change.*<time datetime=" "${TEMPFILE}" | sed "s/.*datetime=\"\(.*\)+00:00.*/\1/g" | sed "s/[^[:digit:]]//g") + LASTCOMMIT=$(grep -m1 "<td class=\"monospace\">[[:alnum:]]\{7\}" "${TEMPFILE}" | sed "s#.*<td class=\"monospace\">\(.*\)</td>.*#\1#") + TARGETVERS="${PORTVERS}-git${CHANGEDATE}~${LASTCOMMIT}" + fi + rm "${TEMPFILE}" else TARGETVERS=$PORTVERS fi |
|
From: m.eik m. <mei...@un...> - 2015-02-10 14:52:35
|
Git commit 161ed159ff222d892e3671c29ecea7b57d353a68 by m.eik michalke. Committed on 10/02/2015 at 14:52. Pushed by meikm into branch 'master'. MacPorts: more updates for the Portfiles; rkward-devel-binary and rkward-binary are building and running M +4 -6 macports/kde/rkward-devel/Portfile M +8 -4 macports/kde/rkward/Portfile http://commits.kde.org/rkward/161ed159ff222d892e3671c29ecea7b57d353a68 diff --git a/macports/kde/rkward-devel/Portfile b/macports/kde/rkward-devel/Portfile index d20442b..7209c86 100644 --- a/macports/kde/rkward-devel/Portfile +++ b/macports/kde/rkward-devel/Portfile @@ -5,9 +5,8 @@ PortSystem 1.0 PortGroup kde4 1.1 fetch.type git name rkward-devel -version 0.6.3-git +version 0.6.4-git git.url http://anongit.kde.org/rkward.git -#svn.revision 4494 worksrcdir rkward conflicts rkward @@ -59,10 +58,9 @@ subport rkward-binary { configure.args-delete \ -DR_EXECUTABLE=${frameworks_dir}/R.framework/Resources/R \ -DRKVERSION_NUMBER=${version} - version 0.6.2 - svn.url http://svn.code.sf.net/p/rkward/code/branches/release_branches/rkward_${version} - svn.revision 4940 - worksrcdir rkward_${version} + version 0.6.3 + git.url http://anongit.kde.org/rkward.git + git.branch releases/0.6.3 depends_lib-delete port:R configure.compiler llvm-gcc-4.2 configure.args-append \ diff --git a/macports/kde/rkward/Portfile b/macports/kde/rkward/Portfile index 87d2a90..0d7674b 100644 --- a/macports/kde/rkward/Portfile +++ b/macports/kde/rkward/Portfile @@ -3,8 +3,11 @@ PortSystem 1.0 PortGroup kde4 1.1 +fetch.type git name rkward version 0.6.3 +git.url http://anongit.kde.org/rkward.git +git.branch releases/0.6.3 #patchfiles patch-rkward-rbackend-rkstructuregetter.cpp.diff worksrcdir ${name}-${version} @@ -22,8 +25,9 @@ long_description RKWard aims to become an easy to use, transparent frontend t homepage http://rkward.kde.org -# FIXME: -master_sites kde:rkward +# maybe in the near future? +#master_sites kde:rkward +master_sites http://sourceforge.net/projects/rkward/files/Current_Stable_Releases depends_lib port:kdelibs4 \ port:kate \ @@ -31,8 +35,8 @@ depends_lib port:kdelibs4 \ port:R # FIXME: -checksums rmd160 a15116209a28676db4ce1bd1f9a4b31f5be345c8 \ - sha256 3534e58a6246f2be18e6158cf486ecfef6531fee4f0060d7ea1955a823b5add6 +#checksums rmd160 a15116209a28676db4ce1bd1f9a4b31f5be345c8 \ +# sha256 3534e58a6246f2be18e6158cf486ecfef6531fee4f0060d7ea1955a823b5add6 post-extract { file mkdir ${worksrcpath}/build |
|
From: m.eik m. <mei...@un...> - 2015-02-09 15:06:10
|
Git commit ea8712fc387865bb13ff1d60c3cc11c78b6eff6e by m.eik michalke. Committed on 09/02/2015 at 15:05. Pushed by meikm into branch 'master'. add fetching of translations to the MacPorts portfile. are the pluginmaps in master currently broken, again? M +6 -0 macports/kde/rkward-devel/Portfile http://commits.kde.org/rkward/ea8712fc387865bb13ff1d60c3cc11c78b6eff6e diff --git a/macports/kde/rkward-devel/Portfile b/macports/kde/rkward-devel/Portfile index 81e7443..d20442b 100644 --- a/macports/kde/rkward-devel/Portfile +++ b/macports/kde/rkward-devel/Portfile @@ -76,6 +76,12 @@ subport rkward-binary { post-extract { file mkdir ${worksrcpath}/build + # need to fetch the plugin translations first + if [file exists ${worksrcpath}/i18n/po] { + system "cd ${worksrcpath}/i18n/po && git pull --rebase" + } else { + system "cd ${worksrcpath}/i18n && git clone http://anongit.kde.org/scratch/tfry/rkward-po-export po" + } } configure.dir ${worksrcpath}/build |
|
From: Thomas F. <tho...@ru...> - 2015-02-08 19:31:05
|
Git commit fb963d5974d1c4707d8a41dc253df1ac8aec0868 by Thomas Friedrichsmeier. Committed on 08/02/2015 at 19:29. Pushed by tfry into branch 'releases/0.6.3'. Bump version M +1 -1 VERSION.cmake M +1 -1 rkward/rbackend/rpackages/rkward/R/ver.R http://commits.kde.org/rkward/fb963d5974d1c4707d8a41dc253df1ac8aec0868 diff --git a/VERSION.cmake b/VERSION.cmake index 761b188..5a7602e 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -1,3 +1,3 @@ # DO NOT CHANGE THIS FILE MANUALLY! # It will be overwritten by scripts/set_dist_version.sh -SET(RKVERSION_NUMBER 0.6.2z+0.6.3+devel2) +SET(RKVERSION_NUMBER 0.6.2z+0.6.3+pre1) diff --git a/rkward/rbackend/rpackages/rkward/R/ver.R b/rkward/rbackend/rpackages/rkward/R/ver.R index f0c2847..fc4a145 100644 --- a/rkward/rbackend/rpackages/rkward/R/ver.R +++ b/rkward/rbackend/rpackages/rkward/R/ver.R @@ -3,4 +3,4 @@ # rkward/SetVersionNumber.cmake #' @export -".rk.app.version" <- "0.6.2z+0.6.3+devel2" +".rk.app.version" <- "0.6.2z+0.6.3+pre1" |
|
From: Thomas F. <tho...@ru...> - 2015-02-08 19:31:05
|
Git commit d626b364536b08c7a4ba62e7e06e2df3635b637b by Thomas Friedrichsmeier. Committed on 08/02/2015 at 19:30. Pushed by tfry into branch 'master'. Bump version on master M +1 -1 VERSION.cmake M +1 -1 rkward/plugins/analysis.pluginmap M +1 -1 rkward/plugins/data.pluginmap M +1 -1 rkward/plugins/distributions.pluginmap M +1 -1 rkward/plugins/embedded.pluginmap M +1 -1 rkward/plugins/import_export.pluginmap M +1 -1 rkward/plugins/irt.pluginmap M +1 -1 rkward/plugins/menu.pluginmap M +1 -1 rkward/plugins/plots.pluginmap M +1 -1 rkward/plugins/pluginmap_meta.inc M +1 -1 rkward/plugins/under_development.pluginmap M +1 -1 rkward/plugins/x11device.pluginmap M +1 -1 rkward/rbackend/rpackages/rkward/R/ver.R http://commits.kde.org/rkward/d626b364536b08c7a4ba62e7e06e2df3635b637b diff --git a/VERSION.cmake b/VERSION.cmake index 761b188..95950e7 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -1,3 +1,3 @@ # DO NOT CHANGE THIS FILE MANUALLY! # It will be overwritten by scripts/set_dist_version.sh -SET(RKVERSION_NUMBER 0.6.2z+0.6.3+devel2) +SET(RKVERSION_NUMBER 0.6.3z+0.6.4+devel1) diff --git a/rkward/plugins/analysis.pluginmap b/rkward/plugins/analysis.pluginmap index 28ae0eb..780cca8 100644 --- a/rkward/plugins/analysis.pluginmap +++ b/rkward/plugins/analysis.pluginmap @@ -5,7 +5,7 @@ <about name="Analysis" shortinfo="Assorted plugins for univariate and multivariate data analysis. Part of the official RKWard distribution" - version="0.6.3" + version="0.6.4" license="GPL" url="http://rkward.kde.org"> <insert snippet="author_rkward_team"/> diff --git a/rkward/plugins/data.pluginmap b/rkward/plugins/data.pluginmap index abb61dc..cf09d69 100644 --- a/rkward/plugins/data.pluginmap +++ b/rkward/plugins/data.pluginmap @@ -5,7 +5,7 @@ <about name="Data transformation and conversion" shortinfo="Plugins for transforming, subsetting, recoding, etc. of data. Part of the official RKWard distribution" - version="0.6.3" + version="0.6.4" license="GPL" url="http://rkward.kde.org"> <insert snippet="author_rkward_team"/> diff --git a/rkward/plugins/distributions.pluginmap b/rkward/plugins/distributions.pluginmap index f0b1fc7..f7cae72 100644 --- a/rkward/plugins/distributions.pluginmap +++ b/rkward/plugins/distributions.pluginmap @@ -5,7 +5,7 @@ <about name="Distributions" shortinfo="Distribution functions, plots, tests of (normal) distribution, central limit theorem. Part of the official RKWard distribution" - version="0.6.3" + version="0.6.4" license="GPL" url="http://rkward.kde.org"> <insert snippet="author_rkward_team"/> diff --git a/rkward/plugins/embedded.pluginmap b/rkward/plugins/embedded.pluginmap index b1f57fa..d4fb562 100644 --- a/rkward/plugins/embedded.pluginmap +++ b/rkward/plugins/embedded.pluginmap @@ -5,7 +5,7 @@ <about name="Embedded plugins" shortinfo="Not for direct use: Utility plugins that can be included by other plugins. Part of the official RKWard distribution" - version="0.6.3" + version="0.6.4" license="GPL" url="http://rkward.kde.org"> <insert snippet="author_rkward_team"/> diff --git a/rkward/plugins/import_export.pluginmap b/rkward/plugins/import_export.pluginmap index c75550d..9eea77d 100644 --- a/rkward/plugins/import_export.pluginmap +++ b/rkward/plugins/import_export.pluginmap @@ -5,7 +5,7 @@ <about name="Data Import and Export" shortinfo="Plugins for reading and writing data in various formats. Part of the official RKWard distribution" - version="0.6.3" + version="0.6.4" license="GPL" url="http://rkward.kde.org"> <insert snippet="author_rkward_team"/> diff --git a/rkward/plugins/irt.pluginmap b/rkward/plugins/irt.pluginmap index 8504649..134d551 100644 --- a/rkward/plugins/irt.pluginmap +++ b/rkward/plugins/irt.pluginmap @@ -5,7 +5,7 @@ <about name="Item Response Theory" shortinfo="Item Response Theory Plugins. Part of the official RKWard distribution" - version="0.6.3" + version="0.6.4" license="GPL" url="http://rkward.kde.org"> <insert snippet="author_rkward_team"/> diff --git a/rkward/plugins/menu.pluginmap b/rkward/plugins/menu.pluginmap index b8cb17b..8b5b852 100644 --- a/rkward/plugins/menu.pluginmap +++ b/rkward/plugins/menu.pluginmap @@ -5,7 +5,7 @@ <about name="Menu structure definition" shortinfo="Not for direct use: Defines the names and order of top level menus. Part of the official RKWard distribution" - version="0.6.3" + version="0.6.4" license="GPL" url="http://rkward.kde.org"> <insert snippet="author_rkward_team"/> diff --git a/rkward/plugins/plots.pluginmap b/rkward/plugins/plots.pluginmap index 79ae5d8..cf5073c 100644 --- a/rkward/plugins/plots.pluginmap +++ b/rkward/plugins/plots.pluginmap @@ -5,7 +5,7 @@ <about name="Plots" shortinfo="Plugins for producing various plots. Part of the official RKWard distribution" - version="0.6.3" + version="0.6.4" license="GPL" url="http://rkward.kde.org"> <insert snippet="author_rkward_team"/> diff --git a/rkward/plugins/pluginmap_meta.inc b/rkward/plugins/pluginmap_meta.inc index 98537f8..35ee2c0 100644 --- a/rkward/plugins/pluginmap_meta.inc +++ b/rkward/plugins/pluginmap_meta.inc @@ -8,7 +8,7 @@ </snippet> <snippet id="rkward_version_guard"> <!-- Guard against accidental inclusion of pluginmaps in a different installed version of RKWard --> - <dependencies rkward_min_version="0.6.2z" rkward_max_version="0.6.3y" /> + <dependencies rkward_min_version="0.6.3z" rkward_max_version="0.6.4y" /> </snippet> </snippets> </document> diff --git a/rkward/plugins/under_development.pluginmap b/rkward/plugins/under_development.pluginmap index 04e3ea8..976e31a 100644 --- a/rkward/plugins/under_development.pluginmap +++ b/rkward/plugins/under_development.pluginmap @@ -5,7 +5,7 @@ <about name="Plugins under development" shortinfo="Plugins that are under development, experimental, or meant for testing, only. Part of the official RKWard distribution" - version="0.6.3" + version="0.6.4" license="GPL" url="http://rkward.kde.org"> <insert snippet="author_rkward_team"/> diff --git a/rkward/plugins/x11device.pluginmap b/rkward/plugins/x11device.pluginmap index 8cfa66e..92da0d2 100644 --- a/rkward/plugins/x11device.pluginmap +++ b/rkward/plugins/x11device.pluginmap @@ -5,7 +5,7 @@ <about name="Graphics Device add-ons" shortinfo="Plugins for use in graphics device (e.g. X11()) windows. Part of the official RKWard distribution" - version="0.6.3" + version="0.6.4" license="GPL" url="http://rkward.kde.org"> <insert snippet="author_rkward_team"/> diff --git a/rkward/rbackend/rpackages/rkward/R/ver.R b/rkward/rbackend/rpackages/rkward/R/ver.R index f0c2847..471834b 100644 --- a/rkward/rbackend/rpackages/rkward/R/ver.R +++ b/rkward/rbackend/rpackages/rkward/R/ver.R @@ -3,4 +3,4 @@ # rkward/SetVersionNumber.cmake #' @export -".rk.app.version" <- "0.6.2z+0.6.3+devel2" +".rk.app.version" <- "0.6.3z+0.6.4+devel1" |
|
From: Thomas F. <tho...@ru...> - 2015-02-07 19:36:54
|
Git commit 9d32035f68530e72b3da462dcf59e77471bb6a9c by Thomas Friedrichsmeier, on behalf of Yuri Chornoivan. Committed on 05/02/2015 at 06:51. Pushed by tfry into branch 'releases/0.6.3'. Some more fixes in docs M +22 -22 doc/rkwardplugins/index.docbook http://commits.kde.org/rkward/9d32035f68530e72b3da462dcf59e77471bb6a9c diff --git a/doc/rkwardplugins/index.docbook b/doc/rkwardplugins/index.docbook index 8c8bdd3..5df1ecb 100644 --- a/doc/rkwardplugins/index.docbook +++ b/doc/rkwardplugins/index.docbook @@ -426,10 +426,10 @@ This is a guide to writing plugins for &rkward;. </para> <programlisting> <tab label="Options"> - <check box id="varequal" label="assume equal variances" value=", var.equal=TRUE"/> + <checkbox id="varequal" label="assume equal variances" value=", var.equal=TRUE"/> </programlisting> <para> - By default elements will be placed top-to-bottom like in a <command><column></command>. Since that is what we want here, we don't have to explicitly state a <command><row></command> or <command><column></command> layout. The first element we define is a check box. Just like the <command><radio></command><command><option></command>s, the check box has a <parameter>label</parameter> and a <parameter>value</parameter>. The <parameter>value</parameter> is what gets returned, if the check box is checked. Of course the check box also needs an <parameter>id</parameter>. + By default elements will be placed top-to-bottom like in a <command><column></command>. Since that is what we want here, we don't have to explicitly state a <command><row></command> or <command><column></command> layout. The first element we define is a checkbox. Just like the <command><radio></command><command><option></command>s, the checkbox has a <parameter>label</parameter> and a <parameter>value</parameter>. The <parameter>value</parameter> is what gets returned, if the check box is checked. Of course the checkbox also needs an <parameter>id</parameter>. </para> <programlisting> <frame label="Confidence Interval" id="frame_conf_int"> @@ -438,15 +438,15 @@ This is a guide to writing plugins for &rkward;. Here's yet another layout element: In order to signal that the two elements below belong together, we draw a <command><frame></command> (box). That frame may have a <parameter>label</parameter> (caption). Since the frame is just a passive layout element, it does not need an <parameter>id</parameter>, we still define one here, as we'll refer to it later, when defining an additional wizard interface. </para> <programlisting> - <check box id="confint" label="print confidence interval" value="1" checked="true"/> + <checkbox id="confint" label="print confidence interval" value="1" checked="true"/> <spinbox type="real" id="conflevel" label="confidence level" min="0" max="1" initial="0.95"/> </frame> </programlisting> <para> - Inside the <command><frame></command> we place another <command><check box></command> (using <parameter>checked=</parameter><replaceable>"true"</replaceable>, we signal that check box should be checked by default), and a <command><spinbox></command>. The spinbox allows the user to select a value between <replaceable>"min"</replaceable> and <replaceable>"max"</replaceable> with the default/initial value <replaceable>"0.95"</replaceable>. Setting the <parameter>type</parameter> to <replaceable>"real"</replaceable> signals that real numbers are accepted as opposed to <parameter>type=</parameter><replaceable>"integer"</replaceable> which would accept integers only. + Inside the <command><frame></command> we place another <command><checkbox></command> (using <parameter>checked=</parameter><replaceable>"true"</replaceable>, we signal that check box should be checked by default), and a <command><spinbox></command>. The spinbox allows the user to select a value between <replaceable>"min"</replaceable> and <replaceable>"max"</replaceable> with the default/initial value <replaceable>"0.95"</replaceable>. Setting the <parameter>type</parameter> to <replaceable>"real"</replaceable> signals that real numbers are accepted as opposed to <parameter>type=</parameter><replaceable>"integer"</replaceable> which would accept integers only. </para> <note><para> - It is also possible, and often preferable, to make the <command><frame></command> itself checkable, instead of adding a <command><check box></command> inside. See the reference for details. This is not done here, for illustrational purposes. + It is also possible, and often preferable, to make the <command><frame></command> itself checkable, instead of adding a <command><checkbox></command> inside. See the reference for details. This is not done here, for illustrational purposes. </para></note> <programlisting> </tab> @@ -513,12 +513,12 @@ This is a guide to writing plugins for &rkward;. </para> <sect2 id="radio_vs_checkbox_vs_dropdown"> - <title><radio> vs. <check box> vs. <dropdown></title> + <title><radio> vs. <checkbox> vs. <dropdown></title> <para> - The three elements <command><radio></command>, <command><check box></command>, <command><dropdown></command>, all serve a similar function: To select one out of several options. Obviously, a check box only allows to chose between two options: checked or not checked, so you cannot use it, if there are more than two options to chose from. But when to use which of the elements? Some rules of thumb: + The three elements <command><radio></command>, <command><checkbox></command>, <command><dropdown></command>, all serve a similar function: To select one out of several options. Obviously, a check box only allows to choose between two options: checked or not checked, so you cannot use it, if there are more than two options to chose from. But when to use which of the elements? Some rules of thumb: </para> <para> - If you find yourself creating a <command><radio></command> or <command><dropdown></command> with only two options, ask yourself, whether the question is essentially a yes / no type of question. E.g. a choice between <quote>adjust results</quote> and <quote>do not adjust results</quote>, or between <quote>remove missing values</quote> and <quote>keep missing values</quote>. In this case a <command><check box></command> is the best choice: It uses little space, will have the least words of labels, and is easiest to read for the user. There are very few situations where you should chose a <command><radio></command> over a <command><check box></command>, when there are only two options. An example of that might be: <quote>Method of calculation: 'pearson'/'spearman'</quote>. Here, more methods might be thinkable, and they don't really form a pair of opposites. + If you find yourself creating a <command><radio></command> or <command><dropdown></command> with only two options, ask yourself, whether the question is essentially a yes / no type of question. E.g. a choice between <quote>adjust results</quote> and <quote>do not adjust results</quote>, or between <quote>remove missing values</quote> and <quote>keep missing values</quote>. In this case a <command><checkbox></command> is the best choice: It uses little space, will have the least words of labels, and is easiest to read for the user. There are very few situations where you should chose a <command><radio></command> over a <command><checkbox></command>, when there are only two options. An example of that might be: <quote>Method of calculation: 'pearson'/'spearman'</quote>. Here, more methods might be thinkable, and they don't really form a pair of opposites. </para> <para> Chosing between a <command><radio></command> and a <command><dropdown></command> is mostly a question of space. The <command><dropdown></command> has the advantage of using little space, even if there are a lot of options to chose from. On the other hand, a <command><radio></command> has the advantage of making all possible choices visible to the user at once, without clicking on the dropdown arrow. Generally, if there are six or more options to chose from, a <command><dropdown></command> is preferable. If there are five or less options, a <command><radio></command> is the better choice. @@ -571,7 +571,7 @@ function calculate () { res <- t.test ( </screen> <para> - as plain text. Next we need to fill in the value, the user selected as the first variable. We fetch this using <function>getString ("x")</function>, and append it to the string to be <quote>echoed</quote>. This prints out the value of the GUI-element with <parameter>id=</parameter><replaceable>"x"</replaceable>: our first <command><check box></command>. Next, we append a ', ', and do the same to fetch the value of the element <replaceable>"y"</replaceable> - the second <command><check box></command>. For the hypothesis (the <command><radio></command> group), and the equal variances <command><check box></command>, the procedure is very similar. + as plain text. Next we need to fill in the value, the user selected as the first variable. We fetch this using <function>getString ("x")</function>, and append it to the string to be <quote>echoed</quote>. This prints out the value of the GUI-element with <parameter>id=</parameter><replaceable>"x"</replaceable>: our first <command><checkbox></command>. Next, we append a ', ', and do the same to fetch the value of the element <replaceable>"y"</replaceable> - the second <command><checkbox></command>. For the hypothesis (the <command><radio></command> group), and the equal variances <command><checkbox></command>, the procedure is very similar. </para> <para> Note that instead of concatenating the output snippets with <quote>+</quote>, you can also use several <function>echo()</function> statments. Everything is printed on a single line. To produce a line break in the generated code, insert a <replaceable>"\n"</replaceable> in the echoed string. In theory, you can even produce many lines with a single echo-statement, but please keep it to one line (or less) of generated code per <function>echo()</function>. @@ -675,7 +675,7 @@ if (my.rotation > wobble.rotation.limit (x)) { <sect2 id="policysimplicity"> <title>Dealing with complex options</title> <para> - Many plugins can do more than one thing. For instance, the <quote>Descriptive Statistics</quote> plugin can compute mean, range, sum, product, median, length, &etc; However, typically the user will only chose to have some of those calculations performed. In this case, please try to keep the generated code as simple as possible. It should only contain portions relevant to the options that are actually selected. To achieve this, here is an example of a common design patterns as you would use it (in JS; here, "domean", "domedian", and "dosd" would be <check box> elements): + Many plugins can do more than one thing. For instance, the <quote>Descriptive Statistics</quote> plugin can compute mean, range, sum, product, median, length, &etc; However, typically the user will only chose to have some of those calculations performed. In this case, please try to keep the generated code as simple as possible. It should only contain portions relevant to the options that are actually selected. To achieve this, here is an example of a common design patterns as you would use it (in JS; here, "domean", "domedian", and "dosd" would be <checkbox> elements): </para> <programlisting> function calculate () { @@ -1888,8 +1888,8 @@ x </components ...> an <replaceable>i18n_context</replaceable> like this: </para> <programlisting> -<check box id="scale" label="Scale" i18n_context="Show the scale"/> -<check box id="scale" label="Scale" i18n_context="Scale the plot"/> +<checkbox id="scale" label="Scale" i18n_context="Show the scale"/> +<checkbox id="scale" label="Scale" i18n_context="Scale the plot"/> </programlisting> <para> Providing <replaceable>i18n_context</replaceable> will cause the two strings to be translated separately. Otherwise they would share a single translation. In addition, the context @@ -2263,7 +2263,7 @@ standards for each defined suite. <chapter id="rkwarddev"> <title>Plugin development with the <application>rkwarddev</application> package</title> <sect1 id="rkdev_overview"><title>Overview</title> - <para>Writing external plugins involves writing files in three languages (XML, JavaScript and R) and the creation of a standardized hierarchy of directories. To make this a lot easier for willing plugin developers, we're providing the <application>rkwarddev</application> package. It provides a number of simple &r; functions to create the XML code for all dialog elements like tabbooks, check boxes, dropdownlists or filebrowsers, as well as functions to create JavaScript code and &rkward; help files to start with. The function <function>rk.plugin.skeleton()</function> creates the expected directory tree and all necessary files where they are supposed to be.</para> + <para>Writing external plugins involves writing files in three languages (XML, JavaScript and R) and the creation of a standardized hierarchy of directories. To make this a lot easier for willing plugin developers, we're providing the <application>rkwarddev</application> package. It provides a number of simple &r; functions to create the XML code for all dialog elements like tabbooks, checkboxes, dropdownlists or filebrowsers, as well as functions to create JavaScript code and &rkward; help files to start with. The function <function>rk.plugin.skeleton()</function> creates the expected directory tree and all necessary files where they are supposed to be.</para> <para>This package is not installed by default, but has to be installed manually from <ulink url="http://files.kde.org/rkward/R/">&rkward;'s own repository</ulink>. You can either do that by using the GUI interface (<menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure packages</guimenuitem></menuchoice>), or from any running &r; session:</para> <programlisting> install.packages("rkwarddev", repos="http://files.kde.org/rkward/R") @@ -2331,7 +2331,7 @@ basic.settings <- rk.XML.row(variables, rk.XML.col(var.x, var.y, test.hypothe <option label="First is greater" value="greater" /> <option label="Second is greater" value="less" /> </radio> - <check box id="chc_Pardsmpl" label="Paired sample" value="1" value_unchecked="0" /> + <checkbox id="chc_Pardsmpl" label="Paired sample" value="1" value_unchecked="0" /> </column> </row> </programlisting> @@ -2546,7 +2546,7 @@ local({ </varlistentry> <varlistentry> <term>Boolean properties</term> -<listitem><para>Properties that can either be on or off, true or false. For instance the properties created by <convert>-tags, also the property accompanying a <check box> (see below). The following values will be returned according to the given modifier: +<listitem><para>Properties that can either be on or off, true or false. For instance the properties created by <convert>-tags, also the property accompanying a <checkbox> (see below). The following values will be returned according to the given modifier: <variablelist> <varlistentry> <term>No modifier ("")</term> @@ -2554,7 +2554,7 @@ local({ </varlistentry> <varlistentry> <term>"labeled"</term> - <listitem><para>Returns the string "true" when true, "false", when false, or whichever custom strings have been specified (typically in a <check box>).</para></listitem> + <listitem><para>Returns the string "true" when true, "false", when false, or whichever custom strings have been specified (typically in a <checkbox>).</para></listitem> </varlistentry> <varlistentry> <term>"true"</term> @@ -2993,7 +2993,7 @@ have an "id" of their own, but see below. Attributes: </varlistentry> <varlistentry> -<term><check box></term> +<term><checkbox></term> <listitem><para>Defines a check box, &ie; a single option that can either be set to on or off. Attributes: <variablelist> <varlistentry> @@ -3622,12 +3622,12 @@ Child elements <true>, <false>, <case>, and <default> ta </varlistentry> <varlistentry> -<term><check box></term> +<term><checkbox></term> <listitem><para>Default property is "state.labeled", which means that the values specified by the <parameter>value</parameter>, and <parameter>value_unchecked</parameter>-attributes are returned, <emphasis>not</emphasis> the displayed label of the check box. <variablelist> <varlistentry> <term>state</term> - <listitem><para>State of the check box (on or off). Note that useful modifiers of this property (as of all boolean properties) are "not" and "labeled" (see <link linkend="propertytypes">types of properties</link>). However, often it is most useful to connect to the property with no modifier, &ie; "<emphasis>check box_id</emphasis>.state", which will return the state of the check box in a format suitable for use in an if statement (0 or 1). (boolean)</para></listitem> + <listitem><para>State of the check box (on or off). Note that useful modifiers of this property (as of all boolean properties) are "not" and "labeled" (see <link linkend="propertytypes">types of properties</link>). However, often it is most useful to connect to the property with no modifier, &ie; "<emphasis>checkbox_id</emphasis>.state", which will return the state of the check box in a format suitable for use in an if statement (0 or 1). (boolean)</para></listitem> </varlistentry> </variablelist></para></listitem> </varlistentry> @@ -3834,7 +3834,7 @@ different types, using modifiers may lead to errors. For <replaceable>fixed_valu <entry>Plots->Barplot, most other plotting plugins</entry> </row> <row> - <entry>rkward::plot_color_choser</entry> + <entry>rkward::color_chooser</entry> <entry>embedded.pluginmap</entry> <entry>Very simple plugin for specifying a color. Current implementation provides a list of color names. Future implementations may provide more elaborate color picking.</entry> @@ -3871,7 +3871,7 @@ different types, using modifiers may lead to errors. For <replaceable>fixed_valu <entry>Plots->Barplot</entry> </row> <row> - <entry>rkward::x11_grid</entry> + <entry>rkward::grid</entry> <entry>embedded.pluginmap</entry> <entry>Add grid to a plot</entry> <entry>In an existing plot window: Edit->Draw grid.</entry> @@ -3901,7 +3901,7 @@ different types, using modifiers may lead to errors. For <replaceable>fixed_valu <variablelist> <varlistentry> <term>base_prefix</term> - <listitem><para>Filenames specified in the &pluginmap; file are assumed to be relative to the directory of the &pluginmap; file + the prefix you specify here. Useful, esp., if all your components are located below a single subdirectory. </para></listitem> + <listitem><para>Filenames specified in the &pluginmap; file are assumed to be relative to the directory of the &pluginmap; file + the prefix you specify here. Useful, esp., if all your components are located below a single subdirectory.</para></listitem> </varlistentry> <varlistentry> <term>namespace</term> |
|
From: Thomas F. <tho...@ru...> - 2015-02-07 19:36:51
|
Git commit 87318a522d7a45d1ccca3eac8edd9d90b85b148a by Thomas Friedrichsmeier. Committed on 07/02/2015 at 12:46. Pushed by tfry into branch 'releases/0.6.3'. First part of splitting .rkh translation units on <ul>, <li>, and friends: Prepare the lookup. M +43 -20 rkward/misc/xmlhelper.cpp http://commits.kde.org/rkward/87318a522d7a45d1ccca3eac8edd9d90b85b148a diff --git a/rkward/misc/xmlhelper.cpp b/rkward/misc/xmlhelper.cpp index d6fd815..78edcf3 100644 --- a/rkward/misc/xmlhelper.cpp +++ b/rkward/misc/xmlhelper.cpp @@ -319,27 +319,11 @@ bool XMLHelper::getBoolAttribute (const QDomElement &element, const QString &nam return def; } -QString XMLHelper::i18nElementText (const QDomElement &element, bool with_paragraphs, int debug_level) const { - RK_TRACE (XML); - +QString translateChunk (const QString &chunk, const QString &context, bool add_paragraphs, const RKMessageCatalog *catalog) { + // if (!with_paragraphs), text should better not contain double newlines. We treat all the same, though, just as the message extraction script does. + QStringList paras = chunk.split ("\n\n"); QString ret; - QTextStream stream (&ret); - if (!element.isNull()) { - QTextStream stream (&ret, QIODevice::WriteOnly); - for (QDomNode node = element.firstChild (); !node.isNull (); node = node.nextSibling ()) { - node.save (stream, 0); - } - } else { - displayError (&element, i18n ("Trying to retrieve contents of invalid element"), debug_level); - return QString (); - } - - QString context = element.attribute ("i18n_context", QString ()); - - // if (!with_paragraphs), text should better not contain double newlines. We treat all the same, though, just as the message extraction script does. - QStringList paras = ret.split ("\n\n"); - ret.clear (); for (int i = 0; i < paras.count (); ++i) { QString para = paras[i].simplified (); if (!para.isEmpty ()) { @@ -350,7 +334,7 @@ QString XMLHelper::i18nElementText (const QDomElement &element, bool with_paragr para.replace ("> </li>", "></li>"); para.replace ("&", "&"); QString text = context.isNull () ? catalog->translate (para) : catalog->translate (context, para); - if (with_paragraphs) ret += "<p>" + text + "</p>"; + if (add_paragraphs) ret += "<p>" + text + "</p>"; else ret += text; } } @@ -358,6 +342,45 @@ QString XMLHelper::i18nElementText (const QDomElement &element, bool with_paragr return ret; } +QString XMLHelper::i18nElementText (const QDomElement &element, bool with_paragraphs, int debug_level) const { + RK_TRACE (XML); + + if (element.isNull ()) { + displayError (&element, i18n ("Trying to retrieve contents of invalid element"), debug_level); + return QString (); + } + + QString ret; + QString context = element.attribute ("i18n_context", QString ()); + QString buffer; + QTextStream stream (&buffer, QIODevice::WriteOnly); + for (QDomNode node = element.firstChild (); !node.isNull (); node = node.nextSibling ()) { + QDomElement e = node.toElement (); + if (!e.isNull ()) { + if (e.tagName () == QLatin1String ("ul") || e.tagName () == QLatin1String ("ol") || e.tagName () == QLatin1String ("li") || e.tagName () == QLatin1String ("p")) { // split translation units on these elements + // split before + ret.append (translateChunk (buffer, context, with_paragraphs, catalog)); + buffer.clear (); + + // serialize the tag with all its attributes but not the children. + e.cloneNode (false).save (stream, 0); // will write: <TAG[ attributes]/> + buffer = buffer.left (buffer.lastIndexOf ('/')) + QChar ('>'); + buffer.append (i18nElementText (e, false, debug_level)); + buffer.append ("</" + e.tagName () + QChar ('>')); + + // split after + ret.append (buffer); + buffer.clear (); + continue; + } + } + node.save (stream, 0); + } + ret.append (translateChunk (buffer, context, with_paragraphs, catalog)); + + return ret; +} + void XMLHelper::displayError (const QDomNode *in_node, const QString &message, int debug_level, int message_level) const { RK_TRACE (XML); |
|
From: Thomas F. <tho...@ru...> - 2015-02-07 19:36:50
|
Git commit 7e23c7e80b59b5f91ac28d5782af4daa96b771ad by Thomas Friedrichsmeier. Committed on 07/02/2015 at 19:17. Pushed by tfry into branch 'releases/0.6.3'. First part of splitting .rkh translation units on <ul>, <li>, and friends: Split units on extraction. M +2 -1 rkward/misc/xmlhelper.cpp M +15 -2 scripts/update_plugin_messages.py http://commits.kde.org/rkward/7e23c7e80b59b5f91ac28d5782af4daa96b771ad diff --git a/rkward/misc/xmlhelper.cpp b/rkward/misc/xmlhelper.cpp index 78edcf3..fc8cd42 100644 --- a/rkward/misc/xmlhelper.cpp +++ b/rkward/misc/xmlhelper.cpp @@ -326,7 +326,8 @@ QString translateChunk (const QString &chunk, const QString &context, bool add_p for (int i = 0; i < paras.count (); ++i) { QString para = paras[i].simplified (); - if (!para.isEmpty ()) { + if (para.isEmpty ()) ret.append (QChar (' ')); + else { if (!ret.isEmpty ()) ret.append ("\n"); // Oh, crap. Fix up after some differences between python message extraction and qt's. para.replace ("<li> <", "<li><"); diff --git a/scripts/update_plugin_messages.py b/scripts/update_plugin_messages.py index 18cb068..4e469a5 100755 --- a/scripts/update_plugin_messages.py +++ b/scripts/update_plugin_messages.py @@ -45,6 +45,8 @@ MSGFMT = os.getenv ('MSGFMT', "msgfmt --check") # list of tag-names the content of which to extract in full (including, possibly, HTML-tags, within) text_containers = ['section', 'text', 'related', 'title', 'summary', 'usage', 'technical', 'setting'] +# (HTML)-elements on which to split translation units within a text_container +text_splitting_elements = ['p', 'ul', 'ol', 'li'] # Elements that refer to a different (labelled) element by id referring_elements = ['setting', 'caption'] # Map of elements to attributes to extract, and default context info @@ -170,9 +172,19 @@ def normalize (text): # get everything inside the element as text. Might include further xml tags. def getFullText (element): + childnodes = element.childNodes + ## Skip over anything containing only a <link href="rkward://"/> and nothing else; a somewhat important special case ("Related"-section) + ## NOTE: The second attribute, here, is the LINE_DUMMY_ATTR , hence checking for cn.attributes.length == 2 + if (childnodes.length == 1): + cn = childnodes.item (0) + if (not cn.hasChildNodes()) and (cn.nodeType == cn.ELEMENT_NODE) and (cn.tagName == "link") and (cn.attributes.length == 2) and (cn.getAttribute ("href").startswith ("rkward://")): + return "" + rc = [] - for cn in element.childNodes: - if cn.nodeType != cn.COMMENT_NODE: + for cn in childnodes: + if (cn.nodeType == cn.ELEMENT_NODE) and (cn.tagName in text_splitting_elements): + rc.append ("\n\n" + getFullText (cn) + "\n\n") + elif cn.nodeType != cn.COMMENT_NODE: rc.append(stripLineDummy (cn.toxml ("utf-8"))) return ''.join (rc).strip ().replace ("&", "&") @@ -229,6 +241,7 @@ def handleNode (node): elif (node.tagName in text_containers): textchunks = getFullText (node).split ("\n\n") for chunk in textchunks: + chunk = chunk.strip () if (chunk != ""): outfile.write (getI18nComment (node)) writeouti18n ("i18n (" + quote (normalize (chunk)) + ");") |
|
From: Thomas F. <tho...@ru...> - 2015-02-07 19:21:18
|
Git commit 4ca10801e8a4fb077cdea6a43d121ee513228488 by Thomas Friedrichsmeier. Committed on 06/02/2015 at 12:33. Pushed by tfry into branch 'master'. Some improvements to translatability of <technical>-sections: - Split into somewhat smaller units (more work to be done) - Mark up all fixed terms, and add a comment on these - Some spelling fixes, and use <label> where appropriate. M +4 -2 rkward/plugins/data/limit_vector_length.rkh M +6 -4 rkward/plugins/data/one_var_tabulation.rkh M +3 -2 rkward/plugins/plots/barplot_embed.rkh M +8 -5 rkward/plugins/plots/histogram_options.rkh M +13 -10 rkward/plugins/plots/plot_options.rkh M +6 -5 rkward/plugins/plots/plot_stepfun_options.rkh http://commits.kde.org/rkward/4ca10801e8a4fb077cdea6a43d121ee513228488 diff --git a/rkward/plugins/data/limit_vector_length.rkh b/rkward/plugins/data/limit_vector_length.rkh index 1cd6dce..e30ff3d 100644 --- a/rkward/plugins/data/limit_vector_length.rkh +++ b/rkward/plugins/data/limit_vector_length.rkh @@ -17,15 +17,17 @@ <setting id="others_label">Label to use for the "others" category. Note: If your data is not labeled, emptying this field will sometimes be preferable.</setting> </settings> - <technical> + <technical><!-- i18n: Terms inside quotes, <i></i> or <b></b> should not be translated, here --> General users may skip this section of help, this is primarily for developers. The following external properties are provided for use in the embedding plugin. + <ul> <li><i>invar</i>: Symbol name of the input variable to be limited. Defaults to 'x'.</li> <li><i>outvar</i>: Symbol name to use for the output variable (the limited vector). May be identical to <i>invar</i>. Defaults to 'x'.</li> - <li><i>parameters</i>: This property will be set to a string describing the limitation options, suitable for pasting into the "parameters" argument of rk.header().</li> + <li><i>parameters</i>: This property will be set to a string describing the limitation options, suitable for pasting into the <i>parameters</i> argument of <b>rk.header()</b>.</li> </ul> + The generated code is available from <i>code.calculate</i>. </technical> </document> diff --git a/rkward/plugins/data/one_var_tabulation.rkh b/rkward/plugins/data/one_var_tabulation.rkh index 9e2f4a8..398706e 100644 --- a/rkward/plugins/data/one_var_tabulation.rkh +++ b/rkward/plugins/data/one_var_tabulation.rkh @@ -24,17 +24,19 @@ </ul> </related> - <technical> + <technical><!-- i18n: Terms inside quotes, <i></i> or <b></b> should not be translated, here --> General users may skip this section of help, this is primarily for developers. - The following external properties are provided for use in the embedding plugin. + The following external properties are provided for use in the embedding plugin: + <ul> - <li><i>varsource</i>: The tabulation plugin does not show its own varselector by default. Connect your own to this one (client="embedded_id.varsource.selected", governor="myvarselector_id.selected").</li> + <li><i>varsource</i>: The tabulation plugin does not show its own varselector by default. Connect your own to this one (<i>client="embedded_id.varsource.selected" governor="myvarselector_id.selected"</i>).</li> <li><i>outvar</i>: By default, the plugin produces a table in a variable called "x". You can set it to use a different name, here.</li> <li><i>titlevar</i>: If you want the plugin to save a description of the grouping variables in an R variable, set this to an object name to use. Else set this to "" to disable. Defaults to "title"</li> <li><i>fun_label</i>: This property will be set to a description of the statistic.</li> - <li><i>parameters</i>: This property will be set to a string describing the tabulation options, suitable for pasting into the "parameters" argument of rk.header().</li> + <li><i>parameters</i>: This property will be set to a string describing the tabulation options, suitable for pasting into the <i>parameters</i> argument of <b>rk.header()</b>.</li> </ul> + The generated code is available from <i>code.calculate</i>. </technical> diff --git a/rkward/plugins/plots/barplot_embed.rkh b/rkward/plugins/plots/barplot_embed.rkh index 1609884..b99f17f 100644 --- a/rkward/plugins/plots/barplot_embed.rkh +++ b/rkward/plugins/plots/barplot_embed.rkh @@ -28,11 +28,12 @@ Choose if you want stacked bars, legend, and rainbow colors. Also you can choose <li><link href="rkward://rhelp/table"/></li> </ul> </related> - <technical> + <technical><!-- i18n: "true", "false", and terms inside <i></i> or <b></b> should not be translated, here --> This plugin is meant to be embedded in other plugins. It does not by itself provide a means to select input data. When embedding this plugin, you will be interested in the following properties: + <ul> <li><i>xvar</i>: The name of the data variable. You can connect this to a varslot, or set it to a fixed string such as "x". This is required.</li> - <li><i>code.preprocess</i>: Provides a summary of parameters to be used in a call to rk.header(), if you have a use for it.</li> + <li><i>code.preprocess</i>: Provides a summary of parameters to be used in a call to <b>rk.header()</b>, if you have a use for it.</li> <li><i>code.printout</i>: The actual commands needed to construct the barplot.</li> </ul> </technical> diff --git a/rkward/plugins/plots/histogram_options.rkh b/rkward/plugins/plots/histogram_options.rkh index 6af40a8..20e516d 100644 --- a/rkward/plugins/plots/histogram_options.rkh +++ b/rkward/plugins/plots/histogram_options.rkh @@ -35,19 +35,22 @@ <li><link href="rkward://rhelp/extendrange"/></li> </ul> </related> - <technical> + <technical><!-- i18n: "true", "false, and terms inside <i></i> or <b></b> should not be translated, here --> General users may skip this section of help, this is primarily for developers. The following external tags are provided for use in the embedding plugin. + <ul> <li><i>varname</i>: For linking to the variable name for which histogram is being plotted. This is used in the 'Integer numbers' option for breaks.</li> - <li><i>allow_freq</i>: Setting this to "true" ("false") enables (disables) the display of the 'Frequency' checkbox.</li> - <li><i>allow_barlabels</i>: Setting this to "true" ("false") enables (disables) the display of the 'Bar labels' checkbox.</li> - <li><i>allow_addtoplot</i>: Setting this to "true" ("false") enables (disables) the display of the 'Add bars to current plot' checkbox.</li> + <li><i>allow_freq</i>: Setting this to "true" ("false") enables (disables) the display of the '<label id="freq"/>' check box.</li> + <li><i>allow_barlabels</i>: Setting this to "true" ("false") enables (disables) the display of the '<label id="barlabels"/>' check box.</li> + <li><i>allow_addtoplot</i>: Setting this to "true" ("false") enables (disables) the display of the '<label id="addtoplot"/>' check box.</li> </ul> + In order to allow flexible use, the generated options are separated into three different sections: + <ul> - <li><i>code.preprocess</i>: Options suitable for use in a call to rk.header(). These are safe to ignore, if you do not need them.</li> + <li><i>code.preprocess</i>: Options suitable for use in a call to <b>rk.header()</b>. These are safe to ignore, if you do not need them.</li> <li><i>code.calculate</i>: This contains only the <i>breaks</i>-option.</li> <li><i>code.printout</i>: This contains all the other options determining the look of the plot.</li> </ul> diff --git a/rkward/plugins/plots/plot_options.rkh b/rkward/plugins/plots/plot_options.rkh index fe16fa4..01b501f 100644 --- a/rkward/plugins/plots/plot_options.rkh +++ b/rkward/plugins/plots/plot_options.rkh @@ -50,29 +50,32 @@ </ul> </related> - <technical> + <technical><!-- i18n: "true", "false", and terms inside <i></i> or <b></b> should not be translated, here --> General users may skip this section of help, this is primarily for developers. The following external tags are provided for use in the embedding plugin. + <ul> <li><i>xvar</i>: The variable to be used for the x-coordinates.</li> <li><i>yvar</i>: The variable to be used for the y-coordinates.</li> - <li><i>default_pointtype</i>: A string that provides the default point type when the user chooses 'Default' for 'Type of points/lines'. The possibilities are p,l,b,o,h,s and S; the options for the <i>type</i> argument.</li> - <li><i>default_pointcolor</i>: A string that provides the default point color when the user chooses 'Default' for 'Color'. For various possibilities see the code color_chooser.xml; the options for the <i>col</i> argument.</li> - <li><i>default_main</i>: A string specifying the <i>main</i> argument to <b>plot.default</b>. By default this is "" which means that the main title generated by the plotting function is used. Note: The default is always used unquoted. If you want to specify a literal string add quotes, explicitly, as "&quote;".</li> + <li><i>default_pointtype</i>: A string that provides the default point type when the user chooses 'Default' for '<label id="pointtype"/>'. The possibilities are p,l,b,o,h,s and S; the options for the <i>type</i> argument.</li> + <li><i>default_pointcolor</i>: A string that provides the default point color when the user chooses 'Default' for '<label id="pointcolor"/>'. For various possibilities see the code color_chooser.xml; the options for the <i>col</i> argument.</li> + <li><i>default_main</i>: A string specifying the <i>main</i> argument to <b>plot.default</b>. By default this is "" which means that the main title generated by the plotting function is used. Note: The default is always used unquoted. If you want to specify a literal string add quotes, explicitly, as "&<i>quote;</i>".</li> <li><i>default_sub</i>: Similar to <i>main</i> above but for the subtitle argument <i>sub</i>.</li> <li><i>default_xlab</i>: Similar to <i>main</i> above but for the X-label argument <i>xlab</i>.</li> <li><i>default_ylab</i>: Similar to <i>main</i> above but for the Y-label argument <i>ylab</i>.</li> - <li><i>allow_log</i>: Setting this to "true" ("false") enables (disables) the display of 'X axis logarithmic' and 'Y axis logarithmic' checkboxes.</li> - <li><i>allow_xlim</i>: Setting this to "true" ("false") enables (disables) the display of 'Min X value' and 'Max X value' input boxes.</li> - <li><i>allow_ylim</i>: Setting this to "true" ("false") enables (disables) the display of 'Min Y value' and 'Max Y value' input boxes.</li> - <li><i>allow_type</i>: Setting this to "true" ("false") enables (disables) the display of the 'Points / Lines' tab.</li> - <li><i>allow_aspect</i>: Setting this to "true" ("false") enables (disables) the display of the 'Aspect ratio' tab.</li> - <li><i>allow_grid</i>: Setting this to "true" ("false") enables (disables) the display of the 'Grid' tab. If "true", the actual code for grid options can be extracted from code.calculate (see below) which in turn extracts it from grid_options.code.printout. Specifically, if the plot options plugin is embedded using an id="plot_options" then the following call:<br> + <li><i>allow_log</i>: Setting this to "true" ("false") enables (disables) the display of '<label id="xlog"/>' and '<label id="ylog"/>' check boxes.</li> + <li><i>allow_xlim</i>: Setting this to "true" ("false") enables (disables) the display of '<label id="xminvalue"/>' and '<label id="xmaxvalue"/>' input boxes.</li> + <li><i>allow_ylim</i>: Setting this to "true" ("false") enables (disables) the display of '<label id="yminvalue"/>' and '<label id="ymaxvalue"/>' input boxes.</li> + <li><i>allow_type</i>: Setting this to "true" ("false") enables (disables) the display of the '<label id="pointtypepage"/>' tab.</li> + <li><i>allow_aspect</i>: Setting this to "true" ("false") enables (disables) the display of the '<label id="aspectratio"/>' tab.</li> + <li><i>allow_grid</i>: Setting this to "true" ("false") enables (disables) the display of the '<label id="tab_grid"/>' tab. If "true", the actual code for grid options can be extracted from code.calculate (see below) which in turn extracts it from grid_options.code.printout. Specifically, if the plot options plugin is embedded using an <i>id="plot_options"</i> then the following call:<br> printIndented ("\t", getRK_val ("plot_options.code.calculate"));</br><br> after the plotting function should do the job.</br></li> </ul> + In order to allow flexible use, the generated options are separated into different sections: + <ul> <li><i>code.preprocess</i>: Nothing yet, but will hopefully include some <b>par</b> options.</li> <li><i>code.calculate</i>: Currently this contains only the <b>grid</b>-options.</li> diff --git a/rkward/plugins/plots/plot_stepfun_options.rkh b/rkward/plugins/plots/plot_stepfun_options.rkh index 62d65de..ab4ad3c 100644 --- a/rkward/plugins/plots/plot_stepfun_options.rkh +++ b/rkward/plugins/plots/plot_stepfun_options.rkh @@ -23,15 +23,16 @@ <li><link href="rkward://rhelp/ecdf"/></li> </ul> </related> - <technical> + <technical><!-- i18n: "true", "false", and terms inside <i></i> or <b></b> should not be translated, here --> General users may skip this section of help, this is primarily for developers. The following external tags are provided for use in the embedding plugin. + <ul> - <li><i>allow_addtoplot</i>: Setting this to "true" ("false") enables (disables) the display of the 'Add to current plot' checkbox.</li> - <li><i>default_dopoints</i>: Setting this to "true" ("false") toggles the state of the 'Draw points' checkbox.</li> - <li><i>default_verticals</i>: Setting this to "true" ("false") toggles the state of the 'Draw vertical lines' checkbox.</li> - <li><i>allow_col01line</i>: Setting this to "true" ("false") enables (disables) the display of the two frames ('For y = 0 line' and 'For y = 1 line') for <i>col.01line</i> option to ecdf.</li> + <li><i>allow_addtoplot</i>: Setting this to "true" ("false") enables (disables) the display of the '<label id="addtoplot"/>' check box.</li> + <li><i>default_dopoints</i>: Setting this to "true" ("false") toggles the state of the '<label id="do_points"/>' check box.</li> + <li><i>default_verticals</i>: Setting this to "true" ("false") toggles the state of the '<label id="verticals"/>' check box.</li> + <li><i>allow_col01line</i>: Setting this to "true" ("false") enables (disables) the display of the two frames ('<label id="frame_col_y0"/>' and '<label id="frame_col_y0"/>') for <i>col.01line</i> option to <b>ecdf</b>.</li> </ul> </technical> </document> |
|
From: Thomas F. <tho...@ru...> - 2015-02-07 19:21:17
|
Git commit 354e1535a9857c8e0a4fa4a19288b92aa52fb14b by Thomas Friedrichsmeier. Committed on 07/02/2015 at 19:19. Pushed by tfry into branch 'master'. Merge branch 'work/i18n_split_lists' http://commits.kde.org/rkward/354e1535a9857c8e0a4fa4a19288b92aa52fb14b |
|
From: Thomas F. <tho...@ru...> - 2015-02-07 19:18:33
|
Git commit 72530a9a7aa5631eb2b45cf8938d7f1bf23583e6 by Thomas Friedrichsmeier. Committed on 07/02/2015 at 19:17. Pushed by tfry into branch 'work/i18n_split_lists'. First part of splitting .rkh translation units on <ul>, <li>, and friends: Split units on extraction. M +2 -1 rkward/misc/xmlhelper.cpp M +15 -2 scripts/update_plugin_messages.py http://commits.kde.org/rkward/72530a9a7aa5631eb2b45cf8938d7f1bf23583e6 diff --git a/rkward/misc/xmlhelper.cpp b/rkward/misc/xmlhelper.cpp index 78edcf3..fc8cd42 100644 --- a/rkward/misc/xmlhelper.cpp +++ b/rkward/misc/xmlhelper.cpp @@ -326,7 +326,8 @@ QString translateChunk (const QString &chunk, const QString &context, bool add_p for (int i = 0; i < paras.count (); ++i) { QString para = paras[i].simplified (); - if (!para.isEmpty ()) { + if (para.isEmpty ()) ret.append (QChar (' ')); + else { if (!ret.isEmpty ()) ret.append ("\n"); // Oh, crap. Fix up after some differences between python message extraction and qt's. para.replace ("<li> <", "<li><"); diff --git a/scripts/update_plugin_messages.py b/scripts/update_plugin_messages.py index 18cb068..4e469a5 100755 --- a/scripts/update_plugin_messages.py +++ b/scripts/update_plugin_messages.py @@ -45,6 +45,8 @@ MSGFMT = os.getenv ('MSGFMT', "msgfmt --check") # list of tag-names the content of which to extract in full (including, possibly, HTML-tags, within) text_containers = ['section', 'text', 'related', 'title', 'summary', 'usage', 'technical', 'setting'] +# (HTML)-elements on which to split translation units within a text_container +text_splitting_elements = ['p', 'ul', 'ol', 'li'] # Elements that refer to a different (labelled) element by id referring_elements = ['setting', 'caption'] # Map of elements to attributes to extract, and default context info @@ -170,9 +172,19 @@ def normalize (text): # get everything inside the element as text. Might include further xml tags. def getFullText (element): + childnodes = element.childNodes + ## Skip over anything containing only a <link href="rkward://"/> and nothing else; a somewhat important special case ("Related"-section) + ## NOTE: The second attribute, here, is the LINE_DUMMY_ATTR , hence checking for cn.attributes.length == 2 + if (childnodes.length == 1): + cn = childnodes.item (0) + if (not cn.hasChildNodes()) and (cn.nodeType == cn.ELEMENT_NODE) and (cn.tagName == "link") and (cn.attributes.length == 2) and (cn.getAttribute ("href").startswith ("rkward://")): + return "" + rc = [] - for cn in element.childNodes: - if cn.nodeType != cn.COMMENT_NODE: + for cn in childnodes: + if (cn.nodeType == cn.ELEMENT_NODE) and (cn.tagName in text_splitting_elements): + rc.append ("\n\n" + getFullText (cn) + "\n\n") + elif cn.nodeType != cn.COMMENT_NODE: rc.append(stripLineDummy (cn.toxml ("utf-8"))) return ''.join (rc).strip ().replace ("&", "&") @@ -229,6 +241,7 @@ def handleNode (node): elif (node.tagName in text_containers): textchunks = getFullText (node).split ("\n\n") for chunk in textchunks: + chunk = chunk.strip () if (chunk != ""): outfile.write (getI18nComment (node)) writeouti18n ("i18n (" + quote (normalize (chunk)) + ");") |
|
From: Thomas F. <tho...@ru...> - 2015-02-07 12:54:41
|
Git commit e0e7f9e042a801d8f320f8a59a05ed49343c4887 by Thomas Friedrichsmeier. Committed on 07/02/2015 at 12:46. Pushed by tfry into branch 'work/i18n_split_lists'. First part of splitting .rkh translation units on <ul>, <li>, and friends: Prepare the lookup. M +43 -20 rkward/misc/xmlhelper.cpp http://commits.kde.org/rkward/e0e7f9e042a801d8f320f8a59a05ed49343c4887 diff --git a/rkward/misc/xmlhelper.cpp b/rkward/misc/xmlhelper.cpp index d6fd815..78edcf3 100644 --- a/rkward/misc/xmlhelper.cpp +++ b/rkward/misc/xmlhelper.cpp @@ -319,27 +319,11 @@ bool XMLHelper::getBoolAttribute (const QDomElement &element, const QString &nam return def; } -QString XMLHelper::i18nElementText (const QDomElement &element, bool with_paragraphs, int debug_level) const { - RK_TRACE (XML); - +QString translateChunk (const QString &chunk, const QString &context, bool add_paragraphs, const RKMessageCatalog *catalog) { + // if (!with_paragraphs), text should better not contain double newlines. We treat all the same, though, just as the message extraction script does. + QStringList paras = chunk.split ("\n\n"); QString ret; - QTextStream stream (&ret); - if (!element.isNull()) { - QTextStream stream (&ret, QIODevice::WriteOnly); - for (QDomNode node = element.firstChild (); !node.isNull (); node = node.nextSibling ()) { - node.save (stream, 0); - } - } else { - displayError (&element, i18n ("Trying to retrieve contents of invalid element"), debug_level); - return QString (); - } - - QString context = element.attribute ("i18n_context", QString ()); - - // if (!with_paragraphs), text should better not contain double newlines. We treat all the same, though, just as the message extraction script does. - QStringList paras = ret.split ("\n\n"); - ret.clear (); for (int i = 0; i < paras.count (); ++i) { QString para = paras[i].simplified (); if (!para.isEmpty ()) { @@ -350,7 +334,7 @@ QString XMLHelper::i18nElementText (const QDomElement &element, bool with_paragr para.replace ("> </li>", "></li>"); para.replace ("&", "&"); QString text = context.isNull () ? catalog->translate (para) : catalog->translate (context, para); - if (with_paragraphs) ret += "<p>" + text + "</p>"; + if (add_paragraphs) ret += "<p>" + text + "</p>"; else ret += text; } } @@ -358,6 +342,45 @@ QString XMLHelper::i18nElementText (const QDomElement &element, bool with_paragr return ret; } +QString XMLHelper::i18nElementText (const QDomElement &element, bool with_paragraphs, int debug_level) const { + RK_TRACE (XML); + + if (element.isNull ()) { + displayError (&element, i18n ("Trying to retrieve contents of invalid element"), debug_level); + return QString (); + } + + QString ret; + QString context = element.attribute ("i18n_context", QString ()); + QString buffer; + QTextStream stream (&buffer, QIODevice::WriteOnly); + for (QDomNode node = element.firstChild (); !node.isNull (); node = node.nextSibling ()) { + QDomElement e = node.toElement (); + if (!e.isNull ()) { + if (e.tagName () == QLatin1String ("ul") || e.tagName () == QLatin1String ("ol") || e.tagName () == QLatin1String ("li") || e.tagName () == QLatin1String ("p")) { // split translation units on these elements + // split before + ret.append (translateChunk (buffer, context, with_paragraphs, catalog)); + buffer.clear (); + + // serialize the tag with all its attributes but not the children. + e.cloneNode (false).save (stream, 0); // will write: <TAG[ attributes]/> + buffer = buffer.left (buffer.lastIndexOf ('/')) + QChar ('>'); + buffer.append (i18nElementText (e, false, debug_level)); + buffer.append ("</" + e.tagName () + QChar ('>')); + + // split after + ret.append (buffer); + buffer.clear (); + continue; + } + } + node.save (stream, 0); + } + ret.append (translateChunk (buffer, context, with_paragraphs, catalog)); + + return ret; +} + void XMLHelper::displayError (const QDomNode *in_node, const QString &message, int debug_level, int message_level) const { RK_TRACE (XML); |
|
From: Thomas F. <tho...@ru...> - 2015-02-06 12:34:46
|
Git commit 0c7e1b97ccdd428849790f5b4565993bd8c8a0bc by Thomas Friedrichsmeier. Committed on 06/02/2015 at 12:33. Pushed by tfry into branch 'releases/0.6.3'. Some improvements to translatability of <technical>-sections: - Split into somewhat smaller units (more work to be done) - Mark up all fixed terms, and add a comment on these - Some spelling fixes, and use <label> where appropriate. M +4 -2 rkward/plugins/data/limit_vector_length.rkh M +6 -4 rkward/plugins/data/one_var_tabulation.rkh M +3 -2 rkward/plugins/plots/barplot_embed.rkh M +8 -5 rkward/plugins/plots/histogram_options.rkh M +13 -10 rkward/plugins/plots/plot_options.rkh M +6 -5 rkward/plugins/plots/plot_stepfun_options.rkh http://commits.kde.org/rkward/0c7e1b97ccdd428849790f5b4565993bd8c8a0bc diff --git a/rkward/plugins/data/limit_vector_length.rkh b/rkward/plugins/data/limit_vector_length.rkh index 1cd6dce..e30ff3d 100644 --- a/rkward/plugins/data/limit_vector_length.rkh +++ b/rkward/plugins/data/limit_vector_length.rkh @@ -17,15 +17,17 @@ <setting id="others_label">Label to use for the "others" category. Note: If your data is not labeled, emptying this field will sometimes be preferable.</setting> </settings> - <technical> + <technical><!-- i18n: Terms inside quotes, <i></i> or <b></b> should not be translated, here --> General users may skip this section of help, this is primarily for developers. The following external properties are provided for use in the embedding plugin. + <ul> <li><i>invar</i>: Symbol name of the input variable to be limited. Defaults to 'x'.</li> <li><i>outvar</i>: Symbol name to use for the output variable (the limited vector). May be identical to <i>invar</i>. Defaults to 'x'.</li> - <li><i>parameters</i>: This property will be set to a string describing the limitation options, suitable for pasting into the "parameters" argument of rk.header().</li> + <li><i>parameters</i>: This property will be set to a string describing the limitation options, suitable for pasting into the <i>parameters</i> argument of <b>rk.header()</b>.</li> </ul> + The generated code is available from <i>code.calculate</i>. </technical> </document> diff --git a/rkward/plugins/data/one_var_tabulation.rkh b/rkward/plugins/data/one_var_tabulation.rkh index 9e2f4a8..398706e 100644 --- a/rkward/plugins/data/one_var_tabulation.rkh +++ b/rkward/plugins/data/one_var_tabulation.rkh @@ -24,17 +24,19 @@ </ul> </related> - <technical> + <technical><!-- i18n: Terms inside quotes, <i></i> or <b></b> should not be translated, here --> General users may skip this section of help, this is primarily for developers. - The following external properties are provided for use in the embedding plugin. + The following external properties are provided for use in the embedding plugin: + <ul> - <li><i>varsource</i>: The tabulation plugin does not show its own varselector by default. Connect your own to this one (client="embedded_id.varsource.selected", governor="myvarselector_id.selected").</li> + <li><i>varsource</i>: The tabulation plugin does not show its own varselector by default. Connect your own to this one (<i>client="embedded_id.varsource.selected" governor="myvarselector_id.selected"</i>).</li> <li><i>outvar</i>: By default, the plugin produces a table in a variable called "x". You can set it to use a different name, here.</li> <li><i>titlevar</i>: If you want the plugin to save a description of the grouping variables in an R variable, set this to an object name to use. Else set this to "" to disable. Defaults to "title"</li> <li><i>fun_label</i>: This property will be set to a description of the statistic.</li> - <li><i>parameters</i>: This property will be set to a string describing the tabulation options, suitable for pasting into the "parameters" argument of rk.header().</li> + <li><i>parameters</i>: This property will be set to a string describing the tabulation options, suitable for pasting into the <i>parameters</i> argument of <b>rk.header()</b>.</li> </ul> + The generated code is available from <i>code.calculate</i>. </technical> diff --git a/rkward/plugins/plots/barplot_embed.rkh b/rkward/plugins/plots/barplot_embed.rkh index 1609884..b99f17f 100644 --- a/rkward/plugins/plots/barplot_embed.rkh +++ b/rkward/plugins/plots/barplot_embed.rkh @@ -28,11 +28,12 @@ Choose if you want stacked bars, legend, and rainbow colors. Also you can choose <li><link href="rkward://rhelp/table"/></li> </ul> </related> - <technical> + <technical><!-- i18n: "true", "false", and terms inside <i></i> or <b></b> should not be translated, here --> This plugin is meant to be embedded in other plugins. It does not by itself provide a means to select input data. When embedding this plugin, you will be interested in the following properties: + <ul> <li><i>xvar</i>: The name of the data variable. You can connect this to a varslot, or set it to a fixed string such as "x". This is required.</li> - <li><i>code.preprocess</i>: Provides a summary of parameters to be used in a call to rk.header(), if you have a use for it.</li> + <li><i>code.preprocess</i>: Provides a summary of parameters to be used in a call to <b>rk.header()</b>, if you have a use for it.</li> <li><i>code.printout</i>: The actual commands needed to construct the barplot.</li> </ul> </technical> diff --git a/rkward/plugins/plots/histogram_options.rkh b/rkward/plugins/plots/histogram_options.rkh index 6af40a8..20e516d 100644 --- a/rkward/plugins/plots/histogram_options.rkh +++ b/rkward/plugins/plots/histogram_options.rkh @@ -35,19 +35,22 @@ <li><link href="rkward://rhelp/extendrange"/></li> </ul> </related> - <technical> + <technical><!-- i18n: "true", "false, and terms inside <i></i> or <b></b> should not be translated, here --> General users may skip this section of help, this is primarily for developers. The following external tags are provided for use in the embedding plugin. + <ul> <li><i>varname</i>: For linking to the variable name for which histogram is being plotted. This is used in the 'Integer numbers' option for breaks.</li> - <li><i>allow_freq</i>: Setting this to "true" ("false") enables (disables) the display of the 'Frequency' checkbox.</li> - <li><i>allow_barlabels</i>: Setting this to "true" ("false") enables (disables) the display of the 'Bar labels' checkbox.</li> - <li><i>allow_addtoplot</i>: Setting this to "true" ("false") enables (disables) the display of the 'Add bars to current plot' checkbox.</li> + <li><i>allow_freq</i>: Setting this to "true" ("false") enables (disables) the display of the '<label id="freq"/>' check box.</li> + <li><i>allow_barlabels</i>: Setting this to "true" ("false") enables (disables) the display of the '<label id="barlabels"/>' check box.</li> + <li><i>allow_addtoplot</i>: Setting this to "true" ("false") enables (disables) the display of the '<label id="addtoplot"/>' check box.</li> </ul> + In order to allow flexible use, the generated options are separated into three different sections: + <ul> - <li><i>code.preprocess</i>: Options suitable for use in a call to rk.header(). These are safe to ignore, if you do not need them.</li> + <li><i>code.preprocess</i>: Options suitable for use in a call to <b>rk.header()</b>. These are safe to ignore, if you do not need them.</li> <li><i>code.calculate</i>: This contains only the <i>breaks</i>-option.</li> <li><i>code.printout</i>: This contains all the other options determining the look of the plot.</li> </ul> diff --git a/rkward/plugins/plots/plot_options.rkh b/rkward/plugins/plots/plot_options.rkh index fe16fa4..01b501f 100644 --- a/rkward/plugins/plots/plot_options.rkh +++ b/rkward/plugins/plots/plot_options.rkh @@ -50,29 +50,32 @@ </ul> </related> - <technical> + <technical><!-- i18n: "true", "false", and terms inside <i></i> or <b></b> should not be translated, here --> General users may skip this section of help, this is primarily for developers. The following external tags are provided for use in the embedding plugin. + <ul> <li><i>xvar</i>: The variable to be used for the x-coordinates.</li> <li><i>yvar</i>: The variable to be used for the y-coordinates.</li> - <li><i>default_pointtype</i>: A string that provides the default point type when the user chooses 'Default' for 'Type of points/lines'. The possibilities are p,l,b,o,h,s and S; the options for the <i>type</i> argument.</li> - <li><i>default_pointcolor</i>: A string that provides the default point color when the user chooses 'Default' for 'Color'. For various possibilities see the code color_chooser.xml; the options for the <i>col</i> argument.</li> - <li><i>default_main</i>: A string specifying the <i>main</i> argument to <b>plot.default</b>. By default this is "" which means that the main title generated by the plotting function is used. Note: The default is always used unquoted. If you want to specify a literal string add quotes, explicitly, as "&quote;".</li> + <li><i>default_pointtype</i>: A string that provides the default point type when the user chooses 'Default' for '<label id="pointtype"/>'. The possibilities are p,l,b,o,h,s and S; the options for the <i>type</i> argument.</li> + <li><i>default_pointcolor</i>: A string that provides the default point color when the user chooses 'Default' for '<label id="pointcolor"/>'. For various possibilities see the code color_chooser.xml; the options for the <i>col</i> argument.</li> + <li><i>default_main</i>: A string specifying the <i>main</i> argument to <b>plot.default</b>. By default this is "" which means that the main title generated by the plotting function is used. Note: The default is always used unquoted. If you want to specify a literal string add quotes, explicitly, as "&<i>quote;</i>".</li> <li><i>default_sub</i>: Similar to <i>main</i> above but for the subtitle argument <i>sub</i>.</li> <li><i>default_xlab</i>: Similar to <i>main</i> above but for the X-label argument <i>xlab</i>.</li> <li><i>default_ylab</i>: Similar to <i>main</i> above but for the Y-label argument <i>ylab</i>.</li> - <li><i>allow_log</i>: Setting this to "true" ("false") enables (disables) the display of 'X axis logarithmic' and 'Y axis logarithmic' checkboxes.</li> - <li><i>allow_xlim</i>: Setting this to "true" ("false") enables (disables) the display of 'Min X value' and 'Max X value' input boxes.</li> - <li><i>allow_ylim</i>: Setting this to "true" ("false") enables (disables) the display of 'Min Y value' and 'Max Y value' input boxes.</li> - <li><i>allow_type</i>: Setting this to "true" ("false") enables (disables) the display of the 'Points / Lines' tab.</li> - <li><i>allow_aspect</i>: Setting this to "true" ("false") enables (disables) the display of the 'Aspect ratio' tab.</li> - <li><i>allow_grid</i>: Setting this to "true" ("false") enables (disables) the display of the 'Grid' tab. If "true", the actual code for grid options can be extracted from code.calculate (see below) which in turn extracts it from grid_options.code.printout. Specifically, if the plot options plugin is embedded using an id="plot_options" then the following call:<br> + <li><i>allow_log</i>: Setting this to "true" ("false") enables (disables) the display of '<label id="xlog"/>' and '<label id="ylog"/>' check boxes.</li> + <li><i>allow_xlim</i>: Setting this to "true" ("false") enables (disables) the display of '<label id="xminvalue"/>' and '<label id="xmaxvalue"/>' input boxes.</li> + <li><i>allow_ylim</i>: Setting this to "true" ("false") enables (disables) the display of '<label id="yminvalue"/>' and '<label id="ymaxvalue"/>' input boxes.</li> + <li><i>allow_type</i>: Setting this to "true" ("false") enables (disables) the display of the '<label id="pointtypepage"/>' tab.</li> + <li><i>allow_aspect</i>: Setting this to "true" ("false") enables (disables) the display of the '<label id="aspectratio"/>' tab.</li> + <li><i>allow_grid</i>: Setting this to "true" ("false") enables (disables) the display of the '<label id="tab_grid"/>' tab. If "true", the actual code for grid options can be extracted from code.calculate (see below) which in turn extracts it from grid_options.code.printout. Specifically, if the plot options plugin is embedded using an <i>id="plot_options"</i> then the following call:<br> printIndented ("\t", getRK_val ("plot_options.code.calculate"));</br><br> after the plotting function should do the job.</br></li> </ul> + In order to allow flexible use, the generated options are separated into different sections: + <ul> <li><i>code.preprocess</i>: Nothing yet, but will hopefully include some <b>par</b> options.</li> <li><i>code.calculate</i>: Currently this contains only the <b>grid</b>-options.</li> diff --git a/rkward/plugins/plots/plot_stepfun_options.rkh b/rkward/plugins/plots/plot_stepfun_options.rkh index 62d65de..ab4ad3c 100644 --- a/rkward/plugins/plots/plot_stepfun_options.rkh +++ b/rkward/plugins/plots/plot_stepfun_options.rkh @@ -23,15 +23,16 @@ <li><link href="rkward://rhelp/ecdf"/></li> </ul> </related> - <technical> + <technical><!-- i18n: "true", "false", and terms inside <i></i> or <b></b> should not be translated, here --> General users may skip this section of help, this is primarily for developers. The following external tags are provided for use in the embedding plugin. + <ul> - <li><i>allow_addtoplot</i>: Setting this to "true" ("false") enables (disables) the display of the 'Add to current plot' checkbox.</li> - <li><i>default_dopoints</i>: Setting this to "true" ("false") toggles the state of the 'Draw points' checkbox.</li> - <li><i>default_verticals</i>: Setting this to "true" ("false") toggles the state of the 'Draw vertical lines' checkbox.</li> - <li><i>allow_col01line</i>: Setting this to "true" ("false") enables (disables) the display of the two frames ('For y = 0 line' and 'For y = 1 line') for <i>col.01line</i> option to ecdf.</li> + <li><i>allow_addtoplot</i>: Setting this to "true" ("false") enables (disables) the display of the '<label id="addtoplot"/>' check box.</li> + <li><i>default_dopoints</i>: Setting this to "true" ("false") toggles the state of the '<label id="do_points"/>' check box.</li> + <li><i>default_verticals</i>: Setting this to "true" ("false") toggles the state of the '<label id="verticals"/>' check box.</li> + <li><i>allow_col01line</i>: Setting this to "true" ("false") enables (disables) the display of the two frames ('<label id="frame_col_y0"/>' and '<label id="frame_col_y0"/>') for <i>col.01line</i> option to <b>ecdf</b>.</li> </ul> </technical> </document> |
|
From: Thomas F. <tho...@ru...> - 2015-02-05 20:19:14
|
Git commit adf61faa15d70b445e70d08e7e5f6f6fcafd118f by Thomas Friedrichsmeier. Committed on 05/02/2015 at 20:16. Pushed by tfry into branch 'releases/0.6.3'. Fix some message lookup failures, due to insufficient normalization of markup. M +5 -0 rkward/misc/xmlhelper.cpp http://commits.kde.org/rkward/adf61faa15d70b445e70d08e7e5f6f6fcafd118f diff --git a/rkward/misc/xmlhelper.cpp b/rkward/misc/xmlhelper.cpp index bb60f80..d6fd815 100644 --- a/rkward/misc/xmlhelper.cpp +++ b/rkward/misc/xmlhelper.cpp @@ -344,6 +344,11 @@ QString XMLHelper::i18nElementText (const QDomElement &element, bool with_paragr QString para = paras[i].simplified (); if (!para.isEmpty ()) { if (!ret.isEmpty ()) ret.append ("\n"); + // Oh, crap. Fix up after some differences between python message extraction and qt's. + para.replace ("<li> <", "<li><"); + para.replace ("br> <", "br><"); + para.replace ("> </li>", "></li>"); + para.replace ("&", "&"); QString text = context.isNull () ? catalog->translate (para) : catalog->translate (context, para); if (with_paragraphs) ret += "<p>" + text + "</p>"; else ret += text; |
|
From: Thomas F. <tho...@ru...> - 2015-02-05 20:19:12
|
Git commit 845f3d23dcb57ff78201828fdef636a2ee83a47f by Thomas Friedrichsmeier. Committed on 05/02/2015 at 20:16. Pushed by tfry into branch 'master'. Fix some message lookup failures, due to insufficient normalization of markup. M +3 -0 ChangeLog M +5 -0 rkward/misc/xmlhelper.cpp http://commits.kde.org/rkward/845f3d23dcb57ff78201828fdef636a2ee83a47f diff --git a/ChangeLog b/ChangeLog index ab9f9f8..81a75c5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +Next release TODO: +- Properly fix normalization of markup within messages between python / qt. + --- Version 0.6.3 - XXXXXXXXXXX - Fixed: Hang when trying to select existing directories in file selectors on Windows - New element <i18n> for use in plugins' logic section: Provides a translatable string property diff --git a/rkward/misc/xmlhelper.cpp b/rkward/misc/xmlhelper.cpp index bb60f80..d6fd815 100644 --- a/rkward/misc/xmlhelper.cpp +++ b/rkward/misc/xmlhelper.cpp @@ -344,6 +344,11 @@ QString XMLHelper::i18nElementText (const QDomElement &element, bool with_paragr QString para = paras[i].simplified (); if (!para.isEmpty ()) { if (!ret.isEmpty ()) ret.append ("\n"); + // Oh, crap. Fix up after some differences between python message extraction and qt's. + para.replace ("<li> <", "<li><"); + para.replace ("br> <", "br><"); + para.replace ("> </li>", "></li>"); + para.replace ("&", "&"); QString text = context.isNull () ? catalog->translate (para) : catalog->translate (context, para); if (with_paragraphs) ret += "<p>" + text + "</p>"; else ret += text; |
|
From: Thomas F. <tho...@ru...> - 2015-02-05 17:15:11
|
Git commit ad661e3dac9c678c1bf8999098318bd428fd2bef by Thomas Friedrichsmeier. Committed on 05/02/2015 at 17:13. Pushed by tfry into branch 'releases/0.6.3'. Don't try to translate empty strings M +6 -2 rkward/misc/xmlhelper.cpp http://commits.kde.org/rkward/ad661e3dac9c678c1bf8999098318bd428fd2bef diff --git a/rkward/misc/xmlhelper.cpp b/rkward/misc/xmlhelper.cpp index d18c068..bb60f80 100644 --- a/rkward/misc/xmlhelper.cpp +++ b/rkward/misc/xmlhelper.cpp @@ -247,9 +247,13 @@ QString XMLHelper::i18nStringAttribute (const QDomElement& element, const QStrin displayError (&element, i18n ("'%1'-attribute not given. Assuming '%2'", name, def), debug_level); return def; } + + QString attr = element.attribute (name); + if (attr.isEmpty ()) return attr; // Do not translate empty strings! + const QString context = element.attribute ("i18n_context", QString ()); - if (!context.isNull ()) return (catalog->translate (context, element.attribute (name))); - return (catalog->translate (element.attribute (name))); + if (!context.isNull ()) return (catalog->translate (context, attr)); + return (catalog->translate (attr)); } int XMLHelper::getMultiChoiceAttribute (const QDomElement &element, const QString &name, const QString &values, int def, int debug_level) { |
|
From: Thomas F. <tho...@ru...> - 2015-02-05 17:15:10
|
Git commit 2bd63162b2760fe53ddba6c6801f1336d17eff60 by Thomas Friedrichsmeier. Committed on 05/02/2015 at 17:13. Pushed by tfry into branch 'master'. Don't try to translate empty strings M +6 -2 rkward/misc/xmlhelper.cpp http://commits.kde.org/rkward/2bd63162b2760fe53ddba6c6801f1336d17eff60 diff --git a/rkward/misc/xmlhelper.cpp b/rkward/misc/xmlhelper.cpp index d18c068..bb60f80 100644 --- a/rkward/misc/xmlhelper.cpp +++ b/rkward/misc/xmlhelper.cpp @@ -247,9 +247,13 @@ QString XMLHelper::i18nStringAttribute (const QDomElement& element, const QStrin displayError (&element, i18n ("'%1'-attribute not given. Assuming '%2'", name, def), debug_level); return def; } + + QString attr = element.attribute (name); + if (attr.isEmpty ()) return attr; // Do not translate empty strings! + const QString context = element.attribute ("i18n_context", QString ()); - if (!context.isNull ()) return (catalog->translate (context, element.attribute (name))); - return (catalog->translate (element.attribute (name))); + if (!context.isNull ()) return (catalog->translate (context, attr)); + return (catalog->translate (attr)); } int XMLHelper::getMultiChoiceAttribute (const QDomElement &element, const QString &name, const QString &values, int def, int debug_level) { |
|
From: Thomas F. <tho...@ru...> - 2015-02-05 15:21:22
|
Git commit 367d579bba73c0334d2bdf734d1d13f915bdfe06 by Thomas Friedrichsmeier. Committed on 05/02/2015 at 15:17. Pushed by tfry into branch 'master'. Bookkeeping M +1 -3 ChangeLog http://commits.kde.org/rkward/367d579bba73c0334d2bdf734d1d13f915bdfe06 diff --git a/ChangeLog b/ChangeLog index 1f33ced..ab9f9f8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,4 @@ -TODO 0.6.3: - - talk to kde-18n-doc +--- Version 0.6.3 - XXXXXXXXXXX - Fixed: Hang when trying to select existing directories in file selectors on Windows - New element <i18n> for use in plugins' logic section: Provides a translatable string property - New element <label> for use in plugin help pages: Copies the label-attribute of the given element into the text @@ -16,7 +15,6 @@ TODO 0.6.3: - Allow to override plugins from a different pluginmap (the plugin with the highest specified version is used) - Fixed: Error when using fix() or trace(...edit=TRUE) with default settings on some systems - When the RKWard installation has moved on disk, try to adjust stored .pluginmaps paths, accordingly - - TODO: Actually test this on Windows - Fixed: Freezes when using RKWard-functionality (such as the RK()-device) from tcl/tk (e.g. Rcmdr) - Allow opening RKWard's plugin files (with correct highlighting), and other text files - More robust control over placement of plugins within a menu |
|
From: Thomas F. <tho...@ru...> - 2015-02-05 15:18:37
|
Git commit b7df07c27b05caa4779142a8b4ced456e0860197 by Thomas Friedrichsmeier. Committed on 18/10/2014 at 15:51. Pushed by tfry into branch 'releases/0.6.2'. Fix one half of http://sourceforge.net/p/rkward/bugs/130/ svn path=/trunk/rkward/; revision=4931 M +2 -2 rkward/windows/rkcommandeditorwindow.cpp http://commits.kde.org/rkward/b7df07c27b05caa4779142a8b4ced456e0860197 diff --git a/rkward/windows/rkcommandeditorwindow.cpp b/rkward/windows/rkcommandeditorwindow.cpp index b729f4a..085e106 100644 --- a/rkward/windows/rkcommandeditorwindow.cpp +++ b/rkward/windows/rkcommandeditorwindow.cpp @@ -2,7 +2,7 @@ rkcommandeditorwindow - description ------------------- begin : Mon Aug 30 2004 - copyright : (C) 2004-2013 by Thomas Friedrichsmeier + copyright : (C) 2004-2014 by Thomas Friedrichsmeier email : tf...@us... ***************************************************************************/ @@ -331,7 +331,7 @@ QString RKCommandEditorWindow::fullCaption () { if (m_doc->url ().isEmpty ()) { return (shortCaption ()); } else { - QString cap = m_doc->url ().url (); + QString cap = m_doc->url ().pathOrUrl (); if (isModified ()) cap.append (i18n (" [modified]")); return (cap); } |
|
From: Thomas F. <tho...@ru...> - 2015-02-05 15:18:36
|
Git commit ab946df44f51fd9496ea5ec4c18dad5d3047926c by Thomas Friedrichsmeier. Committed on 05/02/2015 at 15:17. Pushed by tfry into branch 'releases/0.6.3'. Bookkeeping M +1 -3 ChangeLog http://commits.kde.org/rkward/ab946df44f51fd9496ea5ec4c18dad5d3047926c diff --git a/ChangeLog b/ChangeLog index 1f33ced..ab9f9f8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,4 @@ -TODO 0.6.3: - - talk to kde-18n-doc +--- Version 0.6.3 - XXXXXXXXXXX - Fixed: Hang when trying to select existing directories in file selectors on Windows - New element <i18n> for use in plugins' logic section: Provides a translatable string property - New element <label> for use in plugin help pages: Copies the label-attribute of the given element into the text @@ -16,7 +15,6 @@ TODO 0.6.3: - Allow to override plugins from a different pluginmap (the plugin with the highest specified version is used) - Fixed: Error when using fix() or trace(...edit=TRUE) with default settings on some systems - When the RKWard installation has moved on disk, try to adjust stored .pluginmaps paths, accordingly - - TODO: Actually test this on Windows - Fixed: Freezes when using RKWard-functionality (such as the RK()-device) from tcl/tk (e.g. Rcmdr) - Allow opening RKWard's plugin files (with correct highlighting), and other text files - More robust control over placement of plugins within a menu |
|
From: Thomas F. <tho...@ru...> - 2015-02-05 15:18:36
|
Git commit 9b8c2624af6598d7a1f5ff7d2ecb6ff2b5aa2a82 by Thomas Friedrichsmeier. Committed on 18/10/2014 at 16:03. Pushed by tfry into branch 'releases/0.6.2'. Pick 2b0b3e67c1c516d67b25e0ab474783bc0be9ee59 from trunk M +2 -0 ChangeLog M +5 -2 rkward/dialogs/startupdialog.cpp http://commits.kde.org/rkward/9b8c2624af6598d7a1f5ff7d2ecb6ff2b5aa2a82 diff --git a/ChangeLog b/ChangeLog index c3ca47a..8671c42 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,5 @@ +- Fixed display of file paths containing non-ascii characters in the title bar and startup dialog + --- Version 0.6.2 - Oct-20-2014 - In data editor, indicate NAs, explicitly - Import Stata plugin gains option to convert character encoding. diff --git a/rkward/dialogs/startupdialog.cpp b/rkward/dialogs/startupdialog.cpp index 54f1bbd..7ac4273 100644 --- a/rkward/dialogs/startupdialog.cpp +++ b/rkward/dialogs/startupdialog.cpp @@ -2,7 +2,7 @@ startupdialog - description ------------------- begin : Thu Aug 26 2004 - copyright : (C) 2004, 2011 by Thomas Friedrichsmeier + copyright : (C) 2004, 2011, 2014 by Thomas Friedrichsmeier email : tf...@us... ***************************************************************************/ @@ -77,7 +77,10 @@ StartupDialog::StartupDialog (QWidget *parent, StartupDialogResult *result, KRec file_list->setSortingEnabled (false); chose_file_item = new QListWidgetItem (i18n ("<<Open another file>>"), file_list); if (recent_files) { - file_list->addItems (recent_files->urls ().toStringList ()); + KUrl::List urls = recent_files->urls (); + for (int i = 0; i < urls.length (); ++i) { + file_list->addItem (urls[i].pathOrUrl ()); + } } connect (file_list, SIGNAL (itemClicked (QListWidgetItem*)), this, SLOT (listClicked (QListWidgetItem*))); connect (file_list, SIGNAL (itemDoubleClicked (QListWidgetItem*)), this, SLOT (listDoubleClicked (QListWidgetItem*))); |
21 messages has been excluded from this view by a project administrator.
