directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
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 GMT
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"/>
    </extension>
+   
+      <extension
+         point="org.eclipse.ui.intro">
+      <intro
+            class="org.eclipse.ui.intro.config.CustomizableIntroPart"
+            id="studio.intro">
+      </intro>
+      <introProductBinding
+            introId="studio.intro"
+            productId="org.apache.directory.studio.product">
+      </introProductBinding>
+   </extension>
+   <extension
+         point="org.eclipse.ui.intro.config">
+      <config
+            introId="studio.intro"
+            content="resources/intro.xml"
+            id="ApacheDirectoryStudio.configId">
+         <presentation
+               home-page-id="root">
+            <implementation
+                  kind="html"
+                  os="win32,linux,macosx">
+            </implementation>
+         </presentation>
+      </config>
+   </extension>
 
 </plugin>

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 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+       "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <title>Concept1.xhtml</title>
+  <link rel="stylesheet" href="shared.css" type="text/css" />	
+  </head>
+
+<body>
+<h1>Welcome to My New Product</h1>
+<h4>Concept One</h4>
+<p>This is where Concept One is explained.</p>
+</body>
+</html>

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 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+       "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <title>Concept2.xhtml</title>
+  <link rel="stylesheet" href="shared.css" type="text/css" />
+  </head>
+
+<body>
+<h1>Welcome to My New Product</h1>
+<h4>Concept Two</h4>
+<p>This is where Concept Two is explained.</p>
+</body>
+</html>

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 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+       "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <title>root.xhtml</title>
+  <link rel="stylesheet" href="shared.css" type="text/css" />
+  <link rel="stylesheet" href="root.css" type="text/css" />
+  </head>
+
+<body> 
+<h1>Welcome to My New Product</h1>
+<div class="page-style">
+  <div id="content"> 	
+	
+		<a href="http://org.eclipse.ui.intro/showPage?id=concept1" id="firstLink">
+			<img border="0" src="link_obj.gif" alt="Concept1" />
+			Learn about Concept One... 
+		</a>
+	
+		<a href="http://org.eclipse.ui.intro/showPage?id=concept2">
+			<img border="0" src="link_obj.gif" alt="Concept2" />
+			Learn about Concept Two...</a>
+	<anchor id="anchor1" /> 
+  </div> 
+</div>
+</body>
+</html>

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 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<introContent>
+    <page id="root" content="content/root.xhtml"/>
+    <page id="concept1" content="content/concept1.xhtml"/>
+    <page id="concept2" content="content/concept2.xhtml"/>
+</introContent>

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 );



Mime
View raw message