Changed some OOo icons by LibreOffice ones

9 files changed, 61 insertions, 28 deletions

diff --git a/core/about.ini b/core/about.ini
index 357d20d..c25da3c 100644
--- a/core/about.ini
+++ b/core/about.ini
@@ -10,10 +10,10 @@ aboutText=%blurb
 
 # Property "windowImage" contains path to window icon (16x16)
 # needed for primary features only
-windowImage=icons/ooo16.png
+windowImage=icons/libreoffice_16.png
 
 # Property "featureImage" contains path to feature image (32x32)
-featureImage=icons/ooo32.png
+featureImage=icons/libreoffice_32.png
 
 # Property "aboutImage" contains path to product image (500x330 or 115x164)
 # needed for primary features only
diff --git a/core/about.properties b/core/about.properties
index 55269e9..9f340df 100644
--- a/core/about.properties
+++ b/core/about.properties
@@ -1,8 +1,8 @@
-blurb=OpenOffice.org development plugin\n\
+blurb=LibreOffice development plugin\n\
 \n\
-Version: 1.0.3\n\
+Version: 1.2.0\n\
 \n\
 Copyright 2005-2006 by Sun Microsystems, Inc.\n\
-Copyright 2005-2006 by Cedric Bosdonnat\n\
-Visit: http://api.openoffice.org for more information \n\
-on OpenOffice.org development
\ No newline at end of file
+Copyright 2005-2010 by Cedric Bosdonnat\n\
+Visit: http://cedric.bosdonnat.free.fr/ooeclipseintegration\n\
+for more information on the development.
\ No newline at end of file
diff --git a/core/icons/libreoffice_16.png b/core/icons/libreoffice_16.png
new file mode 100644
index 0000000..5484fe9
--- /dev/null
+++ b/core/icons/libreoffice_16.png
diff --git a/core/icons/libreoffice_32.png b/core/icons/libreoffice_32.png
new file mode 100644
index 0000000..7c474eb
--- /dev/null
+++ b/core/icons/libreoffice_32.png
diff --git a/core/icons/ooo16.png b/core/icons/ooo16.png
deleted file mode 100644
index 9d45ec1..0000000
--- a/core/icons/ooo16.png
+++ /dev/null
diff --git a/core/icons/ooo32.png b/core/icons/ooo32.png
deleted file mode 100755
index f2e6e9e..0000000
--- a/core/icons/ooo32.png
+++ /dev/null
diff --git a/core/plugin.xml b/core/plugin.xml
index af031cb..48000f7 100644
--- a/core/plugin.xml
+++ b/core/plugin.xml
@@ -269,7 +269,7 @@
             delegateName="Open Office Launcher"
             id="org.openoffice.ide.eclipse.core.launchOpenOffice"
             modes="run,debug"
-            name="Open Office Application">
+            name="LibreOffice Application">
       </launchConfigurationType>
    </extension>
    <extension
@@ -292,7 +292,7 @@
             id="org.openoffice.ide.eclipse.core.UreLaunchIcon"/>
       <launchConfigurationTypeImage
             configTypeID="org.openoffice.ide.eclipse.core.launchOpenOffice"
-            icon="icons/ooo16.png"
+            icon="icons/libreoffice_16.png"
             id="org.openoffice.ide.eclipse.core.OfficeLaunchIcon">
       </launchConfigurationTypeImage>
    </extension>
@@ -306,7 +306,7 @@
             class="org.openoffice.ide.eclipse.core.wizards.PackageExportWizard"
             icon="/icons/export_package.gif"
             id="org.openoffice.ide.eclipse.core.export.package"
-            name="OpenOffice.org package"/>
+            name="LibreOffice package"/>
    </extension>
    <extension
          point="org.eclipse.ui.startup">
diff --git a/core/source/org/openoffice/ide/eclipse/core/launch/office/Messages.java b/core/source/org/openoffice/ide/eclipse/core/launch/office/Messages.java
index 5f362ec..1fa97f9 100644
--- a/core/source/org/openoffice/ide/eclipse/core/launch/office/Messages.java
+++ b/core/source/org/openoffice/ide/eclipse/core/launch/office/Messages.java
@@ -1,9 +1,45 @@
+/*************************************************************************

+ *

+ * The Contents of this file are made available subject to the terms of

+ * the GNU Lesser General Public License Version 2.1

+ *

+ * GNU Lesser General Public License Version 2.1

+ * =============================================

+ * Copyright 2010 by Dan Corneanu

+ *

+ * This library is free software; you can redistribute it and/or

+ * modify it under the terms of the GNU Lesser General Public

+ * License version 2.1, as published by the Free Software Foundation.

+ *

+ * This library is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

+ * Lesser General Public License for more details.

+ *

+ * You should have received a copy of the GNU Lesser General Public

+ * License along with this library; if not, write to the Free Software

+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,

+ * MA 02111-1307 USA

+ * 

+ * The Initial Developer of the Original Code is: Dan Corneanu.

+ *

+ * Copyright: 2010 by Dan Corneanu

+ *

+ * All Rights Reserved.

+ * 

+ ************************************************************************/

 package org.openoffice.ide.eclipse.core.launch.office;

 

 import org.eclipse.osgi.util.NLS;

 

