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

show correct product name in File Encodings settings (PY-2069)

Browse Source
This commit is contained in:
Dmitry Jemerov
2010-10-08 17:30:16 +04:00
parent ed297a1de5
commit bdb381f9fd
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/openapi/vfs/encoding/FileEncodingConfigurable.form
+2 -2
View File
@@ -8,7 +8,7 @@
<properties/>
<border type="none" title=""/>
<children>
<component id="e9af6" class="javax.swing.JLabel">
<component id="e9af6" class="javax.swing.JLabel" binding="myTitleLabel">
<constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
@@ -16,7 +16,7 @@
<text resource-bundle="messages/IdeBundle" key="encodings.dialog.caption"/>
</properties>
</component>
<scrollpane class="com.intellij.ui.components.JBScrollPane" id="fe0c3" binding="myTreePanel" custom-create="true">
<scrollpane id="fe0c3" class="com.intellij.ui.components.JBScrollPane" binding="myTreePanel" custom-create="true">
<constraints>
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="7" hsize-policy="7" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints>
platform/lang-impl/src/com/intellij/openapi/vfs/encoding/FileEncodingConfigurable.java
+7 -1
View File
@@ -21,7 +21,11 @@ import com.intellij.ide.IdeBundle;
import com.intellij.openapi.actionSystem.ActionManager;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.Presentation;
import com.intellij.openapi.options.*;
import com.intellij.openapi.application.ApplicationNamesInfo;
import com.intellij.openapi.options.ConfigurationException;
import com.intellij.openapi.options.NonDefaultProjectConfigurable;
import com.intellij.openapi.options.OptionalConfigurable;
import com.intellij.openapi.options.SearchableConfigurable;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Comparing;
import com.intellij.openapi.util.IconLoader;
@@ -51,10 +55,12 @@ public class FileEncodingConfigurable implements SearchableConfigurable, NonDefa
private JPanel myPropertiesFilesEncodingCombo;
private Charset mySelectedCharsetForPropertiesFiles;
private JComboBox myIdeEncodingsCombo;
private JLabel myTitleLabel;
private ChooseFileEncodingAction myAction;
public FileEncodingConfigurable(Project project) {
myProject = project;
myTitleLabel.setText(myTitleLabel.getText().replace("$productName", ApplicationNamesInfo.getInstance().getFullProductName()));
}
@Nls
platform/platform-resources-en/src/messages/IdeBundle.properties
+1 -1
View File
@@ -1042,7 +1042,7 @@ finished.with.exit.code.text.message=Process finished with exit code {0}
# Encodings
file.encodings.configurable=File Encodings
encodings.dialog.caption=<html><body>\
To change encoding IntelliJ IDEA uses for a file, directory, or an entire project,<br>\
To change encoding $productName uses for a file, directory, or an entire project,<br>\
click an item and then select encoding from the Default Encoding list.<br>\
Notes:<br>\
Built-in file encoding (e.g. JSP, HTML or XML) overrides encoding you specify here.<br>\