Updated Application and Window Icons to new 4diac Logo

plugins/org.eclipse.fordiac.ide.product/org.eclipse.fordiac.ide.product

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="4diac IDE" uid="org.eclipse.fordiac.ide.product" id="org.eclipse.fordiac.ide.product" application="org.eclipse.ui.ide.workbench" version="2.0.1.qualifier" type="features" includeLaunchers="true" autoIncludeRequirements="true">
+<product name="4diac IDE" uid="org.eclipse.fordiac.ide.product" id="org.eclipse.fordiac.ide.product" application="org.eclipse.ui.ide.workbench" version="3.0.0.qualifier" type="features" includeLaunchers="true" autoIncludeRequirements="true">
 
    <aboutInfo>
       <image path="/org.eclipse.fordiac.ide.images/images/dialog.png"/>
@@ -34,16 +34,16 @@
       </vmArgsMac>
    </launcherArgs>
 
-   <windowImages i16="/org.eclipse.fordiac.ide/icons/fordiac16.png" i32="/org.eclipse.fordiac.ide/icons/fordiac32.png" i48="/org.eclipse.fordiac.ide/icons/fordiac48.png" i256="/org.eclipse.fordiac.ide/icons/fordiac256.png"/>
+   <windowImages i16="/org.eclipse.fordiac.ide/icons/4diac16.png" i32="/org.eclipse.fordiac.ide/icons/4diac32.png" i48="/org.eclipse.fordiac.ide/icons/4diac48.png" i64="/org.eclipse.fordiac.ide/icons/4diac64.png" i128="/org.eclipse.fordiac.ide/icons/4diac128.png" i256="/org.eclipse.fordiac.ide/icons/4diac256.png"/>
 
    <splash
       location="org.eclipse.fordiac.ide"
       startupProgressRect="375,375,172,4" />
    <launcher name="4diac-ide">
-      <linux icon="/icons/fordiac.xpm"/>
-      <macosx icon="/icons/fordiac.icns"/>
+      <linux icon="/icons/4diac.xpm"/>
+      <macosx icon="/icons/4diac.icns"/>
       <win useIco="true">
-         <ico path="icons/fordiac.ico"/>
+         <ico path="/icons/4diac.ico"/>
          <bmp/>
       </win>
    </launcher>
@@ -53,6 +53,7 @@
    <vm>
    </vm>
 
+
    <plugins>
    </plugins>
 

plugins/org.eclipse.fordiac.ide/META-INF/MANIFEST.MF

@@ -4,12 +4,13 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.fordiac.ide.ui,
  org.eclipse.fordiac.ide.systemmanagement
-Bundle-Vendor: Eclipse 4diac
+Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
 Bundle-Version: 3.0.0.qualifier
-Bundle-Name: Main
+Bundle-Name: %Bundle-Name
 Bundle-Activator: org.eclipse.fordiac.ide.Activator
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.fordiac.ide;singleton:=true
 Bundle-RequiredExecutionEnvironment: JavaSE-21
 Automatic-Module-Name: org.eclipse.fordiac.ide
+Bundle-Localization: plugin

plugins/org.eclipse.fordiac.ide/build.properties

@@ -5,11 +5,10 @@ bin.includes = plugin.xml,\
                .,\
                plugin_customization.ini,\
                splash.bmp,\
-               OSGI-INF/l10n/bundle.properties,\
+               plugin.properties,\
                about.mappings,\
                icons/,\
                intro/,\
-               OSGI-INF/,\
                html/,\
                html/toc.xml,\
                .options

plugins/org.eclipse.fordiac.ide/plugin.properties

@@ -0,0 +1,39 @@
+###############################################################################
+# Copyright (c) 2013, 2024 Profactor GbmH, fortiss GmbH, 
+#                          Johannes Kepler University Linz
+# 
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#   Gerhard Ebenhofer, Alois Zoitl
+#     - initial API and implementation and/or initial documentation
+###############################################################################
+
+#Properties file for org.eclipse.fordiac.ide
+aboutText = 4diac IDE \n\nVersion: {0}\nBuild id: {1}\n\n(c) Copyright Eclipse contributors and others 2007 - 2018. All rights reserved.\nVisit https://eclipse.dev/4diac/\n\nThis product includes software developed by other open source projects including the Apache Software Foundation, https://www.apache.org/.
+
+command.label = Show Error View
+
+Bundle-Vendor = Eclipse 4diac
+Bundle-Name = 4diac IDE Main Plug-in
+
+introTitle = Welcome to 4diac IDE
+introQuicklink.CloneFromGit.label = Clone Project from GIT Repository
+introQuicklink.CloneFromGit.description = Clone existing 4diac IDE projects from a GIT repository
+introQuicklink.CloseIntro.label = Continue to 4diac IDE
+introQuicklink.CloseIntro.description = Close welcome page and work on your projects
+introQuicklink.ImportProject.label = Import Existing Projects
+introQuicklink.ImportProject.description = Import existing 4diac IDE projects from the file system or an archive
+introQuicklink.New4diacIDEProject.label = Create New 4diac IDE Project
+introQuicklink.New4diacIDEProject.description = Create a new 4diac IDE IEC 61499 project with an Automation System
+
+perspective.name = System
+product.name = 4diac IDE
+
+FordiacLogListener_ErrorDialogDescription=We recommend to save your changes and restart 4diac IDE.\n\nPlease report this issue by submitting the details below\!
+FordiacLogListener_ErrorDialogTitle=Major Error Occurred\!
+FordiacLogListener_ReportIssue=Report Issue

