From 4ec59a094ffb4b6fffc8a0e43d00b8fc27ac5497 Mon Sep 17 00:00:00 2001 From: Dmitry Batrak Date: Tue, 28 Jun 2016 19:35:39 +0300 Subject: [PATCH] show warning in settings UI when user enables ligatures, and IDE is not launched using bundled JRE (further updates) --- .../com/intellij/application/options/colors/FontOptions.java | 2 +- .../src/messages/ApplicationBundle.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/application/options/colors/FontOptions.java b/platform/lang-impl/src/com/intellij/application/options/colors/FontOptions.java index 1e6fb7761375..b133d5e02b09 100644 --- a/platform/lang-impl/src/com/intellij/application/options/colors/FontOptions.java +++ b/platform/lang-impl/src/com/intellij/application/options/colors/FontOptions.java @@ -105,7 +105,7 @@ public class FontOptions extends JPanel implements OptionsPanel{ myEnableLigaturesCheckbox.setBorder(null); panel.add(myEnableLigaturesCheckbox); JLabel warningIcon = new JLabel(AllIcons.General.BalloonWarning); - warningIcon.setToolTipText(ApplicationBundle.message("ligatures.jre.warning", ApplicationNamesInfo.getInstance().getProductName())); + warningIcon.setToolTipText(ApplicationBundle.message("ligatures.jre.warning", ApplicationNamesInfo.getInstance().getFullProductName())); warningIcon.setBorder(JBUI.Borders.emptyLeft(5)); updateWarningIconVisibility(warningIcon); panel.add(warningIcon); diff --git a/platform/platform-resources-en/src/messages/ApplicationBundle.properties b/platform/platform-resources-en/src/messages/ApplicationBundle.properties index 875aa7cf0d58..19ac3c9e7033 100644 --- a/platform/platform-resources-en/src/messages/ApplicationBundle.properties +++ b/platform/platform-resources-en/src/messages/ApplicationBundle.properties @@ -533,7 +533,7 @@ checkbox.show.only.monospaced.fonts=Show only monospaced fonts primary.font=Primary font: secondary.font=Secondary font: use.ligatures=Enable font ligatures -ligatures.jre.warning=Running {0} with bundled JRE is recommended.\nOther JREs have known functional and performance issues\nrelated to ligatures support. +ligatures.jre.warning=The JRE you are running {0} with might have\nfunctional and performance issues related to ligatures support.\nTo avoid such issues, run IntelliJ IDEA with the bundled JRE. editbox.enter.tag.name=Enter tag name: title.tag.name=Tag Name title.xml=XML