Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 28591 invoked from network); 15 Jun 2007 12:09:21 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 15 Jun 2007 12:09:20 -0000 Received: (qmail 65339 invoked by uid 500); 15 Jun 2007 12:09:24 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 65299 invoked by uid 500); 15 Jun 2007 12:09:24 -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 65287 invoked by uid 99); 15 Jun 2007 12:09:24 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Jun 2007 05:09:24 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Jun 2007 05:09:19 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 99E871A981A; Fri, 15 Jun 2007 05:08:59 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r547642 - in /directory/studio/trunk: dependencies/eclipse/3.2/plugins/ studio-rcp/ studio-rcp/META-INF/ studio-rcp/resources/ studio-rcp/resources/intro/ studio-rcp/src/main/java/org/apache/directory/studio/ Date: Fri, 15 Jun 2007 12:08:58 -0000 To: commits@directory.apache.org From: pamarcelot@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070615120859.99E871A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: pamarcelot Date: Fri Jun 15 05:08:55 2007 New Revision: 547642 URL: http://svn.apache.org/viewvc?view=rev&rev=547642 Log: Fixed DIRSTUDIO-140 (Add Eclipse Intro mecanism to the Apache Directory Studio RCP plugin). Added: directory/studio/trunk/dependencies/eclipse/3.2/plugins/org.eclipse.ui.intro_3.2.1.R321_v20060810.jar (with props) directory/studio/trunk/studio-rcp/resources/intro/ directory/studio/trunk/studio-rcp/resources/intro/concept1.xhtml directory/studio/trunk/studio-rcp/resources/intro/concept2.xhtml directory/studio/trunk/studio-rcp/resources/intro/link_obj.gif (with props) directory/studio/trunk/studio-rcp/resources/intro/root.css directory/studio/trunk/studio-rcp/resources/intro/root.xhtml directory/studio/trunk/studio-rcp/resources/intro/shared.css directory/studio/trunk/studio-rcp/resources/intro/titlebanner.gif (with props) directory/studio/trunk/studio-rcp/resources/introContent.xml Modified: directory/studio/trunk/studio-rcp/META-INF/MANIFEST.MF directory/studio/trunk/studio-rcp/plugin.xml directory/studio/trunk/studio-rcp/src/main/java/org/apache/directory/studio/ApplicationActionBarAdvisor.java Added: directory/studio/trunk/dependencies/eclipse/3.2/plugins/org.eclipse.ui.intro_3.2.1.R321_v20060810.jar URL: http://svn.apache.org/viewvc/directory/studio/trunk/dependencies/eclipse/3.2/plugins/org.eclipse.ui.intro_3.2.1.R321_v20060810.jar?view=auto&rev=547642 ============================================================================== Binary file - no diff available. Propchange: directory/studio/trunk/dependencies/eclipse/3.2/plugins/org.eclipse.ui.intro_3.2.1.R321_v20060810.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: directory/studio/trunk/studio-rcp/META-INF/MANIFEST.MF URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-rcp/META-INF/MANIFEST.MF?view=diff&rev=547642&r1=547641&r2=547642 ============================================================================== --- directory/studio/trunk/studio-rcp/META-INF/MANIFEST.MF (original) +++ directory/studio/trunk/studio-rcp/META-INF/MANIFEST.MF Fri Jun 15 05:08:55 2007 @@ -9,7 +9,8 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.update.core, org.eclipse.update.ui, - org.eclipse.ui + org.eclipse.ui, + org.eclipse.ui.intro Eclipse-LazyStart: true Bundle-ClassPath: ., lib/nlog4j-1.2.24.jar Modified: directory/studio/trunk/studio-rcp/plugin.xml URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-rcp/plugin.xml?view=diff&rev=547642&r1=547641&r2=547642 ============================================================================== --- directory/studio/trunk/studio-rcp/plugin.xml (original) +++ directory/studio/trunk/studio-rcp/plugin.xml Fri Jun 15 05:08:55 2007 @@ -83,5 +83,32 @@ id="org.apache.directory.studio.rcp.ui.category" name="Apache Directory Studio RCP"/> + + + + + + + + + + + + + + + Added: directory/studio/trunk/studio-rcp/resources/intro/concept1.xhtml URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-rcp/resources/intro/concept1.xhtml?view=auto&rev=547642 ============================================================================== --- directory/studio/trunk/studio-rcp/resources/intro/concept1.xhtml (added) +++ directory/studio/trunk/studio-rcp/resources/intro/concept1.xhtml Fri Jun 15 05:08:55 2007 @@ -0,0 +1,15 @@ + + + + + Concept1.xhtml + + + + +

Welcome to My New Product

+

Concept One

+

This is where Concept One is explained.

+ + Added: directory/studio/trunk/studio-rcp/resources/intro/concept2.xhtml URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-rcp/resources/intro/concept2.xhtml?view=auto&rev=547642 ============================================================================== --- directory/studio/trunk/studio-rcp/resources/intro/concept2.xhtml (added) +++ directory/studio/trunk/studio-rcp/resources/intro/concept2.xhtml Fri Jun 15 05:08:55 2007 @@ -0,0 +1,15 @@ + + + + + Concept2.xhtml + + + + +

