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.

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

Added JabRef logo as tiff for Mac OS installer (retina support) #5759 #6306

Merged
merged 2 commits into from
Apr 18, 2020

Conversation

Gena928
Copy link
Contributor

@Gena928 Gena928 commented Apr 17, 2020

Fixes #5759
Created JabRef logo as tiff for Mac OS installer (retina support). Tiff file for installer and it's png images:
masOS install images.zip

Settings for icons in Mac dmg install package:

  • JabRef & Applications icons are of 84 size (dmg file properties);
  • font size of JabRef icon & Applications icon - 12 px;

Comments

  • Change in CHANGELOG.md described (if applicable)
  • Tests created for changes (if applicable)
  • Manually tested changed features in running JabRef (always required)
  • Screenshots added in PR description (for UI changes)
  • Checked documentation: Is the information available and up to date? If not created an issue at https://github.com/JabRef/user-documentation/issues or, even better, submitted a pull request to the documentation repository.

@tobiasdiez
Copy link
Member

Thanks. I think the file needs to be named background_dmg.tiff and be placed in https://github.com/JabRef/jabref/tree/master/buildres/mac

@tobiasdiez
Copy link
Member

tobiasdiez commented Apr 18, 2020

Thanks!

We run into a strange bug from gitversion which is why the build currently fails. I'll merge now and hope the master branch builds without problem. Can you please check the build from builds.jabref.org/master/ in about 30 min and make sure that the build version looks fine as well (I don't have a mac sadly).

@tobiasdiez tobiasdiez merged commit 67ba45f into JabRef:master Apr 18, 2020
@Gena928
Copy link
Contributor Author

Gena928 commented Apr 18, 2020

Good day,
I downloaded pkg and dmg files from your link and starter JabRef. Works fine, it doesn't crashes.

@tobiasdiez
Copy link
Member

Perfect. I assume this also means that the dmg installer is shown correctly, right?

@Gena928
Copy link
Contributor Author

Gena928 commented Apr 18, 2020

Sorry, but it's still the same.
Screenshot 2020-04-18 at 13 40 32

@tobiasdiez
Copy link
Member

There was a problem in the build chain and the build wasn't updated. Can you please retry in 30 min. Thanks

@Siedlerchr
Copy link
Member

Probably the same reason why the plist file doesn't get copied. Do we need to specify the resource folder somewhere?

@Gena928
Copy link
Contributor Author

Gena928 commented Apr 18, 2020

Hello again,
dmg file is the same. I.e. old design.

@tobiasdiez
Copy link
Member

tobiasdiez commented Apr 18, 2020

It's only now uploading...you can verify that you are testing the new file by looking at the "Last modified" date on https://builds.jabref.org/master/ (which is currently 2020-04-14)
Progress: https://github.com/JabRef/jabref/runs/597737609

@Siedlerchr
Copy link
Member

Refs #5986 I just also pushed the --resource dir for mac switch

@Siedlerchr
Copy link
Member

Let's wait the current build. If it works it's fine, otherwise I found this helpful guide:
https://docs.oracle.com/en/java/javase/14/jpackage/override-jpackage-resources.html#GUID-1B718F8B-B68D-4D46-B1DB-003D7729AAB6

@Gena928
Copy link
Contributor Author

Gena928 commented Apr 18, 2020

dmg file as of "2020-04-18 15:25" looks the same. I.e. black background color.
If I press Command + Shift + . I can see the content of package, and looks like our new image is not there.
Screenshot 2020-04-18 at 15 31 54

The program works fine.

@Siedlerchr
Copy link
Member

I just renamed the file according to the docs. Waiting for the new build.

@Gena928
Copy link
Contributor Author

Gena928 commented Apr 18, 2020

2020-04-18 15:58
The same dmg file. I.e. just black background without image.

@Siedlerchr
Copy link
Member

I have created an issue at the jlink/jpackage gradle plugin repo:
beryx/badass-jlink-plugin#132

@tobiasdiez
Copy link
Member

