[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [rkward/frameworks] /: Merge branch 'master' into frameworks
From: Thomas Friedrichsmeier <thomas.friedrichsmeier () ruhr-uni-bochum ! de>
Date: 2016-07-04 19:56:04
Message-ID: E1bK9yO-0005tu-43 () code ! kde ! org
[Download RAW message or body]
Git commit 1c4a9e5db4fde6a1385bf65d3592a9236dc6e825 by Thomas Friedrichsmeier.
Committed on 04/07/2016 at 19:55.
Pushed by tfry into branch 'frameworks'.
Merge branch 'master' into frameworks
M +8 -1 ChangeLog
M +15 -1 debian/changelog
M +17 -2 debian/control
M +2 -0 rkward/dialogs/rkerrordialog.cpp
M +2 -1 rkward/main.cpp
M +2 -0 rkward/plugin/rkstandardcomponent.cpp
M +4 -1 rkward/rbackend/rkrbackend.cpp
M +6 -1 rkward/rbackend/rkrsupport.cpp
M +4 -2 rkward/rbackend/rpackages/rkward/R/public_graphics.R
M +3 -1 rkward/settings/rksettingsmoduleoutput.cpp
M +3 -1 rkward/windows/rkworkplace.cpp
http://commits.kde.org/rkward/1c4a9e5db4fde6a1385bf65d3592a9236dc6e825
diff --cc ChangeLog
index 0fe517e,6d37e82..f5b0850
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,11 +1,16 @@@
+- Show the message accompanying rk.show.files() or rk.edit.files() inside the main \
window, instead of a separate dialog +- File browser gains "Rename" context menu \
action +- File selection fields in plugin dialogs remember the last used directory \
(per session), and check for a valid selection +- Better handling of text \
drag-and-drop inside the R console window +
- UNRELEASED: --- Version 0.6.5 - Apr-02-2016
+ --- Version 0.6.5a - UNRELEASED
+ - EXPERIMENTAL: Fix NAs introduced by editing data containing characters that \
cannot be encoded in the system locale + - Fixed: Preview boxes followed by a \
<stretch/> element would not work under some circumstances + - Fixed: Setting an \
output CSS file via the GUI did not work + - Fixed: Bug report feature on Windows did \
nothing TODO: Really test this! + - Avoid some potential encoding issues, that \
could cause graphical select.list to fail for certain strings, under some \
circumstances +
+ --- 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
diff --cc debian/changelog
index fb471c4,b91bf51..c0950d5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,16 +1,23 @@@
-rkward (0.6.5-1) UNRELEASED; urgency=low
++<<<<<<< HEAD
+rkward (0.6.9z+0.7.0+devel1-1) UNRELEASED; urgency=low
+ * new upstream release
- * TODO merge changelog of older releases
++ * TODO merge changelog of older releases and second check history
+
+ -- Thomas Friedrichsmeier <tfry@users.sourceforge.net> Wed, 16 Dec 2015 10:30:00 \
+0100 +
++ rkward (0.6.5-1) unstable; urgency=low
+ * new upstream release
+ * fix debian/watch file
+ * always use build-time version of r-base-core as runtime dependency, even
+ if most builds would actually be backwards compatible
+ * split architecture independent files into new rkward-data package
+ * bump standards version to 3.9.7 (no changes needed)
+ * strip testing locale "x-test" from package
+ * add override for false-positive source-contains-prebuilt-javascript-object
+ and source-is-missing lintian warnings
+
+ -- Thomas Friedrichsmeier <tfry@users.sourceforge.net> Wed, 30 Mar 2016 14:00:00 \
+0100 +
rkward (0.6.4-1) unstable; urgency=low
* new upstream release
* remove obsolete README.Debian file
diff --cc debian/control
index 57f1151,6878073..f4bba89
--- a/debian/control
+++ b/debian/control
@@@ -3,13 -3,12 +3,13 @@@ Section: mat
Priority: optional
Maintainer: Thomas Friedrichsmeier <tfry@users.sourceforge.net>
Build-Depends: cmake,
+ extra-cmake-modules,
debhelper (>= 6.0.0),
- kdelibs5-dev,
- libqtwebkit-dev | libqt4-dev (<< 4:4.7),
- libx11-dev,
+ libkf5webkit-dev,
+ libkf5texteditor-dev,
+ kdoctools-dev,
r-base-dev (>= 2.8.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
Vcs-Git: git://anongit.kde.org/rkward.git
diff --cc rkward/dialogs/rkerrordialog.cpp
index 7c1a5d4,40b7dac..69a6b8a
--- a/rkward/dialogs/rkerrordialog.cpp
+++ b/rkward/dialogs/rkerrordialog.cpp
@@@ -25,10 -26,8 +25,11 @@@
#include <QLabel>
#include <QTextEdit>
#include <QTemporaryFile>
+ #include <QDir>
#include <QTextStream>
+#include <QPushButton>
+#include <QDialog>
+#include <QVBoxLayout>
#include "../rbackend/rinterface.h"
#include "../rbackend/rksessionvars.h"
@@@ -58,22 -60,18 +59,23 @@@ public
QString ("http://bugs.kde.org"), QString \
("https://bugs.kde.org/createaccount.cgi"), QString \
("http://rkward.kde.org/bugs/"))
+ i18n ("<p><b>What information should I provide, and \
how?</b></p>Clicking \"Report issue\" will take you to the "
"KDE bugtracking system. After logging in, some \
information will already be pre-filled into the report form. Please \
make sure "
- "to fill in the missing bits - in English - \
where indicated, especially in the \"Comment\" field.</p>"), vbox); + \
"to fill in the missing bits - in English - where indicated, especially in the \
\"Comment\" field.</p>"), this); label->setWordWrap (true);
label->setOpenExternalLinks (true);
+ layout->addWidget (label);
- connect (this, SIGNAL (finished()), this, SLOT (deleteLater()));
+ RKDialogButtonBox *buttons = new RKDialogButtonBox (QDialogButtonBox::Ok | \
QDialogButtonBox::Cancel, this); + buttons->button (QDialogButtonBox::Ok)->setText \
(i18n ("Report issue")); + buttons->button (QDialogButtonBox::Ok)->setIcon \
(QIcon::fromTheme("tools-report-bug")); + layout->addWidget (buttons);
+
+ connect (this, &QDialog::finished, this, &RKBugzillaReportDialog::deleteLater);
}
- // KF5 TODO: add override keyword
- void accept () {
+ void accept () override {
// The report template is just too large to pass it via GET, so we use a local \
proxy page to pass it in a POST request QTemporaryFile proxy;
+ proxy.setFileTemplate (QDir::tempPath () + "/rkwardbugXXXXXX.html"); // Force \
.html-suffix, as it appears to be required on Windows proxy.setAutoRemove (false);
proxy.open ();
QTextStream out (&proxy);
diff --cc rkward/main.cpp
index 67f0e2e,0e9a45c..2cf49e3
--- a/rkward/main.cpp
+++ b/rkward/main.cpp
@@@ -129,58 -162,13 +129,59 @@@ int main (int argc, char *argv[])
for (int i = 1; i < argc; ++i) {
argv_copy[i] = argv[i];
}
- KCmdLineArgs::init (argc, argv_copy, &aboutData);
- KCmdLineArgs::addCmdLineOptions( options ); // Add our own options.
- KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
- RK_Debug_Level = DL_FATAL - QString (args->getOption ("debug-level")).toInt ();
- RK_Debug_Flags = QString (args->getOption ("debug-flags")).toInt ();
- if (!args->getOption ("debugger").isEmpty ()) {
+ QApplication app (argc, argv_copy);
+ // Don't complain when linking rkward://-pages from Rd pages
+ KUrlAuthorized::allowUrlAction ("redirect", QUrl("http://"), QUrl ("rkward://"));
+ // Don't complain when trying to open help pages
+ KUrlAuthorized::allowUrlAction ("redirect", QUrl("rkward://"), QUrl ("help:"));
+
+ KLocalizedString::setApplicationDomain ("rkward");
- KAboutData aboutData ("rkward", i18n ("RKWard"), RKWARD_VERSION, i18n ("Frontend \
to the R statistics language"), KAboutLicense::GPL, i18n ("(c) 2002, 2004 - 2015"), \
QString (), "http://rkward.kde.org"); ++ KAboutData aboutData ("rkward", i18n \
("RKWard"), RKWARD_VERSION, i18n ("Frontend to the R statistics language"), \
KAboutLicense::GPL, i18n ("(c) 2002, 2004 - 2016"), QString (), \
"http://rkward.kde.org"); + aboutData.addAuthor (i18n ("Thomas Friedrichsmeier"), \
i18n ("Project leader / main developer")); + aboutData.addAuthor (i18n ("Pierre \
Ecochard"), i18n ("C++ developer between 2004 and 2007")); + aboutData.addAuthor \
(i18n ("Prasenjit Kapat"), i18n ("Many plugins, suggestions, plot history feature")); \
+ aboutData.addAuthor (i18n ("Meik Michalke"), i18n ("Many plugins, suggestions, \
rkwarddev package")); + aboutData.addAuthor (i18n ("Stefan Roediger"), i18n ("Many \
plugins, suggestions, marketing, translations")); + aboutData.addCredit (i18n \
("Contributors in alphabetical order")); + aboutData.addCredit (i18n ("Björn \
Balazs"), i18n ("Extensive usability feedback")); + aboutData.addCredit (i18n \
("Aaron Batty"), i18n ("Whealth of feedback, hardware donations")); \
+ aboutData.addCredit (i18n ("Jan Dittrich"), i18n ("Extensive usability feedback")); \
+ aboutData.addCredit (i18n ("Philippe Grosjean"), i18n ("Several helpful comments \
and discussions")); + aboutData.addCredit (i18n ("Adrien d'Hardemare"), i18n \
("Plugins and patches")); + aboutData.addCredit (i18n ("Yves Jacolin"), i18n ("New \
website")); + aboutData.addCredit (i18n ("Germán Márquez Mejía"), i18n ("HP \
filter plugin, spanish translation"), 0); + aboutData.addCredit (i18n ("Marco \
Martin"), i18n ("A cool icon")); + aboutData.addCredit (i18n ("Daniele Medri"), i18n \
("RKWard logo, many suggestions, help on wording")); + aboutData.addCredit (i18n \
("David Sibai"), i18n ("Several valuable comments, hints and patches")); \
+ aboutData.addCredit (i18n ("Ilias Soumpasis"), i18n ("Translation, Suggestions, \
plugins")); + aboutData.addCredit (i18n ("Ralf Tautenhahn"), i18n ("Many comments, \
useful suggestions, and bug reports")); + aboutData.addCredit (i18n ("Jannis \
Vajen"), i18n ("German Translation, bug reports")); + aboutData.addCredit (i18n \
("Roland Vollgraf"), i18n ("Some patches")); + aboutData.addCredit (i18n ("Roy Qu"), \
i18n ("patches and helpful comments")); + aboutData.addCredit (i18n ("Many more \
people on rkward-devel@kde.org"), i18n ("Sorry, if we forgot to list you. Please \
contact us to get added")); + KAboutData::setApplicationData (aboutData);
+
+ QCommandLineParser parser;
+ parser.addVersionOption ();
+ parser.addHelpOption ();
+ parser.addOption (QCommandLineOption ("evaluate", i18n ("After starting (and after \
loading the specified workspace, if applicable), evaluate the given R code."), \
"Rcode", QString ())); + parser.addOption (QCommandLineOption ("debug-level", i18n \
("Verbosity of debug messages (0-5)"), "level", "2")); + parser.addOption \
(QCommandLineOption ("debug-flags", i18n ("Mask for components to debug (see \
debug.h)"), "flags", QString::number (DEBUG_ALL))); + parser.addOption \
(QCommandLineOption ("debugger", i18n ("Debugger for the frontend. Specify last, or \
add '--' after all debugger arguments"), "command and arguments", QString ())); \
+ parser.addOption (QCommandLineOption ("backend-debugger", i18n ("Debugger for the \
backend. (Enclose any debugger arguments in single quotes ('') together with the \
command. Make sure to re-direct stdout!)"), "command", QString ())); \
+ parser.addOption (QCommandLineOption ("r-executable", i18n ("Use specified R \
installation, instead of the one configured at compile time (note: rkward R library \
must be installed to that installation of R)"), "command", QString ())); \
+ parser.addOption (QCommandLineOption ("reuse", i18n ("Reuse a running RKWard \
instance (if available). If a running instance is reused, only the file arguments \
will be interpreted, all other options will be ignored."))); ++ parser.addOption \
(QCommandLineOption ("nowarn-external", i18n ("When used in conjunction with \
rkward://runplugin/-URLs specified on the command line, suppresses the warning about \
application-external (untrusted) links."))); + parser.addPositionalArgument \
("files", i18n ("File or files to open, typically a workspace, or an R script file. \
When loading several things, you should specify the workspace, first."), \
"[Files...]"); +
+ aboutData.setupCommandLine (&parser);
+ parser.process (app);
+ aboutData.processCommandLine (&parser);
+
+ RK_Debug_Level = DL_FATAL - QString (parser.value ("debug-level")).toInt ();
+ RK_Debug_Flags = QString (parser.value ("debug-flags")).toInt ();
+ if (!parser.value ("debugger").isEmpty ()) {
RK_DEBUG (DEBUG_ALL, DL_ERROR, "--debugger option should have been handled by \
wrapper script. Ignoring."); }
diff --cc rkward/settings/rksettingsmoduleoutput.cpp
index dcb80c6,7d78436..c4813e9
--- a/rkward/settings/rksettingsmoduleoutput.cpp
+++ b/rkward/settings/rksettingsmoduleoutput.cpp
@@@ -168,8 -168,8 +168,8 @@@ RKSettingsModuleOutput::RKSettingsModul
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 ()); + 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"), \
custom_css_file);
- connect (custom_css_file_box, SIGNAL (locationChanged()), this, SLOT \
(boxChanged())); // KF5 TODO new syntax + connect (custom_css_file_box, \
&GetFileNameWidget::locationChanged, this, &RKSettingsModuleOutput::boxChanged); \
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);
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic