From kde-commits  Wed May 06 17:12:12 2015
From: Cyrille Berger <cberger () cberger ! net>
Date: Wed, 06 May 2015 17:12:12 +0000
To: kde-commits
Subject: [calligra/krita-scripting-rempt] krita: have the script menu show up
Message-Id: <E1Yq2rk-0005Ab-2N () scm ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=143093234730978

Git commit 23b9b6fd1bc4212ea24078f92c3ab65bda01ceeb by Cyrille Berger.
Committed on 06/05/2015 at 16:30.
Pushed by berger into branch 'krita-scripting-rempt'.

have the script menu show up

M  +2    -2    krita/krita.rc
M  +2    -3    krita/ui/kis_script_manager.cpp

http://commits.kde.org/calligra/23b9b6fd1bc4212ea24078f92c3ab65bda01ceeb

diff --git a/krita/krita.rc b/krita/krita.rc
index 1f756a1..b7f3f67 100644
--- a/krita/krita.rc
+++ b/krita/krita.rc
@@ -1,5 +1,5 @@
 <?xml version=3D"1.0"?>
-<kpartgui xmlns=3D"http://www.kde.org/standards/kxmlgui/1.0" xmlns:xsi=3D"=
http://www.w3.org/2001/XMLSchema-instance" name=3D"Krita" version=3D"66" xs=
i:schemaLocation=3D"http://www.kde.org/standards/kxmlgui/1.0      http://ww=
w.kde.org/standards/kxmlgui/1.0/kxmlgui.xsd">
+<kpartgui xmlns=3D"http://www.kde.org/standards/kxmlgui/1.0" xmlns:xsi=3D"=
http://www.w3.org/2001/XMLSchema-instance" name=3D"Krita" version=3D"67" xs=
i:schemaLocation=3D"http://www.kde.org/standards/kxmlgui/1.0      http://ww=
w.kde.org/standards/kxmlgui/1.0/kxmlgui.xsd">
   <MenuBar>
     <Menu name=3D"file" noMerge=3D"1">
       <text>&amp;File</text>
@@ -249,7 +249,7 @@
       </Menu>
     </Menu>
     =

-    <Action name=3D"scripts"/>
+    <Action name=3D"scripting"/>
     =

     <Menu name=3D"settings">
       <text>Setti&amp;ngs</text>
diff --git a/krita/ui/kis_script_manager.cpp b/krita/ui/kis_script_manager.=
cpp
index 25b955c..374500e 100644
--- a/krita/ui/kis_script_manager.cpp
+++ b/krita/ui/kis_script_manager.cpp
@@ -46,9 +46,6 @@ KisScriptManager::KisScriptManager(KisViewManager *view)
     , d(new Private())
 {
     d->view =3D view;
-    d->actionCollection =3D view->actionCollection();
-    d->scriptMenu =3D new KActionMenu(i18n("Scripts"),this);
-    d->actionCollection->addAction("scripting", d->scriptMenu);
 }
 =

 KisScriptManager::~KisScriptManager()
@@ -60,6 +57,8 @@ KisScriptManager::~KisScriptManager()
 void KisScriptManager::setup(KActionCollection * ac)
 {
     d->actionCollection =3D ac;
+    d->scriptMenu =3D new KActionMenu(i18n("Scripts"),this);
+    d->actionCollection->addAction("scripting", d->scriptMenu);
 }
 =

 void KisScriptManager::updateGUI()