Welcome to My New Product

+

Concept Two

+

This is where Concept Two is explained.

+ + Added: directory/studio/trunk/studio-rcp/resources/intro/link_obj.gif URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-rcp/resources/intro/link_obj.gif?view=auto&rev=547642 ============================================================================== Binary file - no diff available. Propchange: directory/studio/trunk/studio-rcp/resources/intro/link_obj.gif ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: directory/studio/trunk/studio-rcp/resources/intro/root.css URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-rcp/resources/intro/root.css?view=auto&rev=547642 ============================================================================== --- directory/studio/trunk/studio-rcp/resources/intro/root.css (added) +++ directory/studio/trunk/studio-rcp/resources/intro/root.css Fri Jun 15 05:08:55 2007 @@ -0,0 +1,28 @@ +img { + width: 48px; + height: 48px; + vertical-align: middle; + } + +/* Give some space for main div.*/ +.page-style { + text-align: center; + margin-top:100px; + } + +/* satisfy Mozilla */ +body > div.page-style { + padding-left:30%; + } + + +#content { + text-align:left; + width:23em; + } + + + + + + Added: directory/studio/trunk/studio-rcp/resources/intro/root.xhtml URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-rcp/resources/intro/root.xhtml?view=auto&rev=547642 ============================================================================== --- directory/studio/trunk/studio-rcp/resources/intro/root.xhtml (added) +++ directory/studio/trunk/studio-rcp/resources/intro/root.xhtml Fri Jun 15 05:08:55 2007 @@ -0,0 +1,28 @@ + + + + + root.xhtml + + + + + +

Welcome to My New Product

+
+
+ + + Concept1 + Learn about Concept One... + + + + Concept2 + Learn about Concept Two... + +
+
+ + Added: directory/studio/trunk/studio-rcp/resources/intro/shared.css URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-rcp/resources/intro/shared.css?view=auto&rev=547642 ============================================================================== --- directory/studio/trunk/studio-rcp/resources/intro/shared.css (added) +++ directory/studio/trunk/studio-rcp/resources/intro/shared.css Fri Jun 15 05:08:55 2007 @@ -0,0 +1,45 @@ +/* Shared style applied to all pages */ +/* trick to get desired scroll bar behavior on all browsers */ +html { + overflow:auto; + border:0px; + height:100%; + } + + +body { + margin-left:14px; + margin-top:10px; + font-family:Tahoma; + font-size: 12px; + color:#000000; + background-image:url("./titlebanner.gif"); + background-repeat: repeat-x; + } + +h1 { + text-align:left; + font-size: 16pt; + font-weight:normal; + color:#E5E5E5; + } + +h4 { + color:#787878; + } + +a { + display:block; + font-family:Tahoma; + font-size: 12px; + color:#000000; + font-weight:normal; + text-decoration:none; + padding-bottom:20px; + } + +p { + padding-left:14px; + } + + Added: directory/studio/trunk/studio-rcp/resources/intro/titlebanner.gif URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-rcp/resources/intro/titlebanner.gif?view=auto&rev=547642 ============================================================================== Binary file - no diff available. Propchange: directory/studio/trunk/studio-rcp/resources/intro/titlebanner.gif ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: directory/studio/trunk/studio-rcp/resources/introContent.xml URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-rcp/resources/introContent.xml?view=auto&rev=547642 ============================================================================== --- directory/studio/trunk/studio-rcp/resources/introContent.xml (added) +++ directory/studio/trunk/studio-rcp/resources/introContent.xml Fri Jun 15 05:08:55 2007 @@ -0,0 +1,6 @@ + + + + + + Modified: directory/studio/trunk/studio-rcp/src/main/java/org/apache/directory/studio/ApplicationActionBarAdvisor.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-rcp/src/main/java/org/apache/directory/studio/ApplicationActionBarAdvisor.java?view=diff&rev=547642&r1=547641&r2=547642 ============================================================================== --- directory/studio/trunk/studio-rcp/src/main/java/org/apache/directory/studio/ApplicationActionBarAdvisor.java (original) +++ directory/studio/trunk/studio-rcp/src/main/java/org/apache/directory/studio/ApplicationActionBarAdvisor.java Fri Jun 15 05:08:55 2007 @@ -97,6 +97,7 @@ private IWorkbenchAction forwardHistoryAction; private IWorkbenchAction nextAction; private IWorkbenchAction previousAction; + private IWorkbenchAction introAction; /** * Creates a new instance of ApplicationActionBarAdvisor. @@ -250,6 +251,9 @@ previousAction = ActionFactory.PREVIOUS.create( window ); register( previousAction ); + + introAction = ActionFactory.INTRO.create(window); + register(introAction); } @@ -343,6 +347,8 @@ windowMenu.add( preferencesAction ); // Help + helpMenu.add( introAction ); + helpMenu.add( new Separator() ); helpMenu.add( helpAction ); helpMenu.add( dynamicHelpAction ); helpMenu.add( reportABug );