INTEGRATION: CWS qwizardsbf6 (1.2.138); FILE MERGED

2005/08/17 09:28:43 tv 1.2.138.1: fixed event bindings, crash when ending tutorial and focus problems
Issue number:
Submitted by:
Reviewed by:

4 files changed, 10 insertions, 10 deletions

diff --git a/wizards/source/tutorials/TutorialOpenDialog.xdl b/wizards/source/tutorials/TutorialOpenDialog.xdl
index ec2f6c210..6c9893306 100644
--- a/wizards/source/tutorials/TutorialOpenDialog.xdl
+++ b/wizards/source/tutorials/TutorialOpenDialog.xdl
@@ -3,10 +3,10 @@
 <dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="TutorialOpenDialog" dlg:left="158" dlg:top="58" dlg:width="250" dlg:height="200" dlg:closeable="true" dlg:moveable="true">
  <dlg:bulletinboard>
   <dlg:button dlg:id="Open" dlg:tab-index="1" dlg:left="141" dlg:top="180" dlg:width="50" dlg:height="14" dlg:value="Open">
-   <script:event script:event-name="on-mouseup" script:location="application" script:macro-name="Tutorials.TutorialOpen.OpenTutorial" script:language="StarBasic"/>
+   <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Tutorials.TutorialOpen.OpenTutorial?language=Basic&amp;location=application" script:language="Script"/>
   </dlg:button>
   <dlg:button dlg:id="Cancel" dlg:tab-index="2" dlg:left="194" dlg:top="180" dlg:width="50" dlg:height="14" dlg:value="Cancel">
-   <script:event script:event-name="on-mouseup" script:location="application" script:macro-name="Tutorials.TutorialOpen.Cancel" script:language="StarBasic"/>
+   <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Tutorials.TutorialOpen.Cancel?language=Basic&amp;location=application" script:language="Script"/>
   </dlg:button>
   <dlg:menulist dlg:id="ListBox" dlg:tab-index="0" dlg:left="8" dlg:top="17" dlg:width="98" dlg:height="155">
    <script:event script:event-name="on-performaction" script:location="application" script:macro-name="Tutorials.TutorialOpen.OpenTutorial" script:language="StarBasic"/>
diff --git a/wizards/source/tutorials/TutorialsDialog.xdl b/wizards/source/tutorials/TutorialsDialog.xdl
index e1fc5d7b3..3a211f9f6 100644
--- a/wizards/source/tutorials/TutorialsDialog.xdl
+++ b/wizards/source/tutorials/TutorialsDialog.xdl
@@ -6,18 +6,18 @@
  </dlg:styles>
  <dlg:bulletinboard>
   <dlg:button dlg:id="CommandButton" dlg:tab-index="3" dlg:left="232" dlg:top="4" dlg:width="13" dlg:height="13" dlg:value="C">
-   <script:event script:event-name="on-mouseup" script:location="application" script:macro-name="Tutorials.Functions.Minimize" script:language="StarBasic"/>
+   <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Tutorials.Functions.Minimize?language=Basic&amp;location=application" script:language="Script"/>
   </dlg:button>
   <dlg:text dlg:id="myText" dlg:tab-index="4" dlg:left="91" dlg:top="26" dlg:width="153" dlg:height="145" dlg:value="This text explains all the action items that the user can do to follow the current step highlighted in the road map at the left side of the tutorial window.&#x0a;&#x0a;1. Open the Format menu&#x0a;2. Choose the Paragraph command&#x0a;3. Click the Numbering tab&#x0a;&#x0a;The first step will always explain what the current tutorial is about.&#x0a;&#x0a;The last step - it is higjlighted currently in the road map - will summarize what the user now has seen or learned." dlg:multiline="true"/>
   <dlg:button dlg:id="show" dlg:tab-index="1" dlg:left="142" dlg:top="180" dlg:width="50" dlg:height="14" dlg:value="Show me">
-   <script:event script:event-name="on-mouseup" script:location="application" script:macro-name="Tutorials.Functions.Show" script:language="StarBasic"/>
+   <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Tutorials.Functions.Show?language=Basic&amp;location=application" script:language="Script"/>
   </dlg:button>
   <dlg:button dlg:id="next" dlg:tab-index="0" dlg:left="89" dlg:top="180" dlg:width="50" dlg:height="14" dlg:value="Next &gt;&gt;">
-   <script:event script:event-name="on-mouseup" script:location="application" script:macro-name="Tutorials.Functions.NextStep" script:language="StarBasic"/>
+   <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Tutorials.Functions.NextStep?language=Basic&amp;location=application" script:language="Script"/>
   </dlg:button>
   <dlg:text dlg:style-id="0" dlg:id="myTextField" dlg:tab-index="5" dlg:left="6" dlg:top="6" dlg:width="192" dlg:height="8" dlg:value="Current Step (in Road Map)"/>
   <dlg:button dlg:id="done" dlg:tab-index="2" dlg:left="195" dlg:top="180" dlg:width="50" dlg:height="14" dlg:value="Close">
-   <script:event script:event-name="on-mouseup" script:location="application" script:macro-name="Tutorials.Functions.EndDialog" script:language="StarBasic"/>
+   <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:Tutorials.Functions.EndDialog?language=Basic&amp;location=application" script:language="Script"/>
   </dlg:button>
   <dlg:text dlg:style-id="0" dlg:id="ActionItemsLabel" dlg:tab-index="8" dlg:left="91" dlg:top="8" dlg:width="45" dlg:height="8" dlg:value="Action Items"/>
   <dlg:fixedline dlg:id="FixedLineHorizontal" dlg:tab-index="7" dlg:left="0" dlg:top="176" dlg:width="250" dlg:height="1"/>
diff --git a/wizards/source/tutorials/dialog.xlb b/wizards/source/tutorials/dialog.xlb
index e229728f9..e02b20688 100644
--- a/wizards/source/tutorials/dialog.xlb
+++ b/wizards/source/tutorials/dialog.xlb
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="Tutorials" library:readonly="true" library:passwordprotected="false">
+<library:library xmlns:library="http://openoffice.org/2000/library" library:name="Tutorials" library:readonly="false" library:passwordprotected="false">
  <library:element library:name="TutorialsDialog"/>
  <library:element library:name="TutorialOpenDialog"/>
  <library:element library:name="TutorialCloseDialog"/>
-</library:library>
+</library:library>
\ No newline at end of file
diff --git a/wizards/source/tutorials/script.xlb b/wizards/source/tutorials/script.xlb
index 4b31163a5..30280c6b1 100644
--- a/wizards/source/tutorials/script.xlb
+++ b/wizards/source/tutorials/script.xlb
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="Tutorials" library:readonly="true" library:passwordprotected="false">
+<library:library xmlns:library="http://openoffice.org/2000/library" library:name="Tutorials" library:readonly="false" library:passwordprotected="false">
  <library:element library:name="Functions"/>
  <library:element library:name="TutorialCreator"/>
  <library:element library:name="TutorialOpen"/>
  <library:element library:name="RoadMap"/>
  <library:element library:name="ShowInfoDialog"/>
  <library:element library:name="TutorialClose"/>
-</library:library>
+</library:library>
\ No newline at end of file