plugins/org.eclipse.fordiac.ide/plugin.xml

@@ -54,10 +54,10 @@
          point="org.eclipse.core.runtime.products">
       <product
             application="org.eclipse.ui.ide.workbench"
-            name="4diac IDE">
+            name="%product.name">
          <property
                name="appName"
-               value="4diac IDE">
+               value="4diac IDE">  <!-- This string shall not be exported! --> 
          </property>
          <property
                name="aboutImage"
@@ -69,11 +69,11 @@
          </property>
          <property
                name="windowImages"
-               value="icons/fordiac16.png,icons/fordiac32.png,icons/fordiac48.png,icons/fordiac256.png">
+               value="icons/4diac16.png,icons/4diac32.png,icons/4diac48.png,icons/4diac64.png,icons/4diac128.png,icons/4diac256.png">
          </property>
          <property
                name="introTitle"
-               value="Welcome to 4diac IDE">
+               value="%introTitle">
          </property>
          <property
                name="introBrandingImageText"
@@ -157,22 +157,22 @@
          point="org.eclipse.ui.intro.quicklinks">
        <command
             id="org.eclipse.ui.newWizard(newWizardId=org.eclipse.fordiac.ide.systemmanagement.ui.wizard.New4diacProjectWizard)"
-            description="Create a new 4diac IDE project with an Automation System"
-            label="Create New Project"
+            description="%introQuicklink.New4diacIDEProject.description"
+            label="%introQuicklink.New4diacIDEProject.label"
             importance="medium"
             resolution="launchbar">
       </command>
        <command
             id="org.eclipse.ui.file.import(importWizardId=org.eclipse.ui.wizards.import.ExternalProject)"
-            description="Import existing 4diac IDE projects from the filesystem or an archive"
+            description="%introQuicklink.ImportProject.description"
             icon="platform:/plugin/org.eclipse.ui.intro.universal/themes/solstice/graphics/icons/ctool/import-existing-project.png"
-            label="Import Existing Projects"
+            label="%introQuicklink.ImportProject.label"
             resolution="launchbar">
       </command> 
       <command
             id="org.eclipse.ui.file.import(importWizardId=org.eclipse.egit.ui.internal.clone.GitCloneWizard)"
-            label="Clone Project from GIT Repository"
-            description="Clone existing 4diac IDE projects from a GIT repository"
+            label="%introQuicklink.CloneFromGit.label"
+            description="%introQuicklink.CloneFromGit.description"
             icon="platform:/plugin/org.eclipse.ui.intro.universal/themes/solstice/graphics/icons/ctool/egit-checkout.png"
             resolution="launchbar">
       </command>  
@@ -183,8 +183,8 @@
       </override>
        <url
             location="http://org.eclipse.ui.intro/close"
-            label="Continue to 4diac IDE"
-            description="Close welcome page and work on your projects"
+            label="%introQuicklink.CloseIntro.label"
+            description="%introQuicklink.CloseIntro.description"
             icon="platform:/plugin/org.eclipse.ui.intro.universal/themes/solstice/graphics/icons/ctool/workbench.png"
             importance="medium">
        </url>  

plugins/org.eclipse.fordiac.ide/src/org/eclipse/fordiac/ide/Messages.java

@@ -14,9 +14,10 @@
 
 import org.eclipse.osgi.util.NLS;
 
-@SuppressWarnings("squid:S3008")  // tell sonar the java naming convention does not make sense for this class
+@SuppressWarnings("squid:S3008") // tell sonar the java naming convention does not make sense for this class
 public final class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.fordiac.ide.messages"; //$NON-NLS-1$
+	private static final String BUNDLE_NAME = "plugin"; //$NON-NLS-1$
+
 	public static String FordiacLogListener_ErrorDialogDescription;
 	public static String FordiacLogListener_ErrorDialogTitle;
 	public static String FordiacLogListener_ReportIssue;