[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice/lib/kross
From:       Sebastian Sauer <mail () dipe ! org>
Date:       2006-02-09 18:39:46
Message-ID: 1139510386.849886.32496.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 507639 by sebsauer:

- Made setXMLFile(), setLocalXMLFile(), setXML() and setDOMDocument() public.
- Let GUI-testcase work as expected again.



 M  +22 -0     main/scriptguiclient.cpp  
 M  +9 -0      main/scriptguiclient.h  
 M  +10 -26    test/testscripting.rc  
 M  +19 -6     test/testwindow.cpp  


--- trunk/koffice/lib/kross/main/scriptguiclient.cpp #507638:507639
@@ -286,6 +286,28 @@
     return false;
 }
 
+void ScriptGUIClient::setXMLFile(const QString& file, bool merge, bool setXMLDoc)
+{
+    KXMLGUIClient::setXMLFile(file, merge, setXMLDoc);
+    loadScriptConfig(file);
+}
+
+void ScriptGUIClient::setLocalXMLFile(const QString &file)
+{
+    KXMLGUIClient::setLocalXMLFile(file);
+    loadScriptConfig(file);
+}
+
+void ScriptGUIClient::setXML(const QString &document, bool merge)
+{
+    KXMLGUIClient::setXML(document, merge);
+}
+
+void ScriptGUIClient::setDOMDocument(const QDomDocument &document, bool merge)
+{
+    KXMLGUIClient::setDOMDocument(document, merge);
+}
+
 bool ScriptGUIClient::executeScriptFile()
 {
     KURL url = openScriptFile( i18n("Execute Script File") );
--- trunk/koffice/lib/kross/main/scriptguiclient.h #507638:507639
@@ -128,6 +128,15 @@
              */
             bool loadScriptConfig(const QString& scriptconfigfile);
 
+            /// KXMLGUIClient overloaded method to set the XML file.
+            virtual void setXMLFile(const QString& file, bool merge = false, bool setXMLDoc = true);
+            /// KXMLGUIClient overloaded method to set the local XML file.
+            virtual void setLocalXMLFile(const QString &file);
+            /// KXMLGUIClient overloaded method to set the XML.
+            virtual void setXML(const QString &document, bool merge = false);
+            /// KXMLGUIClient overloaded method to set the XML DOM-document.
+            virtual void setDOMDocument(const QDomDocument &document, bool merge = false);
+
         public slots:
 
            /**
--- trunk/koffice/lib/kross/test/testscripting.rc #507638:507639
@@ -1,34 +1,18 @@
 <KrossScripting>
-  <Scripts>
-
-    <ScriptAction name="sa1name" text="ScriptAction1Text" interpreter="python" icon="exec">
+    <ScriptAction 
+        name="sa1name"
+        text="ScriptAction1Text"
+        description="Some describing text"
+        interpreter="python"
+        icon="exec">
 print "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
 print "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
     </ScriptAction>
 
     <ScriptAction
-      name="importxhtml"
-      text="Import Data From XHTML File"
-      icon="fileimport"
-      interpreter="python"
-      resource="appdata"
-      file="kross/python/ImportXHTML.py" />
+      name="testkexidb"
+      text="TestKexiDB"
+      description="Test the kexidb binding."
+      interpreter="python" />
 
-    <ScriptAction
-      name="exportxhtml"
-      text="Export Data to XHTML File"
-      icon="fileexport"
-      interpreter="python"
-      resource="appdata"
-      file="kross/python/ExportXHTML.py" />
-
-    <ScriptAction
-      name="projectdocumentator"
-      text="Project Documentator"
-      icon="contents"
-      interpreter="python"
-      resource="appdata"
-      file="kross/python/ProjectDocumentator.py" />
-
-  </Scripts>
 </KrossScripting>
--- trunk/koffice/lib/kross/test/testwindow.cpp #507638:507639
@@ -25,15 +25,16 @@
 #include <qvgroupbox.h>
 //#include <qhgroupbox.h>
 #include <qcombobox.h>
+#include <qdir.h>
+#include <qpopupmenu.h>
+
 #include <ktextedit.h>
 #include <kpushbutton.h>
 #include <kpopupmenu.h>
 #include <kmenubar.h>
 #include <kstandarddirs.h>
-
 #include <kdebug.h>
 
-#include <qpopupmenu.h>
 TestWindow::TestWindow(const QString& interpretername, const QString& scriptcode)
     : KMainWindow()
     , m_interpretername(interpretername)
@@ -47,12 +48,24 @@
     menuBar()->insertItem( "&File", menuFile );
 
     m_scriptextension = new Kross::Api::ScriptGUIClient(this, this);
-    //m_scriptextension->setXMLFile( KGlobal::dirs()->findResource("appdata", "testscripting.rc") );
 
-    m_scriptextension->action("executescriptfile")->plug(menuFile);
-    //m_scriptextension->action("configurescripts")->plug(menuFile);
+    QString file = KGlobal::dirs()->findResource("appdata", "testscripting.rc");
+    if(file.isNull())
+        file = QDir(QDir::currentDirPath()).filePath("testscripting.rc");
+    else kdDebug()<<"-------------------------222222"<<endl;
+
+    kdDebug()<<"XML-file: "<<file<<endl;
+    m_scriptextension->setXMLFile(file);
+
     //menuFile->insertSeparator();
-    KAction* scriptsaction = m_scriptextension->action("scripts");
+
+    KAction* execaction = m_scriptextension->action("executescriptfile");
+    if(execaction) execaction->plug(menuFile);
+
+    KAction* configaction = m_scriptextension->action("configurescripts");
+    if(configaction) configaction->plug(menuFile);
+
+    KAction* scriptsaction = m_scriptextension->action("installedscripts");
     if(scriptsaction) scriptsaction->plug(menuFile);
     //menuFile->insertItem( ( (KActionMenu*)m_scriptextension->action("scripts") )->popupMenu() );
 
[prev in list] [next in list] [prev in thread] [next in thread]