[rkward/work/kateintegration] rkward: Merge branch 'master' into work/kateintegration

[Thomas Friedrichsmeier]

Git commit c5325e2a2ccca67fe95065172ca3679616b5d86f by Thomas Friedrichsmeier.
Committed on 05/01/2020 at 17:01.
Pushed by tfry into branch 'work/kateintegration'.

Merge branch 'master' into work/kateintegration

M  +34   -10   rkward/rkward.cpp
M  +1    -1    rkward/rkward.h
M  +1    -13   rkward/windows/CMakeLists.txt
M  +236  -178  rkward/windows/rkcommandeditorwindow.cpp

https://commits.kde.org/rkward/c5325e2a2ccca67fe95065172ca3679616b5d86f

diff --cc rkward/rkward.cpp
index 35ab94f7,d32db527..9d7b6c73
--- a/rkward/rkward.cpp
+++ b/rkward/rkward.cpp
@@@ -81,11 -84,8 +84,9 @@@
  #include "windows/rkdebugconsole.h"
  #include "windows/rkcallstackviewer.h"
  #include "windows/rkdebugmessagewindow.h"
 +#include "windows/katepluginintegration.h"
  #include "rkconsole.h"
  #include "debug.h"
- #include "version.h"
- 
  
  #include "agents/showedittextfileagent.h"	// TODO: see below: needed purely for linking!
  #include "dialogs/rkreadlinedialog.h"	// TODO: see below: needed purely for linking!
@@@ -121,8 -121,8 +122,9 @@@ RKWardMainWindow::RKWardMainWindow () 
  	workspace_modified = false;
  	merge_loads = false;
  	rkward_mainwin = this;
 +	katepluginintegration = 0;
  	RKGlobals::rinter = 0;
+ 	RKCommonFunctions::getRKWardDataDir(); // call this before any forking, in order to avoid potential race conditions during initialization of data dir
  	RKSettings::settings_tracker = new RKSettingsTracker (this);
  
  	///////////////////////////////////////////////////////////////////
@@@ -179,17 -179,10 +181,19 @@@ RKWardMainWindow::~RKWardMainWindow() 
  	delete RKGlobals::tracker ();
  	delete RKGlobals::rInterface ();
  	delete RControlWindow::getControl ();
+ 	factory ()->removeClient (RKComponentMap::getMap ());
+ 	delete RKComponentMap::getMap ();
  }
  
 +KatePluginIntegration* RKWardMainWindow::katePluginIntegration () {
 +	RK_TRACE (APP);
 +
 +	if (!katepluginintegration) {
 +		katepluginintegration = new KatePluginIntegration (this);
 +	}
 +	return katepluginintegration;
 +}
 +
  void RKWardMainWindow::closeEvent (QCloseEvent *e) {
  	RK_TRACE (APP);
  
diff --cc rkward/windows/CMakeLists.txt
index 0259de35,830a17b5..50fc3d8b
--- a/rkward/windows/CMakeLists.txt
+++ b/rkward/windows/CMakeLists.txt
@@@ -21,7 -21,7 +21,8 @@@ SET(windows_STAT_SRC
  	rktoolwindowlist.cpp
  	robjectbrowser.cpp
  	rkdebugmessagewindow.cpp
 +	katepluginintegration.cpp
+ 	rkcodecompletion.cpp
  )
  
  ADD_LIBRARY(windows STATIC ${windows_STAT_SRCS})
diff --cc rkward/windows/rkcommandeditorwindow.cpp
index d0729361,67268c3e..7ea52269
--- a/rkward/windows/rkcommandeditorwindow.cpp
+++ b/rkward/windows/rkcommandeditorwindow.cpp
@@@ -60,8 -63,9 +63,10 @@@
  #include "../rkglobals.h"
  #include "../rkward.h"
  #include "rkhelpsearchwindow.h"
+ #include "rkhtmlwindow.h"
  #include "rkworkplace.h"
 +#include "katepluginintegration.h"
+ #include "rkcodecompletion.h"
  
  #include "../debug.h"
  
@@@ -173,7 -178,11 +179,12 @@@ RKCommandEditorWindow::RKCommandEditorW
  	KTextEditor::ModificationInterface* em_iface = qobject_cast<KTextEditor::ModificationInterface*> (m_doc);
  	if (em_iface) em_iface->setModifiedOnDiskWarning (true);
  	else RK_ASSERT (false);
 +	m_view = m_doc->createView (this, RKWardMainWindow::getMain ()->katePluginIntegration ()->mainWindow ());
+ 	preview = new RKXMLGUIPreviewArea (QString(), this);
+ 	preview_manager = new RKPreviewManager (this);
+ 	connect (preview_manager, &RKPreviewManager::statusChanged, [this]() { preview_timer.start (500); });
+ 	m_view = m_doc->createView (this);
+ 	RKWorkplace::mainWorkplace()->registerNamedWindow (preview_manager->previewId(), this, preview);
  	if (!url.isEmpty ()) {
  		KConfigGroup viewconf (RKWorkplace::mainWorkplace ()->workspaceConfig (), QString ("SkriptViewSettings %1").arg (RKWorkplace::mainWorkplace ()->portableUrl (url)));
  		m_view->readSessionConfig (viewconf);