@Gena928
Copy link
Contributor Author

Gena928 commented Apr 18, 2020

dmg file as of "2020-04-18 22:09".
Looks the same. But when I show hidden files (Command + Shift + .) I see our background image in one of the folders.
Screenshot 2020-04-18 at 22 19 54

A progress )).
Sorry, but I'm afraid I must ask a few questions. Let's say we solved the problem with background. But then:

  • how we are going to add "Applications" icon to dmg file?
  • how we are going to position JabRef icon & Applications icon?
    Those icons should be carefully positioned on a both sides of the arrow.
  • how we are going to increase the size of JabRef icon and Applications icon?
    84 size is required. Otherwise it looks ugly.

I can do it manually, using Mac "Disk Utility", but is it possible to do it automatically?
I'm sorry, if I'm asking those questions too late. I've never done it before.

@tobiasdiez
Copy link
Member

The position of the icon is hard-coded here:
https://github.com/openjdk/jdk/blob/master/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/DMGsetup.scpt
So I guess the background needs to be designed around this (unfortunately)

@Siedlerchr
Copy link
Member

@Gena928 No problem, this is new for us all. The jpackage tool is relatively new. The idea is relative simple, you provide the icons in the resource folders for the system like background and in the gradle file the locations are specified for each os:
You already have the svg file, so it should be possible to create a 84x84 icns version,

@tobiasdiez We can also modfiy the DMGgsetup script:
Using default package resource DMGsetup.scpt [DMG setup script] (add JabRef-dmg-setup.scpt to the resource-dir to customize).

From the log I saw that we also need images for the pgk build:

 Building PKG package for JabRef.
Using default package resource background_pkg.png [pkg background image] (add JabRef-background.png to the resource-dir to customize).
Using default package resource background_pkg.png [pkg background image] (add JabRef-background-darkAqua.png to the resource-dir to customize).

Using default package resource java.icns [volume icon] (add JabRef-volume.icns to the resource-dir to customize).

jabref/build.gradle

Lines 641 to 693 in 38e3aa7

if (OperatingSystem.current().isWindows()) {
// This requires WiX to be installed: https://github.com/wixtoolset/wix3/releases
installerType = "msi"
imageOptions = [
'--icon', "${projectDir}/src/main/resources/icons/jabref.ico",
]
installerOptions = [
'--vendor', 'JabRef',
'--app-version', "${project.version}",
'--verbose',
'--win-upgrade-uuid', 'd636b4ee-6f10-451e-bf57-c89656780e36',
'--win-dir-chooser',
'--win-shortcut',
'--temp', "$buildDir/installer",
'--resource-dir', "${projectDir}/buildres/windows",
'--file-associations', "${projectDir}/buildres/windows/bibtexAssociations.properties"
]
}
if (OperatingSystem.current().isLinux()) {
imageOptions = [
'--icon', "${projectDir}/src/main/resources/icons/JabRef-icon-64.png",
]
installerOptions = [
'--verbose',
'--vendor', 'JabRef',
'--app-version', "${project.version}",
// '--temp', "$buildDir/installer",
'--resource-dir', "${projectDir}/buildres/linux",
'--linux-menu-group', 'Office;',
'--linux-rpm-license-type', 'MIT',
// '--license-file', "${projectDir}/LICENSE.md",
'--description', 'JabRef is an open source bibliography reference manager. The native file format used by JabRef is BibTeX, the standard LaTeX bibliography format.',
'--linux-shortcut',
'--file-associations', "${projectDir}/buildres/linux/bibtexAssociations.properties"
]
}
if (OperatingSystem.current().isMacOsX()) {
imageOptions = [
'--icon', "${projectDir}/src/main/resources/icons/jabref.icns",
'--resource-dir', "${projectDir}/buildres/mac"
]
installerOptions = [
'--verbose',
'--vendor', 'JabRef',
'--app-version', "${project.version}",
'--file-associations', "${projectDir}/buildres/mac/bibtexAssociations.properties",
'--resource-dir', "${projectDir}/buildres/mac"
]
}
}

