You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by se...@apache.org on 2007/01/23 23:52:56 UTC

svn commit: r499174 - in /directory/ldapstudio/trunk: ldapstudio-browser-help/ ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/search/ ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/m...

Author: seelmann
Date: Tue Jan 23 14:52:54 2007
New Revision: 499174

URL: http://svn.apache.org/viewvc?view=rev&rev=499174
Log:
Added context-sensitive help.

Added:
    directory/ldapstudio/trunk/ldapstudio-browser-help/contexts.xml
Modified:
    directory/ldapstudio/trunk/ldapstudio-browser-help/build.xml
    directory/ldapstudio/trunk/ldapstudio-browser-help/plugin.xml
    directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/search/SearchPage.java
    directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/modificationlogs/ModificationLogsView.java
    directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/AttributeWizard.java
    directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/BatchOperationWizard.java
    directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/ExportCsvWizard.java
    directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/ExportDsmlWizard.java
    directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/ExportExcelWizard.java
    directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/ExportLdifWizard.java
    directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/ImportDsmlWizard.java
    directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/ImportLdifWizard.java
    directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/NewConnectionWizard.java
    directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/NewEntryWizard.java

Modified: directory/ldapstudio/trunk/ldapstudio-browser-help/build.xml
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-help/build.xml?view=diff&rev=499174&r1=499173&r2=499174
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-browser-help/build.xml (original)
+++ directory/ldapstudio/trunk/ldapstudio-browser-help/build.xml Tue Jan 23 14:52:54 2007
@@ -111,6 +111,7 @@
 		
 		<copy todir="${project.build}" overwrite="true">
 			<fileset dir="${basedir}">
+				<include name="contexts.xml" />
 				<include name="plugin.xml" />
 				<include name="plugin.properties" />
 				<include name="about.html" />
@@ -222,6 +223,7 @@
 				<exclude name="ivy.xml"/>
 				<exclude name="plugin.properties"/>
 				<exclude name="plugin.xml"/>
+				<exclude name="contexts.xml"/>
 				<exclude name="docbook/**"/>
 				<exclude name="src/**" />
 				<exclude name="resources/**" />

