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

[Thomas Friedrichsmeier]

Git commit 21c839aad6972dfbd14c6ebebd4917edd3ce5a6a by Thomas Friedrichsmeier.
Committed on 22/04/2018 at 09:21.
Pushed by tfry into branch 'work/kateintegration'.

Merge branch 'work/kate_plugins' into work/kateintegration

M  +11   -0    rkward/rkward.cpp
M  +1    -0    rkward/windows/CMakeLists.txt
M  +2    -1    rkward/windows/rkcommandeditorwindow.cpp

https://commits.kde.org/rkward/21c839aad6972dfbd14c6ebebd4917edd3ce5a6a

diff --cc rkward/windows/rkcommandeditorwindow.cpp
index 0f7cfe97,ddcb3c6f..d0729361
--- a/rkward/windows/rkcommandeditorwindow.cpp
+++ b/rkward/windows/rkcommandeditorwindow.cpp
@@@ -172,11 -93,7 +173,11 @@@ 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);
+ 	m_view = m_doc->createView (this, RKWardMainWindow::getMain ()->katePluginIntegration ()->mainWindow ());
 +	if (!url.isEmpty ()) {
 +		KConfigGroup viewconf (RKWorkplace::mainWorkplace ()->workspaceConfig (), QString ("SkriptViewSettings %1").arg (RKWorkplace::mainWorkplace ()->portableUrl (url)));
 +		m_view->readSessionConfig (viewconf);
 +	}
  
  	setFocusProxy (m_view);
  	setFocusPolicy (Qt::StrongFocus);