koppor pushed a commit that referenced this pull request Dec 1, 2022
bef74ed Create conservation-science-and-practice.csl (#6258)
9fb7eb7 Bug fixes triangle.csl (#6251)
e6112ba Update ucl-university-college-apa.csl (#6250)
6dcba3a Update engineering-technology-and-applied-science-research.csl (#6247)
00fe4a2 Create constructivist-foundations.csl (#6243)
03ad71b Create les-mondes-du-travail.csl (#6234)
a2bce86 Corrections based on author instructions (#6306)

git-subtree-dir: buildres/csl/csl-styles
git-subtree-split: bef74ed
koppor pushed a commit that referenced this pull request Dec 15, 2022
f6c778e Update emerald-harvard.csl (#6335)
d6c6a16 Fix Brazilian quotes on  chicago-author-date.csl (#6317)
a1549b6 Update medizinische-hochschule-hannover.csl (#6330)
da88073 Update journal-of-the-american-college-of-cardiology.csl (#6334)
a520d8e Bump nokogiri from 1.13.9 to 1.13.10 (#6333)
ba54b44 Update royal-society-of-chemistry.csl (#6328)
1378ba7 LUSEM: Remove full stop (#6332)
9e3cf89 Create interpreting.csl (#6254)
bef74ed Create conservation-science-and-practice.csl (#6258)
9fb7eb7 Bug fixes triangle.csl (#6251)
e6112ba Update ucl-university-college-apa.csl (#6250)
6dcba3a Update engineering-technology-and-applied-science-research.csl (#6247)
00fe4a2 Create constructivist-foundations.csl (#6243)
03ad71b Create les-mondes-du-travail.csl (#6234)
a2bce86 Corrections based on author instructions (#6306)

git-subtree-dir: buildres/csl/csl-styles
git-subtree-split: f6c778e
koppor pushed a commit that referenced this pull request Dec 17, 2022
84dba23 Update international-union-of-crystallography.csl (#6279)
13dd9e8 Update zeitschrift-fur-deutsche-philologie.csl (#6340)
d95b652 Create cahiers-mondes-anciens.csl (#6203)
ded567c Create rassegna-degli-archivi-di-stato-bibliografia-generale.csl (#6275)
124777a Create scientific-online-letters-on-the-atmosphere.csl (#6261)
3c276e7 Create american-medical-association-no-url-alphabetical.csl (#6252)
595ad95 Bump mathieudutour/github-tag-action from 6.0 to 6.1 (#6287)
7008128 Create cambridge-a (#6336)
17e930c Update norsk-apa-manual-note.csl (#6338)
b360859 Update norsk-apa-manual.csl (#6337)
f6c778e Update emerald-harvard.csl (#6335)
d6c6a16 Fix Brazilian quotes on  chicago-author-date.csl (#6317)
a1549b6 Update medizinische-hochschule-hannover.csl (#6330)
da88073 Update journal-of-the-american-college-of-cardiology.csl (#6334)
a520d8e Bump nokogiri from 1.13.9 to 1.13.10 (#6333)
ba54b44 Update royal-society-of-chemistry.csl (#6328)
1378ba7 LUSEM: Remove full stop (#6332)
9e3cf89 Create interpreting.csl (#6254)
bef74ed Create conservation-science-and-practice.csl (#6258)
9fb7eb7 Bug fixes triangle.csl (#6251)
e6112ba Update ucl-university-college-apa.csl (#6250)
6dcba3a Update engineering-technology-and-applied-science-research.csl (#6247)
00fe4a2 Create constructivist-foundations.csl (#6243)
03ad71b Create les-mondes-du-travail.csl (#6234)
a2bce86 Corrections based on author instructions (#6306)

git-subtree-dir: buildres/csl/csl-styles
git-subtree-split: 84dba23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add JabRef logo as tiff for Mac OS installer (retina support)
3 participants