[Sciviews-commits] r549 - in pkg: SciViews svDialogs svDialogstcltk svDoc svGUI svHttp svIDE svMisc svSocket svSweave svTools svTools/R svTools/man svUnit svWidgets tcltk2 tcltk2/inst/tklibs/ttktheme_clearlooks
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Sun Mar 2 09:46:50 CET 2014
Author: phgrosjean
Date: 2014-03-02 09:46:50 +0100 (Sun, 02 Mar 2014)
New Revision: 549
Removed:
pkg/svDoc/LICENSE
Modified:
pkg/SciViews/DESCRIPTION
pkg/svDialogs/DESCRIPTION
pkg/svDialogstcltk/DESCRIPTION
pkg/svDoc/DESCRIPTION
pkg/svGUI/DESCRIPTION
pkg/svHttp/DESCRIPTION
pkg/svIDE/DESCRIPTION
pkg/svMisc/DESCRIPTION
pkg/svSocket/DESCRIPTION
pkg/svSweave/DESCRIPTION
pkg/svTools/DESCRIPTION
pkg/svTools/NEWS
pkg/svTools/R/completion.R
pkg/svTools/R/errorlist.R
pkg/svTools/R/lintDescription.R
pkg/svTools/R/lintNamespace.R
pkg/svTools/man/svTools-package.Rd
pkg/svUnit/DESCRIPTION
pkg/svWidgets/DESCRIPTION
pkg/tcltk2/DESCRIPTION
pkg/tcltk2/inst/tklibs/ttktheme_clearlooks/clearlooks8.5.tcl
Log:
Rework of DESCRIPTION files
Rework of code in svTools to avoid using :::
Slight rework of clearlooks theme in tcltk2
Modified: pkg/SciViews/DESCRIPTION
===================================================================
--- pkg/SciViews/DESCRIPTION 2014-03-02 07:06:51 UTC (rev 548)
+++ pkg/SciViews/DESCRIPTION 2014-03-02 08:46:50 UTC (rev 549)
@@ -3,9 +3,9 @@
Version: 0.9-12
Date: 2014-02-10
Title: SciViews GUI API - Main package
+Author: Philippe Grosjean [aut, cre]
Authors at R: c(person("Philippe", "Grosjean", role = c("aut", "cre"),
email = "phgrosjean at sciviews.org"))
-Author: Philippe Grosjean
Maintainer: Philippe Grosjean <phgrosjean at sciviews.org>
Depends: R (>= 2.6.0), methods, grDevices, graphics, stats, MASS
Imports: ellipse
Modified: pkg/svDialogs/DESCRIPTION
===================================================================
--- pkg/svDialogs/DESCRIPTION 2014-03-02 07:06:51 UTC (rev 548)
+++ pkg/svDialogs/DESCRIPTION 2014-03-02 08:46:50 UTC (rev 549)
@@ -3,9 +3,9 @@
Version: 0.9-54
Date: 2013-01-27
Title: SciViews GUI API - Dialog boxes
+Author: Philippe Grosjean [aut, cre]
Authors at R: c(person("Philippe", "Grosjean", role = c("aut", "cre"),
email = "phgrosjean at sciviews.org"))
-Author: Philippe Grosjean
Maintainer: Philippe Grosjean <phgrosjean at sciviews.org>
Depends: R (>= 2.6.0), svGUI (>= 0.9-52)
SystemRequirements: TODO!!!
Modified: pkg/svDialogstcltk/DESCRIPTION
===================================================================
--- pkg/svDialogstcltk/DESCRIPTION 2014-03-02 07:06:51 UTC (rev 548)
+++ pkg/svDialogstcltk/DESCRIPTION 2014-03-02 08:46:50 UTC (rev 549)
@@ -3,9 +3,9 @@
Version: 0.9-4
Date: 2013-11-30
Title: SciViews GUI API - Dialog boxes using Tcl/Tk
+Author: Philippe Grosjean [aut, cre]
Authors at R: c(person("Philippe", "Grosjean", role = c("aut", "cre"),
email = "phgrosjean at sciviews.org"))
-Author: Philippe Grosjean
Maintainer: Philippe Grosjean <phgrosjean at sciviews.org>
Depends: R (>= 2.6.0), svDialogs (>= 0.9-50), tcltk
Imports: svGUI (>= 0.9-52)
Modified: pkg/svDoc/DESCRIPTION
===================================================================
--- pkg/svDoc/DESCRIPTION 2014-03-02 07:06:51 UTC (rev 548)
+++ pkg/svDoc/DESCRIPTION 2014-03-02 08:46:50 UTC (rev 549)
@@ -3,9 +3,9 @@
Version: 0.9-9
Date: 2013-09-21
Title: SciViews GUI API - svDoc functions
+Author: Philippe Grosjean [aut, cre]
Authors at R: c(person("Philippe", "Grosjean", role = c("aut", "cre"),
email = "phgrosjean at sciviews.org"))
-Author: Philippe Grosjean
Maintainer: Philippe Grosjean <phgrosjean at sciviews.org>
Depends: R (>= 2.6.0), svMisc, ascii
Imports: utils
Deleted: pkg/svDoc/LICENSE
===================================================================
--- pkg/svDoc/LICENSE 2014-03-02 07:06:51 UTC (rev 548)
+++ pkg/svDoc/LICENSE 2014-03-02 08:46:50 UTC (rev 549)
@@ -1,88 +0,0 @@
-The svDoc package is licensed underg GPL-2 license.
-However, it includes other open source software components with the following
-licenses:
-
-- asciidoc
-- jQuery
-- jslider
-- easytabs
-
-asciidoc license
-----------------------------------------------------------------------
-Copyright (C) 2000-2007 Stuart Rackham
-
-Email: srackham at gmail.com
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or (at
-your option) any later version.
-
-This program is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-USA.
-
-
-jQuery license
-----------------------------------------------------------------------
-
-Copyright (c) 2012 jQuery Foundation and other contributors,
-http://jquery.com/
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-jslider license
-----------------------------------------------------------------------
-
-The MIT License (MIT)
-Copyright (c) 2012 Egor Khmelev
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-
-easytabs license
-----------------------------------------------------------------------
-
-By Steve Schwartz](https://github.com/JangoSteve - http://www.alfajango.com)
-Dual licensed under the MIT (http://www.opensource.org/licenses/mit-license.php)
-and GPL (http://www.gnu.org/licenses/gpl.html) licenses.
Modified: pkg/svGUI/DESCRIPTION
===================================================================
--- pkg/svGUI/DESCRIPTION 2014-03-02 07:06:51 UTC (rev 548)
+++ pkg/svGUI/DESCRIPTION 2014-03-02 08:46:50 UTC (rev 549)
@@ -3,9 +3,9 @@
Version: 0.9-54
Date: 2013-01-27
Title: SciViews GUI API - Functions to manage GUIs
+Author: Philippe Grosjean [aut, cre]
Authors at R: c(person("Philippe", "Grosjean", role = c("aut", "cre"),
email = "phgrosjean at sciviews.org"))
-Author: Philippe Grosjean
Maintainer: Philippe Grosjean <phgrosjean at sciviews.org>
Depends: R (>= 2.6.0)
Description: Functions to manage GUIs from R
Modified: pkg/svHttp/DESCRIPTION
===================================================================
--- pkg/svHttp/DESCRIPTION 2014-03-02 07:06:51 UTC (rev 548)
+++ pkg/svHttp/DESCRIPTION 2014-03-02 08:46:50 UTC (rev 549)
@@ -3,9 +3,9 @@
Version: 0.9-55
Date: 2014-03-01
Title: SciViews GUI API - R HTTP server
+Author: Philippe Grosjean [aut, cre]
Authors at R: c(person("Philippe", "Grosjean", role = c("aut", "cre"),
email = "phgrosjean at sciviews.org"))
-Author: Philippe Grosjean
Maintainer: Philippe Grosjean <phgrosjean at sciviews.org>
Depends: R (>= 2.11.0)
Imports: tools, svMisc (>= 0.9-68)
Modified: pkg/svIDE/DESCRIPTION
===================================================================
--- pkg/svIDE/DESCRIPTION 2014-03-02 07:06:51 UTC (rev 548)
+++ pkg/svIDE/DESCRIPTION 2014-03-02 08:46:50 UTC (rev 549)
@@ -3,9 +3,9 @@
Version: 0.9-50
Date: 2010-09-25
Title: SciViews GUI API - IDE and code editor functions
+Author: Philippe Grosjean [aut, cre]
Authors at R: c(person("Philippe", "Grosjean", role = c("aut", "cre"),
email = "phgrosjean at sciviews.org"))
-Author: Philippe Grosjean
Maintainer: Philippe Grosjean <phgrosjean at sciviews.org>
Depends: R (>= 2.6.0)
Imports: utils, tcltk, svMisc, XML
Modified: pkg/svMisc/DESCRIPTION
===================================================================
--- pkg/svMisc/DESCRIPTION 2014-03-02 07:06:51 UTC (rev 548)
+++ pkg/svMisc/DESCRIPTION 2014-03-02 08:46:50 UTC (rev 549)
@@ -3,13 +3,15 @@
Version: 0.9-70
Date: 2014-03-01
Title: SciViews GUI API - Miscellaneous functions
+Author: Philippe Grosjean [aut, cre],
+ Romain Francois [ctb],
+ Kamil Barton [ctb]
Authors at R: c(person("Philippe", "Grosjean", role = c("aut", "cre"),
email = "phgrosjean at sciviews.org"),
person("Romain", "Francois", role = "ctb",
email = "romain at r-enthusiasts.com"),
person("Kamil", "Barton", role = "ctb",
email = "kamil.barton at uni-wuerzburg.de"))
-Author: Philippe Grosjean, with contributions from Romain Francois and Kamil Barton
Maintainer: Philippe Grosjean <phgrosjean at sciviews.org>
Imports: utils, methods, tools
Depends: R (>= 2.13.0)
Modified: pkg/svSocket/DESCRIPTION
===================================================================
--- pkg/svSocket/DESCRIPTION 2014-03-02 07:06:51 UTC (rev 548)
+++ pkg/svSocket/DESCRIPTION 2014-03-02 08:46:50 UTC (rev 549)
@@ -3,11 +3,12 @@
Version: 0.9-55
Date: 2013-01-28
Title: SciViews GUI API - R Socket Server
+Author: Philippe Grosjean [aut, cre],
+ Matthew Dowle [ctb]
Authors at R: c(person("Philippe", "Grosjean", role = c("aut", "cre"),
email = "phgrosjean at sciviews.org"),
person("Matthew", "Dowle", role = "ctb",
email = "mdowle at mdowle.plus.com"))
-Author: Philippe Grosjean, with contributions from Matthew Dowle
Maintainer: Philippe Grosjean <phgrosjean at sciviews.org>
Depends: R (>= 2.6.0)
Imports: tcltk, svMisc (>= 0.9-68)
Modified: pkg/svSweave/DESCRIPTION
===================================================================
--- pkg/svSweave/DESCRIPTION 2014-03-02 07:06:51 UTC (rev 548)
+++ pkg/svSweave/DESCRIPTION 2014-03-02 08:46:50 UTC (rev 549)
@@ -3,9 +3,9 @@
Version: 0.9-8
Date: 2013-01-27
Title: SciViews GUI API - Sweave functions
+Author: Philippe Grosjean [aut, cre]
Authors at R: c(person("Philippe", "Grosjean", role = c("aut", "cre"),
email = "phgrosjean at sciviews.org"))
-Author: Philippe Grosjean
Maintainer: Philippe Grosjean <phgrosjean at sciviews.org>
Depends: R (>= 2.6.0), knitr
Imports: utils
Modified: pkg/svTools/DESCRIPTION
===================================================================
--- pkg/svTools/DESCRIPTION 2014-03-02 07:06:51 UTC (rev 548)
+++ pkg/svTools/DESCRIPTION 2014-03-02 08:46:50 UTC (rev 549)
@@ -1,13 +1,14 @@
Package: svTools
Type: Package
Version: 0.9-4
-Date: 2013-11-30
+Date: 2014-03-02
Title: SciViews GUI API - Tools (wrapper for packages tools and codetools)
+Author: Philippe Grosjean [aut, cre],
+ Romain Francois [aut]
Authors at R: c(person("Philippe", "Grosjean", role = c("aut", "cre"),
email = "phgrosjean at sciviews.org"),
person("Romain", "Francois", role = "aut",
email = "romain at r-enthusiasts.com"))
-Author: Philippe Grosjean and Romain Francois
Maintainer: Philippe Grosjean <phgrosjean at sciviews.org>
Depends: R (>= 2.6.0)
Imports: utils, tools, codetools, svMisc
Modified: pkg/svTools/NEWS
===================================================================
--- pkg/svTools/NEWS 2014-03-02 07:06:51 UTC (rev 548)
+++ pkg/svTools/NEWS 2014-03-02 08:46:50 UTC (rev 549)
@@ -5,7 +5,9 @@
* Internal change: tools:::file_path_as_absolute() changed to
tools::file_path_as_absolute().
+* Reworked other uses of :::.
+
== Changes in svTools 0.9-3
* Fixed a bug in lint() that prevented to retrieve warnings from codetools 0.2-8
Modified: pkg/svTools/R/completion.R
===================================================================
--- pkg/svTools/R/completion.R 2014-03-02 07:06:51 UTC (rev 548)
+++ pkg/svTools/R/completion.R 2014-03-02 08:46:50 UTC (rev 549)
@@ -1,13 +1,13 @@
-## TODO: avoid using ::: everywhere here!!!
completeCode <- function (...)
{
+ utilsNS <- getNamespace("utils")
out <- completion(..., min.length = 1)
if (is.null(out)) {
out <- matrix("", ncol = 4, nrow = 0)
- token <- utils:::.guessTokenFromLine()
+ token <- utilsNS$.guessTokenFromLine()
} else {
token <- attr(out, "token")
- if (is.null(token)) token <- utils:::.guessTokenFromLine()
+ if (is.null(token)) token <- utilsNS$.guessTokenFromLine()
types <- rep("function", nrow(out))
completions <- out[, 1]
types[regexpr("= *$", completions) > 0] <- "argument"
@@ -16,7 +16,7 @@
out <- cbind(out, types)[order(types), , drop = FALSE]
}
- fun <- utils:::inFunction()
+ fun <- utilsNS$inFunction()
if (length(fun) && !is.na(fun)) {
tooltip <- callTip(fun)
} else {
Modified: pkg/svTools/R/errorlist.R
===================================================================
--- pkg/svTools/R/errorlist.R 2014-03-02 07:06:51 UTC (rev 548)
+++ pkg/svTools/R/errorlist.R 2014-03-02 08:46:50 UTC (rev 549)
@@ -1,6 +1,5 @@
### Removes errors concerning a file or a set of files from the list of errors
### Romain Francois <francoisromain at free.fr>
-## TODO: avoid using ::: everywhere here!!!
resetErrors <- function (file = NULL, pattern = NULL)
{
if (!is.null(file)) {
Modified: pkg/svTools/R/lintDescription.R
===================================================================
--- pkg/svTools/R/lintDescription.R 2014-03-02 07:06:51 UTC (rev 548)
+++ pkg/svTools/R/lintDescription.R 2014-03-02 08:46:50 UTC (rev 549)
@@ -1,4 +1,3 @@
-## TODO: avoid using ::: at several places here!
lintDescription <- function (descfile, txt = readLines(descfile))
{
txt <- unlist(strsplit(txt, "\\\n"))
@@ -89,14 +88,15 @@
message = "the `Date`field should be in format yyyy-mm-dd")
}
-### TODO: check OS_type that can olny be unix or windows
+### TODO: check OS_type that can only be unix or windows
## Check the dependencies
### FIXME: all the stuff below comes from tools, I need to figure out what to do with it
- db <- tools:::.read_description(descfile)
- depends <- tools:::.get_requires_from_package_db(db, "Depends")
- imports <- tools:::.get_requires_from_package_db(db, "Imports")
- suggests <- tools:::.get_requires_from_package_db(db, "Suggests")
+ toolsNS <- getNamespace("tools")
+ db <- toolsNS$.read_description(descfile)
+ depends <- toolsNS$.get_requires_from_package_db(db, "Depends")
+ imports <- toolsNS$.get_requires_from_package_db(db, "Imports")
+ suggests <- toolsNS$.get_requires_from_package_db(db, "Suggests")
reqs <- unique(c(depends, imports,
if (!identical(as.logical(Sys.getenv("_R_CHECK_FORCE_SUGGESTS_")),
FALSE)) suggests))
@@ -108,7 +108,7 @@
}
installed <- sub("_.*", "", installed)
reqs <- reqs[!reqs %in% installed]
- stdPkgNames <- tools:::.get_standard_package_names()
+ stdPkgNames <- toolsNS$.get_standard_package_names()
m <- reqs %in% stdPkgNames$stubs
if (length(reqs[!m]))
addErr(line = grep("^(Depends|Suggests|Enhances)", txt),
Modified: pkg/svTools/R/lintNamespace.R
===================================================================
--- pkg/svTools/R/lintNamespace.R 2014-03-02 07:06:51 UTC (rev 548)
+++ pkg/svTools/R/lintNamespace.R 2014-03-02 08:46:50 UTC (rev 549)
@@ -1,10 +1,9 @@
-## TODO: avoid using ::: at several places here!
lintNamespace <- function (namespace, checkPackages = TRUE)
{
resetErrors(file = namespace)
if (isTRUE(checkPackages)) allpacks <- .packages(all.available = TRUE)
## Look for the 'object is not subsettable' error
- test <- try(tools:::.check_namespace(
+ test <- try(getNamespace("tools")$.check_namespace(
dirname(tools::file_path_as_absolute(namespace))), silent = TRUE)
if (inherits(test, "try-error")) {
if (regexpr("object is not subsettable", test) > 0) {
Modified: pkg/svTools/man/svTools-package.Rd
===================================================================
--- pkg/svTools/man/svTools-package.Rd 2014-03-02 07:06:51 UTC (rev 548)
+++ pkg/svTools/man/svTools-package.Rd 2014-03-02 08:46:50 UTC (rev 549)
@@ -13,7 +13,7 @@
Package: \tab svTools\cr
Type: \tab Package\cr
Version: \tab 0.9-4\cr
- Date: \tab 2012-11-30\cr
+ Date: \tab 2014-03-02\cr
License: \tab GPL 2 or above, at your convenience\cr
}
% TODO: add description of main functions here. Also add examples
Modified: pkg/svUnit/DESCRIPTION
===================================================================
--- pkg/svUnit/DESCRIPTION 2014-03-02 07:06:51 UTC (rev 548)
+++ pkg/svUnit/DESCRIPTION 2014-03-02 08:46:50 UTC (rev 549)
@@ -3,9 +3,9 @@
Version: 0.7-11
Date: 2013-01-27
Title: SciViews GUI API - Unit testing
+Author: Philippe Grosjean [aut, cre]
Authors at R: c(person("Philippe", "Grosjean", role = c("aut", "cre"),
email = "phgrosjean at sciviews.org"))
-Author: Philippe Grosjean
Maintainer: Philippe Grosjean <phgrosjean at sciviews.org>
Depends: R (>= 1.9.0)
Suggests: svGUI, datasets, utils, XML
Modified: pkg/svWidgets/DESCRIPTION
===================================================================
--- pkg/svWidgets/DESCRIPTION 2014-03-02 07:06:51 UTC (rev 548)
+++ pkg/svWidgets/DESCRIPTION 2014-03-02 08:46:50 UTC (rev 549)
@@ -3,9 +3,9 @@
Version: 0.9-44
Date: 2013-11-30
Title: SciViews GUI API - Widgets & Windows
+Author: Philippe Grosjean [aut, cre]
Authors at R: c(person("Philippe", "Grosjean", role = c("aut", "cre"),
email = "phgrosjean at sciviews.org"))
-Author: Philippe Grosjean
Maintainer: Philippe Grosjean <phgrosjean at sciviews.org>
Depends: R (>= 2.7.0)
Imports: tcltk, utils, svMisc (>= 0.9-68)
Modified: pkg/tcltk2/DESCRIPTION
===================================================================
--- pkg/tcltk2/DESCRIPTION 2014-03-02 07:06:51 UTC (rev 548)
+++ pkg/tcltk2/DESCRIPTION 2014-03-02 08:46:50 UTC (rev 549)
@@ -3,9 +3,9 @@
Version: 1.2-9
Date: 2013-12-11
Title: Tcl/Tk Additions
+Author: Philippe Grosjean [aut, cre]
Authors at R: c(person("Philippe", "Grosjean", role = c("aut", "cre"),
email = "phgrosjean at sciviews.org"))
-Author: Philippe Grosjean
Maintainer: Philippe Grosjean <phgrosjean at sciviews.org>
Depends: R (>= 2.8.0), tcltk
Suggests: utils
Modified: pkg/tcltk2/inst/tklibs/ttktheme_clearlooks/clearlooks8.5.tcl
===================================================================
--- pkg/tcltk2/inst/tklibs/ttktheme_clearlooks/clearlooks8.5.tcl 2014-03-02 07:06:51 UTC (rev 548)
+++ pkg/tcltk2/inst/tklibs/ttktheme_clearlooks/clearlooks8.5.tcl 2014-03-02 08:46:50 UTC (rev 549)
@@ -89,6 +89,7 @@
## Buttons.
#
+ ttk::style configure TButton -anchor center
ttk::style configure TButton -padding {10 0}
ttk::style layout TButton {
Button.button -children {
More information about the Sciviews-commits
mailing list