MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

i18n for color&fonts

Browse Source 
GitOrigin-RevId: 7e63c3818a306177f4b44a6e45b69fdab3a43de1
This commit is contained in:
Sergey Ignatov
2020-01-13 22:35:31 +00:00
committed by intellij-monorepo-bot
parent 081f7bcb3a
commit c7f2007a99
4 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/application/options/colors/ColorAndFontOptions.java
+8 -6
View File
@@ -10,7 +10,6 @@ import com.intellij.execution.impl.ConsoleViewUtil;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.actionSystem.DataContext;
import com.intellij.openapi.application.ApplicationBundle;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.colors.*;
import com.intellij.openapi.editor.colors.ex.DefaultColorSchemesManager;
@@ -68,7 +67,6 @@ public class ColorAndFontOptions extends SearchableConfigurable.Parent.Abstract
private static final Logger LOG = Logger.getInstance(ColorAndFontOptions.class);
public static final String ID = "reference.settingsdialog.IDE.editor.colors";
public static final String FONT_CONFIGURABLE_NAME = "Color Scheme Font";
private Map<String, MyColorScheme> mySchemes;
private MyColorScheme mySelectedScheme;
@@ -470,12 +468,16 @@ public class ColorAndFontOptions extends SearchableConfigurable.Parent.Abstract
return new ArrayList<>(extensions);
}
public static String getFontConfigurableName() {
return ApplicationBundle.message("title.colors.scheme.font");
}
private static class FontConfigurableFactory implements ColorAndFontPanelFactoryEx {
@Override
@NotNull
public NewColorAndFontPanel createPanel(@NotNull ColorAndFontOptions options) {
FontEditorPreview previewPanel = new FontEditorPreview(()->options.getSelectedScheme(), true);
return new NewColorAndFontPanel(new SchemesPanel(options, 0), new FontOptions(options), previewPanel, FONT_CONFIGURABLE_NAME, null, null){
return new NewColorAndFontPanel(new SchemesPanel(options, 0), new FontOptions(options), previewPanel, getFontConfigurableName(), null, null){
@Override
public boolean containsFontOptions() {
return true;
@@ -486,7 +488,7 @@ public class ColorAndFontOptions extends SearchableConfigurable.Parent.Abstract
@Override
@NotNull
public String getPanelDisplayName() {
return FONT_CONFIGURABLE_NAME;
return getFontConfigurableName();
}
@Override
@@ -505,7 +507,7 @@ public class ColorAndFontOptions extends SearchableConfigurable.Parent.Abstract
return ConsoleViewUtil.updateConsoleColorScheme(selectedScheme);
}
};
return new NewColorAndFontPanel(new SchemesPanel(options, 0), new ConsoleFontOptions(options), previewPanel, "Font", null, null){
return new NewColorAndFontPanel(new SchemesPanel(options, 0), new ConsoleFontOptions(options), previewPanel, ApplicationBundle.message("label.font.type"), null, null){
@Override
public boolean containsFontOptions() {
return true;
@@ -516,7 +518,7 @@ public class ColorAndFontOptions extends SearchableConfigurable.Parent.Abstract
@Override
@NotNull
public String getPanelDisplayName() {
return "Console Font";
return ApplicationBundle.message("title.console.font");
}
@NotNull
platform/platform-impl/src/com/intellij/application/options/colors/ConsoleFontOptions.java
+1 -1
View File
@@ -39,7 +39,7 @@ public class ConsoleFontOptions extends FontOptions {
if (allSettings != null) {
ColorAndFontOptions colorAndFontOptions = allSettings.find(ColorAndFontOptions.class);
if (colorAndFontOptions != null) {
Configurable editorFontConfigurable = colorAndFontOptions.findSubConfigurable(ColorAndFontOptions.FONT_CONFIGURABLE_NAME);
Configurable editorFontConfigurable = colorAndFontOptions.findSubConfigurable(ColorAndFontOptions.getFontConfigurableName());
if (editorFontConfigurable != null) {
allSettings.select(editorFontConfigurable);
}
platform/platform-impl/src/com/intellij/application/options/editor/fonts/AppEditorFontOptionsPanel.java
+1 -1
View File
@@ -179,7 +179,7 @@ public class AppEditorFontOptionsPanel extends AbstractFontOptionsPanel {
final Configurable colorSchemeConfigurable = allSettings.find(ColorAndFontOptions.ID);
if (colorSchemeConfigurable instanceof ColorAndFontOptions) {
Configurable fontOptions =
((ColorAndFontOptions)colorSchemeConfigurable).findSubConfigurable(ColorAndFontOptions.FONT_CONFIGURABLE_NAME);
((ColorAndFontOptions)colorSchemeConfigurable).findSubConfigurable(ColorAndFontOptions.getFontConfigurableName());
if (fontOptions != null) {
allSettings.select(fontOptions);
}
platform/platform-resources-en/src/messages/ApplicationBundle.properties
+2
View File
@@ -640,6 +640,8 @@ file.status.color.menu.normal.text=UI Font Color
file.status.color.menu.reset.to.default=Default
title.scope.based=By Scope
title.colors.and.fonts=Color Scheme
title.colors.scheme.font=Color Scheme Font
title.console.font=Console Font
progress.analysing.font=Analysing font: {0}
group.editor.font=Editor Font
label.fallback.fonts.list.description=For symbols not supported by the main font