Added: directory/ldapstudio/trunk/ldapstudio-browser-help/contexts.xml
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-help/contexts.xml?view=auto&rev=499174
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-browser-help/contexts.xml (added)
+++ directory/ldapstudio/trunk/ldapstudio-browser-help/contexts.xml Tue Jan 23 14:52:54 2007
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?NLS TYPE="org.eclipse.help.contexts"?>
+<contexts>
+ 
+ 	<context id="tools_connections_view">
+   		<description>The Connections view shows all the LDAP connections.</description>
+   		<topic label="Connections view" href="html/tools_connections_view.html"/>
+   	</context>
+ 	<context id="tools_browser_view">
+   		<description>The LDAP Browser shows the DIT, searches and bookmarks. It allows you to explore the directory content.</description>
+   		<topic label="Overview, Sorting" href="html/tools_browser_view_overview.html"/>
+   		<topic label="DIT category" href="html/tools_browser_view_dit.html"/>
+   		<topic label="Searches category" href="html/tools_browser_view_searches.html"/>
+   		<topic label="Bookmarks category" href="html/tools_browser_view_bookmarks.html"/>
+   		<topic label="Context menu" href="html/tools_browser_view_contextmenu.html"/>
+   	</context>
+ 	<context id="tools_entry_editor">
+   		<description>The Entry editor is used to view and edit the attributes and values of an entry.</description>
+   		<topic label="Overview" href="html/tools_entry_editor_overview.html"/>
+   		<topic label="Features (Sorting, Filtering, Editing)" href="html/tools_entry_editor_features.html"/>
+   		<topic label="Context menu" href="html/tools_entry_editor_contextmenu.html"/>
+   	</context>
+ 	<context id="tools_search_result_editor">
+   		<description>The Search Result editor is used to view and edit search results.</description>
+   		<topic label="Overview" href="html/tools_search_result_editor_overview.html"/>
+   		<topic label="Features (Sorting, Filtering, Editing)" href="html/tools_search_result_editor_features.html"/>
+   		<topic label="Context menu" href="html/tools_search_result_editor_contextmenu.html"/>
+   	</context>
+ 	<context id="tools_schema_browser">
+   		<description>With the Schema Browser you can browse the schema of a LDAP directory.</description>
+   		<topic label="Overview" href="html/tools_schema_browser_overview.html"/>
+   		<topic label="Object Classes" href="html/tools_schema_browser_ocd.html"/>
+   		<topic label="Attribute Types" href="html/tools_schema_browser_atd.html"/>
+   		<topic label="Syntaxes" href="html/tools_schema_browser_lsd.html"/>
+   		<topic label="Matching Rules" href="html/tools_schema_browser_mrd.html"/>
+   		<topic label="Matching Rule Use" href="html/tools_schema_browser_mru.html"/>
+   	</context>
+ 	<context id="tools_modification_logs_view">
+   		<description>The Modification Logs view shows all sucessful and failed modifications.</description>
+   		<topic label="Modification Logs view" href="html/tools_modification_logs_view.html"/>
+   	</context>
+ 	<context id="tools_ldif_editor">
+   		<description>The LDIF editor provides you with LDIF specific text editing support.</description>
+   		<topic label="LDIF editor" href="html/tools_ldif_editor.html"/>
+   	</context>
+   	
+   	
+   	
+ 	<context id="tools_newconnection_wizard">
+   		<description>This wizard helps you to create a new connection to a LDAP directory.</description>
+   		<topic label="New LDAP Connection wizard" href="html/tools_newconnection_wizard.html"/>
+   		<topic label="Specify network parameters" href="html/tools_newconnection_wizard.html#tools_newconnection_wizard_1"/>
+   		<topic label="Specify authentication parameters" href="html/tools_newconnection_wizard.html#tools_newconnection_wizard_2"/>
+   		<topic label="Specify additional parameters" href="html/tools_newconnection_wizard.html#tools_newconnection_wizard_3"/>
+   	</context>
+ 	<context id="tools_newentry_wizard">
+   		<description>This wizard helps you to create a new entry in a LDAP directory.</description>
+   		<topic label="New Entry wizard" href="html/tools_newentry_wizard.html"/>
+   		<topic label="Select entry creation method" href="html/tools_newentry_wizard.html#tools_newentry_wizard_1"/>
+   		<topic label="Specify object classes" href="html/tools_newentry_wizard.html#tools_newentry_wizard_2"/>
+   		<topic label="Specifiy the distinguished name" href="html/tools_newentry_wizard.html#tools_newentry_wizard_3"/>
+   		<topic label="Enter attributes and values" href="html/tools_newentry_wizard.html#tools_newentry_wizard_4"/>
+   	</context>
+ 	<context id="tools_attribute_wizard">
+   		<description>This wizard is used to create or edit an attribute.</description>
+   		<topic label="Attribute wizard" href="html/tools_attribute_wizard.html"/>
+   		<topic label="Enter attribute type" href="html/tools_attribute_wizard.html#tools_attribute_wizard_1"/>
+   		<topic label="Specify options" href="html/tools_attribute_wizard.html#tools_attribute_wizard_2"/>
+   	</context>
+ 	<context id="tools_search_dialog">
+   		<description>In the LDAP Search page you can specify search parameters to query a directory.</description>
+   		<topic label="LDAP Search page" href="html/tools_search_dialog.html"/>
+   	</context>
+ 	<context id="tools_batchoperation_wizard">
+   		<description> This wizard helps you to modify several entries.</description>
+   		<topic label="Batch Operation wizard" href="html/tools_batchoperation_wizard.html"/>
+   		<topic label="Select entries" href="html/tools_batchoperation_wizard.html#tools_batchoperation_wizard_1"/>
+   		<topic label="Select operation" href="html/tools_batchoperation_wizard.html#tools_batchoperation_wizard_2"/>
+   		<topic label="Specify modification" href="html/tools_batchoperation_wizard.html#tools_batchoperation_wizard_3"/>
+   		<topic label="Choose execution method" href="html/tools_batchoperation_wizard.html#tools_batchoperation_wizard_4"/>
+   	</context>
+ 	<context id="tools_ldifimport_wizard">
+   		<description>This wizard imports LDIF files into the directory.</description>
+   		<topic label="LDIF Import wizard" href="html/tools_ldifimport_wizard.html"/>
+   	</context>
+ 	<context id="tools_dsmlimport_wizard">
+   		<description>This wizard imports DSML files into the directory.</description>
+   		<topic label="DSML Import wizard" href="html/tools_dsmlimport_wizard.html"/>
+   	</context>
+ 	<context id="tools_ldifexport_wizard">
+   		<description>This wizard exports directory content to LDIF files.</description>
+   		<topic label="LDIF Export wizard" href="html/tools_ldifexport_wizard.html"/>
+   	</context>
+ 	<context id="tools_dsmlexport_wizard">
+   		<description>This wizard exports directory content to DSML files.</description>
+   		<topic label="DSML Export wizard" href="html/tools_dsmlexport_wizard.html"/>
+   	</context>
+ 	<context id="tools_csvexport_wizard">
+   		<description>This wizard exports directory content to CSV files.</description>
+   		<topic label="CSV Export wizard" href="html/tools_csvexport_wizard.html"/>
+   	</context>
+ 	<context id="tools_excelexport_wizard">
+   		<description>This wizard exports directory content to Excel files.</description>
+   		<topic label="Excel Export wizard" href="html/tools_excelexport_wizard.html"/>
+   	</context>
+
+    		
+</contexts>

