Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

545490/splash and about #65

Merged
merged 2 commits into from
Nov 27, 2019
Merged

545490/splash and about #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f0a5f0
Bug 545490 - [Passage] Provide logo for product
ruspl-afed Nov 27, 2019
6997bb1
Bug 545490 - [Passage] Provide logo for product
ruspl-afed Nov 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion bundles/org.eclipse.passage.loc.operator/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ bin.includes = META-INF/,\
css/,\
images/,\
about.html,\
about.mappings
about.mappings,\
splash.bmp

generateSourceReferences = true
Binary file added bundles/org.eclipse.passage.loc.operator/images/about.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 5 additions & 1 deletion bundles/org.eclipse.passage.loc.operator/plugin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@
name="appName"
value="%application.name">
</property>
<property
name="aboutImage"
value="images/about.png">
</property>
<property
name="aboutText"
value="%aboutText">
Expand All @@ -37,7 +41,7 @@
</property>
<property
name="windowImages"
value="images/loc16.png,images/loc32.png,images/loc48.png,images/loc64.png,images/loc128.png">
value="images/loc16.png,images/loc32.png,images/loc48.png,images/loc64.png">
</property>
<property
name="lifeCycleURI"
Expand Down
Binary file added bundles/org.eclipse.passage.loc.operator/splash.bmp
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions ...ipse.passage.loc.workbench/src/org/eclipse/passage/loc/workbench/dialogs/AboutDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
public class AboutDialog extends Dialog {

private static final String PRODUCT_NAME = "%product.name"; //$NON-NLS-1$
private static final String ABOUT_IMAGE = "%aboutImage"; //$NON-NLS-1$
private static final String ABOUT_IMAGE = "aboutImage"; //$NON-NLS-1$
private static final String ABOUT_TITLE = "%aboutTitle"; //$NON-NLS-1$

private static final String PRODUCT_BUNDLE_URL = "platform:/plugin/%s"; //$NON-NLS-1$
Expand Down Expand Up @@ -75,7 +75,7 @@ protected Control createDialogArea(Composite parent) {
base.setLayout(workLayout);
base.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));

String productImg = translations.translate(ABOUT_IMAGE, bundleUrl);
String productImg = applicationContext.getBrandingProperty(ABOUT_IMAGE);

if (productImg != null) {
URL url = getUrl(productImg);
Expand Down
11 changes: 6 additions & 5 deletions ...org.eclipse.passage.loc.operator.product/org.eclipse.passage.loc.operator.product.product
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,13 @@
</launcherArgs>

<windowImages
i16="/org.eclipse.passage.lco.operator/images/loc16.png"
i32="/org.eclipse.passage.lco.operator/images/loc32.png"
i48="/org.eclipse.passage.lco.operator/images/loc48.png"
i64="/org.eclipse.passage.lco.operator/images/loc64.png"
i128="/org.eclipse.passage.lco.operator/images/loc128.png"/>
i16="/org.eclipse.passage.loc.operator/images/loc16.png"
i32="/org.eclipse.passage.loc.operator/images/loc32.png"
i48="/org.eclipse.passage.loc.operator/images/loc48.png"
i64="/org.eclipse.passage.loc.operator/images/loc64.png"/>

<splash
location="org.eclipse.passage.loc.operator" />
<launcher name="PassageOperator">
<win useIco="false">
<png
Expand Down