Return-Path: 
 <commits-return-14762-apmail-directory-commits-archive=directory.apache.org@directory.apache.org>
Delivered-To: apmail-directory-commits-archive@www.apache.org
Received: (qmail 57897 invoked from network); 26 Jul 2007 22:45:09 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 26 Jul 2007 22:45:09 -0000
Received: (qmail 28509 invoked by uid 500); 26 Jul 2007 22:45:10 -0000
Delivered-To: apmail-directory-commits-archive@directory.apache.org
Received: (qmail 28484 invoked by uid 500); 26 Jul 2007 22:45:10 -0000
Mailing-List: contact commits-help@directory.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@directory.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@directory.apache.org>
List-Post: <mailto:commits@directory.apache.org>
List-Id: <commits.directory.apache.org>
Reply-To: dev@directory.apache.org
Delivered-To: mailing list commits@directory.apache.org
Received: (qmail 28468 invoked by uid 99); 26 Jul 2007 22:45:10 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Jul 2007 15:45:10 -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; Thu, 26 Jul 2007 15:45:08 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id AB34D1A981A; Thu, 26 Jul 2007 15:44:46 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r560023 - in /directory/studio/trunk/studio-rcp:
 plugin.xml
 resources/icons/intro.gif
 src/main/java/org/apache/directory/studio/ApplicationActionBarAdvisor.java
 src/main/java/org/apache/directory/studio/view/ImageKeys.java
Date: Thu, 26 Jul 2007 22:44:46 -0000
To: commits@directory.apache.org
From: pamarcelot@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20070726224446.AB34D1A981A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: pamarcelot
Date: Thu Jul 26 15:44:44 2007
New Revision: 560023

URL: http://svn.apache.org/viewvc?view=rev&rev=560023
Log:
Added Intro icon in the Welcome screen and MenuItem.

Added:
    directory/studio/trunk/studio-rcp/resources/icons/intro.gif   (with props)
Modified:
    directory/studio/trunk/studio-rcp/plugin.xml
    directory/studio/trunk/studio-rcp/src/main/java/org/apache/directory/studio/ApplicationActionBarAdvisor.java
    directory/studio/trunk/studio-rcp/src/main/java/org/apache/directory/studio/view/ImageKeys.java

Modified: directory/studio/trunk/studio-rcp/plugin.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-rcp/plugin.xml?view=diff&rev=560023&r1=560022&r2=560023
==============================================================================
--- directory/studio/trunk/studio-rcp/plugin.xml (original)
+++ directory/studio/trunk/studio-rcp/plugin.xml Thu Jul 26 15:44:44 2007
@@ -70,8 +70,9 @@
    
       <extension
          point="org.eclipse.ui.intro">
-      <intro
-            class="org.eclipse.ui.intro.config.CustomizableIntroPart"
+      <intro
+            class="org.eclipse.ui.intro.config.CustomizableIntroPart"
+            icon="resources/icons/intro.gif"
             id="studio.intro">
       </intro>
       <introProductBinding

Added: directory/studio/trunk/studio-rcp/resources/icons/intro.gif
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-rcp/resources/icons/intro.gif?view=auto&rev=560023
==============================================================================
Binary file - no diff available.

Propchange: directory/studio/trunk/studio-rcp/resources/icons/intro.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

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=560023&r1=560022&r2=560023
==============================================================================
--- 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 Thu Jul 26 15:44:44 2007
@@ -99,6 +99,7 @@
     private IWorkbenchAction previousAction;
     private IWorkbenchAction introAction;
 