Modified: directory/ldapstudio/trunk/ldapstudio-browser-help/plugin.xml
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-help/plugin.xml?view=diff&rev=499174&r1=499173&r2=499174
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-browser-help/plugin.xml (original)
+++ directory/ldapstudio/trunk/ldapstudio-browser-help/plugin.xml Tue Jan 23 14:52:54 2007
@@ -5,5 +5,7 @@
 	<extension point="org.eclipse.help.toc">
 		<toc file="toc.xml" primary="true" />
 	</extension>
-
+	<extension point="org.eclipse.help.contexts">
+		<contexts file="contexts.xml" plugin="org.apache.directory.ldapstudio.browser.ui" />
+	</extension>
 </plugin>

Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/search/SearchPage.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/search/SearchPage.java?view=diff&rev=499174&r1=499173&r2=499174
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/search/SearchPage.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/search/SearchPage.java Tue Jan 23 14:52:54 2007
@@ -115,14 +115,16 @@
         // convertHorizontalDLUsToPixels(IDialogConstants.MINIMUM_MESSAGE_AREA_WIDTH);
         parent.setLayoutData( gd );
 
-        PlatformUI.getWorkbench().getHelpSystem().setHelp( parent,
-            BrowserUIPlugin.PLUGIN_ID + "." + "tools_search_dialog" );
-
         Composite composite = BaseWidgetUtils.createColumnContainer( parent, 3, 1 );
         this.spw = new SearchPageWrapper( SearchPageWrapper.NONE );
         this.spw.createContents( composite );
         this.spw.loadFromSearch( this.search );
         this.spw.addWidgetModifyListener( this );
+        
+        PlatformUI.getWorkbench().getHelpSystem().setHelp( composite,
+            BrowserUIPlugin.PLUGIN_ID + "." + "tools_search_dialog" );
+        PlatformUI.getWorkbench().getHelpSystem().setHelp( parent,
+            BrowserUIPlugin.PLUGIN_ID + "." + "tools_search_dialog" );
 
         super.setControl( parent );
     }

Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/modificationlogs/ModificationLogsView.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/modificationlogs/ModificationLogsView.java?view=diff&rev=499174&r1=499173&r2=499174
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/modificationlogs/ModificationLogsView.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/views/modificationlogs/ModificationLogsView.java Tue Jan 23 14:52:54 2007
@@ -89,9 +89,6 @@
         layout.marginHeight = 0;
         composite.setLayout( layout );
 
-        PlatformUI.getWorkbench().getHelpSystem().setHelp( composite,
-            BrowserUIPlugin.PLUGIN_ID + "." + "tools_modification_logs_view" );
-
         // create main widget
         mainWidget = new LdifEditorWidget( null, "", false );
         mainWidget.createWidget( composite );
@@ -104,6 +101,10 @@
 
         // create the listener
         this.universalListener = new ModificationLogsViewUniversalListener( this );
+
+        // set help context
+        PlatformUI.getWorkbench().getHelpSystem().setHelp( mainWidget.getSourceViewer().getTextWidget(),
+            BrowserUIPlugin.PLUGIN_ID + "." + "tools_modification_logs_view" );
     }
 
 

Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/AttributeWizard.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/AttributeWizard.java?view=diff&rev=499174&r1=499173&r2=499174
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/AttributeWizard.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/AttributeWizard.java Tue Jan 23 14:52:54 2007
@@ -106,10 +106,23 @@
             IWizardPage page = new DummyWizardPage();
             addPage( page );
         }
+    }
+
 
