where the TOC menu gets added to dynamically, and a second one to toggle show/hide - .rk.cat.output (paste ( - "

\n", - "\tHide TOC\n", - "\tGo to top\n
", - "\t\t\n\t\t\t1 •\n", - "\t\t\t2 •\n", - "\t\t\t3 •\n", - "\t\t\t4\n\t\t\n", - "\t\n

\n", - "

\n", - "\tShow TOC\n", - "\tGo to top\n", - "

\n", sep="")) + if (style != "preview") { + # This initial output mostly to indicate the output is really there, just empty for now + .rk.cat.output (paste ("\n

RKWard output initialized on", .rk.date (), "

\n")) + # an empty

where the TOC menu gets added to dynamically, and a second one to toggle show/hide + .rk.cat.output (paste ( + "

\n", + "\tHide TOC\n", + "\tGo to top\n
", + "\t\t\n\t\t\t1 •\n", + "\t\t\t2 •\n", + "\t\t\t3 •\n", + "\t\t\t4\n\t\t\n", + "\t\n

\n", + "

\n", + "\tShow TOC\n", + "\tGo to top\n", + "

\n", sep="")) + } } # needs to come after initialization, so initialization alone does not trigger an update during startup .rk.do.plain.call ("set.output.file", x, synchronous=FALSE) - invisible (NULL) + invisible (oldfile) } # Internal helper function to extract file names of images used in html files. @@ -193,7 +212,7 @@ #' @export #' @rdname rk.get.tempfile.name -"rk.flush.output" <- function (x=rk.get.output.html.file (), flush.images=TRUE, ask=TRUE) { +"rk.flush.output" <- function (x=rk.get.output.html.file (), flush.images=TRUE, ask=TRUE, ...) { images <- character (0) if (flush.images) images <- .rk.get.images.in.html.file (x) @@ -213,5 +232,5 @@ } ) - rk.set.output.html.file (x) + rk.set.output.html.file (x, ...) } diff -Nru rkward-0.6.4/rkward/rbackend/rpackages/rkward/R/rk.plugin-functions.R rkward-0.6.5/rkward/rbackend/rpackages/rkward/R/rk.plugin-functions.R --- rkward-0.6.4/rkward/rbackend/rpackages/rkward/R/rk.plugin-functions.R 2015-02-20 12:10:45.000000000 +0000 +++ rkward-0.6.5/rkward/rbackend/rpackages/rkward/R/rk.plugin-functions.R 2016-03-08 09:11:38.000000000 +0000 @@ -181,3 +181,75 @@ .rk.do.plain.call ("setPluginStatus", c (id, context, visible)) invisible (NULL) } + +assign(".rk.preview.data", list (), envir=.rk.variables) + +#' Manage (shortly) persistent data for previews (for use in RKWard plugins wishing to provide custom previews) +#' +#' \code{rk.assign.preview.data} stores data associated with a specific "id". Usually this id is +#' provided by the -feature of a plugin. +#' \code{rk.get.preview.data} retrieves data previously stored with \code{rk.assign.preview.data} +#' \code{rk.discard.preview.data} discards data previously stored with \code{rk.assign.preview.data}. +#' This gets called by the -box of the plugin, automtically, when the plugin dialog is closed. +#' You do not generally have to call it manually. See the notes for running custom clearnup code, below. +#' +#' @param id (character). Id associated with the data. Usually this will be the 'id' value of the -box. +#' @param value. The value to assign. If this is a list, and contains a function named "on.delete", this function +#' will be run by rk.discard.preview.data (with the \code{id} as argument. This is useful for running custom clearnup +#' code, such as removing temporary files, etc. +#' +#' @return \code{rk.assign.preview.data} amd \code{rk.get.preview.data} returns the preview data (newly) associated +#' with the given id. \code{rk.discard.preview.data} returns \code{NULL}, invisibly. +#' +#' \bold{Note}: Plugins that want to produce a single plot, or open a single object via \code{\link{rk.edit}()} do \bold{not} +#' have to call these functions, manually. See the chapter on providing previews in the Introduction to +#' writing plugins for RKWard. +#' +#' @author Thomas Friedrichsmeier \email{rkward-devel@@kde.org} +#' @keywords utilities +#' +#' @examples +#' ## To be generated in the preview() code section of a plugin +#' +#' ## NOT RUN +#' pdata <- rk.get.preview.data("SOMEID") +#' if (is.null (pdata)) { +#' outfile <- rk.get.tempfile.name(prefix="preview", extension=".txt") +#' pdata <- list(filename=outfile, on.delete=function (id) { +#' unlink(rk.get.preview.data(id)$filename) +#' }) +#' rk.assign.preview.data("SOMEID", pdata) +#' } +#' try ({ +#' cat ("This is a test", pdata$filename) +#' rk.edit.files(file=pdata$filename) +#' }) +#' ## END NOT RUN +#' +#' @export +#' @rdname rk.assign.preview.data +#' @aliases rk.get.preview.data .rk.discard.preview.data +"rk.assign.preview.data" <- function (id, value=list ()) { + pdata <- .rk.variables$.rk.preview.data + pdata[[id]] <- value + assign (".rk.preview.data", pdata, envir=.rk.variables) + rk.sync (.rk.variables$.rk.preview.data) + invisible (pdata[[id]]) +} + +#' @export +#' @rdname rk.assign.preview.data +"rk.get.preview.data" <- function (id) { + .rk.variables$.rk.preview.data[[id]] +} + +#' @export +#' @rdname rk.assign.preview.data +"rk.discard.preview.data" <- function (id) { + pdata <- .rk.variables$.rk.preview.data + if (!is.null (pdata[[id]]) && !is.null (pdata[[id]]$on.exit)) pdata[[id]]$on.delete (id) + pdata[[id]] <- NULL + assign (".rk.preview.data", pdata, envir=.rk.variables) + rk.sync (.rk.variables$.rk.preview.data) + invisible (NULL) +} diff -Nru rkward-0.6.4/rkward/rbackend/rpackages/rkward/R/rk.print-functions.R rkward-0.6.5/rkward/rbackend/rpackages/rkward/R/rk.print-functions.R --- rkward-0.6.4/rkward/rbackend/rpackages/rkward/R/rk.print-functions.R 2015-02-20 12:10:45.000000000 +0000 +++ rkward-0.6.5/rkward/rbackend/rpackages/rkward/R/rk.print-functions.R 2016-03-08 09:11:38.000000000 +0000 @@ -9,7 +9,8 @@ #' \code{rk.print} prints/exports the given object to the output (html) file #' using the \code{\link{HTML}} function. This requires the \code{R2HTML} #' package. Additional arguments in \code{...} are passed on to -#' \code{\link{HTML}}. +#' \code{\link{HTML}}. For some types of objects (e.g. "htmlwidgets" from +#' the "htmlwidgets" package) additional packages may be required. #' #' \code{rk.print.literal} prints/exports the given object using a #' \code{paste(x, collapse="\n")} construct to the output (html) file. @@ -90,9 +91,21 @@ #' #' @export "rk.print" <- function(x,...) { - htmlfile <- rk.get.output.html.file() - if(require("R2HTML")==TRUE) { - HTML(x, file=htmlfile,...) + if (inherits (x, "htmlwidget")) { + require ("htmlwidgets") + name <- deparse (substitute (x)) + filename <- rk.get.tempfile.name (name, ".html") + dir <- rk.get.tempfile.name (name, "_data") + saveWidget (x, filename, selfcontained=FALSE, libdir=dir) + .rk.cat.output (paste0 ("

")) + } else if (inherits (x, "gvis")) { + require ("googleVis") + print (x, file=rk.get.output.html.file(), append=TRUE) + } else { + htmlfile <- rk.get.output.html.file() + if(require("R2HTML")==TRUE) { + HTML(x, file=htmlfile,...) + } } } diff -Nru rkward-0.6.4/rkward/rbackend/rpackages/rkward/R/rk.workspace-functions.R rkward-0.6.5/rkward/rbackend/rpackages/rkward/R/rk.workspace-functions.R --- rkward-0.6.4/rkward/rbackend/rpackages/rkward/R/rk.workspace-functions.R 2015-02-20 12:10:45.000000000 +0000 +++ rkward-0.6.5/rkward/rbackend/rpackages/rkward/R/rk.workspace-functions.R 2016-03-08 09:11:38.000000000 +0000 @@ -69,3 +69,45 @@ .rk.do.plain.call ("workplace.layout", c ("set", close, lines), synchronous=FALSE) invisible (NULL) } + +#' Control window placement and style +#' +#' \code{.rk.with.window.hints} can be used to make windows appear in a specific +#' location: attached, detached, or in a named position where a previous window is +#' found. (The latter used for preview windows, importantly). It can also be used to pass +#' "style" hints, importantly indicating that the window is a preview window. All specifications +#' affect newly created windows, only, not existing ones. +#' +#' NOTE: This function is still somewhat experimental, and it is not guaranteed that +#' it will remain in place, with compatible parameters. +#' +#' @aliases .rk.with.window.hints rk.with.window.hints +#' @param expr Expression to evaluate, unsually an expression that is expected to create exactly one +#' new window. +#' @param placement a character string specifying either "attached" or "detached" placement, or +#' (if left empty) the default placement for the type of window created. +#' @param name character string specifing a named position. If a name is given, and this position is +#' not yet known, the placement hint (see above) will be followed. If later a second window is +#' created with the same given name, it will replace the first window. +#' @param style character string specifing a style hint. Currently, this can either be "preview" or +#' "" (default), with most types of window not implementing any special behavior for "preview". +#' @return \code{NULL}, invisibly. +#' @author Thomas Friedrichsmeier \email{rkward-devel@@kde.org} +#' @keywords utilities +#' @rdname rk.with.window.hints +#' @examples +#' +#' ## Not run +#' .rk.with.window.hints ({ +#' RK () +#' plot (1, 1) +#' }, "attached") +#' ## End not run +#' +#' @export +".rk.with.window.hints" <- function (expr, placement="", name="", style="") { + .rk.do.plain.call ("set.window.placement.hint", as.character (c (placement, name, style)), FALSE) + on.exit (.rk.do.plain.call ("set.window.placement.hint", c ("", "", ""), FALSE)) + eval.parent (substitute (eval (quote (expr), parent.frame ()))) + invisible (NULL) +} diff -Nru rkward-0.6.4/rkward/rbackend/rpackages/rkward/R/ver.R rkward-0.6.5/rkward/rbackend/rpackages/rkward/R/ver.R --- rkward-0.6.4/rkward/rbackend/rpackages/rkward/R/ver.R 2015-12-15 09:10:12.000000000 +0000 +++ rkward-0.6.5/rkward/rbackend/rpackages/rkward/R/ver.R 2016-03-23 16:43:26.000000000 +0000 @@ -3,4 +3,4 @@ # rkward/SetVersionNumber.cmake #' @export -".rk.app.version" <- "0.6.4" +".rk.app.version" <- "0.6.4z+0.6.5+pre1" diff -Nru rkward-0.6.4/rkward/resource.ver rkward-0.6.5/rkward/resource.ver --- rkward-0.6.4/rkward/resource.ver 1970-01-01 00:00:00.000000000 +0000 +++ rkward-0.6.5/rkward/resource.ver 2016-03-23 16:43:26.000000000 +0000 @@ -0,0 +1 @@ +0.6.4z+0.6.5+pre1 diff -Nru rkward-0.6.4/rkward/rkconsole.cpp rkward-0.6.5/rkward/rkconsole.cpp --- rkward-0.6.4/rkward/rkconsole.cpp 2015-12-15 09:10:12.000000000 +0000 +++ rkward-0.6.5/rkward/rkconsole.cpp 2016-03-22 19:22:59.000000000 +0000 @@ -880,9 +880,11 @@ RKCommandHighlighter::copyLinesToOutput (view, RKCommandHighlighter::RInteractiveSession); } -void RKConsole::showContextHelp () { +void RKConsole::currentHelpContext (QString* symbol, QString* package) { RK_TRACE (APP); - RKHelpSearchWindow::mainHelpSearch ()->getContextHelp (currentEditingLine (), currentCursorPositionInCommand ()); + Q_UNUSED (package); + + *symbol = RKCommonFunctions::getCurrentSymbol (currentEditingLine (), currentCursorPositionInCommand ()); } void RKConsole::initializeActions (KActionCollection *ac) { @@ -895,7 +897,8 @@ # define REAL_CMD_KEY Qt::MetaModifier #endif RKStandardActions::copyLinesToOutput (this, this, SLOT (copyLinesToOutput())); - context_help_action = RKStandardActions::functionHelp (this, this, SLOT(showContextHelp())); + RKStandardActions::functionHelp (this, this); + RKStandardActions::onlineHelp (this, this); run_selection_action = RKStandardActions::runCurrent (this, this, SLOT (runSelection())); interrupt_command_action = ac->addAction ("interrupt", this, SLOT (resetConsole())); diff -Nru rkward-0.6.4/rkward/rkconsole.h rkward-0.6.5/rkward/rkconsole.h --- rkward-0.6.4/rkward/rkconsole.h 2015-12-15 09:10:12.000000000 +0000 +++ rkward-0.6.5/rkward/rkconsole.h 2016-03-22 19:22:59.000000000 +0000 @@ -62,6 +62,7 @@ int currentCursorPositionInCommand (); void doTabCompletion (); QString provideContext (int line_rev); + void currentHelpContext (QString *symbol, QString *package); // KF5 TODO: override keyword static RKConsole *mainConsole () { return main_console; }; static void setMainConsole (RKConsole *console) { main_console = console; }; @@ -135,7 +136,6 @@ bool tab_key_pressed_before; - KAction* context_help_action; KAction* run_selection_action; KAction* interrupt_command_action; KAction* copy_commands_action; @@ -158,8 +158,6 @@ void literalCopy (); /** Clear the view, and add a prompt at the top. */ void clear (); -/** show context help on the current word */ - void showContextHelp (); /** Cancels the current command, if any, and clears the command buffer(s) */ void resetConsole (); void runSelection (); diff -Nru rkward-0.6.4/rkward/rkward.cpp rkward-0.6.5/rkward/rkward.cpp --- rkward-0.6.4/rkward/rkward.cpp 2015-12-15 09:10:12.000000000 +0000 +++ rkward-0.6.5/rkward/rkward.cpp 2016-03-22 19:22:59.000000000 +0000 @@ -197,7 +197,8 @@ KMessageBox::error (this, i18n ("

RKWard either could not find its resource files at all, or only an old version of those files. The most likely cause is that the last installation failed to place the files in the correct place. This can lead to all sorts of problems, from single missing features to complete failure to function.

You should quit RKWard, now, and fix your installation. For help with that, see http://rkward.kde.org/compiling.

"), i18n ("Broken installation"), KMessageBox::Notify | KMessageBox::AllowLink); } - QVariantList open_urls = RKGlobals::startup_options.take ("initial_urls").toList (); + QStringList open_urls = RKGlobals::startup_options.take ("initial_urls").toStringList (); + bool warn_external = RKGlobals::startup_options.take ("warn_external").toBool (); QString evaluate_code = RKGlobals::startup_options.take ("evaluate").toString (); initPlugins (); @@ -216,22 +217,21 @@ } } #endif + KMessageBox::enableMessage ("external_link_warning"); KUrl recover_url = RKRecoverDialog::checkRecoverCrashedWorkspace (); if (!recover_url.isEmpty ()) { - open_urls.clear (); - open_urls.append (recover_url); // Well, not a perfect solution. But we certainly don't want to overwrite the just recovered workspace. + open_urls.clear (); // Well, not a perfect solution. But we certainly don't want to overwrite the just recovered workspace. + open_urls.append (recover_url.url ()); } - setMergeLoads (true); for (int i = 0; i < open_urls.size (); ++i) { // make sure local urls are absolute, as we may be changing wd before loading - KUrl url = open_urls[i].toUrl (); + KUrl url = open_urls[i]; if (url.isRelative ()) { - open_urls[i] = KUrl::fromLocalFile (QDir::current ().absoluteFilePath (url.toLocalFile ())); + open_urls[i] = QDir::current ().absoluteFilePath (url.toLocalFile ()); } } - setMergeLoads (false); QString cd_to = RKSettingsModuleGeneral::initialWorkingDirectory (); if (!cd_to.isEmpty ()) { @@ -243,9 +243,7 @@ // the help window will be on top if (RKSettingsModuleGeneral::showHelpOnStartup ()) toplevel_actions->showRKWardHelp (); - for (int i = 0; i < open_urls.size (); ++i) { - RKWorkplace::mainWorkplace ()->openAnyUrl (open_urls[i].toUrl ()); - } + openUrlsFromCommandLineOrDBus (warn_external, open_urls); } else { StartupDialog::StartupDialogResult result = StartupDialog::getStartupAction (this, fileOpenRecentWorkspace); if (!result.open_url.isEmpty ()) { @@ -278,6 +276,31 @@ setCaption (QString ()); // our version of setCaption takes care of creating a correct caption, so we do not need to provide it here } +void RKWardMainWindow::openUrlsFromCommandLineOrDBus (bool warn_external, QStringList urls) { + RK_TRACE (APP); + + bool any_dangerous_urls = false; + for (int i = 0; i < urls.size (); ++i) { + QUrl url = urls[i]; + if (url.scheme () == "rkward" && url.host () == "runplugin") { + any_dangerous_urls = true; + break; + } + } + + if (warn_external && any_dangerous_urls) { + RK_ASSERT (urls.size () == 1); + QString message = i18n ("

You are about to start an RKWard dialog from outside of RKWard, probably by clicking on an 'rkward://'-link, somewhere. In case you have found this link on an external website, please bear in mind that R can be used to run arbitrary commands on your computer, potentially including downloading and installing malicious software. If you do not trust the source of the link you were following, you should press 'Cancel', below.

In case you click 'Continue', no R code will be run, unless and until you click 'Submit' in the dialog window, and you are encouraged to review the generated R code, before doing so.

Note: Checking 'Do not ask again' will suppress this message for the remainder of this session, only."); + if (KMessageBox::warningContinueCancel (this, message, i18n ("A note on external links"), KStandardGuiItem::cont (), KStandardGuiItem::cancel (), "external_link_warning") != KMessageBox::Continue) return; + } + + RKWardMainWindow::getMain ()->setMergeLoads (true); + for (int i = 0; i < urls.size (); ++i) { + RKWorkplace::mainWorkplace ()->openAnyUrl (urls[i], QString (), false); + } + RKWardMainWindow::getMain ()->setMergeLoads (false); +} + void RKWardMainWindow::initPlugins (const QStringList &automatically_added) { RK_TRACE (APP); slotSetStatusBarText(i18n("Setting up plugins...")); diff -Nru rkward-0.6.4/rkward/rkward.desktop rkward-0.6.5/rkward/rkward.desktop --- rkward-0.6.4/rkward/rkward.desktop 2015-12-15 09:10:12.000000000 +0000 +++ rkward-0.6.5/rkward/rkward.desktop 2016-03-08 09:11:38.000000000 +0000 @@ -19,8 +19,11 @@ Name[uk]=RKWard Name[x-test]=xxRKWardxx GenericName=GUI for R +GenericName[ca]=IGU pel R +GenericName[ca@valencia]=IGU pel R GenericName[de]=Benutzeroberfläche (GUI) für R GenericName[es]=Interfaz gráfica para R +GenericName[gl]=Interface gráfica para R GenericName[nl]=GUI voor R GenericName[pl]=Interfejs dla R GenericName[pt]=Interface para o R diff -Nru rkward-0.6.4/rkward/rkward.h rkward-0.6.5/rkward/rkward.h --- rkward-0.6.4/rkward/rkward.h 2015-12-15 09:10:12.000000000 +0000 +++ rkward-0.6.5/rkward/rkward.h 2016-03-22 19:22:59.000000000 +0000 @@ -133,6 +133,8 @@ void setCaption (const QString &); /** HACK this is only to make the compiler happy with -Woverloaded-virtual */ void setCaption (const QString &dummy, bool) { setCaption (dummy); }; + + void openUrlsFromCommandLineOrDBus (bool warn_external, QStringList urls); private slots: void partChanged (KParts::Part *new_part); private: diff -Nru rkward-0.6.4/rkward/rkward-open.desktop rkward-0.6.5/rkward/rkward-open.desktop --- rkward-0.6.4/rkward/rkward-open.desktop 2015-12-15 09:10:12.000000000 +0000 +++ rkward-0.6.5/rkward/rkward-open.desktop 2016-03-08 09:11:38.000000000 +0000 @@ -19,8 +19,11 @@ Name[uk]=RKWard Name[x-test]=xxRKWardxx GenericName=GUI for R +GenericName[ca]=IGU pel R +GenericName[ca@valencia]=IGU pel R GenericName[de]=Benutzeroberfläche (GUI) für R GenericName[es]=Interfaz gráfica para R +GenericName[gl]=Interface gráfica para R GenericName[nl]=GUI voor R GenericName[pl]=Interfejs dla R GenericName[pt]=Interface para o R diff -Nru rkward-0.6.4/rkward/rkward_startup_wrapper.cpp rkward-0.6.5/rkward/rkward_startup_wrapper.cpp --- rkward-0.6.4/rkward/rkward_startup_wrapper.cpp 2015-12-15 09:10:12.000000000 +0000 +++ rkward-0.6.5/rkward/rkward_startup_wrapper.cpp 2016-03-22 19:22:59.000000000 +0000 @@ -2,7 +2,7 @@ rkward_startup_wrapper - description ------------------- begin : Sun Mar 10 2013 - copyright : (C) 2013, 2014 by Thomas Friedrichsmeier + copyright : (C) 2013, 2014, 2015 by Thomas Friedrichsmeier email : thomas.friedrichsmeier@kdemail.net ***************************************************************************/ @@ -57,6 +57,7 @@ #ifdef Q_WS_WIN #include +#include #endif QString quoteCommand (const QString &orig) { #ifdef Q_WS_WIN @@ -107,6 +108,7 @@ QStringList debugger_args; QStringList file_args; bool reuse = false; + bool warn_external = true; QString r_exe_arg; int debug_level = 2; @@ -131,6 +133,8 @@ } } else if (args[i] == "--reuse") { reuse = true; + } else if (args[i] == "--nowarn-external") { + warn_external = false; } else if (args[i].startsWith ("--")) { // all RKWard and KDE options (other than --reuse) are of the for --option . So skip over the i++; @@ -150,7 +154,7 @@ } else { QDBusInterface iface (RKDBUS_SERVICENAME, "/", "", QDBusConnection::sessionBus ()); if (iface.isValid ()) { - QDBusReply reply = iface.call ("openAnyUrl", file_args); + QDBusReply reply = iface.call ("openAnyUrl", file_args, warn_external); if (!reply.isValid ()) { if (debug_level > 2) qDebug ("Error while placing dbus call: %s", qPrintable (reply.error ().message ())); return 1; @@ -287,10 +291,32 @@ InteractiveProcess proc; #ifdef Q_WS_WIN - proc.setProcessChannelMode (debugger_args.isEmpty () ? QProcess::MergedChannels : QProcess::ForwardedChannels); // ForwardedChannels causes console window to pop up! -#else - proc.setProcessChannelMode (QProcess::ForwardedChannels); + if (debugger_args.isEmpty ()) { + // start _without_ opening an annoying console window + QTemporaryFile *vbsf = new QTemporaryFile (QDir::tempPath () + "/rkwardlaunchXXXXXX.vbs"); + vbsf->setAutoRemove (false); + if (vbsf->open ()) { + QTextStream vbs (vbsf); + vbs << "Dim WinScriptHost\r\nSet WinScriptHost = CreateObject(\"WScript.Shell\")\r\nWinScriptHost.Run \"" << quoteCommand (r_exe); + for (int i = 0; i < call_args.length (); ++i) { + vbs << " " << call_args[i]; + } + vbs << "\", 0\r\nSet WomScriptHost = Nothing\r\n"; + vbsf->close (); + QString filename = vbsf->fileName (); + delete (vbsf); // somehow, if creating vbsf on the stack, we cannot launch it, because "file is in use by another process", despite we have closed it. + proc.start ("WScript.exe", QStringList (filename)); + bool ok = proc.waitForFinished (-1); + if (proc.exitCode () || !ok) { + QMessageBox::critical (0, "Error starting RKWard", QString ("Starting RKWard failed with error \"%1\"").arg (proc.errorString ())); + } + QFile (filename).remove (); + return (0); + } + } + // if that did not work or not on windows: #endif + proc.setProcessChannelMode (QProcess::ForwardedChannels); proc.start (quoteCommand (r_exe), call_args); bool ok = proc.waitForFinished (-1); if (proc.exitCode () || !ok) { diff -Nru rkward-0.6.4/rkward/scriptbackends/common.js rkward-0.6.5/rkward/scriptbackends/common.js --- rkward-0.6.4/rkward/scriptbackends/common.js 2015-01-15 13:37:21.000000000 +0000 +++ rkward-0.6.5/rkward/scriptbackends/common.js 2016-03-08 09:11:38.000000000 +0000 @@ -158,6 +158,11 @@ echo (getValue (id)); } +makeOption = function (optionname, value, def) { + if (typeof (de) == 'undefined') def = ""; + return ((value == def) ? '' : (', ' + optionname + '=' + value)); +} + include = function (file) { _RK_backend.includeFile (file); } diff -Nru rkward-0.6.4/rkward/settings/rksettingsmoduleoutput.cpp rkward-0.6.5/rkward/settings/rksettingsmoduleoutput.cpp --- rkward-0.6.4/rkward/settings/rksettingsmoduleoutput.cpp 2015-12-15 09:10:12.000000000 +0000 +++ rkward-0.6.5/rkward/settings/rksettingsmoduleoutput.cpp 2016-03-22 19:22:59.000000000 +0000 @@ -29,6 +29,8 @@ #include #include "../rkglobals.h" +#include "../misc/getfilenamewidget.h" +#include "../misc/rkcommonfunctions.h" #include "../rbackend/rinterface.h" #include "../debug.h" @@ -44,6 +46,7 @@ RK_TRACE (SETTINGS); QVBoxLayout *main_vbox = new QVBoxLayout (this); + main_vbox->setContentsMargins (0, 0, 0, 0); cc_globally_enabled_box = new QGroupBox (i18n ("Carbon copy commands to output"), this); cc_globally_enabled_box->setCheckable (true); connect (cc_globally_enabled_box, SIGNAL (clicked(bool)), this, SLOT (settingChanged())); @@ -146,6 +149,7 @@ int RKSettingsModuleOutput::graphics_width; int RKSettingsModuleOutput::graphics_height; int RKSettingsModuleOutput::graphics_jpg_quality; +QString RKSettingsModuleOutput::custom_css_file; RKSettingsModuleOutput::RKSettingsModuleOutput (RKSettings *gui, QWidget *parent) : RKSettingsModule(gui, parent) { RK_TRACE (SETTINGS); @@ -164,6 +168,11 @@ main_vbox->addWidget (group); + custom_css_file_box = new GetFileNameWidget (this, GetFileNameWidget::ExistingFile, true, i18n ("CSS file to use for output (leave empty for default)"), i18n ("Select CSS file"), QString ()); + connect (custom_css_file_box, SIGNAL (locationChanged()), this, SLOT (boxChanged())); // KF5 TODO new syntax + RKCommonFunctions::setTips (i18n ("Select a CSS file for custom formatting of the output window. Leave empty to use the default CSS file shipped with RKWard. Note that this setting takes effect, when initializing an output file (e.g. after flushing the output), only."), custom_css_file_box); + main_vbox->addWidget (custom_css_file_box); + group = new QGroupBox (i18n ("Graphics"), this); group_layout = new QVBoxLayout (group); QHBoxLayout *h_layout = new QHBoxLayout (); @@ -255,6 +264,7 @@ cg.writeEntry ("graphics_width", graphics_width); cg.writeEntry ("graphics_height", graphics_height); cg.writeEntry ("graphics_jpg_quality", graphics_jpg_quality); + cg.writeEntry ("custom css file", custom_css_file); RKCarbonCopySettings::saveSettings (config); } @@ -269,6 +279,7 @@ graphics_width = cg.readEntry ("graphics_width", 480); graphics_height = cg.readEntry ("graphics_height", 480); graphics_jpg_quality = cg.readEntry ("graphics_jpg_quality", 75); + custom_css_file = cg.readEntry ("custom css file", QString ()); RKCarbonCopySettings::loadSettings (config); } @@ -283,8 +294,9 @@ command.append (", \"rk.graphics.width\"=" + QString::number (graphics_width)); command.append (", \"rk.graphics.height\"=" + QString::number (graphics_height)); if (graphics_type == "\"JPG\"") command.append (", \"rk.graphics.jpg.quality\"=" + QString::number (graphics_jpg_quality)); + command.append (", \"rk.output.css.file\"=\"" + (custom_css_file.isEmpty () ? RKCommonFunctions::getRKWardDataDir () + "pages/rkward_output.css" : custom_css_file) + '\"'); list.append (command + ")\n"); - + return (list); } diff -Nru rkward-0.6.4/rkward/settings/rksettingsmoduleoutput.h rkward-0.6.5/rkward/settings/rksettingsmoduleoutput.h --- rkward-0.6.4/rkward/settings/rksettingsmoduleoutput.h 2015-12-15 09:10:12.000000000 +0000 +++ rkward-0.6.5/rkward/settings/rksettingsmoduleoutput.h 2016-03-22 19:22:59.000000000 +0000 @@ -26,6 +26,7 @@ class QComboBox; class KIntSpinBox; class RCommand; +class GetFileNameWidget; /** Allows to configure which types of commands should be "carbon copied" to the output window. Like the RKSettingsModules classes, this class encapsulates both, the setting itself, @@ -99,6 +100,7 @@ KIntSpinBox *graphics_height_box; KIntSpinBox *graphics_jpg_quality_box; RKCarbonCopySettings *cc_settings; + GetFileNameWidget *custom_css_file_box; static bool auto_show; static bool auto_raise; @@ -106,6 +108,7 @@ static int graphics_width; static int graphics_height; static int graphics_jpg_quality; + static QString custom_css_file; }; #endif diff -Nru rkward-0.6.4/rkward/settings/rksettingsmoduleplugins.cpp rkward-0.6.5/rkward/settings/rksettingsmoduleplugins.cpp --- rkward-0.6.4/rkward/settings/rksettingsmoduleplugins.cpp 2015-12-15 09:10:12.000000000 +0000 +++ rkward-0.6.5/rkward/settings/rksettingsmoduleplugins.cpp 2016-03-22 19:22:59.000000000 +0000 @@ -2,7 +2,7 @@ rksettingsmoduleplugins - description ------------------- begin : Wed Jul 28 2004 - copyright : (C) 2004-2014 by Thomas Friedrichsmeier + copyright : (C) 2004-2016 by Thomas Friedrichsmeier email : thomas.friedrichsmeier@kdemail.net ***************************************************************************/ @@ -49,6 +49,7 @@ RKSettingsModulePlugins::PluginPrefs RKSettingsModulePlugins::interface_pref; bool RKSettingsModulePlugins::show_code; int RKSettingsModulePlugins::code_size; +int RKSettingsModulePlugins::side_preview_width; RKSettingsModulePlugins::RKSettingsModulePlugins (RKSettings *gui, QWidget *parent) : RKSettingsModule (gui, parent) { RK_TRACE (SETTINGS); @@ -81,28 +82,6 @@ connect (button_group, SIGNAL (buttonClicked(int)), this, SLOT (settingChanged())); main_vbox->addWidget (button_box); - - main_vbox->addSpacing (2*RKGlobals::spacingHint ()); - - - QGroupBox *code_frame = new QGroupBox (i18n ("R syntax display (in dialogs)"), this); - group_layout = new QVBoxLayout (code_frame); - - show_code_box = new QCheckBox (i18n ("Code shown by default"), code_frame); - show_code_box->setChecked (show_code); - connect (show_code_box, SIGNAL (stateChanged(int)), this, SLOT (settingChanged())); - group_layout->addWidget (show_code_box); - - KHBox *code_size_hbox = new KHBox (code_frame); - new QLabel (i18n ("Default height of code display (pixels)"), code_size_hbox); - code_size_box = new RKSpinBox (code_size_hbox); - code_size_box->setIntMode (20, 5000, code_size); - connect (code_size_box, SIGNAL (valueChanged(int)), this, SLOT (settingChanged())); - group_layout->addWidget (code_size_hbox); - - main_vbox->addWidget (code_frame); - - main_vbox->addSpacing (2*RKGlobals::spacingHint ()); QPushButton *pluginmap_config_button = new QPushButton (i18n ("Configure Active Plugins"), this); @@ -130,8 +109,6 @@ RK_TRACE (SETTINGS); interface_pref = static_cast (button_group->checkedId ()); - show_code = show_code_box->isChecked (); - code_size = code_size_box->intValue (); } RKSettingsModulePlugins::PluginMapList RKSettingsModulePlugins::setPluginMaps (const RKSettingsModulePlugins::PluginMapList new_list) { @@ -178,6 +155,7 @@ cg.writeEntry ("Interface Preferences", static_cast (interface_pref)); cg.writeEntry ("Code display default", show_code); cg.writeEntry ("Code display size", code_size); + cg.writeEntry ("Other preview size", side_preview_width); } void RKSettingsModulePlugins::loadSettings (KConfig *config) { @@ -223,6 +201,8 @@ interface_pref = static_cast (cg.readEntry ("Interface Preferences", static_cast (PreferRecommended))); show_code = cg.readEntry ("Code display default", false); code_size = cg.readEntry ("Code display size", 250); + side_preview_width = cg.readEntry ("Other preview size", 250); + if (RKSettingsModuleGeneral::storedConfigVersion () <= RKSettingsModuleGeneral::RKWardConfig_Pre0_5_7) { if (code_size == 40) code_size = 250; // previous default untouched. } diff -Nru rkward-0.6.4/rkward/settings/rksettingsmoduleplugins.h rkward-0.6.5/rkward/settings/rksettingsmoduleplugins.h --- rkward-0.6.4/rkward/settings/rksettingsmoduleplugins.h 2015-12-15 09:10:12.000000000 +0000 +++ rkward-0.6.5/rkward/settings/rksettingsmoduleplugins.h 2016-03-22 19:22:59.000000000 +0000 @@ -2,7 +2,7 @@ rksettingsmoduleplugins - description ------------------- begin : Wed Jul 28 2004 - copyright : (C) 2004-2014 by Thomas Friedrichsmeier + copyright : (C) 2004-2016 by Thomas Friedrichsmeier email : thomas.friedrichsmeier@kdemail.net ***************************************************************************/ @@ -53,7 +53,11 @@ static QStringList pluginMaps (); static PluginPrefs getInterfacePreference () { return interface_pref; }; static bool showCodeByDefault () { return show_code; }; + static void setShowCodeByDefault (bool shown) { show_code = shown; }; static int defaultCodeHeight () { return code_size; }; + static void setDefaultCodeHeight (int new_height) { code_size = new_height; } + static int defaultSidePreviewWidth () { return side_preview_width; }; + static void setDefaultSidePreviewWidth (int new_width) { side_preview_width = new_width; } /** register a list of available plugin-maps (which may or may not already be known). New maps are activated, automatically. * @param maps Plugin maps (filenames) to add * @param force_add If true, maps are added, even if they are not "new", and had previously been disabled by the user @@ -90,8 +94,6 @@ void configurePluginmaps (); private: QButtonGroup *button_group; - QCheckBox *show_code_box; - RKSpinBox *code_size_box; /** plugin maps which are not necessarily active, but have been encountered, before. @see plugin_maps */ static PluginMapList known_plugin_maps; @@ -99,6 +101,7 @@ static PluginPrefs interface_pref; static bool show_code; static int code_size; + static int side_preview_width; /* TODO: This one is currently unused (leftover of GHNS-based plugin installation), but might still be of interest */ static QStringList findPluginMapsRecursive (const QString &basedir); diff -Nru rkward-0.6.4/rkward/settings/rksettingsmoduler.cpp rkward-0.6.5/rkward/settings/rksettingsmoduler.cpp --- rkward-0.6.4/rkward/settings/rksettingsmoduler.cpp 2015-12-15 09:10:12.000000000 +0000 +++ rkward-0.6.5/rkward/settings/rksettingsmoduler.cpp 2016-03-22 19:22:59.000000000 +0000 @@ -328,7 +328,8 @@ options_pager = cg.readEntry ("pager", builtin_editor); options_further = cg.readEntry ("further init commands", QString ()); #ifdef Q_WS_WIN - options_internet2 = cg.readEntry ("internet2", false); + options_internet2 = cg.readEntry ("internet2", true); + if (RKSettingsModuleGeneral::storedConfigVersion () < RKSettingsModuleGeneral::RKWardConfig_0_6_4) options_internet2 = true; #endif } @@ -495,6 +496,7 @@ #if defined Q_WS_WIN || defined Q_WS_MAC ret.append ("options (pkgType=\""); if (source_packages) ret.append ("source"); + else if (RKSessionVars::compareRVersion ("3.1.3") <= 0) ret.append ("binary"); // "automatically select appropriate binary", unfortunately it's only available from R 3.1.3. onwards. # if defined Q_WS_WIN else ret.append ("win.binary"); # else diff -Nru rkward-0.6.4/rkward/version.h rkward-0.6.5/rkward/version.h --- rkward-0.6.4/rkward/version.h 1970-01-01 00:00:00.000000000 +0000 +++ rkward-0.6.5/rkward/version.h 2016-03-23 16:43:26.000000000 +0000 @@ -0,0 +1,2 @@ +/* Version number of package */ +#define RKWARD_VERSION "0.6.4z+0.6.5+pre1" diff -Nru rkward-0.6.4/rkward/windows/rkcommandeditorwindow.cpp rkward-0.6.5/rkward/windows/rkcommandeditorwindow.cpp --- rkward-0.6.4/rkward/windows/rkcommandeditorwindow.cpp 2015-12-15 09:10:12.000000000 +0000 +++ rkward-0.6.5/rkward/windows/rkcommandeditorwindow.cpp 2016-03-22 19:22:59.000000000 +0000 @@ -218,7 +218,8 @@ action->setText (i18n ("Insert line break and run")); action->setShortcuts (KShortcut (Qt::AltModifier + Qt::Key_Return, Qt::AltModifier + Qt::Key_Enter)); - action_help_function = RKStandardActions::functionHelp (this, this, SLOT (showHelp())); + RKStandardActions::functionHelp (this, this); + RKStandardActions::onlineHelp (this, this); actionmenu_run_block = new KActionMenu (i18n ("Run block"), this); actionmenu_run_block->setDelayed (false); // KDE4: TODO does not work correctly in the tool bar. @@ -580,13 +581,14 @@ RKWardMainWindow::getMain ()->addScriptUrl (url ()); } -void RKCommandEditorWindow::showHelp () { +void RKCommandEditorWindow::currentHelpContext (QString *symbol, QString *package) { RK_TRACE (COMMANDEDITOR); + Q_UNUSED (package); KTextEditor::Cursor c = m_view->cursorPosition(); QString line = m_doc->line(c.line ()) + ' '; - RKHelpSearchWindow::mainHelpSearch ()->getContextHelp (line, c.column()); + *symbol = RKCommonFunctions::getCurrentSymbol (line, c.column ()); } void RKCommandEditorWindow::tryCompletionProxy (KTextEditor::Document*) { diff -Nru rkward-0.6.4/rkward/windows/rkcommandeditorwindow.h rkward-0.6.5/rkward/windows/rkcommandeditorwindow.h --- rkward-0.6.4/rkward/windows/rkcommandeditorwindow.h 2015-12-15 09:10:12.000000000 +0000 +++ rkward-0.6.5/rkward/windows/rkcommandeditorwindow.h 2016-03-22 19:22:59.000000000 +0000 @@ -2,7 +2,7 @@ rkcommandeditorwindow - description ------------------- begin : Mon Aug 30 2004 - copyright : (C) 2004-2014 by Thomas Friedrichsmeier + copyright : (C) 2004-2016 by Thomas Friedrichsmeier email : thomas.friedrichsmeier@kdemail.net ***************************************************************************/ @@ -68,7 +68,12 @@ /** to be implemented in subclasses. Provide some context, i.e. text *preceding* the cursor position (probably a line, but you may provide chunks in arbitrary size). If line_rev is 0, provide the line, the cursor is in. If line_rev is greater than 0, provide context before that. @param context Place the context here @returns a chunk of context. A null QString(), if no context was available. */ - virtual QString provideContext (int line_rev) = 0; + virtual QString provideContext (int line_rev) { + Q_UNUSED (line_rev); + return QString (); + }; + /** to be implemented in subclasses. Provide current context for help searches (based on current selection / current cursor position). If not package information is known, leave that empty. */ + virtual void currentHelpContext (QString *symbol, QString *package) = 0; }; class RObject; @@ -190,6 +195,7 @@ KUrl url (); QString provideContext (int line_rev); + void currentHelpContext (QString* symbol, QString* package); // KF5 TODO: add override keyword QString currentCompletionWord () const; void highlightLine (int linenum); @@ -202,8 +208,6 @@ void tryCompletion (); void setPopupMenu (); void focusIn (KTextEditor::View *); -/** Show help about the current word. */ - void showHelp (); /** run the currently selected command(s) or line */ void runCurrent (); /** run the entire script */ @@ -288,8 +292,6 @@ KAction* action_setwd_to_script; - KAction* action_help_function; - KUrl previous_autosave_url; QTimer* autosave_timer; diff -Nru rkward-0.6.4/rkward/windows/rkcommandeditorwindowpart.rc rkward-0.6.5/rkward/windows/rkcommandeditorwindowpart.rc --- rkward-0.6.4/rkward/windows/rkcommandeditorwindowpart.rc 2015-12-15 09:10:12.000000000 +0000 +++ rkward-0.6.5/rkward/windows/rkcommandeditorwindowpart.rc 2016-03-08 09:11:38.000000000 +0000 @@ -1,6 +1,7 @@ - + +

&File &Edit &Tools Move diff -Nru rkward-0.6.4/rkward/windows/rkhtmlwindow.cpp rkward-0.6.5/rkward/windows/rkhtmlwindow.cpp --- rkward-0.6.4/rkward/windows/rkhtmlwindow.cpp 2015-12-15 09:10:12.000000000 +0000 +++ rkward-0.6.5/rkward/windows/rkhtmlwindow.cpp 2016-03-22 19:22:59.000000000 +0000 @@ -95,6 +95,10 @@ return false; } + if (frame != mainFrame ()) { + if (request.url ().isLocalFile () && (KMimeType::findByUrl (request.url ())->is ("text/html"))) return true; + } + if (KUrl (mainFrame ()->url ()).equals (request.url (), KUrl::CompareWithoutFragment | KUrl::CompareWithoutTrailingSlash)) { RK_DEBUG (APP, DL_DEBUG, "Page internal navigation request from %s to %s", qPrintable (mainFrame ()->url ().toString ()), qPrintable (request.url ().toString ())); emit (pageInternalNavigation (request.url ())); @@ -354,9 +358,9 @@ if (window_mode == HTMLOutputWindow) { if (url != current_url) { - // output window should not change url after initialization + // output window should not change url after initialization open any links in new windows if (!current_url.isEmpty ()) { - RK_ASSERT (false); + RKWorkplace::mainWorkplace ()->openAnyUrl (url); return false; } @@ -611,7 +615,7 @@ outputFlush->setText (i18n ("&Flush Output")); outputFlush->setIcon (KIcon ("edit-delete")); - outputRefresh = actionCollection ()->addAction ("output_refresh", window->page->action (QWebPage::ReloadAndBypassCache), SLOT (trigger())); + outputRefresh = actionCollection ()->addAction ("output_refresh", window, SLOT (refresh())); outputRefresh->setText (i18n ("&Refresh Output")); outputRefresh->setIcon (KIcon ("view-refresh")); @@ -1019,6 +1023,13 @@ url.cleanPath (); QString path = url.toLocalFile (); +#ifdef Q_OS_WIN + // On windows, when flushing the output (i.e. deleting, re-creating it), KDirWatch seems to purge the file from the + // watch list (KDE 4.10.2; always?), so we need to re-add it. To make things complex, however, this may happen + // asynchronously, with this function called (via rk.set.output.html.file()), _before_ KDirWatch purges the file. + // To hack around the race condition, we re-watch the output file after a short delay. + QTimer::singleShot (100, this, SLOT (rewatchOutput ())); +#endif if (path == current_default_path) return; if (!windows.contains (path)) { @@ -1031,6 +1042,13 @@ current_default_path = path; } +void RKOutputWindowManager::rewatchOutput () { + RK_TRACE (APP); + // called on Windows, only + file_watcher->removeFile (current_default_path); + file_watcher->addFile (current_default_path); +} + RKHTMLWindow* RKOutputWindowManager::getCurrentOutputWindow () { RK_TRACE (APP); @@ -1056,6 +1074,7 @@ window_list[i]->refresh (); w = window_list[i]; } + RK_DEBUG (APP, DL_DEBUG, "changed %s, window %p", qPrintable (path), w); if (w) { if (RKSettingsModuleOutput::autoRaise ()) w->activate (); diff -Nru rkward-0.6.4/rkward/windows/rkhtmlwindow.h rkward-0.6.5/rkward/windows/rkhtmlwindow.h --- rkward-0.6.4/rkward/windows/rkhtmlwindow.h 2015-12-15 09:10:12.000000000 +0000 +++ rkward-0.6.5/rkward/windows/rkhtmlwindow.h 2016-03-22 19:22:59.000000000 +0000 @@ -232,6 +232,7 @@ private slots: void fileChanged (const QString &path); void windowDestroyed (QObject *window); + void rewatchOutput (); }; #endif diff -Nru rkward-0.6.4/rkward/windows/rkmdiwindow.cpp rkward-0.6.5/rkward/windows/rkmdiwindow.cpp --- rkward-0.6.4/rkward/windows/rkmdiwindow.cpp 2015-12-15 09:10:12.000000000 +0000 +++ rkward-0.6.5/rkward/windows/rkmdiwindow.cpp 2016-03-22 19:22:59.000000000 +0000 @@ -28,6 +28,7 @@ #include #include #include +#include #include "rkworkplace.h" #include "rkworkplaceview.h" @@ -36,6 +37,7 @@ #include "../settings/rksettingsmodulegeneral.h" #include "../misc/rkstandardicons.h" #include "../misc/rkxmlguisyncer.h" +#include "../rbackend/rcommand.h" #include "../debug.h" @@ -65,7 +67,9 @@ tool_window_bar = 0; part = 0; active = false; + no_border_when_active = false; standard_client = 0; + status_popup = 0; setWindowIcon (RKStandardIcons::iconForWindow (this)); } @@ -75,6 +79,7 @@ if (isToolWindow ()) RKToolWindowList::unregisterToolWindow (this); delete standard_client; + delete status_popup; } KActionCollection *RKMDIWindow::standardActionCollection () { @@ -244,7 +249,7 @@ QFrame::paintEvent (e); - if (isActive ()) { + if (isActive () && !no_border_when_active) { QPainter paint (this); paint.setPen (QColor (255, 0, 0)); paint.drawLine (0, 0, 0, height ()-1); @@ -261,10 +266,37 @@ if (active || (!isAttached ())) update (); } -void RKMDIWindow::slotActivate () { +void RKMDIWindow::slotActivateForFocusFollowsMouse () { RK_TRACE (APP); + if (!underMouse ()) return; + + // we can't do without activateWindow(), below. Unfortunately, this has the side effect of raising the window (in some cases). This is not always what we want, e.g. if a + // plot window is stacked above this window. (And since this is activation by mouse hover, this window is already visible, by definition!) + // So we try a heuristic (imperfect) to find, if there are any other windows stacked above this one, in order to re-raise them above this. + QWidgetList toplevels = qApp->topLevelWidgets (); + QWidgetList overlappers; + QWidget *window = topLevelWidget (); + QRect rect = window->frameGeometry (); + for (int i = toplevels.size () - 1; i >= 0; --i) { + QWidget *tl = toplevels[i]; + if (!tl->isWindow ()) continue; + if (tl == window) continue; + if (tl->isHidden ()) continue; + + QRect tlrect = tl->geometry (); + QRect intersected = tlrect.intersected (rect); + if (!intersected.isEmpty ()) { + QWidget *above = qApp->topLevelAt ((intersected.left () +intersected.right ()) / 2, (intersected.top () +intersected.bottom ()) / 2); + if (above && (above != window) && (above->isWindow ()) && (!above->isHidden ()) && (overlappers.indexOf (above) < 0)) overlappers.append (above); + } + } + activate (true); + + for (int i = 0; i < overlappers.size (); ++i) { + overlappers[i]->raise (); + } } void RKMDIWindow::enterEvent (QEvent *event) { @@ -275,9 +307,14 @@ if (!QApplication::activePopupWidget ()) { // see http://sourceforge.net/p/rkward/bugs/90/ // enter events may be delivered while a popup-menu (in a different window) is executing. If we activate in this case, the popup-menu might get deleted - // while still handling events. Similar problems seem to occur, when the popup menu has just finished (by the user selecting an action) and this results + // while still handling events. + // + // Similar problems seem to occur, when the popup menu has just finished (by the user selecting an action) and this results // in the mouse entering this widget. To prevent crashes in this second case, we delay the activation until the next iteration of the event loop. - QTimer::singleShot (0, this, SLOT (slotActivate())); + // + // Finally, in some cases (such as when a new script window was created), we need a short delay, as we may be catching an enter event on a window that is in the same place, + // where the newly created window goes. This would cause activation to switch back, immediately. + QTimer::singleShot (50, this, SLOT (slotActivateForFocusFollowsMouse())); } } } @@ -285,6 +322,58 @@ QFrame::enterEvent (event); } +void RKMDIWindow::setStatusMessage (const QString& message, RCommand *command) { + RK_TRACE (MISC); + + if (!status_popup) { + status_popup = new KPassivePopup (this); + disconnect (status_popup, SIGNAL (clicked()), status_popup, SLOT (hide())); // no auto-hiding, please + } + + if (command) connect (command->notifier (), SIGNAL (commandFinished (RCommand*)), this, SLOT (clearStatusMessage())); + if (!message.isEmpty ()) { + status_popup->setView (QString (), message); + status_popup->show (this->mapToGlobal (QPoint (20, 20))); + status_popup->setTimeout (0); + } else { + status_popup->hide (); + status_popup->setTimeout (10); // this is a lame way to keep track of whether the popup is empty. See showEvent() + } +} + +void RKMDIWindow::clearStatusMessage () { + RK_TRACE (APP); + + setStatusMessage (QString ()); +} + +void RKMDIWindow::hideEvent (QHideEvent* ev) { + if (status_popup) { + status_popup->hide (); + } + QWidget::hideEvent (ev); +} + +void RKMDIWindow::showEvent (QShowEvent* ev) { + if (status_popup && (status_popup->timeout () == 0)) status_popup->show (this->mapToGlobal (QPoint (20, 20))); + QWidget::showEvent (ev); +} + + +void RKMDIWindow::setWindowStyleHint (const QString& hint) { + RK_TRACE (APP); + + if (hint == "preview") { + if (standard_client) { + QAction *act = standardActionCollection ()->action ("window_help"); + if (act) act->setVisible (false); + act = standardActionCollection ()->action ("window_configure"); + if (act) act->setVisible (false); + } + no_border_when_active = true; + } +} + void RKMDIWindow::setMetaInfo (const QString& _generic_window_name, const QString& _help_url, RKSettings::SettingsPage _settings_page) { RK_TRACE (APP); diff -Nru rkward-0.6.4/rkward/windows/rkmdiwindow.h rkward-0.6.5/rkward/windows/rkmdiwindow.h --- rkward-0.6.4/rkward/windows/rkmdiwindow.h 2015-12-15 09:10:12.000000000 +0000 +++ rkward-0.6.5/rkward/windows/rkmdiwindow.h 2016-03-22 19:22:59.000000000 +0000 @@ -29,6 +29,8 @@ class QPaintEvent; class RKWorkplace; class RKToolWindowBar; +class KPassivePopup; +class RCommand; class RKMDIStandardActionClient : public KXMLGUIClient { public: @@ -101,6 +103,12 @@ virtual void prepareToBeDetached (); /** Tool windows will only hide themselves, and ignore the also_delete flag */ virtual bool close (bool also_delete); +/** Set a status message to be shown in a popup inside the window. The message persists until the given R command has finished, or until this function is called with an empty string. +This should be used, when the information shown is currently out-of-date (e.g. when refreshing a preview / loading a plot from history), _not_ when the window +is simply busy (e.g. when saving the current plot to history). */ + void setStatusMessage (const QString& message, RCommand* command=0); +/** Set a style hint for the window. So far the only interpreted style hint is "preview", and not all windows implement it. Base implements hiding of "active" indicator border for "preview"s. */ + virtual void setWindowStyleHint (const QString& hint); bool eventFilter (QObject *watched, QEvent *e); bool acceptsEventsFor (QObject *object); @@ -119,6 +127,7 @@ protected slots: void showWindowHelp (); void showWindowSettings (); + void clearStatusMessage (); protected: void setPart (KParts::Part *p) { part = p; }; void setMetaInfo (const QString& generic_window_name, const QString& help_url, RKSettings::SettingsPage settings_page=RKSettings::NoPage); @@ -130,11 +139,16 @@ void enterEvent (QEvent *event); /** @see globalContextProperty() */ void setGlobalContextProperty (const QString& property, const QString& value) { global_context_properties.insert (property, value); }; + + KPassivePopup* status_popup; + void hideEvent (QHideEvent *ev); + void showEvent (QShowEvent *ev); + friend class RKWorkplace; /** type of this window */ int type; private slots: - void slotActivate (); + void slotActivateForFocusFollowsMouse (); private: friend class RKToolWindowBar; /** state of this window (attached / detached). This is usually set from the RKWorkplace */ @@ -142,6 +156,7 @@ State state; RKToolWindowBar *tool_window_bar; bool active; + bool no_border_when_active; RKMDIStandardActionClient *standard_client; /** @see globalContextProperty() */ QMap global_context_properties; diff -Nru rkward-0.6.4/rkward/windows/rkstandardactions.rc rkward-0.6.5/rkward/windows/rkstandardactions.rc --- rkward-0.6.4/rkward/windows/rkstandardactions.rc 2015-12-15 09:10:12.000000000 +0000 +++ rkward-0.6.5/rkward/windows/rkstandardactions.rc 2016-03-14 19:51:51.000000000 +0000 @@ -1,26 +1,26 @@ - + - + &File - + &Edit - + &Run - + &Help - + &Settings @@ -40,6 +40,7 @@ + @@ -48,6 +49,7 @@ + diff -Nru rkward-0.6.4/rkward/windows/rkwindowcatcher.cpp rkward-0.6.5/rkward/windows/rkwindowcatcher.cpp --- rkward-0.6.4/rkward/windows/rkwindowcatcher.cpp 2015-12-15 09:10:12.000000000 +0000 +++ rkward-0.6.5/rkward/windows/rkwindowcatcher.cpp 2016-03-22 19:22:59.000000000 +0000 @@ -128,7 +128,6 @@ #include #include #include -#include #include "../rkglobals.h" #include "../rbackend/rinterface.h" @@ -141,7 +140,7 @@ // static QHash RKCaughtX11Window::device_windows; -RKCaughtX11Window::RKCaughtX11Window (WId window_to_embed, int device_number) : RKMDIWindow (0, X11Window), RCommandReceiver () { +RKCaughtX11Window::RKCaughtX11Window (WId window_to_embed, int device_number) : RKMDIWindow (0, X11Window) { RK_TRACE (MISC); commonInit (device_number); @@ -210,10 +209,6 @@ setFocusPolicy (Qt::ClickFocus); updateHistoryActions (0, 0, QStringList ()); - status_popup = new KPassivePopup (this); - status_popup->setTimeout (0); - disconnect (status_popup, SIGNAL (clicked()), status_popup, SLOT (hide())); // no auto-hiding, please - QVBoxLayout *layout = new QVBoxLayout (this); layout->setContentsMargins (0, 0, 0, 0); box_widget = new KVBox (this); @@ -250,9 +245,11 @@ RKWardApplication::getApp ()->registerNameWatcher (embedded, this); #endif } - // make xembed_container resizable, again, now that it actually has a content - dynamic_size_action->setChecked (true); - fixedSizeToggled (); + if (!isAttached ()) { + // make xembed_container resizable, again, now that it actually has a content + dynamic_size_action->setChecked (true); + fixedSizeToggled (); + } // try to be helpful when the window is too large to fit on screen QRect dims = window ()->frameGeometry (); @@ -272,7 +269,17 @@ if (embedded) RKWardApplication::getApp ()->unregisterNameWatcher (embedded); #endif error_dialog->autoDeleteWhenDone (); - delete status_popup; +} + +void RKCaughtX11Window::setWindowStyleHint (const QString& hint) { + RK_TRACE (MISC); + + if (hint == "preview") { + for (int i = actions_not_for_preview.count () - 1; i >= 0; --i) { + actions_not_for_preview[i]->setVisible (false); + } + } + RKMDIWindow::setWindowStyleHint (hint); } void RKCaughtX11Window::forceClose () { @@ -340,6 +347,8 @@ RK_TRACE (MISC); dynamic_size_action->setEnabled (true); + dynamic_size_action->setChecked (true); + fixedSizeToggled (); reEmbed (); } @@ -586,39 +595,6 @@ plot_properties_action->setEnabled (RKSettingsModuleGraphics::plotHistoryEnabled ()); } -void RKCaughtX11Window::setStatusMessage (const QString& message, RCommand *command) { - RK_TRACE (MISC); - - status_change_command = command; - if (command) command->addReceiver (this); - if (!message.isEmpty ()) { - status_popup->setView (QString (), message); - status_popup->show (xembed_container->mapToGlobal (QPoint (20, 20))); - } else { - status_popup->hide (); - } -} - -// static -void RKCaughtX11Window::setStatusMessage(int dev_num, const QString& message, RCommand* command) { - RK_TRACE (MISC); - - RKCaughtX11Window *window = getWindow (dev_num); - if (!window) return; - window->setStatusMessage (message, command); -} - -void RKCaughtX11Window::rCommandDone (RCommand *command) { - RK_TRACE (MISC); - - if (command == status_change_command) { - setStatusMessage (QString ()); - status_popup->hide(); - } - RCommandReceiver::rCommandDone (command); -} - - ///////////////////////////////// END RKCaughtX11Window /////////////////////////////// /**************************************************************************************/ //////////////////////////////// BEGIN RKCaughtX11WindowPart ////////////////////////// @@ -637,44 +613,56 @@ window->dynamic_size_action = new KToggleAction (i18n ("Draw area follows size of window"), window); connect (window->dynamic_size_action, SIGNAL (triggered()), window, SLOT (fixedSizeToggled())); actionCollection ()->addAction ("toggle_fixed_size", window->dynamic_size_action); + window->actions_not_for_preview.append (window->dynamic_size_action); QAction *action; action = actionCollection ()->addAction ("set_fixed_size_1", window, SLOT (setFixedSize1())); action->setText (i18n ("Set fixed size 500x500")); + window->actions_not_for_preview.append (action); action = actionCollection ()->addAction ("set_fixed_size_2", window, SLOT (setFixedSize2())); action->setText (i18n ("Set fixed size 1000x1000")); + window->actions_not_for_preview.append (action); action = actionCollection ()->addAction ("set_fixed_size_3", window, SLOT (setFixedSize3())); action->setText (i18n ("Set fixed size 2000x2000")); + window->actions_not_for_preview.append (action); action = actionCollection ()->addAction ("set_fixed_size_manual", window, SLOT (setFixedSizeManual())); action->setText (i18n ("Set specified fixed size...")); + window->actions_not_for_preview.append (action); action = actionCollection ()->addAction ("plot_prev", window, SLOT (previousPlot())); + window->actions_not_for_preview.append (action); action->setText (i18n ("Previous plot")); action->setIcon (RKStandardIcons::getIcon (RKStandardIcons::ActionMoveLeft)); window->plot_prev_action = (KAction*) action; action = actionCollection ()->addAction ("plot_first", window, SLOT (firstPlot())); + window->actions_not_for_preview.append (action); action->setText (i18n ("First plot")); action->setIcon (RKStandardIcons::getIcon (RKStandardIcons::ActionMoveFirst)); window->plot_first_action = (KAction*) action; action = actionCollection ()->addAction ("plot_next", window, SLOT (nextPlot())); + window->actions_not_for_preview.append (action); action->setText (i18n ("Next plot")); action->setIcon (RKStandardIcons::getIcon (RKStandardIcons::ActionMoveRight)); window->plot_next_action = (KAction*) action; action = actionCollection ()->addAction ("plot_last", window, SLOT (lastPlot())); + window->actions_not_for_preview.append (action); action->setText (i18n ("Last plot")); action->setIcon (RKStandardIcons::getIcon (RKStandardIcons::ActionMoveLast)); window->plot_last_action = (KAction*) action; action = window->plot_list_action = new KSelectAction (i18n ("Go to plot"), 0); + window->actions_not_for_preview.append (action); window->plot_list_action->setToolBarMode (KSelectAction::MenuMode); action->setIcon (RKStandardIcons::getIcon (RKStandardIcons::ActionListPlots)); actionCollection ()->addAction ("plot_list", action); connect (action, SIGNAL (triggered(int)), window, SLOT (gotoPlot(int))); action = actionCollection ()->addAction ("plot_force_append", window, SLOT (forceAppendCurrentPlot())); + window->actions_not_for_preview.append (action); action->setText (i18n ("Append this plot")); action->setIcon (RKStandardIcons::getIcon (RKStandardIcons::ActionSnapshot)); window->plot_force_append_action = (KAction*) action; action = actionCollection ()->addAction ("plot_remove", window, SLOT (removeCurrentPlot())); + window->actions_not_for_preview.append (action); action->setText (i18n ("Remove this plot")); action->setIcon (RKStandardIcons::getIcon (RKStandardIcons::ActionRemovePlot)); window->plot_remove_action = (KAction*) action; @@ -683,15 +671,18 @@ window->plot_clear_history_action = (KAction*) action; action->setText (i18n ("Clear history")); action->setIcon (RKStandardIcons::getIcon (RKStandardIcons::ActionClear)); + window->actions_not_for_preview.append (action); action = actionCollection ()->addAction ("plot_properties", window, SLOT (showPlotInfo())); window->plot_properties_action = (KAction*) action; action->setText (i18n ("Plot properties")); action->setIcon (RKStandardIcons::getIcon (RKStandardIcons::ActionDocumentInfo)); + window->actions_not_for_preview.append (action); action = actionCollection ()->addAction ("device_activate", window, SLOT (activateDevice())); action->setText (i18n ("Make active")); action->setIcon (RKStandardIcons::getIcon (RKStandardIcons::ActionFlagGreen)); + window->actions_not_for_preview.append (action); action = actionCollection ()->addAction ("device_copy_to_output", window, SLOT (copyDeviceToOutput())); action->setText (i18n ("Copy to output")); action->setIcon (RKStandardIcons::getIcon (RKStandardIcons::WindowOutput)); diff -Nru rkward-0.6.4/rkward/windows/rkwindowcatcher.h rkward-0.6.5/rkward/windows/rkwindowcatcher.h --- rkward-0.6.4/rkward/windows/rkwindowcatcher.h 2015-12-15 09:10:12.000000000 +0000 +++ rkward-0.6.5/rkward/windows/rkwindowcatcher.h 2016-03-22 19:22:59.000000000 +0000 @@ -80,7 +80,6 @@ #include "rkmdiwindow.h" -#include "../rbackend/rcommandreceiver.h" #include @@ -94,12 +93,11 @@ class RKProgressControl; class QX11EmbedContainer; class QWinHost; -class KPassivePopup; class RKGraphicsDevice; /** An R onscreen graphics device window managed by rkward. Currently, this can be X11 devices (on X11), Windows devices (on Windows), and RK devices (anywhere). */ -class RKCaughtX11Window : public RKMDIWindow, public RCommandReceiver { +class RKCaughtX11Window : public RKMDIWindow { Q_OBJECT public: /** ctor @@ -119,13 +117,6 @@ /** returns the window corresponding the to given R device number (or 0 if no such window exists) */ static RKCaughtX11Window* getWindow (int device_number) { return device_windows.value (device_number); }; void updateHistoryActions (int history_length, int position, const QStringList &labels); -/** Set a status message to be shown in a popup inside the window. The message persists until the given R command has finished, or until this function is called with an empty string. -This should be used, when the plot is currently out-of-date (e.g. when loading a plot from history), _not_ when the window -is simply busy (e.g. when saving the current plot to history). */ - void setStatusMessage (const QString& message, RCommand* command=0); -/** static convencience wrapper around setStatusMessage (). Sets the message on the window corresponding to the given device number. - * NOTE: If no device exists (or isn't known to the system), this function does nothing */ - static void setStatusMessage (int dev_num, const QString &message, RCommand *command=0); public slots: void deviceInteractive (bool interactive, const QString &prompt); @@ -161,13 +152,13 @@ /** reimplemented to keep window alive while saving history */ bool close (bool also_delete); void setKilledInR () { killed_in_r = true; }; + void setWindowStyleHint (const QString& hint); // KF5 TODO: add override keyword private slots: void doEmbed (); private: void forceClose (); void commonInit (int device_number); void reEmbed (); - void rCommandDone (RCommand *command); friend class RKCaughtX11WindowPart; // needs access to the actions int device_number; bool killed_in_r; @@ -202,9 +193,7 @@ KSelectAction *plot_list_action; KAction *stop_interaction; - KPassivePopup* status_popup; - RCommand* status_change_command; - + QList actions_not_for_preview; int history_length; int history_position; }; diff -Nru rkward-0.6.4/rkward/windows/rkworkplace.cpp rkward-0.6.5/rkward/windows/rkworkplace.cpp --- rkward-0.6.4/rkward/windows/rkworkplace.cpp 2015-12-15 09:10:12.000000000 +0000 +++ rkward-0.6.5/rkward/windows/rkworkplace.cpp 2016-03-22 19:22:59.000000000 +0000 @@ -2,7 +2,7 @@ rkworkplace - description ------------------- begin : Thu Sep 21 2006 - copyright : (C) 2006-2013 by Thomas Friedrichsmeier + copyright : (C) 2006-2016 by Thomas Friedrichsmeier email : thomas.friedrichsmeier@kdemail.net ***************************************************************************/ @@ -65,6 +65,7 @@ main_workplace = this; _workspace_config = 0; + window_placement_override = RKMDIWindow::AnyWindowState; /* Splitter setup contains heavy copying from Kate's katemdi! */ KVBox *vbox = new KVBox (this); @@ -211,10 +212,62 @@ void RKWorkplace::addWindow (RKMDIWindow *window, bool attached) { RK_TRACE (APP); + // first handle placement overrides + if (window_placement_override == RKMDIWindow::Attached) { + if (!attached) window->state = RKMDIWindow::Detached; // Ok, yeah. BAD style. But windows that would go to detached by default would not prepareToBeAttached(), without this. + // TODO: Create third state: NotManaged + attached = true; + } else if (window_placement_override == RKMDIWindow::Detached) { + attached = false; + } + + // style override. Windows may or may not handle this + if (!window_style_override.isEmpty ()) window->setWindowStyleHint (window_style_override); + + // next handle name overrides, if any + if (!window_name_override.isEmpty ()) { + int pos = -1; + for (int i = 0; i < named_windows.size (); ++i) { + if (named_windows[i].id == window_name_override) { + pos = i; + break; + } + } + if (pos < 0) { // not yet known: implicit registration -> create corresponing named_window_spec on the fly. + registerNamedWindow (window_name_override, 0, attached ? RKWardMainWindow::getMain () : 0); + pos = named_windows.size () - 1; + } + + NamedWindow &nw = named_windows[pos]; + if (nw.window != window) { + if (nw.window) { // kill existing window (going to be replaced) + // TODO: this is not really elegant, yet, as it will change tab-placement (for attached windows), and discard / recreate container (for detached windows) + disconnect (nw.window, SIGNAL (destroyed(QObject*)), this, SLOT (namedWindowDestroyed(QObject*))); + nw.window->deleteLater (); + } + nw.window = window; + connect (nw.window, SIGNAL (destroyed(QObject*)), this, SLOT (namedWindowDestroyed(QObject*))); + } + named_windows[pos] = nw; + + // add window in the correct area + if (nw.parent == RKWardMainWindow::getMain ()) attached = true; + else if (nw.parent == 0) attached = false; + else { // custom parent + window->prepareToBeAttached (); + window->setParent (nw.parent); + // TODO: do this is somewhat inconsistent. But such windows are not attached to the main workplace view, which makes them rather behave detached. + window->state = RKMDIWindow::Detached; + // NOTE: The window is _not_ added to the window list/window history in this case. + return; + } + } + windows.append (window); connect (window, SIGNAL (destroyed(QObject*)), this, SLOT (removeWindow(QObject*))); connect (window, SIGNAL (windowActivated(RKMDIWindow*)), history, SLOT (windowActivated(RKMDIWindow*))); if (window->isToolWindow () && !window->tool_window_bar) return; + if (attached) attachWindow (window); else detachWindow (window, false); } @@ -247,6 +300,78 @@ else if (needs_registration) attachWindow (window); } +void RKWorkplace::setWindowPlacementOverrides(const QString& placement, const QString& name, const QString& style) { + RK_TRACE (APP); + + if (placement == "attached") window_placement_override = RKMDIWindow::Attached; + else if (placement == "detached") window_placement_override = RKMDIWindow::Attached; + else { + RK_ASSERT (placement.isEmpty ()); + window_placement_override = RKMDIWindow::AnyWindowState; + } + window_name_override = name; + window_style_override = style; +} + +void RKWorkplace::registerNamedWindow (const QString& id, QObject* owner, QWidget* parent, RKMDIWindow* window) { + RK_TRACE (APP); + + NamedWindow nw; + nw.id = id; + nw.owner = owner; + nw.parent = parent; + nw.window = window; + + for (int i = 0; i < named_windows.size (); ++i) { + RK_ASSERT (named_windows[i].id != id); + } + + named_windows.append (nw); + if (owner) connect (owner, SIGNAL (destroyed(QObject*)), this, SLOT (namedWindowOwnerDestroyed(QObject*))); + if (window) connect (window, SIGNAL (destroyed(QObject*)), this, SLOT (namedWindowDestroyed(QObject*))); +} + +RKMDIWindow* RKWorkplace::getNamedWindow (const QString& id) { + RK_TRACE (APP); + + for (int i = 0; i < named_windows.size (); ++i) { + if (named_windows[i].id == id) { + return named_windows[i].window; + } + } + + return 0; +} + +void RKWorkplace::namedWindowDestroyed (QObject* window) { + RK_TRACE (APP); + + for (int i = 0; i < named_windows.size (); ++i) { + if (named_windows[i].window == window) { + if (!named_windows[i].owner) { + named_windows.removeAt (i); + return; + } else { + named_windows[i].window = 0; + } + } + } +} + +void RKWorkplace::namedWindowOwnerDestroyed (QObject* owner) { + RK_TRACE (APP); + + for (int i = 0; i < named_windows.size (); ++i) { + if (named_windows[i].owner == owner) { + if (named_windows[i].window) { + named_windows[i].window->deleteLater (); + } + named_windows.removeAt (i); + return; + } + } +} + bool RKWorkplace::openAnyUrl (const KUrl &url, const QString &known_mimetype, bool force_external) { RK_TRACE (APP); diff -Nru rkward-0.6.4/rkward/windows/rkworkplace.h rkward-0.6.5/rkward/windows/rkworkplace.h --- rkward-0.6.4/rkward/windows/rkworkplace.h 2015-12-15 09:10:12.000000000 +0000 +++ rkward-0.6.5/rkward/windows/rkworkplace.h 2016-03-22 19:22:59.000000000 +0000 @@ -2,7 +2,7 @@ rkworkplace - description ------------------- begin : Thu Sep 21 2006 - copyright : (C) 2006-2013 by Thomas Friedrichsmeier + copyright : (C) 2006-2016 by Thomas Friedrichsmeier email : thomas.friedrichsmeier@kdemail.net ***************************************************************************/ @@ -162,6 +162,13 @@ KUrl workspaceURL () const { return current_url; }; KConfigBase *workspaceConfig (); QString portableUrl (const KUrl &url); +/** Register a named area where to place MDI windows. For directing preview windows to a specific location. */ + void registerNamedWindow (const QString& id, QObject *owner, QWidget* parent, RKMDIWindow *window=0); +/** Return the window in the specified named area (can be 0). */ + RKMDIWindow *getNamedWindow (const QString& id); +/** Make the next window to be created appear in a specific location (can be a named window). + * @note It is the caller's responsibility to clear the override (by calling setWindowPlacementOverride ()) after the window in question has been created. */ + void setWindowPlacementOverrides (const QString& placement=QString (), const QString& name=QString (), const QString& style=QString ()); signals: /** emitted when the workspace Url has changed */ void workspaceUrlChanged (const KUrl& url); @@ -169,6 +176,9 @@ /** When windows are attached to the workplace, their QObject::destroyed () signal is connected to this slot. Thereby deleted objects are removed from the workplace automatically */ void removeWindow (QObject *window); void saveSettings (); +private slots: + void namedWindowDestroyed (QObject *); + void namedWindowOwnerDestroyed (QObject *); private: KUrl current_url; KConfig *_workspace_config; @@ -192,6 +202,22 @@ RKToolWindowBar* tool_window_bars[TOOL_WINDOW_BAR_COUNT]; friend class RKToolWindowBar; void placeInToolWindowBar (RKMDIWindow *window, int position); + + /** Control placement of windows from R */ + struct NamedWindow { + /** "Owner" of this named window. If non-0, and the owner gets destroyed, the named window record gets closed, too. */ + QObject *owner; + /** Where to place window, if it does not exist, yet. Can be one of 0: detached, RKWardMainWindow::getMain(): attached, any other: docked in a special region */ + QPointer parent; + /** Pointer to window, if it exists, already */ + RKMDIWindow* window; + /** Identifier string */ + QString id; + }; + QList named_windows; + RKMDIWindow::State window_placement_override; + QString window_name_override; + QString window_style_override; }; #endif diff -Nru rkward-0.6.4/rkward/windows/robjectbrowser.cpp rkward-0.6.5/rkward/windows/robjectbrowser.cpp --- rkward-0.6.4/rkward/windows/robjectbrowser.cpp 2015-12-15 09:10:12.000000000 +0000 +++ rkward-0.6.5/rkward/windows/robjectbrowser.cpp 2016-03-22 19:22:59.000000000 +0000 @@ -2,7 +2,7 @@ robjectbrowser - description ------------------- begin : Thu Aug 19 2004 - copyright : (C) 2004 - 2015 by Thomas Friedrichsmeier + copyright : (C) 2004 - 2016 by Thomas Friedrichsmeier email : thomas.friedrichsmeier@kdemail.net ***************************************************************************/ @@ -37,6 +37,7 @@ #include "../misc/rkobjectlistview.h" #include "../misc/rkdummypart.h" #include "../misc/rkstandardicons.h" +#include "../misc/rkstandardactions.h" #include "rkworkplace.h" #include "../dataeditor/rkeditor.h" @@ -93,14 +94,14 @@ RK_DEBUG (APP, DL_INFO, "creating workspace browser"); - internal = new RObjectBrowserInternal (layout_widget); + internal = new RObjectBrowserInternal (layout_widget, this); setFocusProxy (internal); setMinimumSize (internal->minimumSize ()); } ///////////////////////// RObjectBrowserInternal ///////////////////////////// -RObjectBrowserInternal::RObjectBrowserInternal (QWidget *parent) : QWidget (parent) { +RObjectBrowserInternal::RObjectBrowserInternal (QWidget *parent, RObjectBrowser *browser) : QWidget (parent) { RK_TRACE (APP); setFocusPolicy (Qt::ClickFocus); @@ -114,8 +115,8 @@ update_button = new QPushButton (i18n ("Update"), this); vbox->addWidget (update_button); - actions.insert (Help, new QAction (i18n ("Search Help"), this)); - connect (actions[Help], SIGNAL(triggered(bool)), this, SLOT(popupHelp())); + actions.insert (Help, RKStandardActions::functionHelp (browser, this)); + actions.insert (SearchOnline, RKStandardActions::onlineHelp (browser, this)); actions.insert (Edit, new QAction (i18n ("Edit"), this)); connect (actions[Edit], SIGNAL(triggered(bool)), this, SLOT(popupEdit())); actions.insert (View, new QAction (i18n ("View"), this)); @@ -164,10 +165,13 @@ RObjectList::getObjectList ()->updateFromR (0); } -void RObjectBrowserInternal::popupHelp () { +void RObjectBrowserInternal::currentHelpContext (QString* symbol, QString* package) { RK_TRACE (APP); - if (list_view->menuObject ()) RKHelpSearchWindow::mainHelpSearch ()->getFunctionHelp (list_view->menuObject ()->getShortName ()); + RObject *object = list_view->menuObject (); + if (!object) return; + *symbol = object->getShortName (); + *package = object->isInGlobalEnv () ? QString () : object->toplevelEnvironment ()->packageName (); } void RObjectBrowserInternal::popupEdit () { @@ -250,7 +254,8 @@ } actions[Help]->setVisible (!(object->isType (RObject::ToplevelEnv) || object->isInGlobalEnv ())); - actions[Edit]->setVisible (object->canEdit () && RKWorkplace::mainWorkplace ()->canEditObject (object)); + actions[Edit]->setText (object->canWrite () ? i18n ("Edit") : i18n ("View in editor (read-only)")); + actions[Edit]->setVisible (RKWorkplace::mainWorkplace ()->canEditObject (object)); actions[View]->setVisible (object->canRead ()); actions[Rename]->setVisible (object->canRename ()); actions[Copy]->setVisible (object->canRead () && (!object->isType (RObject::ToplevelEnv))); @@ -267,7 +272,7 @@ if (!object) return; if (object == RObjectList::getObjectList ()) return; - if (object->canEdit () && RKWorkplace::mainWorkplace ()->canEditObject (object)) { + if (RKWorkplace::mainWorkplace ()->canEditObject (object)) { RKWorkplace::mainWorkplace ()->editObject (object); } else { RKWorkplace::mainWorkplace ()->flushAllData (); diff -Nru rkward-0.6.4/rkward/windows/robjectbrowser.h rkward-0.6.5/rkward/windows/robjectbrowser.h --- rkward-0.6.4/rkward/windows/robjectbrowser.h 2015-12-15 09:10:12.000000000 +0000 +++ rkward-0.6.5/rkward/windows/robjectbrowser.h 2016-03-22 19:22:59.000000000 +0000 @@ -2,7 +2,7 @@ robjectbrowser - description ------------------- begin : Thu Aug 19 2004 - copyright : (C) 2004 - 2015 by Thomas Friedrichsmeier + copyright : (C) 2004 - 2016 by Thomas Friedrichsmeier email : thomas.friedrichsmeier@kdemail.net ***************************************************************************/ @@ -22,6 +22,8 @@ #include #include +#include "rkcommandeditorwindow.h" + class RKObjectListView; class RKObjectListViewSettings; class QPushButton; @@ -59,16 +61,15 @@ @author Thomas Friedrichsmeier */ -class RObjectBrowserInternal : public QWidget { +class RObjectBrowserInternal : public QWidget, public RKScriptContextProvider { Q_OBJECT public: - explicit RObjectBrowserInternal (QWidget *parent); + explicit RObjectBrowserInternal (QWidget *parent, RObjectBrowser *browser); ~RObjectBrowserInternal (); private slots: void updateButtonClicked (); void contextMenuCallback (RObject *object, bool *suppress); - - void popupHelp (); + void popupEdit (); void popupCopy (); /** essentially like popupCopy, but does not ask for a name */ @@ -82,9 +83,11 @@ protected: /** reimplemnented from QWidget to make show the globalenv object when activated (other than by mouse click) */ void focusInEvent (QFocusEvent *e); + void currentHelpContext (QString *symbol, QString *package); // KF5 TODO: override private: enum PopupActions { Help=0, + SearchOnline, Edit, View, Rename, diff -Nru rkward-0.6.4/tests/analysis_plugins.R rkward-0.6.5/tests/analysis_plugins.R --- rkward-0.6.4/tests/analysis_plugins.R 2015-02-20 12:10:45.000000000 +0000 +++ rkward-0.6.5/tests/analysis_plugins.R 2016-03-08 09:11:38.000000000 +0000 @@ -154,7 +154,7 @@ rk.call.plugin ("rkward::power_analysis", drp_pwr_hypothesis.string="greater", drp_pwr_proptype.string="two.sample.same", drp_pwr_stat.string="pwr.p.test", pwr_spin_sample0.real="30.00", rad_pwr_param.string="Significance level", spn_Effectsz.real="0.30", spn_Power.real="0.81", svb_Svrsltst.active="0", svb_Svrsltst.objectname="pwr.result", svb_Svrsltst.parent=".GlobalEnv", submit.mode="submit") rk.call.plugin ("rkward::power_analysis", drp_pwr_hypothesis.string="two.sided", drp_pwr_stat.string="pwr.norm.test", pwr_spin_sample0.real="30.00", rad_pwr_param.string="Significance level", spn_Effectsz.real="0.30", spn_Power.real="0.80", svb_Svrsltst.active="0", svb_Svrsltst.objectname="pwr.result", svb_Svrsltst.parent=".GlobalEnv", submit.mode="submit") rk.call.plugin ("rkward::power_analysis", drp_pwr_stat.string="pwr.f2.test", pwr_spin_dfv.real="30.00", pwr_spin_sample0.real="30.00", rad_pwr_param.string="Parameter count", spn_Effectsz.real="0.30", spn_Power.real="0.80", spn_Sgnfcncl.real="0.10", svb_Svrsltst.active="0", svb_Svrsltst.objectname="pwr.result", svb_Svrsltst.parent=".GlobalEnv", submit.mode="submit") - }) + }, libraries=c("pwr")) ), postCalls = list ( # like initCalls: run after all tests to clean up. function () { suppressWarnings (rm (list=c ("women", "warpbreaks", "rock", "co2", "test50x", "test50y", "test50z", "test10x", "test10y", "test10z", "test_table", "hptrend", "hpcycle"), envir=globalenv())) diff -Nru rkward-0.6.4/tests/import_export_plugins/import_xls.rkcommands.R rkward-0.6.5/tests/import_export_plugins/import_xls.rkcommands.R --- rkward-0.6.4/tests/import_export_plugins/import_xls.rkcommands.R 1970-01-01 00:00:00.000000000 +0000 +++ rkward-0.6.5/tests/import_export_plugins/import_xls.rkcommands.R 2016-03-23 16:44:47.000000000 +0000 @@ -0,0 +1,15 @@ +local({ +## Prepare +require (gdata) +## Compute +data <- read.xls ("/home/thomas/develop/rkward/tests/import_export_plugins_testfile.xls", sheet="1", header=TRUE, verbose=FALSE, nrows=-1, skip=0, na.string="NA", strip.white = FALSE) +.GlobalEnv$my.xls.data <- data # assign to globalenv() +## Print result +rk.header ("Import Microsoft EXCEL sheet", parameters=list("File name"="/home/thomas/develop/rkward/tests/import_export_plugins_testfile.xls", + "Object to save to"="my.xls.data", + "Name or number of sheet"="1", + "Use first row as column names"="yes", + "Number of rows to skip"="0", + "Max number of rows to read (-1 for no limit)"="-1", + "Character for missing values"="NA")) +}) diff -Nru rkward-0.6.4/tests/import_export_plugins/import_xls.rkout rkward-0.6.5/tests/import_export_plugins/import_xls.rkout --- rkward-0.6.4/tests/import_export_plugins/import_xls.rkout 1970-01-01 00:00:00.000000000 +0000 +++ rkward-0.6.5/tests/import_export_plugins/import_xls.rkout 2016-03-08 09:11:38.000000000 +0000 @@ -0,0 +1,104 @@ +

Import Microsoft EXCEL sheet

Parameters

File name: /home/thomas/develop/rkward/tests/import_export_plugins_testfile.xls
Object to save to: my.xls.data
Name or number of sheet: 1
Use first row as column names: yes
Number of rows to skip: 0
Max number of rows to read (-1 for no limit): -1
Character for missing values: NA

+DATE
+

Messages, warnings, or errors:

Calling POSIX::isdigit() is deprecated at /home/thomas/.rkward/library/gdata/perl/xls2csv.pl line 118.
+

+ + +

+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
First.var Second.var Third.war Gap Fourth.var
1 + 5 + a + 1.1 + + This is a test +
2 + 4 + b + 1.2 + + +
3 + 3 + c + 1.3 + + This is a test +
4 + 2 + b + 1.4 + + +
5 + 1 + b + 1.6 + + This is a test +
+
+
diff -Nru rkward-0.6.4/tests/import_export_plugins/import_xls_xlconnect.rkcommands.R rkward-0.6.5/tests/import_export_plugins/import_xls_xlconnect.rkcommands.R --- rkward-0.6.4/tests/import_export_plugins/import_xls_xlconnect.rkcommands.R 1970-01-01 00:00:00.000000000 +0000 +++ rkward-0.6.5/tests/import_export_plugins/import_xls_xlconnect.rkcommands.R 2016-03-08 09:11:38.000000000 +0000 @@ -0,0 +1,22 @@ +local({ +## Prepare +require (XLConnect) +## Compute +data <- readWorksheetFromFile ("/home/thomas/develop/rkward/tests/import_export_plugins_testfile.xlsx", sheet=1, startRow=0, startCol=0, endRow=7, endCol=0) + +.GlobalEnv$my.xls.data <- data # assign to globalenv() +## Print result +rk.header ("Import SPSS data", parameters=list("File name"="/home/thomas/develop/rkward/tests/import_export_plugins_testfile.xlsx", + "Object to save to"="my.xls.data")) +}) +local({ +## Prepare +require (XLConnect) +## Compute +data <- readWorksheetFromFile ("/home/thomas/develop/rkward/tests/import_export_plugins_testfile.xls", sheet=1, region="A6:B9", header=FALSE) + +.GlobalEnv$my.xlsx.data <- data # assign to globalenv() +## Print result +rk.header ("Import SPSS data", parameters=list("File name"="/home/thomas/develop/rkward/tests/import_export_plugins_testfile.xls", + "Object to save to"="my.xlsx.data")) +}) diff -Nru rkward-0.6.4/tests/import_export_plugins/import_xls_xlconnect.rkout rkward-0.6.5/tests/import_export_plugins/import_xls_xlconnect.rkout --- rkward-0.6.4/tests/import_export_plugins/import_xls_xlconnect.rkout 1970-01-01 00:00:00.000000000 +0000 +++ rkward-0.6.5/tests/import_export_plugins/import_xls_xlconnect.rkout 2016-03-08 09:11:38.000000000 +0000 @@ -0,0 +1,129 @@ +

Import SPSS data

Parameters

File name: /home/thomas/develop/rkward/tests/import_export_plugins_testfile.xlsx
Object to save to: my.xls.data

+DATE
+ + +

+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
First.var Second.var Third.war Gap Fourth.var
1 + 5 + a + 1.1 + + This is a test +
2 + 4 + b + 1.2 + + +
3 + 3 + c + 1.3 + + This is a test +
4 + 2 + b + 1.4 + + +
+
+
+

Import SPSS data

Parameters

File name: /home/thomas/develop/rkward/tests/import_export_plugins_testfile.xls
Object to save to: my.xlsx.data

+DATE
+ + +

+ + +
+ + + + + + + + + + + + + + + + + + + + + + + +
Col1 Col2
1 + 3 + c +
2 + 2 + b +
3 + 1 + b +
+
+
diff -Nru rkward-0.6.4/tests/import_export_plugins.R rkward-0.6.5/tests/import_export_plugins.R --- rkward-0.6.4/tests/import_export_plugins.R 2015-12-15 09:10:12.000000000 +0000 +++ rkward-0.6.5/tests/import_export_plugins.R 2016-03-23 16:37:59.000000000 +0000 @@ -60,6 +60,17 @@ rk.print (my.stata.data) for (var in my.stata.data) rk.print (rk.get.description(var)) }, libraries=c("foreign"), files=c("../import_export_plugins_testfile.dta")), + new ("RKTest", id="import_xls_xlconnect", call=function () { + rk.call.plugin ("rkward::import_xls_xlconnect", autofitcol.state="1", autofitrow.state="1", coltypes.tsv="", doedit.state="0", endcol.real="0.00", endrow.real="7.00", file.selection="/home/thomas/develop/rkward/tests/import_export_plugins_testfile.xlsx", header.state="1", range.text="", rownames.text="", saveto.objectname="my.xls.data", saveto.parent=".GlobalEnv", sheet.text="1", startcol.real="0.00", startrow.real="0.00", submit.mode="submit") + rk.print (my.xls.data) + rk.call.plugin ("rkward::import_xls_xlconnect", autofitcol.state="1", autofitrow.state="1", coltypes.tsv="", doedit.state="0", file.selection="/home/thomas/develop/rkward/tests/import_export_plugins_testfile.xls", header.state="0", range.text="A6:B9", rownames.text="", saveto.objectname="my.xlsx.data", saveto.parent=".GlobalEnv", sheet.text="1", submit.mode="submit") + rk.print (my.xlsx.data) + }, libraries=c("XLConnect"), files=c("../import_export_plugins_testfile.xls", "../import_export_plugins_testfile.xlsx")), + new ("RKTest", id="import_xls", call=function () { + rk.call.plugin ("rkward::import_xls", doedit.state="0", file.selection="/home/thomas/develop/rkward/tests/import_export_plugins_testfile.xls", fill.state="0", header.state="1", na.text="NA", nrows.text="-1", saveto.objectname="my.xls.data", saveto.parent=".GlobalEnv", sheetname.text="1", skip.text="0", strings_as_factors.string="", stripwhite.state="0", verbose.state="0", submit.mode="submit") + rk.print (my.xls.data) + # TODO: known bug: does not import numeric columns from xlsx-files correctly + }, libraries=c("gdata"), files=c("../import_export_plugins_testfile.xls", "../import_export_plugins_testfile.xlsx")), new ("RKTest", id="load_source", call=function () { stopifnot (!exists ("testx", globalenv ())) Binary files /tmp/tmpv1UDtN/INb1CRdn87/rkward-0.6.4/tests/import_export_plugins_testfile.xls and /tmp/tmpv1UDtN/DcXiLrUBmJ/rkward-0.6.5/tests/import_export_plugins_testfile.xls differ Binary files /tmp/tmpv1UDtN/INb1CRdn87/rkward-0.6.4/tests/import_export_plugins_testfile.xlsx and /tmp/tmpv1UDtN/DcXiLrUBmJ/rkward-0.6.5/tests/import_export_plugins_testfile.xlsx differ diff -Nru rkward-0.6.4/tests/make_plugintests.txt rkward-0.6.5/tests/make_plugintests.txt --- rkward-0.6.4/tests/make_plugintests.txt 1970-01-01 00:00:00.000000000 +0000 +++ rkward-0.6.5/tests/make_plugintests.txt 2016-03-23 16:48:53.000000000 +0000 @@ -0,0 +1,623 @@ +RKWard Version: +[1] "0.6.4z+0.6.5+pre1" + + +R-Version: + _ +platform x86_64-pc-linux-gnu +arch x86_64 +os linux-gnu +system x86_64, linux-gnu +status Under development (unstable) +major 3 +minor 3.0 +year 2016 +month 03 +day 05 +svn rev 70278 +language R +version.string R Under development (unstable) (2016-03-05 r70278) +nickname Unsuffered Consequences + + +Installed packages: + LibPath Version +abind "/home/thomas/.rkward/library" "1.4-0" +acepack "/home/thomas/.rkward/library" "1.3-3.2" +ada "/home/thomas/.rkward/library" "2.0-3" +adapt "/home/thomas/.rkward/library" "1.0-4" +AdaptFit "/home/thomas/.rkward/library" "0.2-2" +AER "/home/thomas/.rkward/library" "1.1-9" +AGD "/home/thomas/.rkward/library" "0.30" +akima "/home/thomas/.rkward/library" "0.5-10" +alr3 "/home/thomas/.rkward/library" "2.0.5" +amap "/home/thomas/.rkward/library" "0.8-7" +AnalyzeFMRI "/home/thomas/.rkward/library" "1.1-13" +anchors "/home/thomas/.rkward/library" "3.0-7" +AnnotationDbi "/home/thomas/.rkward/library" "1.12.0" +ape "/home/thomas/.rkward/library" "3.0-8" +aplpack "/home/thomas/.rkward/library" "1.2.7" +arules "/home/thomas/.rkward/library" "1.0-13" +arulesViz "/home/thomas/.rkward/library" "0.1-5" +ash "/home/thomas/.rkward/library" "1.0-14" +bayesm "/home/thomas/.rkward/library" "2.2-5" +bdsmatrix "/home/thomas/.rkward/library" "1.3-1" +biclust "/home/thomas/.rkward/library" "1.0.2" +Biobase "/home/thomas/.rkward/library" "2.10.0" +bit "/home/thomas/.rkward/library" "1.1-10" +bitops "/home/thomas/.rkward/library" "1.0-5" +blotter "/home/thomas/.rkward/library" "0.7" +boot "/home/thomas/.rkward/library" "1.3-9" +brew "/home/thomas/.rkward/library" "1.0-6" +Cairo "/home/thomas/.rkward/library" "1.5-2" +cairoDevice "/home/thomas/.rkward/library" "2.19" +car "/home/thomas/.rkward/library" "2.0-22" +caTools "/home/thomas/.rkward/library" "1.14" +cba "/home/thomas/.rkward/library" "0.2-11" +chron "/home/thomas/.rkward/library" "2.3-43" +CircStats "/home/thomas/.rkward/library" "0.2-4" +class "/home/thomas/.rkward/library" "7.3-7" +clue "/home/thomas/.rkward/library" "0.3-46" +cluster "/home/thomas/.rkward/library" "1.14.4" +clv "/home/thomas/.rkward/library" "0.3-2" +cmprsk "/home/thomas/.rkward/library" "2.2-6" +cocor "/home/thomas/.rkward/library" "1.0-0" +coda "/home/thomas/.rkward/library" "0.16-1" +codetools "/home/thomas/.rkward/library" "0.2-8" +coin "/home/thomas/.rkward/library" "1.0-21" +colorspace "/home/thomas/.rkward/library" "1.2-2" +CompQuadForm "/home/thomas/.rkward/library" "1.4" +corpcor "/home/thomas/.rkward/library" "1.6.5" +coxme "/home/thomas/.rkward/library" "2.2-3" +cubature "/home/thomas/.rkward/library" "1.1-2" +DAAG "/home/thomas/.rkward/library" "1.15" +date "/home/thomas/.rkward/library" "1.2-33" +DBI "/home/thomas/.rkward/library" "0.2-6" +Defaults "/home/thomas/.rkward/library" "1.1-1" +degreenet "/home/thomas/.rkward/library" "1.2" +deldir "/home/thomas/.rkward/library" "0.0-22" +DEoptim "/home/thomas/.rkward/library" "2.2-2" +descr "/home/thomas/.rkward/library" "1.0.1" +Design "/home/thomas/.rkward/library" "2.3-0" +diagram "/home/thomas/.rkward/library" "1.6" +dichromat "/home/thomas/.rkward/library" "2.0-0" +digest "/home/thomas/.rkward/library" "0.6.3" +diptest "/home/thomas/.rkward/library" "0.75-4" +doBy "/home/thomas/.rkward/library" "4.5-3" +DT "/home/thomas/.rkward/library" "0.1" +dynlm "/home/thomas/.rkward/library" "0.3-1" +e1071 "/home/thomas/.rkward/library" "1.6-1" +Ecdat "/home/thomas/.rkward/library" "0.2-2" +effects "/home/thomas/.rkward/library" "2.2-4" +ellipse "/home/thomas/.rkward/library" "0.3-8" +emulator "/home/thomas/.rkward/library" "1.2-9" +ENmisc "/home/thomas/.rkward/library" "1.2-6" +ergm "/home/thomas/.rkward/library" "3.0-3" +eRm "/home/thomas/.rkward/library" "0.15-4" +evaluate "/home/thomas/.rkward/library" "0.4.3" +evd "/home/thomas/.rkward/library" "2.3-0" +exactRankTests "/home/thomas/.rkward/library" "0.8-24" +expm "/home/thomas/.rkward/library" "0.99-1.1" +ez "/home/thomas/.rkward/library" "3.0-0" +FAdist "/home/thomas/.rkward/library" "2.0" +fastICA "/home/thomas/.rkward/library" "1.1-16" +fBasics "/home/thomas/.rkward/library" "2160.85" +fCalendar "/home/thomas/.rkward/library" "270.78.3" +fdrtool "/home/thomas/.rkward/library" "1.2.10" +fEcofin "/home/thomas/.rkward/library" "290.76" +ff "/home/thomas/.rkward/library" "2.2-11" +fGarch "/home/thomas/.rkward/library" "2150.81" +fields "/home/thomas/.rkward/library" "6.6.3" +filehash "/home/thomas/.rkward/library" "2.2-2" +fImport "/home/thomas/.rkward/library" "3000.82" +FinancialInstrument "/home/thomas/.rkward/library" "1.1" +flexclust "/home/thomas/.rkward/library" "1.3-3" +flexmix "/home/thomas/.rkward/library" "2.3-8" +foreach "/home/thomas/.rkward/library" "1.4.0" +foreign "/home/thomas/.rkward/library" "0.8-53" +formatR "/home/thomas/.rkward/library" "0.7" +Formula "/home/thomas/.rkward/library" "1.1-1" +fpc "/home/thomas/.rkward/library" "2.1-4" +fSeries "/home/thomas/.rkward/library" "270.76.3" +fts "/home/thomas/.rkward/library" "0.7.7" +fUtilities "/home/thomas/.rkward/library" "2110.78" +gam "/home/thomas/.rkward/library" "1.06.2" +gamlss "/home/thomas/.rkward/library" "4.2-0" +gamlss.data "/home/thomas/.rkward/library" "4.2-0" +gamlss.dist "/home/thomas/.rkward/library" "4.2-0" +gclus "/home/thomas/.rkward/library" "1.3.1" +gdata "/home/thomas/.rkward/library" "2.12.0.2" +gee "/home/thomas/.rkward/library" "4.13-18" +ggm "/home/thomas/.rkward/library" "1.995-2" +ggplot2 "/home/thomas/.rkward/library" "0.9.3.1" +GO "/home/thomas/.rkward/library" "1.14.1" +GO.db "/home/thomas/.rkward/library" "2.4.5" +GOFSN "/home/thomas/.rkward/library" "1.0" +googleVis "/home/thomas/.rkward/library" "0.5.10" +GPArotation "/home/thomas/.rkward/library" "2012.3-1" +gpclib "/home/thomas/.rkward/library" "1.5-5" +gplots "/home/thomas/.rkward/library" "2.11.0.1" +graph "/home/thomas/.rkward/library" "1.24.1" +gridBase "/home/thomas/.rkward/library" "0.4-6" +gtable "/home/thomas/.rkward/library" "0.1.2" +gtools "/home/thomas/.rkward/library" "2.7.1" +gWidgets "/home/thomas/.rkward/library" "0.0-52" +gWidgetsRGtk2 "/home/thomas/.rkward/library" "0.0-81" +gWidgetstcltk "/home/thomas/.rkward/library" "0.0-54" +hdrcde "/home/thomas/.rkward/library" "3.1" +hexbin "/home/thomas/.rkward/library" "1.26.2" +Hmisc "/home/thomas/.rkward/library" "3.10-1" +HSAUR "/home/thomas/.rkward/library" "1.3-0" +htmltools "/home/thomas/.rkward/library" "0.3" +htmlwidgets "/home/thomas/.rkward/library" "0.5" +httpuv "/home/thomas/.rkward/library" "1.3.3" +igraph "/home/thomas/.rkward/library" "0.6.5-1" +igraph0 "/home/thomas/.rkward/library" "0.5.7" +igraphdata "/home/thomas/.rkward/library" "0.1-1" +ineq "/home/thomas/.rkward/library" "0.2-10" +inline "/home/thomas/.rkward/library" "0.3.11" +intervals "/home/thomas/.rkward/library" "0.14.0" +iplots "/home/thomas/.rkward/library" "1.1-5" +ipred "/home/thomas/.rkward/library" "0.9-1" +IQCC "/home/thomas/.rkward/library" "0.5" +isa2 "/home/thomas/.rkward/library" "0.3.2-2" +iterators "/home/thomas/.rkward/library" "1.0.6" +its "/home/thomas/.rkward/library" "1.1.8" +JavaGD "/home/thomas/.rkward/library" "0.6-1" +jpeg "/home/thomas/.rkward/library" "0.1-3" +jsonlite "/home/thomas/.rkward/library" "0.9.19" +Kendall "/home/thomas/.rkward/library" "2.2" +kernlab "/home/thomas/.rkward/library" "0.9-18" +KernSmooth "/home/thomas/.rkward/library" "2.23-14" +kinship "/home/thomas/.rkward/library" "1.1.1" +klausuR "/home/thomas/.rkward/library" "0.12-5" +knitr "/home/thomas/.rkward/library" "1.2" +koRpus "/home/thomas/.rkward/library" "0.04-40" +ks "/home/thomas/.rkward/library" "1.8.10" +labeling "/home/thomas/.rkward/library" "0.1" +latentnet "/home/thomas/.rkward/library" "2.4-1" +lattice "/home/thomas/.rkward/library" "0.20-15" +latticeExtra "/home/thomas/.rkward/library" "0.6-24" +latticist "/home/thomas/.rkward/library" "0.9-44" +lavaan "/home/thomas/.rkward/library" "0.5-9" +lawstat "/home/thomas/.rkward/library" "2.3" +leaps "/home/thomas/.rkward/library" "2.9" +LearnBayes "/home/thomas/.rkward/library" "2.12" +lme4 "/home/thomas/.rkward/library" "0.999999-2" +lmtest "/home/thomas/.rkward/library" "0.9-31" +locfit "/home/thomas/.rkward/library" "1.5-9.1" +logspline "/home/thomas/.rkward/library" "2.1.4" +lokern "/home/thomas/.rkward/library" "1.1-4" +lpSolve "/home/thomas/.rkward/library" "5.6.7" +ltm "/home/thomas/.rkward/library" "1.0-0" +lumiHumanV1 "/home/thomas/.rkward/library" "1.3.1" +magrittr "/home/thomas/.rkward/library" "1.5" +mapproj "/home/thomas/.rkward/library" "1.2-1" +maps "/home/thomas/.rkward/library" "2.3-2" +maptools "/home/thomas/.rkward/library" "0.8-23" +markdown "/home/thomas/.rkward/library" "0.5.4" +MASS "/home/thomas/.rkward/library" "7.3-26" +MatchIt "/home/thomas/.rkward/library" "2.4-20" +Matrix "/home/thomas/.rkward/library" "1.1-4" +matrixcalc "/home/thomas/.rkward/library" "1.0-3" +MatrixModels "/home/thomas/.rkward/library" "0.3-1" +maxLik "/home/thomas/.rkward/library" "1.2-0" +MBESS "/home/thomas/.rkward/library" "3.3.3" +mboost "/home/thomas/.rkward/library" "2.2-2" +mclust "/home/thomas/.rkward/library" "4.0" +MCMCpack "/home/thomas/.rkward/library" "1.3-2" +memisc "/home/thomas/.rkward/library" "0.96-9" +memoise "/home/thomas/.rkward/library" "0.1" +MEMSS "/home/thomas/.rkward/library" "0.9-0" +mgcv "/home/thomas/.rkward/library" "1.8-10" +mice "/home/thomas/.rkward/library" "2.15" +micEcon "/home/thomas/.rkward/library" "0.6-10" +mime "/home/thomas/.rkward/library" "0.4" +minpack.lm "/home/thomas/.rkward/library" "1.1-7" +minqa "/home/thomas/.rkward/library" "1.2.1" +misc3d "/home/thomas/.rkward/library" "0.8-4" +miscTools "/home/thomas/.rkward/library" "0.6-16" +mitools "/home/thomas/.rkward/library" "2.2" +mix "/home/thomas/.rkward/library" "1.0-8" +mlbench "/home/thomas/.rkward/library" "2.1-1" +mlmRev "/home/thomas/.rkward/library" "1.0-1" +mlogit "/home/thomas/.rkward/library" "0.2-4" +mnormt "/home/thomas/.rkward/library" "1.4-5" +modeltools "/home/thomas/.rkward/library" "0.2-19" +moments "/home/thomas/.rkward/library" "0.13" +mondate "/home/thomas/.rkward/library" "0.9.10.04" +msm "/home/thomas/.rkward/library" "1.5" +mstate "/home/thomas/.rkward/library" "0.2.6" +multcomp "/home/thomas/.rkward/library" "1.2-13" +multicore "/home/thomas/.rkward/library" "0.1-7" +multilevel "/home/thomas/.rkward/library" "2.5" +munsell "/home/thomas/.rkward/library" "0.4" +mvtnorm "/home/thomas/.rkward/library" "1.0-2" +network "/home/thomas/.rkward/library" "1.7.2" +networkDynamic "/home/thomas/.rkward/library" "0.4" +networksis "/home/thomas/.rkward/library" "1.4" +nlme "/home/thomas/.rkward/library" "3.1-109" +nnet "/home/thomas/.rkward/library" "7.3-6" +nor1mix "/home/thomas/.rkward/library" "1.1-4" +nortest "/home/thomas/.rkward/library" "1.0-2" +np "/home/thomas/.rkward/library" "0.50-1" +numDeriv "/home/thomas/.rkward/library" "2012.9-1" +nws "/home/thomas/.rkward/library" "1.7.0.1" +odesolve "/home/thomas/.rkward/library" "0.9-9" +odfWeave "/home/thomas/.rkward/library" "0.8.1" +outliers "/home/thomas/.rkward/library" "0.14" +oz "/home/thomas/.rkward/library" "1.0-19" +pan "/home/thomas/.rkward/library" "0.7" +parser "/home/thomas/.rkward/library" "0.0-16" +party "/home/thomas/.rkward/library" "1.0-2" +pastecs "/home/thomas/.rkward/library" "1.3-13" +pbivnorm "/home/thomas/.rkward/library" "0.5-1" +pbkrtest "/home/thomas/.rkward/library" "0.3-4" +PBSmapping "/home/thomas/.rkward/library" "2.65.40" +PerformanceAnalytics "/home/thomas/.rkward/library" "1.1.0" +permute "/home/thomas/.rkward/library" "0.8-4" +playwith "/home/thomas/.rkward/library" "0.9-54" +plm "/home/thomas/.rkward/library" "1.3-1" +plyr "/home/thomas/.rkward/library" "1.8" +pmml "/home/thomas/.rkward/library" "1.2.30" +png "/home/thomas/.rkward/library" "0.1-4" +polycor "/home/thomas/.rkward/library" "0.7-8" +PortfolioAnalytics "/home/thomas/.rkward/library" "0.6" +prodlim "/home/thomas/.rkward/library" "1.3.3" +proto "/home/thomas/.rkward/library" "0.3-10" +proxy "/home/thomas/.rkward/library" "0.4-10" +pscl "/home/thomas/.rkward/library" "1.4.9" +psych "/home/thomas/.rkward/library" "1.3.2" +psychometric "/home/thomas/.rkward/library" "2.2" +pwr "/home/thomas/.rkward/library" "1.1.1" +qcc "/home/thomas/.rkward/library" "2.5" +qgraph "/home/thomas/.rkward/library" "1.1.0" +qpcR "/home/thomas/.rkward/library" "1.3-7" +qtbase "/home/thomas/.rkward/library" "1.0.4" +qtutils "/home/thomas/.rkward/library" "0.1-3" +quadprog "/home/thomas/.rkward/library" "1.5-5" +quantmod "/home/thomas/.rkward/library" "0.4-0" +quantreg "/home/thomas/.rkward/library" "4.97" +quantstrat "/home/thomas/.rkward/library" "0.3" +R2HTML "/home/thomas/.rkward/library" "2.3.1" +R6 "/home/thomas/.rkward/library" "2.1.1" +RandomFields "/home/thomas/.rkward/library" "2.0.66" +randomForest "/home/thomas/.rkward/library" "4.6-7" +randomSurvivalForest "/home/thomas/.rkward/library" "3.6.4" +RANN "/home/thomas/.rkward/library" "2.2.1" +RArcInfo "/home/thomas/.rkward/library" "0.4-12" +RaschSampler "/home/thomas/.rkward/library" "0.8-6" +raster "/home/thomas/.rkward/library" "2.3-12" +rattle "/home/thomas/.rkward/library" "2.6.26" +rbenchmark "/home/thomas/.rkward/library" "1.0.0" +RBGL "/home/thomas/.rkward/library" "1.28.0" +RColorBrewer "/home/thomas/.rkward/library" "1.0-5" +rcompgen "/home/thomas/.rkward/library" "0.1-15" +Rcpp "/home/thomas/.rkward/library" "0.12.3" +Rcsdp "/home/thomas/.rkward/library" "0.1.52" +R.devices "/home/thomas/.rkward/library" "2.1.1" +relations "/home/thomas/.rkward/library" "0.6-1" +relimp "/home/thomas/.rkward/library" "1.0-3" +reshape "/home/thomas/.rkward/library" "0.8.4" +reshape2 "/home/thomas/.rkward/library" "1.2.2" +rgdal "/home/thomas/.rkward/library" "0.9-1" +rgenoud "/home/thomas/.rkward/library" "5.7-8.1" +rgl "/home/thomas/.rkward/library" "0.92.892" +Rglpk "/home/thomas/.rkward/library" "0.3-10" +RGtk2 "/home/thomas/.rkward/library" "2.20.25" +RGtk2Extras "/home/thomas/.rkward/library" "0.5.0" +rJava "/home/thomas/.rkward/library" "0.9-4" +RJSONIO "/home/thomas/.rkward/library" "1.0-3" +rk.ANOVA "/home/thomas/.rkward/library" "0.01-17" +rk.ClusterAnalysis "/home/thomas/.rkward/library" "0.01-10" +rk.CohenKappa "/home/thomas/.rkward/library" "0.01-5" +rk.FactorAnalysis "/home/thomas/.rkward/library" "0.01-11" +rk.power "/home/thomas/.rkward/library" "0.01-2" +rk.subset "/home/thomas/.rkward/library" "0.01-2" +rkwarddev "/home/thomas/.rkward/library" "0.08-2" +rlecuyer "/home/thomas/.rkward/library" "0.3-3" +R.matlab "/home/thomas/.rkward/library" "1.6.1" +rmeta "/home/thomas/.rkward/library" "2.16" +R.methodsS3 "/home/thomas/.rkward/library" "1.4.2" +rms "/home/thomas/.rkward/library" "3.6-3" +robustbase "/home/thomas/.rkward/library" "0.9-7" +R.oo "/home/thomas/.rkward/library" "1.9.9" +roxygen2 "/home/thomas/.rkward/library" "4.0.2" +rpart "/home/thomas/.rkward/library" "4.1-1" +rpart.plot "/home/thomas/.rkward/library" "1.4-3" +R.rsp "/home/thomas/.rkward/library" "0.8.2" +RSQLite "/home/thomas/.rkward/library" "0.11.3" +rstudioapi "/home/thomas/.rkward/library" "0.1" +RSvgDevice "/home/thomas/.rkward/library" "0.6.4.2" +RSVGTipsDevice "/home/thomas/.rkward/library" "1.0-4" +Rsymphony "/home/thomas/.rkward/library" "0.1-15" +RUnit "/home/thomas/.rkward/library" "0.4.26" +R.utils "/home/thomas/.rkward/library" "1.16.2" +sampleSelection "/home/thomas/.rkward/library" "0.7-2" +sandwich "/home/thomas/.rkward/library" "2.2-10" +scales "/home/thomas/.rkward/library" "0.2.3" +scatterplot3d "/home/thomas/.rkward/library" "0.3-33" +sciplot "/home/thomas/.rkward/library" "1.1-0" +sem "/home/thomas/.rkward/library" "3.0-0" +SemiPar "/home/thomas/.rkward/library" "1.0-4" +seriation "/home/thomas/.rkward/library" "1.0-7" +sets "/home/thomas/.rkward/library" "1.0-13" +sfsmisc "/home/thomas/.rkward/library" "1.0-23" +sgeostat "/home/thomas/.rkward/library" "1.0-25" +shape "/home/thomas/.rkward/library" "1.4.0" +shapes "/home/thomas/.rkward/library" "1.1-6" +shiny "/home/thomas/.rkward/library" "0.13.0" +siar "/home/thomas/.rkward/library" "4.1.3" +siatclust "/home/thomas/.rkward/library" "1.0.4" +slam "/home/thomas/.rkward/library" "0.1-28" +sm "/home/thomas/.rkward/library" "2.2-4.1" +sn "/home/thomas/.rkward/library" "0.4-17" +sna "/home/thomas/.rkward/library" "2.3-1" +snow "/home/thomas/.rkward/library" "0.3-12" +sp "/home/thomas/.rkward/library" "1.0-16" +spam "/home/thomas/.rkward/library" "0.29-2" +SparseM "/home/thomas/.rkward/library" "0.97" +spatial "/home/thomas/.rkward/library" "7.3-6" +spatstat "/home/thomas/.rkward/library" "1.31-1" +spdep "/home/thomas/.rkward/library" "0.5-56" +stabledist "/home/thomas/.rkward/library" "0.6-5" +statmod "/home/thomas/.rkward/library" "1.4.17" +statnet.common "/home/thomas/.rkward/library" "3.1-0" +stringr "/home/thomas/.rkward/library" "1.0.0" +strucchange "/home/thomas/.rkward/library" "1.4-7" +subselect "/home/thomas/.rkward/library" "0.12-2" +survey "/home/thomas/.rkward/library" "3.29-4" +survival "/home/thomas/.rkward/library" "2.37-4" +svDialogs "/home/thomas/.rkward/library" "0.9-54" +svGUI "/home/thomas/.rkward/library" "0.9-54" +svIDE "/home/thomas/.rkward/library" "0.9-50" +svMisc "/home/thomas/.rkward/library" "0.9-69" +svSocket "/home/thomas/.rkward/library" "0.9-55" +svSweave "/home/thomas/.rkward/library" "0.9-8" +svUnit "/home/thomas/.rkward/library" "0.7-11" +svWidgets "/home/thomas/.rkward/library" "0.9-43" +systemfit "/home/thomas/.rkward/library" "1.1-14" +tcltk2 "/home/thomas/.rkward/library" "1.2-5" +TeachingDemos "/home/thomas/.rkward/library" "2.9" +testthat "/home/thomas/.rkward/library" "0.7.1" +tikzDevice "/home/thomas/.rkward/library" "0.7.0" +timeDate "/home/thomas/.rkward/library" "2160.97" +timeSeries "/home/thomas/.rkward/library" "3000.96" +tis "/home/thomas/.rkward/library" "1.23" +tree "/home/thomas/.rkward/library" "1.0-33" +trimcluster "/home/thomas/.rkward/library" "0.1-2" +tripack "/home/thomas/.rkward/library" "1.3-5" +truncreg "/home/thomas/.rkward/library" "0.1-1" +tseries "/home/thomas/.rkward/library" "0.10-31" +TSP "/home/thomas/.rkward/library" "1.0-7" +TTR "/home/thomas/.rkward/library" "0.22-0" +tweedie "/home/thomas/.rkward/library" "2.1.7" +urca "/home/thomas/.rkward/library" "1.2-7" +vcd "/home/thomas/.rkward/library" "1.3-2" +vegan "/home/thomas/.rkward/library" "2.3-2" +verification "/home/thomas/.rkward/library" "1.34" +VGAM "/home/thomas/.rkward/library" "0.9-0" +waveslim "/home/thomas/.rkward/library" "1.7.1" +WDI "/home/thomas/.rkward/library" "2.2" +weightedKmeans "/home/thomas/.rkward/library" "1.2.0" +whisker "/home/thomas/.rkward/library" "0.3-2" +XiMpLe "/home/thomas/.rkward/library" "0.03-24" +XLConnect "/home/thomas/.rkward/library" "0.2-11" +XLConnectJars "/home/thomas/.rkward/library" "0.2-9" +XML "/home/thomas/.rkward/library" "3.9-4" +xtable "/home/thomas/.rkward/library" "1.7-1" +xts "/home/thomas/.rkward/library" "0.9-3" +yaml "/home/thomas/.rkward/library" "2.1.13" +Zelig "/home/thomas/.rkward/library" "4.1-3" +zoo "/home/thomas/.rkward/library" "1.7-9" +rkward "/usr/local/lib/R/site-library" "0.6.5" +rkwardtests "/usr/local/lib/R/site-library" "0.6.1" +base "/usr/local/lib/R/library" "3.3.0" +boot "/usr/local/lib/R/library" "1.3-18" +class "/usr/local/lib/R/library" "7.3-14" +cluster "/usr/local/lib/R/library" "2.0.3" +codetools "/usr/local/lib/R/library" "0.2-14" +compiler "/usr/local/lib/R/library" "3.3.0" +datasets "/usr/local/lib/R/library" "3.3.0" +foreign "/usr/local/lib/R/library" "0.8-66" +graphics "/usr/local/lib/R/library" "3.3.0" +grDevices "/usr/local/lib/R/library" "3.3.0" +grid "/usr/local/lib/R/library" "3.3.0" +KernSmooth "/usr/local/lib/R/library" "2.23-15" +lattice "/usr/local/lib/R/library" "0.20-33" +MASS "/usr/local/lib/R/library" "7.3-45" +Matrix "/usr/local/lib/R/library" "1.2-4" +methods "/usr/local/lib/R/library" "3.3.0" +mgcv "/usr/local/lib/R/library" "1.8-12" +nlme "/usr/local/lib/R/library" "3.1-125" +nnet "/usr/local/lib/R/library" "7.3-12" +parallel "/usr/local/lib/R/library" "3.3.0" +rpart "/usr/local/lib/R/library" "4.1-10" +spatial "/usr/local/lib/R/library" "7.3-11" +splines "/usr/local/lib/R/library" "3.3.0" +stats "/usr/local/lib/R/library" "3.3.0" +stats4 "/usr/local/lib/R/library" "3.3.0" +survival "/usr/local/lib/R/library" "2.38-3" +tcltk "/usr/local/lib/R/library" "3.3.0" +tools "/usr/local/lib/R/library" "3.3.0" +utils "/usr/local/lib/R/library" "3.3.0" +[1] "Differences between /tmp/RtmpQoRGMt/rktests.19ae4b425774/import_export_plugins/import_csv_overwrite.messages.txt and /home/thomas/develop/rkward/tests/import_export_plugins/import_csv_overwrite.messages.txt :" +[1] "1c1" +[2] "< Error in rk.call.plugin(\"rkward::import_csv\", allow_escapes.state = \"0\", : " +[3] "---" +[4] "> Error in rk.call.plugin(\"rkward::import_csv\", file.selection = \"women.csv\", : " +attr(,"status") +[1] 1 +[1] "Differences between /tmp/RtmpQoRGMt/rktests.19ae4b425774/import_export_plugins/import_spss.rkout and /home/thomas/develop/rkward/tests/import_export_plugins/import_spss.rkout :" + [1] "0a1,120" + [2] ">

Import SPSS data

" + [3] ">

Parameters

" + [4] ">

File name: import_export_plugins_testfile.sav
Object to save to: my.spss.data

" + [7] "> DATE
" + [8] "> " + [9] "> " + [10] ">

" + [11] "> " + [12] "> " + [13] ">
" + [14] "> \t" + [15] "> \t " + [16] "> \t " + [17] "> \t\t" + [18] "> \t\t" + [19] "> \t\t" + [20] "> \t\t " + [21] "> \t " + [22] "> " + [23] "> " + [25] "> " + [27] "> " + [29] "> " + [31] "> " + [32] "> " + [33] "> " + [35] "> " + [37] "> " + [39] "> " + [41] "> " + [42] "> " + [43] "> " + [45] "> " + [47] "> " + [49] "> " + [51] "> " + [52] "> " + [53] "> " + [55] "> " + [57] "> " + [59] "> " + [61] "> " + [62] "> " + [63] "> " + [65] "> " + [67] "> " + [69] "> " + [71] "> " + [72] "> " + [73] "> " + [75] "> " + [77] "> " + [79] "> " + [81] "> " + [82] "> " + [83] "> " + [85] "> " + [87] "> " + [89] "> " + [91] "> " + [92] "> " + [93] "> " + [95] "> " + [97] "> " + [99] "> " +[101] "> " +[102] "> " +[103] "> " +[105] "> " +[107] "> " +[109] "> " +[111] "> " +[112] "> \t" +[113] ">
A_long_variable_name \xe4\xf6\xfc\xdf\xe9\xc8 Value_labels
1" + [24] "> 1" + [26] "> 1.1" + [28] "> 1" + [30] ">
2" + [34] "> " + [36] "> 1.2" + [38] "> 2" + [40] ">
3" + [44] "> 3" + [46] "> 1.3" + [48] "> 3" + [50] ">
4" + [54] "> " + [56] "> 1.4" + [58] "> 4" + [60] ">
5" + [64] "> 5" + [66] "> 1.5" + [68] "> 5" + [70] ">
6" + [74] "> 6" + [76] "> NA" + [78] "> 5" + [80] ">
7" + [84] "> 7" + [86] "> 1.6" + [88] "> " + [90] ">
8" + [94] "> 7" + [96] "> 1.7" + [98] "> 5" +[100] ">
9" +[104] "> 8" +[106] "> 1.8" +[108] "> 0" +[110] ">
" +[114] ">
" +[115] ">
" +[116] "> " +[117] ">

var (Does this variable label show up)

" +[118] "> " +[119] ">

var (This contains some regional chars in Windows encoding)

" +[120] "> " +[121] ">

var

" +attr(,"status") +[1] 1 +[1] "Differences between /tmp/RtmpQoRGMt/rktests.19ae4b425774/import_export_plugins/import_spss.messages.txt and /home/thomas/develop/rkward/tests/import_export_plugins/import_spss.messages.txt :" +[1] "1,5c1,2" +[2] "< Warning in read.spss(\"PATH/import_export_plugins_testfile.sav\", :" +[3] "< PATH/import_export_plugins_testfile.sav: position 1: Variable name begins with invalid character" +[4] "< Error in read.spss(\"PATH/import_export_plugins_testfile.sav\", : " +[5] "< error reading system-file header" +[6] "< Error in inherits(x, \"htmlwidget\") : object 'my.spss.data' not found" +[7] "---" +[8] "> Warning in read.spss(\"import_export_plugins_testfile.sav\", to.data.frame = TRUE, :" +[9] "> import_export_plugins_testfile.sav: position 1: Variable name character 4 is lowercase letter \xdf" +attr(,"status") +[1] 1 + +Skipping test "import_xls_xlconnect" due to missing libraries: "XLConnect" +[1] "ok" + +> testx <- c (20:30) + +> print ("ok") +[1] "ok" +[1] "Differences between /tmp/RtmpQoRGMt/rktests.19ae4b425774/import_export_plugins/package_skeleton.rkout and /home/thomas/develop/rkward/tests/import_export_plugins/package_skeleton.rkout :" +[1] "4c4" "<

Directory: PATH

" +[3] "---" ">

Directory: .

" +attr(,"status") +[1] 1 + + +Overall results: +ID code match output match message match error result +------------------------------------------------------------------------------------------------ +load_r_object match match match (empty) no pass +import_csv match match match (empty) no pass +import_csv_overwrite match (empty) match (empty) MISMATCH expected error FAIL +setworkdir match match (empty) match (empty) no pass +import_spss match MISMATCH MISMATCH ERROR FAIL +import_stata match match match (empty) no pass +import_xls_xlconnect NA NA NA missing lib(s) --skipped-- +import_xls match match match (empty) no pass +load_source match match match (empty) no pass +save_r_object match match match (empty) no pass +write_vector_matrix match match match (empty) no pass +write_csv match match match (empty) no pass +package_skeleton match MISMATCH match no FAIL +------------------------------------------------------------------------------------------------ +9 / 12 tests passed +(1 / 13 tests skipped due to missing libraries) +NOTE: Skipped tests due to missing libaries are not an indication of problems. +The following missing R packages are needed in order to run all tests: +[1] "XLConnect" diff -Nru rkward-0.6.4/TODO rkward-0.6.5/TODO --- rkward-0.6.4/TODO 2015-12-15 09:10:11.000000000 +0000 +++ rkward-0.6.5/TODO 2016-03-22 19:22:57.000000000 +0000 @@ -24,6 +24,9 @@ - At least we could check for errors - Perhaps a special diff of the generated R commands, where all quoted strings and comments are stripped? +MacOS: + - Avoiding mis-placment of certain menu-entries: QAction::menuRole() + Bugs outside RKWard: - KDE 4 - why is the icon style only honored for mainToolBar (in KXMLGUIBuilder)? It looks like this is done on purpose, but why??? diff -Nru rkward-0.6.4/VERSION.cmake rkward-0.6.5/VERSION.cmake --- rkward-0.6.4/VERSION.cmake 2015-12-15 09:11:04.000000000 +0000 +++ rkward-0.6.5/VERSION.cmake 2016-03-24 19:35:02.000000000 +0000 @@ -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.4) +SET(RKVERSION_NUMBER 0.6.5)

" + title + "

Locating point(s)

Punt/s d'ubicació

RKWard output file could not be found

El fitxer de resultats del RKWard no s'ha pogut trobar

El fitxer de sortida del RKWard no s'ha pogut trobar

Falta la pàgina d'ajuda

Manca la pàgina d'ajuda

On this page:

Locating point(s)

Punt/s d'ubicació

RKWard output file could not be found

El fitxer de resultats del RKWard no s'ha pogut trobar

El fitxer d'eixida del RKWard no s'ha pogut trobar

Falta la pàgina d'ajuda

Manca la pàgina d'ajuda

On this page:

Locating point(s)

Localizar puntos

RKWard output file could not be found

Non foi posíbel atopar o ficheiro de saída de RKWard

A páxina de axuda non existe

On this page:

Nesta páxina:

Import Microsoft EXCEL sheet

Parameters

Messages, warnings, or errors:

Import SPSS data

Parameters

Import SPSS data

Parameters

Import SPSS data

Parameters