Commit 2c81ceec authored by Thomas Friedrichsmeier's avatar Thomas Friedrichsmeier

Merge tag 'v0.6.5' into released

Tagging 0.6.5 final release
parents 7393f73a e2561c06
--- Version 0.6.5 - Apr-02-2016
- Add option to override CSS file used for the output window
- When manually adding pluginmaps, load these after, not before other pluginmaps, by default
- Added context menu option to search for information on current symbol online
- Fixed: Wizard plugins would be too small, initially
- Fixed: Help Search was not longer working correctly with R 3.2.x
- Fix compilation with R 3.3.x
- Provide better status feedback when searching / filtering among installable packages
- Add access to basic menu items for docked previews
- Move preview controls to the button-column of dialogs
- Add preview to Sort data-, Subset data, and Recode categorical data-plugins
- Add preview to Power Analysis plugin
- Add support for adding "htmlwidget"- and "gvis"-class objects to the output window via rk.print()
- Add plugins for importing Excel files (.xls and .xlsx, Perl- and Java-based)
- Add ability to extract <matrix> values row-wise in plugins
- Add convenience JS-function "makeOption()" for use in plugins
- Fixed: Numerical (display) precision setting was not honored in data editor
- Fix several window activation quirks in "Focus follows mouse" mode
- File selectors in "Import XYZ" plugins now filter for standard file extensions, by default
- Add previews for CSV, SPSS, and Stata import plugins
- Allow previews for data, (HTML) output, and custom types of previews
- Allow previews to be docked to the dialog window, and dock them, by default
- Implicitly save code preview visibility and size (instead of the former explicit settings)
- data.frame objects outside of globalenv() can be opened read-only in an editor window
- Show a warning screen when invoking plugins from the command line (or from clicking an rkward://-link in an external application)
- Use package type option "binary" from R 3.1.3 onwards, for automatic selection of the appropriate binary package
--- Version 0.6.4 - Dec-20-2015
- Fixed: Plugin variable slots taking more than one object would not be hightlighted in red while invalid
- Plugins check for correct object type, in more places, but allow to proceed with questionable object selections
......
......@@ -24,6 +24,9 @@ i18n-Thoughts:
- 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???
......
# 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)
rkward (0.6.4z+0.6.5+devel1-1) UNRELEASED; urgency=low
* new upstream release
* TODO: FIX changelog in case 0.6.4-2 never gets uploaded!!!!!!!!!!
-- Thomas Friedrichsmeier <tfry@users.sourceforge.net> Wed, 10 Feb 2016 11:30:00 +0100
rkward (0.6.4-2) unstable; urgency=low
* bump standards version to 3.9.7 (no changes needed)
* strip testing locale "x-test" from package
* split architecture independent files into new rkward-data package
* add override for false-positive source-contains-prebuilt-javascript-object
lintian warnings
* make existing lintian overrides work with lintian 2.5.42
* Adjust copyright file to changed filenames in rkward/qwinhost
-- Thomas Friedrichsmeier <tfry@users.sourceforge.net> Mon, 07 Mar 2016 14:00:00 +0100
rkward (0.6.4-1) unstable; urgency=low
* new upstream release
* add override for false-positive source-is-missing lintian warnings
* remove obsolete README.Debian file
* increase debhelper compatibility level to 9 (no changes needed)
* replace dh_clean -k with dh_prep
......
......@@ -7,14 +7,14 @@ Build-Depends: cmake,
kdelibs5-dev,
libx11-dev,
r-base-dev (>= 3.0.0)
Standards-Version: 3.9.6
Standards-Version: 3.9.7
Homepage: http://rkward.kde.org
Vcs-Browser: http://quickgit.kde.org/?p=rkward.git&a=tree&f=debian-official
Vcs-Git: git://anongit.kde.org/rkward.git
Package: rkward
Architecture: any
Depends: ${misc:Depends}, ${rvers}, ${shlibs:Depends}
Depends: rkward-data, ${misc:Depends}, ${rvers}, ${shlibs:Depends}
Recommends: r-base-html
Description: KDE frontend to the R statistics language
RKWard aims to become an easy to use, transparent frontend to R,
......@@ -22,3 +22,18 @@ Description: KDE frontend to the R statistics language
Besides a convenient GUI for the most important statistical functions,
future versions will also provide seamless integration with an
office-suite.
Package: rkward-data
Architecture: all
Depends: ${misc:Depends}
Recommends: rkward
Breaks: rkward (<< 0.6.4-2~)
Replaces: rkward (<< 0.6.4-2~)
Description: KDE frontend to the R statistics language
RKWard aims to become an easy to use, transparent frontend to R,
a powerful system for statistical computation and graphics.
Besides a convenient GUI for the most important statistical functions,
future versions will also provide seamless integration with an
office-suite.
.
This package provides the architecture independent data files for rkward.
......@@ -4,6 +4,17 @@ Source: http://rkward.kde.org
Files: *
Copyright: 2002-2015 Thomas Friedrichsmeier and the RKWard team (Meik Michalke, Stefan Rödiger, Prasenjit Kapat, Pierre Ecochard, and others)
License: GPL-2+
Files: rkward/rbackend/rpackages/rkwardtests/* rkward/plugins/rkwarddev_scripts/* rkward/plugins/rkwarddev_scripts/write_csv.R rkward/plugins/analysis/power/*
Copyright: 2012, 2015 Thomas Friedrichsmeier, Meik Michalke and the RKWard team (Stefan Rödiger, Prasenjit Kapat, Pierre Ecochard, and others)
License: GPL-2+
Files: rkward/syntax/*
Copyright: 2006 Arne Henningsen
2006-2015 Pierre Ecochard, Thomas Friedrichsmeier and the RKWard team (Meik Michalke, Stefan Rödiger, Prasenjit Kapat, and others)
License: GPL-2+
License: GPL-2+
This program is free software; you can redistribute it
and/or modify it under the terms of the GNU General Public
......@@ -26,7 +37,7 @@ License: GPL-2+
License version 2 can be found in the file
`/usr/share/common-licenses/GPL-2'.
Files: rkward/qwinhost/qwinhost.cpp.orig rkward/qwinhost/qwinhost.cpp rkward/qwinhost/qwinhost.h.orig rkward/qwinhost/qwinhost.h
Files: rkward/qwinhost/qwinhost.cpp.unmodified rkward/qwinhost/qwinhost.cpp rkward/qwinhost/qwinhost.h.unmodified rkward/qwinhost/qwinhost.h
Copyright: (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
License: LPGL-2.1 and Nokia_Exception or GPL-3
......
......@@ -321,7 +321,7 @@ fcc6002a97581d15ee4fbe6842e3a8255e14ae46
#include "../rkglobals.h"
#include "../rbackend/rinterface.h"
@@ -61,109 +53,77 @@
@@ -61,113 +53,77 @@
#include "../misc/rkxmlguisyncer.h"
#include "../misc/rkprogresscontrol.h"
#include "../misc/rkmessagecatalog.h"
......@@ -359,6 +359,10 @@ fcc6002a97581d15ee4fbe6842e3a8255e14ae46
- 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 ()));
......@@ -480,7 +484,7 @@ fcc6002a97581d15ee4fbe6842e3a8255e14ae46
}
KUrl RKHTMLWindow::restorableUrl () {
@@ -177,74 +137,71 @@
@@ -181,74 +137,71 @@
return false;
}
......@@ -592,7 +596,7 @@ fcc6002a97581d15ee4fbe6842e3a8255e14ae46
}
void RKHTMLWindow::openLocationFromHistory (VisitedLocation &loc) {
@@ -254,17 +211,17 @@
@@ -258,17 +211,17 @@
int history_last = url_history.count () - 1;
RK_ASSERT (current_history_position >= 0);
RK_ASSERT (current_history_position <= history_last);
......@@ -616,7 +620,7 @@ fcc6002a97581d15ee4fbe6842e3a8255e14ae46
}
void RKHTMLWindow::slotForward () {
@@ -279,7 +236,7 @@
@@ -283,7 +236,7 @@
// if going back from the end of the history, save that position, first.
if (current_history_position >= (url_history.count () - 1)) {
......@@ -625,7 +629,7 @@ fcc6002a97581d15ee4fbe6842e3a8255e14ae46
--current_history_position;
}
--current_history_position;
@@ -292,17 +249,10 @@
@@ -296,17 +249,10 @@
RK_ASSERT (url.protocol () == "rkward");
changeURL (url);
bool ok = false;
......@@ -647,7 +651,7 @@ fcc6002a97581d15ee4fbe6842e3a8255e14ae46
} else if (url.host ().toUpper () == "RHELPBASE") { // NOTE: QUrl () may lowercase the host part, internally
KUrl fixed_url = KUrl (RKSettingsModuleR::helpBaseUrl ());
fixed_url.setPath (url.path ());
@@ -330,12 +280,7 @@
@@ -334,12 +280,7 @@
} else {
if (url.host () == "rhelp") {
// TODO: find a nice solution to render this in the current window
......@@ -661,7 +665,7 @@ fcc6002a97581d15ee4fbe6842e3a8255e14ae46
return true;
}
@@ -370,7 +315,7 @@
@@ -374,7 +315,7 @@
QFileInfo out_file (url.toLocalFile ());
bool ok = out_file.exists();
if (ok) {
......@@ -670,7 +674,7 @@ fcc6002a97581d15ee4fbe6842e3a8255e14ae46
} else {
fileDoesNotExistMessage ();
}
@@ -379,7 +324,7 @@
@@ -383,7 +324,7 @@
if (url_change_is_from_history || url.protocol ().toLower ().startsWith ("help")) { // handle help pages, and any page that we have previously handled (from history)
changeURL (url);
......@@ -679,7 +683,7 @@ fcc6002a97581d15ee4fbe6842e3a8255e14ae46
return true;
}
@@ -409,23 +354,19 @@
@@ -413,23 +354,19 @@
tj->putOnHold ();
if (type == "text/html") {
changeURL (url);
......@@ -706,7 +710,7 @@ fcc6002a97581d15ee4fbe6842e3a8255e14ae46
current_url = url;
updateCaption (url);
@@ -435,14 +376,14 @@
@@ -439,14 +376,14 @@
url_history = url_history.mid (0, current_history_position);
VisitedLocation loc;
......@@ -725,7 +729,7 @@ fcc6002a97581d15ee4fbe6842e3a8255e14ae46
}
}
}
@@ -454,82 +395,83 @@
@@ -458,82 +395,83 @@
else setCaption (url.fileName ());
}
......@@ -847,7 +851,7 @@ fcc6002a97581d15ee4fbe6842e3a8255e14ae46
}
void RKHTMLWindow::flushOutput () {
@@ -547,104 +489,7 @@
@@ -551,104 +489,7 @@
}
}
......@@ -953,7 +957,7 @@ fcc6002a97581d15ee4fbe6842e3a8255e14ae46
RK_TRACE (APP);
if (url.protocol () != "rkward") {
@@ -652,6 +497,8 @@
@@ -656,6 +497,8 @@
return (false);
}
......@@ -962,7 +966,7 @@ fcc6002a97581d15ee4fbe6842e3a8255e14ae46
bool for_component = false; // is this a help page for a component, or a top-level help page?
if (url.host () == "component") for_component = true;
@@ -663,19 +510,20 @@
@@ -667,19 +510,20 @@
if (!chandle) return false;
}
......@@ -987,7 +991,7 @@ fcc6002a97581d15ee4fbe6842e3a8255e14ae46
if (!help_file_name.isEmpty ()) help_file_name = QFileInfo (chandle->getFilename ()).absoluteDir ().filePath (help_file_name);
}
} else {
@@ -684,22 +532,28 @@
@@ -688,22 +532,28 @@
RK_DEBUG (APP, DL_DEBUG, "rendering help page for local file %s", help_file_name.toLatin1().data());
// open help file
......@@ -1023,7 +1027,7 @@ fcc6002a97581d15ee4fbe6842e3a8255e14ae46
if (help_doc_element.isNull ()) {
RK_ASSERT (for_component);
@@ -713,7 +567,7 @@
@@ -717,7 +567,7 @@
// fix all elements containing an "src" attribute
QDir base_path (QFileInfo (help_file_name).absolutePath());
......@@ -1032,7 +1036,7 @@ fcc6002a97581d15ee4fbe6842e3a8255e14ae46
for (XMLChildList::iterator it = src_elements.begin (); it != src_elements.end (); ++it) {
QString src = (*it).attribute ("src");
if (KUrl::isRelativeUrl (src)) {
@@ -723,64 +577,64 @@
@@ -727,64 +577,64 @@
}
// render the sections
......@@ -1120,7 +1124,7 @@ fcc6002a97581d15ee4fbe6842e3a8255e14ae46
}
if (for_component) {
@@ -797,7 +651,7 @@
@@ -801,7 +651,7 @@
if (for_component) {
about = chandle->getAboutData ();
} else {
......@@ -1129,7 +1133,7 @@ fcc6002a97581d15ee4fbe6842e3a8255e14ae46
}
if (about.valid) {
writeHTML (startSection ("about", i18n ("About"), QString (), &anchors, &anchornames));
@@ -818,24 +672,30 @@
@@ -822,24 +672,30 @@
}
writeHTML ("</div><div id=\"navigation\">" + navigation + "</div>");
writeHTML ("</body></html>\n");
......@@ -1165,7 +1169,7 @@ fcc6002a97581d15ee4fbe6842e3a8255e14ae46
// Can't resolve links and references based on the already parsed dom-tree, because they can be inside string to be translated.
// I.e. resolving links before doing i18n will cause i18n-lookup to fail
@@ -865,7 +725,7 @@
@@ -869,7 +725,7 @@
}
ret += text.mid (pos);
......@@ -1174,7 +1178,7 @@ fcc6002a97581d15ee4fbe6842e3a8255e14ae46
text = ret;
ret.clear ();
pos = 0;
@@ -880,7 +740,7 @@
@@ -884,7 +740,7 @@
id = text.mid (id_start, id_end - id_start);
pos = text.indexOf ("/>", id_end) + 2;
}
......@@ -1183,7 +1187,7 @@ fcc6002a97581d15ee4fbe6842e3a8255e14ae46
}
ret += text.mid (pos);
}
@@ -889,7 +749,7 @@
@@ -893,7 +749,7 @@
return ret;
}
......@@ -1192,7 +1196,7 @@ fcc6002a97581d15ee4fbe6842e3a8255e14ae46
RK_TRACE (APP);
QString ret = "<a href=\"" + href + "\">";
@@ -923,7 +783,7 @@
@@ -927,7 +783,7 @@
return (ret + "</a>");
}
......@@ -1201,7 +1205,7 @@ fcc6002a97581d15ee4fbe6842e3a8255e14ae46
RK_TRACE (APP);
QStringList path_segments = path.split ('/', QString::SkipEmptyParts);
@@ -935,13 +795,13 @@
@@ -939,13 +795,13 @@
return (path_segments.join ("::"));
}
......@@ -1217,7 +1221,7 @@ fcc6002a97581d15ee4fbe6842e3a8255e14ae46
QString ret = "<a name=\"" + name + "\">";
ret.append ("<h2>" + title + "</h2>\n");
anchors->append (name);
@@ -950,12 +810,66 @@
@@ -954,12 +810,66 @@
return (ret);
}
......@@ -1286,7 +1290,7 @@ fcc6002a97581d15ee4fbe6842e3a8255e14ae46
/////////////////////////////////////
/////////////////////////////////////
@@ -1081,3 +995,4 @@
@@ -1085,3 +995,4 @@
}
#include "rkhtmlwindow.moc"
......
usr/bin/
usr/lib/
\ No newline at end of file
......@@ -29,6 +29,9 @@ RMINOR = $(shell echo $(RVERS) | awk -F. '{print $$2}')
# set built-time of GNUR packages to time of created binary package based on stamp in changelog
builttime = $(shell dpkg-parsechangelog -l$(CURDIR)/debian/changelog | awk -F': ' '/Date/ {print $$2}')
# easier typing
DESTDIR = $(CURDIR)/debian/tmp
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
else
......@@ -94,13 +97,19 @@ install: build
dh_prep
dh_installdirs
# Add here commands to install the package into debian/rkward.
cd $(CURDIR)/build && $(MAKE) install DESTDIR=$(CURDIR)/debian/rkward
# Install into debian/tmp, first
cd $(CURDIR)/build && $(MAKE) install DESTDIR=$(DESTDIR)
# dirty hack to get rid of conflicting r.xml file without adjusting all makefiles
rm -vf $(CURDIR)/debian/rkward/`kde4-config --install data`/katepart/syntax/r.xml
rm -vf $(DESTDIR)/`kde4-config --install data`/katepart/syntax/r.xml
# remove unneeded R package files
rm -vf $(CURDIR)/debian/rkward/usr/lib/R/site-library/R.css $(CURDIR)/debian/rkward/usr/lib/R/site-library/rkward/COPYING
rm -vf $(DESTDIR)/usr/lib/R/site-library/R.css $(DESTDIR)/usr/lib/R/site-library/rkward/COPYING
# remove x-test locale
rm -rvf $(DESTDIR)/usr/share/kde4/apps/rkward/po/x-test $(DESTDIR)/usr/share/locale/x-test
# Sort the remaining bits into rkward and rkward-data subpackages
dh_install
# Build architecture-independent files here.
binary-indep: build install
......@@ -114,7 +123,7 @@ binary-arch: build install
dh_installdocs
dh_installexamples
dh_installmenu
dh_installman $(CURDIR)/build/doc/rkward/rkward.1
dh_installman
dh_link
dh_strip
# do not compress KDE HTML help
......
# Some of the plugin .js-files seem to generate false positives. Most of these _are_ primary sources, none of them are minified or post-processed in any other way.
# A handful of .js-files _are_ generated (upstream, manually), indeed. These carry a corresponding notice, and their primary sources are included in rkward/plugins/rkwarddev_scripts .
rkward source: source-contains-prebuilt-javascript-object rkward/plugins/*
rkward source: source-is-missing rkward/plugins/*
rkward (0.6.4z+0.6.5+devel1-1) UNRELEASED; urgency=low
* new upstream release
-- Thomas Friedrichsmeier <tfry@users.sourceforge.net> Wed, 16 Dec 2015 10:30:00 +0100
rkward (0.6.4-1) unstable; urgency=low
* new upstream release
* remove obsolete README.Debian file
......
......@@ -4,6 +4,17 @@ Source: http://rkward.kde.org
Files: *
Copyright: 2002-2015 Thomas Friedrichsmeier and the RKWard team (Meik Michalke, Stefan Rödiger, Prasenjit Kapat, Pierre Ecochard, and others)
License: GPL-2+
Files: rkward/rbackend/rpackages/rkwardtests/* rkward/plugins/rkwarddev_scripts/* rkward/plugins/rkwarddev_scripts/write_csv.R rkward/plugins/analysis/power/*
Copyright: 2012, 2015 Thomas Friedrichsmeier, Meik Michalke and the RKWard team (Stefan Rödiger, Prasenjit Kapat, Pierre Ecochard, and others)
License: GPL-2+
Files: rkward/syntax/*
Copyright: 2006 Arne Henningsen
2006-2015 Pierre Ecochard, Thomas Friedrichsmeier and the RKWard team (Meik Michalke, Stefan Rödiger, Prasenjit Kapat, and others)
License: GPL-2+