-        PlatformUI.getWorkbench().getHelpSystem().setHelp( getContainer().getShell(),
+    /**
+     * {@inheritDoc}
+     */
+    public void createPageControls( Composite pageContainer )
+    {
+        super.createPageControls( pageContainer );
+        
+        // set help context ID
+        PlatformUI.getWorkbench().getHelpSystem().setHelp( typePage.getControl(),
+            BrowserUIPlugin.PLUGIN_ID + "." + "tools_attribute_wizard" );
+        PlatformUI.getWorkbench().getHelpSystem().setHelp( optionsPage.getControl(),
             BrowserUIPlugin.PLUGIN_ID + "." + "tools_attribute_wizard" );
     }
+
 
     class DummyWizardPage extends WizardPage
     {

Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/BatchOperationWizard.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/BatchOperationWizard.java?view=diff&rev=499174&r1=499173&r2=499174
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/BatchOperationWizard.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/BatchOperationWizard.java Tue Jan 23 14:52:54 2007
@@ -138,10 +138,29 @@
             IWizardPage page = new DummyWizardPage();
             addPage( page );
         }
+    }
+
 
-        PlatformUI.getWorkbench().getHelpSystem().setHelp( getContainer().getShell(),
+    /**
+     * {@inheritDoc}
+     */
+    public void createPageControls( Composite pageContainer )
+    {
+        super.createPageControls( pageContainer );
+        
+        // set help context ID
+        PlatformUI.getWorkbench().getHelpSystem().setHelp( applyOnPage.getControl(),
+            BrowserUIPlugin.PLUGIN_ID + "." + "tools_batchoperation_wizard" );
+        PlatformUI.getWorkbench().getHelpSystem().setHelp( typePage.getControl(),
+            BrowserUIPlugin.PLUGIN_ID + "." + "tools_batchoperation_wizard" );
+        PlatformUI.getWorkbench().getHelpSystem().setHelp( ldifPage.getControl(),
+            BrowserUIPlugin.PLUGIN_ID + "." + "tools_batchoperation_wizard" );
+        PlatformUI.getWorkbench().getHelpSystem().setHelp( modifyPage.getControl(),
+            BrowserUIPlugin.PLUGIN_ID + "." + "tools_batchoperation_wizard" );
+        PlatformUI.getWorkbench().getHelpSystem().setHelp( finishPage.getControl(),
             BrowserUIPlugin.PLUGIN_ID + "." + "tools_batchoperation_wizard" );
     }
+
 
     class DummyWizardPage extends WizardPage
     {

Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/ExportCsvWizard.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/ExportCsvWizard.java?view=diff&rev=499174&r1=499173&r2=499174
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/ExportCsvWizard.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/ExportCsvWizard.java Tue Jan 23 14:52:54 2007
@@ -22,6 +22,9 @@
 
 
 import org.apache.directory.ldapstudio.browser.core.jobs.ExportCsvJob;
+import org.apache.directory.ldapstudio.browser.ui.BrowserUIPlugin;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.PlatformUI;
 
 
 public class ExportCsvWizard extends ExportBaseWizard
@@ -50,6 +53,21 @@
         addPage( fromPage );
         toPage = new ExportCsvToWizardPage( ExportCsvToWizardPage.class.getName(), this );
         addPage( toPage );
+    }
+
+
+    /**
+     * {@inheritDoc}
+     */
+    public void createPageControls( Composite pageContainer )
+    {
+        super.createPageControls( pageContainer );
+        
+        // set help context ID
+        PlatformUI.getWorkbench().getHelpSystem().setHelp( fromPage.getControl(),
+            BrowserUIPlugin.PLUGIN_ID + "." + "tools_csvexport_wizard" );
+        PlatformUI.getWorkbench().getHelpSystem().setHelp( toPage.getControl(),
+            BrowserUIPlugin.PLUGIN_ID + "." + "tools_csvexport_wizard" );
     }
 
 

Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/ExportDsmlWizard.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/ExportDsmlWizard.java?view=diff&rev=499174&r1=499173&r2=499174
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/ExportDsmlWizard.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/ExportDsmlWizard.java Tue Jan 23 14:52:54 2007
@@ -21,6 +21,9 @@
 package org.apache.directory.ldapstudio.browser.ui.wizards;
 
 import org.apache.directory.ldapstudio.browser.core.jobs.ExportDsmlJob;
+import org.apache.directory.ldapstudio.browser.ui.BrowserUIPlugin;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.PlatformUI;
 
 
 /**
@@ -66,6 +69,21 @@
         addPage( fromPage );
         toPage = new ExportDsmlToWizardPage( ExportDsmlToWizardPage.class.getName(), this );
         addPage( toPage );
+    }
+
+
+    /**
+     * {@inheritDoc}
+     */
+    public void createPageControls( Composite pageContainer )
+    {
+        super.createPageControls( pageContainer );
+        
+        // set help context ID
+        PlatformUI.getWorkbench().getHelpSystem().setHelp( fromPage.getControl(),
+            BrowserUIPlugin.PLUGIN_ID + "." + "tools_dsmlexport_wizard" );
+        PlatformUI.getWorkbench().getHelpSystem().setHelp( toPage.getControl(),
+            BrowserUIPlugin.PLUGIN_ID + "." + "tools_dsmlexport_wizard" );
     }
 
 

Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/ExportExcelWizard.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/ExportExcelWizard.java?view=diff&rev=499174&r1=499173&r2=499174
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/ExportExcelWizard.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/ExportExcelWizard.java Tue Jan 23 14:52:54 2007
@@ -22,6 +22,9 @@
 
 
 import org.apache.directory.ldapstudio.browser.core.jobs.ExportXlsJob;
+import org.apache.directory.ldapstudio.browser.ui.BrowserUIPlugin;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.PlatformUI;
 
 
 public class ExportExcelWizard extends ExportBaseWizard
@@ -50,6 +53,21 @@
         addPage( fromPage );
         toPage = new ExportExcelToWizardPage( ExportExcelToWizardPage.class.getName(), this );
         addPage( toPage );
+    }
+
+
+    /**
+     * {@inheritDoc}
+     */
+    public void createPageControls( Composite pageContainer )
+    {
+        super.createPageControls( pageContainer );
+        
+        // set help context ID
+        PlatformUI.getWorkbench().getHelpSystem().setHelp( fromPage.getControl(),
+            BrowserUIPlugin.PLUGIN_ID + "." + "tools_excelexport_wizard" );
+        PlatformUI.getWorkbench().getHelpSystem().setHelp( toPage.getControl(),
+            BrowserUIPlugin.PLUGIN_ID + "." + "tools_excelexport_wizard" );
     }
 
 

Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/ExportLdifWizard.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/ExportLdifWizard.java?view=diff&rev=499174&r1=499173&r2=499174
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/ExportLdifWizard.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/ExportLdifWizard.java Tue Jan 23 14:52:54 2007
@@ -22,6 +22,9 @@
 
 
 import org.apache.directory.ldapstudio.browser.core.jobs.ExportLdifJob;
