[Cpp] Finished the Uno Client wizard

 * Impossible to set the launch configuration environment variables from
   the project creation wizard: dropping that automation
 * Adding a Cheat sheet for the creation of C++ UNO client

6 files changed, 72 insertions, 6 deletions

diff --git a/core/plugin.properties b/core/plugin.properties
index 8d925cd..f586151 100755
--- a/core/plugin.properties
+++ b/core/plugin.properties
@@ -26,7 +26,7 @@ newactions.newfile.tooltip     = Launch the new UNO-IDL file wizard
 

 idlcerrormarker.name           = Marker for idlc errors 

 

-cheatsheets.name                 = OpenOffice.org plugin

+cheatsheets.name                 = OpenOffice.org extensions

 cheatsheets.starting.name        = Starting to use the plugin

 cheatsheets.starting.description = This tutorial will guide you trough the differents necessary steps \

                                    to start a new component for the first time.

diff --git a/core/plugin.xml b/core/plugin.xml
index 5749017..880dd51 100755
--- a/core/plugin.xml
+++ b/core/plugin.xml
@@ -206,12 +206,13 @@
       <persistent value="true"/>
    </extension>
    
- <!-- Uncomment when the cheatsheet will be reworked
+
    <extension
          point="org.eclipse.ui.cheatsheets.cheatSheetContent">
       <category
             id="org.openoffice.ide.eclipse.core.cheatsheets"
             name="%cheatsheets.name"/>
+	  <!-- Uncomment when the cheatsheet will be reworked
       <cheatsheet
             category="org.openoffice.ide.eclipse.core.cheatsheets"
             contentFile="$nl$/doc/cheatsheets/starting.xml"
@@ -221,8 +222,8 @@
             %cheatsheets.starting.description
          </description>
       </cheatsheet>
+      -->
    </extension>
- -->
  
    <extension
          point="org.eclipse.help.toc">
diff --git a/cpp/META-INF/MANIFEST.MF b/cpp/META-INF/MANIFEST.MF
index 54c59d4..e9292dd 100644
--- a/cpp/META-INF/MANIFEST.MF
+++ b/cpp/META-INF/MANIFEST.MF
@@ -12,6 +12,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.cdt.core;bundle-version="5.0.1",
  org.eclipse.cdt.managedbuilder.core;bundle-version="5.0.1",
  org.eclipse.cdt.ui;bundle-version="5.1.0",
- org.eclipse.ui.ide;bundle-version="3.5.0"
+ org.eclipse.ui.ide;bundle-version="3.5.0",
+ org.eclipse.ui.cheatsheets
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/cpp/doc/cheatsheets/unoclient.xml b/cpp/doc/cheatsheets/unoclient.xml
new file mode 100644
index 0000000..5742df5
--- /dev/null
+++ b/cpp/doc/cheatsheets/unoclient.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<cheatsheet
+      title="Create a C++ UNO client">
+   <intro>
+      <description>
+         OpenOffice.org can be used as well as a server. Creating clients connecting to it is not an easy task for beginners and the informations are split all over the web.
+<br/><br/>
+<b>Follow the next steps to create a new C++ UNO Client really quickly.</b>
+      </description>
+   </intro>
+   <item
+         title="Create the C++ UNO Client">
+      <description>
+         <b>Create a new project of type C++ UNO Client application.</b> 
+<br/><br/>
+Configure the OpenOffice.org instance and SDK used to build to program and configure the OpenOffice.org connection.
+      </description>
+      <command
+            required="true"
+            serialization="org.eclipse.ui.newWizard(newWizardId=org.openoffice.ide.eclipse.cpp.client)"/>
+   </item>
+   <item
+         title="Write the client code">
+      <description>
+         <b>Replace the TODO comment</b> by the code using the UNO connection to OpenOffice.org.
+      </description>
+   </item>
+   <item
+         title="Create a launch configuration">
+      <description>
+         Create a C++ Application run configuration. 
+<br/><br/>
+Don&apos;t forget to add the <b>LD_LIBRARY_PATH or PATH</b> in the environment variables and set it to the path to the <b>ure/lib</b> folder in the OpenOffice.org installation.
+      </description>
+      <command
+            required="true"
+            serialization="org.eclipse.debug.ui.commands.OpenRunConfigurations"/>
+   </item>
+   <item
+         skip="false"
+         title="Start OpenOffice.org">
+      <description>
+         OpenOffice.org needs to be started with the following parameter depending on your connection configuration:
+<br/><br/>
+<b>Pipe connection: </b><br/> -accept=&quot;pipe,name=<b>pipename</b>;urp;StarOffice.ServiceManager&quot;
+<br/><br/>
+<b>Socket connection: </b><br/> -accept=&quot;socket,host=<b>host</b>,port=<b>port</b>;urp;StarOffice.ServiceManager&quot;
+      </description>
+   </item>
+   <item
+         title="Run the client">
+      <description>
+         <b>Everything is done!</b> Now run the new UNO client program.
+      </description>
+   </item>
+</cheatsheet>
diff --git a/cpp/plugin.xml b/cpp/plugin.xml
index df6fc15..7ec255f 100644
--- a/cpp/plugin.xml
+++ b/cpp/plugin.xml
@@ -21,5 +21,15 @@
             project="true">
       </wizard>
    </extension>
+   <extension
+         point="org.eclipse.ui.cheatsheets.cheatSheetContent">
+      <cheatsheet
+            category="org.openoffice.ide.eclipse.core.cheatsheets"
+            composite="false"
+            contentFile="doc/cheatsheets/unoclient.xml"
+            id="org.openoffice.ide.eclipse.cpp.unoclient"
+            name="Create a C++ UNO Client">
+      </cheatsheet>
+   </extension>
 
 </plugin>
diff --git a/cpp/source/org/openoffice/ide/eclipse/cpp/client/ClientWizard.java b/cpp/source/org/openoffice/ide/eclipse/cpp/client/ClientWizard.java
index 4f0843d..7196035 100644
--- a/cpp/source/org/openoffice/ide/eclipse/cpp/client/ClientWizard.java
+++ b/cpp/source/org/openoffice/ide/eclipse/cpp/client/ClientWizard.java
@@ -121,8 +121,6 @@ public class ClientWizard extends CCProjectWizard {
 
             CppProjectHandler.addOOoDependencies( ooo, sdk, newProject );
             
-            // TODO Setup the launch config
-            
             selectAndReveal( srcDir.getFile( CLIENT_FILE ) );
             WorkbenchHelper.showFile( srcDir.getFile( CLIENT_FILE ), mActivePage );