[rkward/frameworks] /: Merge branch 'master' into frameworks

[Thomas Friedrichsmeier]

Git commit bd6bf69444f593bc29d0fb887da8ccf0ca887ae8 by Thomas Friedrichsmeier.
Committed on 26/01/2016 at 13:42.
Pushed by tfry into branch 'frameworks'.

Merge branch 'master' into frameworks

M  +5    -0    ChangeLog
M  +27   -8    rkward/plugin/rkmatrixinput.cpp
M  +2    -1    rkward/plugin/rkmatrixinput.h
M  +8    -0    rkward/plugins/import_export.pluginmap
M  +0    -5    rkward/plugins/under_development.pluginmap
M  +1    -0    rkward/settings/rksettingsmoduler.cpp
M  +6    -2    rkward/windows/rkhtmlwindow.cpp
M  +15   -1    rkward/windows/rkmdiwindow.cpp
M  +5    -2    rkward/windows/rkmdiwindow.h

http://commits.kde.org/rkward/bd6bf69444f593bc29d0fb887da8ccf0ca887ae8

diff --cc ChangeLog
index a219040,8ea0ed1..6c1b923
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,7 +1,13 @@@
 +- 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
 +
 +--- Version 0.6.5 - XXXXXXXXXXXXXXX
 +
 +
+ - 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
diff --cc rkward/settings/rksettingsmoduler.cpp
index f09776f,4ffbcec..d2ff5a0
--- a/rkward/settings/rksettingsmoduler.cpp
+++ b/rkward/settings/rksettingsmoduler.cpp
@@@ -511,10 -493,11 +511,11 @@@ QString RKSettingsModuleRPackages::libL
  //static
  QString RKSettingsModuleRPackages::pkgTypeOption () {
  	QString ret;
 -#if defined Q_WS_WIN || defined Q_WS_MAC
 +#if defined Q_OS_WIN || defined Q_OS_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
 +#	if defined Q_OS_WIN
  	else ret.append ("win.binary");
  #	else
  	else if (RKSessionVars::compareRVersion ("3.0.0") > 0) {
diff --cc rkward/windows/rkhtmlwindow.cpp
index 4479bc5,451c2c3..4ef4fee
--- a/rkward/windows/rkhtmlwindow.cpp
+++ b/rkward/windows/rkhtmlwindow.cpp
@@@ -96,7 -95,11 +96,11 @@@ bool RKWebPage::acceptNavigationReques
  		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)) {
 +	if (QUrl (mainFrame ()->url ()).matches (request.url (), QUrl::NormalizePathSegments | QUrl::StripTrailingSlash)) {
  		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 ()));
  		return true;
diff --cc rkward/windows/rkmdiwindow.cpp
index 1f08015,f287c15..6b58e5b
--- a/rkward/windows/rkmdiwindow.cpp
+++ b/rkward/windows/rkmdiwindow.cpp
@@@ -330,12 -327,10 +330,11 @@@ void RKMDIWindow::setStatusMessage (con
  
  	if (!status_popup) {
  		status_popup = new KPassivePopup (this);
- 		status_popup->setTimeout (0);
 -		disconnect (status_popup, SIGNAL (clicked()), status_popup, SLOT (hide()));   // no auto-hiding, please
 +		disconnect (status_popup, SIGNAL (clicked()), status_popup, SLOT (hide()));   // no auto-hiding, please, either SIGNAL / SLOT mechanism
 +		disconnect (status_popup, static_cast<void (KPassivePopup::*)()>(&KPassivePopup::clicked), status_popup, &QWidget::hide);
  	}
  
 -	if (command) connect (command->notifier (), SIGNAL (commandFinished (RCommand*)), this, SLOT (clearStatusMessage()));
 +	if (command) connect (command->notifier (), &RCommandNotifier::commandFinished, this, &RKMDIWindow::clearStatusMessage);
  	if (!message.isEmpty ()) {
  		status_popup->setView (QString (), message);
  		status_popup->show (this->mapToGlobal (QPoint (20, 20)));
diff --cc rkward/windows/rkmdiwindow.h
index 8243ec8,9d0414f..049b5bc
--- a/rkward/windows/rkmdiwindow.h
+++ b/rkward/windows/rkmdiwindow.h
@@@ -131,15 -130,20 +131,20 @@@ protected slots
  	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);
 +	void setMetaInfo (const QString& generic_window_name, const QUrl& help_url, RKSettings::SettingsPage settings_page=RKSettings::NoPage);
  	void initializeActivationSignals ();
 -	void paintEvent (QPaintEvent *e);
 -	void windowActivationChange (bool);
 +	void paintEvent (QPaintEvent *e) override;
 +	void changeEvent (QEvent *event) override;
  
  /** reimplemented from QWidget to emulate focus-follows-mouse behavior */
 -	void enterEvent (QEvent *event);
 +	void enterEvent (QEvent *event) override;
  /** @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;
@@@ -157,10 -161,8 +162,8 @@@ friend class RKToolWindowBar
  /** @see globalContextProperty() */
  	QMap<QString, QString> global_context_properties;
  	QString generic_window_name;
 -	QString help_url;
 +	QUrl help_url;
  	RKSettings::SettingsPage settings_page;
- 
- 	KPassivePopup* status_popup;
  };
  
  #endif