+import org.apache.directory.ldapstudio.browser.ui.BrowserUIPlugin;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.PlatformUI;
 
 
 public class ExportLdifWizard extends ExportBaseWizard
@@ -50,6 +53,21 @@
         addPage( fromPage );
         toPage = new ExportLdifToWizardPage( ExportLdifToWizardPage.class.getName(), this );
         addPage( toPage );
+    }
+    
+    
+    /**
+     * {@inheritDoc}
+     */
+    public void createPageControls( Composite pageContainer )
+    {
+        super.createPageControls( pageContainer );
+        
+        // set help context ID
+        PlatformUI.getWorkbench().getHelpSystem().setHelp( fromPage.getControl(),
+            BrowserUIPlugin.PLUGIN_ID + "." + "tools_ldifexport_wizard" );
+        PlatformUI.getWorkbench().getHelpSystem().setHelp( toPage.getControl(),
+            BrowserUIPlugin.PLUGIN_ID + "." + "tools_ldifexport_wizard" );
     }
 
 

Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/ImportDsmlWizard.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/ImportDsmlWizard.java?view=diff&rev=499174&r1=499173&r2=499174
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/ImportDsmlWizard.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/ImportDsmlWizard.java Tue Jan 23 14:52:54 2007
@@ -30,10 +30,13 @@
 import org.apache.directory.ldapstudio.browser.core.model.IEntry;
 import org.apache.directory.ldapstudio.browser.core.model.ISearchResult;
 import org.apache.directory.ldapstudio.browser.core.model.IValue;
