Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 14597 invoked from network); 5 Oct 2008 10:49:05 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 5 Oct 2008 10:49:05 -0000 Received: (qmail 96577 invoked by uid 500); 5 Oct 2008 10:49:04 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 96535 invoked by uid 500); 5 Oct 2008 10:49:04 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 96522 invoked by uid 99); 5 Oct 2008 10:49:04 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 05 Oct 2008 03:49:03 -0700 X-ASF-Spam-Status: No, hits=-1998.8 required=10.0 tests=ALL_TRUSTED,DNS_FROM_DOB,RCVD_IN_DOB X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 05 Oct 2008 10:48:09 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 84129238889D; Sun, 5 Oct 2008 03:48:44 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r701774 - in /directory/studio/trunk: connection-ui/src/main/java/org/apache/directory/studio/connection/ui/wizards/ ldapbrowser-help/ ldapbrowser-help/src/main/resources/ Date: Sun, 05 Oct 2008 10:48:44 -0000 To: commits@directory.apache.org From: seelmann@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081005104844.84129238889D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: seelmann Date: Sun Oct 5 03:48:43 2008 New Revision: 701774 URL: http://svn.apache.org/viewvc?rev=701774&view=rev Log: Fixed dynamc help Added: directory/studio/trunk/ldapbrowser-help/src/main/resources/contexts-connection-ui.xml - copied, changed from r701629, directory/studio/trunk/ldapbrowser-help/plugin.xml directory/studio/trunk/ldapbrowser-help/src/main/resources/contexts-ldapbrowser-common.xml directory/studio/trunk/ldapbrowser-help/src/main/resources/contexts-ldapbrowser-ui.xml - copied, changed from r701629, directory/studio/trunk/ldapbrowser-help/src/main/resources/contexts.xml Modified: directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/wizards/NewConnectionWizard.java directory/studio/trunk/ldapbrowser-help/plugin.xml directory/studio/trunk/ldapbrowser-help/src/main/resources/contexts.xml Modified: directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/wizards/NewConnectionWizard.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/wizards/NewConnectionWizard.java?rev=701774&r1=701773&r2=701774&view=diff ============================================================================== --- directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/wizards/NewConnectionWizard.java (original) +++ directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/wizards/NewConnectionWizard.java Sun Oct 5 03:48:43 2008 @@ -35,6 +35,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.INewWizard; import org.eclipse.ui.IWorkbench; +import org.eclipse.ui.PlatformUI; /** @@ -126,12 +127,11 @@ { super.createPageControls( pageContainer ); - // TODO: set help context ID, move help from browser-help plugin to connections-help plugin - // for ( NewConnectionWizardPage wizardPage : wizardPages ) - // { - // PlatformUI.getWorkbench().getHelpSystem().setHelp( wizardPage.getControl(), - // ConnectionUIPlugin.PLUGIN_ID + "." + "tools_newconnection_wizard" ); - // } + for ( NewConnectionWizardPage wizardPage : wizardPages ) + { + PlatformUI.getWorkbench().getHelpSystem().setHelp( wizardPage.getControl(), + ConnectionUIConstants.PLUGIN_ID + "." + "tools_newconnection_wizard" ); + } } Modified: directory/studio/trunk/ldapbrowser-help/plugin.xml URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-help/plugin.xml?rev=701774&r1=701773&r2=701774&view=diff ============================================================================== --- directory/studio/trunk/ldapbrowser-help/plugin.xml (original) +++ directory/studio/trunk/ldapbrowser-help/plugin.xml Sun Oct 5 03:48:43 2008 @@ -19,11 +19,16 @@ under the License. --> - - + + + + + + + Copied: directory/studio/trunk/ldapbrowser-help/src/main/resources/contexts-connection-ui.xml (from r701629, directory/studio/trunk/ldapbrowser-help/plugin.xml) URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-help/src/main/resources/contexts-connection-ui.xml?p2=directory/studio/trunk/ldapbrowser-help/src/main/resources/contexts-connection-ui.xml&p1=directory/studio/trunk/ldapbrowser-help/plugin.xml&r1=701629&r2=701774&rev=701774&view=diff ============================================================================== --- directory/studio/trunk/ldapbrowser-help/plugin.xml (original) +++ directory/studio/trunk/ldapbrowser-help/src/main/resources/contexts-connection-ui.xml Sun Oct 5 03:48:43 2008 @@ -1,5 +1,5 @@ - + - - - - - - - - - + + + This wizard helps you to create a new connection to a LDAP directory. + + + + + + Added: directory/studio/trunk/ldapbrowser-help/src/main/resources/contexts-ldapbrowser-common.xml URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-help/src/main/resources/contexts-ldapbrowser-common.xml?rev=701774&view=auto ============================================================================== --- directory/studio/trunk/ldapbrowser-help/src/main/resources/contexts-ldapbrowser-common.xml (added) +++ directory/studio/trunk/ldapbrowser-help/src/main/resources/contexts-ldapbrowser-common.xml Sun Oct 5 03:48:43 2008 @@ -0,0 +1,36 @@ + + + + + + This wizard helps you to create a new entry in a LDAP directory. + + + + + + + + This wizard is used to create or edit an attribute. + + + + + Copied: directory/studio/trunk/ldapbrowser-help/src/main/resources/contexts-ldapbrowser-ui.xml (from r701629, directory/studio/trunk/ldapbrowser-help/src/main/resources/contexts.xml) URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-help/src/main/resources/contexts-ldapbrowser-ui.xml?p2=directory/studio/trunk/ldapbrowser-help/src/main/resources/contexts-ldapbrowser-ui.xml&p1=directory/studio/trunk/ldapbrowser-help/src/main/resources/contexts.xml&r1=701629&r2=701774&rev=701774&view=diff ============================================================================== --- directory/studio/trunk/ldapbrowser-help/src/main/resources/contexts.xml (original) +++ directory/studio/trunk/ldapbrowser-help/src/main/resources/contexts-ldapbrowser-ui.xml Sun Oct 5 03:48:43 2008 @@ -19,7 +19,6 @@ under the License. --> - The Connections view shows all the LDAP connections. @@ -57,26 +56,9 @@ The Modification Logs view shows all sucessful and failed modifications. - - This wizard helps you to create a new connection to a LDAP directory. - - - - - - - This wizard helps you to create a new entry in a LDAP directory. - - - - - - - - This wizard is used to create or edit an attribute. - - - + + The Search Logs view shows all sucessful and failed searches + In the LDAP Search page you can specify search parameters to query a directory. @@ -114,6 +96,4 @@ This wizard exports directory content to Excel files. - - Modified: directory/studio/trunk/ldapbrowser-help/src/main/resources/contexts.xml URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-help/src/main/resources/contexts.xml?rev=701774&r1=701773&r2=701774&view=diff ============================================================================== --- directory/studio/trunk/ldapbrowser-help/src/main/resources/contexts.xml (original) +++ directory/studio/trunk/ldapbrowser-help/src/main/resources/contexts.xml Sun Oct 5 03:48:43 2008 @@ -57,7 +57,12 @@ The Modification Logs view shows all sucessful and failed modifications. - + + The Search Logs view shows all sucessful and failed searches + + + + This wizard helps you to create a new connection to a LDAP directory.