+
     /**
      * Creates a new instance of ApplicationActionBarAdvisor.
      *
@@ -129,82 +130,82 @@
         newAction = ActionFactory.NEW.create( window );
         register( newAction );
         newAction.setText( "New..." );
-        
+
         newDropDownAction = new NewWizardDropDownAction( window );
-//        new NavigationHistoryAction( window, false );
-        
+        //        new NavigationHistoryAction( window, false );
+
         openFileAction = new OpenFileAction( window );
-        register(openFileAction);
-        
+        register( openFileAction );
+
         closeAction = ActionFactory.CLOSE.create( window );
         register( closeAction );
-        
+
         closeAllAction = ActionFactory.CLOSE_ALL.create( window );
         register( closeAllAction );
 
         saveAction = ActionFactory.SAVE.create( window );
         register( saveAction );
-        
+
         saveAsAction = ActionFactory.SAVE_AS.create( window );
         register( saveAsAction );
 
         saveAllAction = ActionFactory.SAVE_ALL.create( window );
         register( saveAllAction );
-        
+
         printAction = ActionFactory.PRINT.create( window );
         register( printAction );
-        
+
         moveAction = ActionFactory.MOVE.create( window );
         register( moveAction );
-        
+
         renameAction = ActionFactory.RENAME.create( window );
         register( renameAction );
-        
+
         refreshAction = ActionFactory.REFRESH.create( window );
         register( refreshAction );
-        
+
         importAction = ActionFactory.IMPORT.create( window );
         register( importAction );
-        
+
         exportAction = ActionFactory.EXPORT.create( window );
         register( exportAction );
-        
+
         propertiesAction = ActionFactory.PROPERTIES.create( window );
         register( propertiesAction );
 
         exitAction = ActionFactory.QUIT.create( window );
         register( exitAction );
-        
+
         undoAction = ActionFactory.UNDO.create( window );
         register( undoAction );
-        
+
         redoAction = ActionFactory.REDO.create( window );
         register( redoAction );
-        
+
         cutAction = ActionFactory.CUT.create( window );
         register( cutAction );
-        
+
         copyAction = ActionFactory.COPY.create( window );
         register( copyAction );
-        
+
         pasteAction = ActionFactory.PASTE.create( window );
         register( pasteAction );
-        
+
         deleteAction = ActionFactory.DELETE.create( window );
         register( deleteAction );
-        
+
         selectAllAction = ActionFactory.SELECT_ALL.create( window );
         register( selectAllAction );
-        
+
         findAction = ActionFactory.FIND.create( window );
         register( findAction );
-        
+
         closePerspectiveAction = ActionFactory.CLOSE_PERSPECTIVE.create( window );
         register( closePerspectiveAction );
-        
+
         closeAllPerspectivesAction = ActionFactory.CLOSE_ALL_PERSPECTIVES.create( window );
         register( closeAllPerspectivesAction );
-        
+
         aboutAction = ActionFactory.ABOUT.create( window );
         aboutAction.setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Application.PLUGIN_ID,
             ImageKeys.ABOUT ) );
@@ -221,25 +222,25 @@
         register( updateAction );
 
         manageConfigurationAction = new ManageConfigurationAction( window );
-        manageConfigurationAction.setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Application.PLUGIN_ID,
-            ImageKeys.MANAGE_CONFIGURATION ) );
+        manageConfigurationAction.setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin(
+            Application.PLUGIN_ID, ImageKeys.MANAGE_CONFIGURATION ) );
         register( manageConfigurationAction );
 
         helpAction = ActionFactory.HELP_CONTENTS.create( window );
         register( helpAction );
-        
+
         dynamicHelpAction = ActionFactory.DYNAMIC_HELP.create( window );
         register( dynamicHelpAction );
-        
+
         viewsList = ContributionItemFactory.VIEWS_SHORTLIST.create( window );
         perspectivesList = ContributionItemFactory.PERSPECTIVES_SHORTLIST.create( window );
         reopenEditorsList = ContributionItemFactory.REOPEN_EDITORS.create( window );
-        
+
         reportABug = new ReportABugAction( window );
         reportABug.setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Application.PLUGIN_ID,
             ImageKeys.REPORT_BUG ) );
         register( reportABug );
-        
+
         forwardHistoryAction = ActionFactory.FORWARD_HISTORY.create( window );
         register( forwardHistoryAction );
 
@@ -251,9 +252,11 @@
 
         previousAction = ActionFactory.PREVIOUS.create( window );
         register( previousAction );
-        
-        introAction = ActionFactory.INTRO.create(window);
-        register(introAction);
+
+        introAction = ActionFactory.INTRO.create( window );
+        introAction.setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Application.PLUGIN_ID,
+            ImageKeys.INTRO ) );
+        register( introAction );
 
     }
 
@@ -307,7 +310,7 @@
         fileMenu.add( new GroupMarker( IWorkbenchActionConstants.MRU ) );
         fileMenu.add( new Separator() );
         fileMenu.add( exitAction );
-        
+
         // Populating Edit Menu
         editMenu.add( undoAction );
         editMenu.add( redoAction );
@@ -323,7 +326,7 @@
         editMenu.add( renameAction );
         editMenu.add( new Separator() );
         editMenu.add( findAction );
-        
+
         // Populating Navigate Menu
         navigateMenu.add( nextAction );
         navigateMenu.add( previousAction );
@@ -332,14 +335,14 @@
         navigateMenu.add( new Separator() );
         navigateMenu.add( backwardHistoryAction );
         navigateMenu.add( forwardHistoryAction );
-        
+
         // Window 
-        MenuManager perspectiveMenu = new MenuManager("Open Perspective", "openPerspective");
-        perspectiveMenu.add(perspectivesList);
-        windowMenu.add(perspectiveMenu);
-        MenuManager viewMenu = new MenuManager("Show View");
-        viewMenu.add(viewsList);
-        windowMenu.add(viewMenu);
+        MenuManager perspectiveMenu = new MenuManager( "Open Perspective", "openPerspective" );
+        perspectiveMenu.add( perspectivesList );
+        windowMenu.add( perspectiveMenu );
+        MenuManager viewMenu = new MenuManager( "Show View" );
+        viewMenu.add( viewsList );
+        windowMenu.add( viewMenu );
         windowMenu.add( new Separator() );
         windowMenu.add( closePerspectiveAction );
         windowMenu.add( closeAllPerspectivesAction );
@@ -386,5 +389,5 @@
         coolBar.add( new ToolBarContributionItem( navToolBar, IWorkbenchActionConstants.TOOLBAR_NAVIGATE ) );
 
     }
-    
+
 }

Modified: directory/studio/trunk/studio-rcp/src/main/java/org/apache/directory/studio/view/ImageKeys.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-rcp/src/main/java/org/apache/directory/studio/view/ImageKeys.java?view=diff&rev=560023&r1=560022&r2=560023
==============================================================================
--- directory/studio/trunk/studio-rcp/src/main/java/org/apache/directory/studio/view/ImageKeys.java (original)
+++ directory/studio/trunk/studio-rcp/src/main/java/org/apache/directory/studio/view/ImageKeys.java Thu Jul 26 15:44:44 2007
@@ -30,9 +30,10 @@
 public class ImageKeys
 {
     // Images for Actions
-    public static final String SHOW_PREFERENCES = "resources/icons/preferences.png"; //$NON-NLS-1$
     public static final String ABOUT = "resources/icons/about.png"; //$NON-NLS-1$
+    public static final String INTRO = "resources/icons/intro.gif"; //$NON-NLS-1$
+    public static final String MANAGE_CONFIGURATION = "resources/icons/manage-configuration.png"; //$NON-NLS-1$
     public static final String REPORT_BUG = "resources/icons/bug-report.png"; //$NON-NLS-1$
     public static final String SEARCH_UPDATES = "resources/icons/search-updates.png"; //$NON-NLS-1$
-    public static final String MANAGE_CONFIGURATION = "resources/icons/manage-configuration.png"; //$NON-NLS-1$
+    public static final String SHOW_PREFERENCES = "resources/icons/preferences.png"; //$NON-NLS-1$
 }