+import org.apache.directory.ldapstudio.browser.ui.BrowserUIPlugin;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.IImportWizard;
 import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.PlatformUI;
 
 /**
  * This class implements the Import DSML Wizard.
@@ -161,8 +164,21 @@
     {
         mainPage = new ImportDsmlMainWizardPage( ImportDsmlMainWizardPage.class.getName(), this );
         addPage( mainPage );
-
     }
+    
+    
+    /**
+     * {@inheritDoc}
+     */
+    public void createPageControls( Composite pageContainer )
+    {
+        super.createPageControls( pageContainer );
+        
+        // set help context ID
+        PlatformUI.getWorkbench().getHelpSystem().setHelp( mainPage.getControl(),
+            BrowserUIPlugin.PLUGIN_ID + "." + "tools_dsmlimport_wizard" );
+    }
+    
     
     /**
      * Get the connection attached to the Import

Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/ImportLdifWizard.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/ImportLdifWizard.java?view=diff&rev=499174&r1=499173&r2=499174
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/ImportLdifWizard.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/ImportLdifWizard.java Tue Jan 23 14:52:54 2007
@@ -34,6 +34,7 @@
 
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.IImportWizard;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.PlatformUI;
@@ -113,11 +114,20 @@
     {
         mainPage = new ImportLdifMainWizardPage( ImportLdifMainWizardPage.class.getName(), this );
         addPage( mainPage );
-
-//        PlatformUI.getWorkbench().getHelpSystem().setHelp( getContainer().getShell(),
-//            BrowserUIPlugin.PLUGIN_ID + "." + "tools_ldifimport_wizard" );
     }
-
+    
+    
+    /**
+     * {@inheritDoc}
+     */
+    public void createPageControls( Composite pageContainer )
+    {
+        super.createPageControls( pageContainer );
+        
+        PlatformUI.getWorkbench().getHelpSystem().setHelp( mainPage.getControl(),
+            BrowserUIPlugin.PLUGIN_ID + "." + "tools_ldifimport_wizard" );
+    }
+    
 
     public boolean performFinish()
     {

Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/NewConnectionWizard.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/NewConnectionWizard.java?view=diff&rev=499174&r1=499173&r2=499174
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/NewConnectionWizard.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/NewConnectionWizard.java Tue Jan 23 14:52:54 2007
@@ -31,6 +31,7 @@
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.wizard.IWizardPage;
 import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.INewWizard;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.PlatformUI;
@@ -87,8 +88,22 @@
 
         optionsPage = new NewConnectionOptionsWizardPage( NewConnectionOptionsWizardPage.class.getName(), this );
         addPage( optionsPage );
+    }
+
 
-        PlatformUI.getWorkbench().getHelpSystem().setHelp( getContainer().getShell(),
+    /**
+     * {@inheritDoc}
+     */
+    public void createPageControls( Composite pageContainer )
+    {
+        super.createPageControls( pageContainer );
+        
+        // set help context ID
+        PlatformUI.getWorkbench().getHelpSystem().setHelp( mainPage.getControl(),
+            BrowserUIPlugin.PLUGIN_ID + "." + "tools_newconnection_wizard" );
+        PlatformUI.getWorkbench().getHelpSystem().setHelp( authPage.getControl(),
+            BrowserUIPlugin.PLUGIN_ID + "." + "tools_newconnection_wizard" );
+        PlatformUI.getWorkbench().getHelpSystem().setHelp( optionsPage.getControl(),
             BrowserUIPlugin.PLUGIN_ID + "." + "tools_newconnection_wizard" );
     }
 

Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/NewEntryWizard.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/NewEntryWizard.java?view=diff&rev=499174&r1=499173&r2=499174
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/NewEntryWizard.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/wizards/NewEntryWizard.java Tue Jan 23 14:52:54 2007
@@ -152,10 +152,27 @@
             IWizardPage page = new DummyWizardPage();
             addPage( page );
         }
+    }
+
 
-        PlatformUI.getWorkbench().getHelpSystem().setHelp( getContainer().getShell(),
+    /**
+     * {@inheritDoc}
+     */
+    public void createPageControls( Composite pageContainer )
+    {
+        super.createPageControls( pageContainer );
+        
+        // set help context ID
+        PlatformUI.getWorkbench().getHelpSystem().setHelp( typePage.getControl(),
+            BrowserUIPlugin.PLUGIN_ID + "." + "tools_newentry_wizard" );
+        PlatformUI.getWorkbench().getHelpSystem().setHelp( ocPage.getControl(),
+            BrowserUIPlugin.PLUGIN_ID + "." + "tools_newentry_wizard" );
+        PlatformUI.getWorkbench().getHelpSystem().setHelp( dnPage.getControl(),
+            BrowserUIPlugin.PLUGIN_ID + "." + "tools_newentry_wizard" );
+        PlatformUI.getWorkbench().getHelpSystem().setHelp( attributePage.getControl(),
             BrowserUIPlugin.PLUGIN_ID + "." + "tools_newentry_wizard" );
     }
+
 
     class DummyWizardPage extends WizardPage
     {