+/**

+ * Messages for the package.

+ * 

+ * @author cdan

+ *

+ */

 public class Messages extends NLS {

-    private static final String BUNDLE_NAME = "org.openoffice.ide.eclipse.core.launch.office.messages"; //$NON-NLS-1$

+    

     public static String OfficeLaunchDelegate_LaunchError;

     public static String OfficeLaunchDelegate_LaunchErrorTitle;

     public static String OfficeTab_Options;

@@ -13,11 +49,19 @@ public class Messages extends NLS {
     public static String OfficeTab_UnoProject;

     public static String OfficeTab_ChkUseCleanUserInstallation;

     public static String OfficeTab_ChkUseCleanUserInstallation_ToolTip;

+    public static String OfficeTab_ProjectChooserTitle;

+    public static String OfficeTab_ProjectChooserMessage;

+    

+    private static final String BUNDLE_NAME = "org.openoffice.ide.eclipse.core.launch.office.messages"; //$NON-NLS-1$

+    

     static {

         // initialize resource bundle

         NLS.initializeMessages(BUNDLE_NAME, Messages.class);

     }

 

+    /**

+     * Private constructor.

+     */

     private Messages() {

     }

 }

diff --git a/core/source/org/openoffice/ide/eclipse/core/launch/office/messages.properties b/core/source/org/openoffice/ide/eclipse/core/launch/office/messages.properties
index 7d54f12..c455461 100644
--- a/core/source/org/openoffice/ide/eclipse/core/launch/office/messages.properties
+++ b/core/source/org/openoffice/ide/eclipse/core/launch/office/messages.properties
@@ -1,24 +1,13 @@
-<<<<<<< HEAD
-OfficeLaunchDelegate_LaunchError=Error Message
-OfficeLaunchDelegate_LaunchErrorTitle=Error Title
-OfficeTab_Configurationerror=Configuration Error
-OfficeTab_ProjectNameLabel=Project
-OfficeTab_Title=OpenOffice
-OfficeTab_UnoProject=UNO Project
-OfficeTab_Options=Options
-OfficeTab_ChkUseCleanUserInstallation=Use Clean User Installation
-OfficeTab_ChkUseCleanUserInstallation_ToolTip=Start OpenOffice with a temporary user profile so that we do not pollute the system installed user profile.
-OfficeLaunchDelegate_LaunchErrorTitle=Error Launching OpenOffice
-=======
 OfficeLaunchDelegate_LaunchError=Error Message

 OfficeLaunchDelegate_LaunchErrorTitle=Error Title

 OfficeTab_Configurationerror=Configuration Error

 OfficeTab_ProjectNameLabel=Project

-OfficeTab_Title=OpenOffice

+OfficeTab_Title=LibreOffice

 OfficeTab_UnoProject=UNO Project

 OfficeTab_Options=Options

 OfficeTab_ChkUseCleanUserInstallation=Use Clean User Installation

-OfficeTab_ChkUseCleanUserInstallation_ToolTip=Start OpenOffice with a temporary user profile so that we do not pollute the system installed user profile.

-OfficeLaunchDelegate_LaunchErrorTitle=Error Launching OpenOffice

->>>>>>> 2a46b52041f0f23b595e1cd433aaffec8fba6b2f
-OfficeLaunchDelegate_LaunchError=There was an exception launching OpenOffice.Please see the Error Log.
\ No newline at end of file
+OfficeTab_ChkUseCleanUserInstallation_ToolTip=Start LibreOffice with a temporary user profile so that we do not pollute the system installed user profile.

+OfficeLaunchDelegate_LaunchErrorTitle=Error Launching LibreOffice

+OfficeLaunchDelegate_LaunchError=There was an exception launching LibreOffice. Please see the Error Log.

+OfficeTab_ProjectChooserTitle=UNO Projet chooser

+OfficeTab_ProjectChooserMessage=Select the project to run
\ No newline at end of file