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

XML ID must be equal to the Configurable ID if it exists.

Browse Source
This commit is contained in:
Sergey Malenkov
2014-10-01 16:21:54 +04:00
parent 782338a996
commit 583a3f2e86
7 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/options/newEditor/SettingsEditor.java
+1 -1
View File
@@ -206,7 +206,7 @@ final class SettingsEditor extends AbstractEditor implements DataProvider {
if (configurable == null) {
String id = myProperties.getValue(SELECTED_CONFIGURABLE);
configurable = new ConfigurableVisitor.ByID(id != null ? id : "appearance").find(groups);
configurable = new ConfigurableVisitor.ByID(id != null ? id : "preferences.lookFeel").find(groups);
if (configurable == null) {
configurable = ConfigurableVisitor.ALL.find(groups);
}
platform/platform-resources/src/META-INF/LangExtensions.xml
+4 -4
View File
@@ -360,8 +360,8 @@
serviceImplementation="com.intellij.codeInspection.ex.ProjectInspectionProfilesVisibleTreeState"/>
<!-- Editor -->
<applicationConfigurable groupId="editor" groupWeight="190" instance="com.intellij.application.options.editor.EditorOptions" id="editor" key="title.editor"
bundle="messages.ApplicationBundle" order="after appearance"
<applicationConfigurable groupId="editor" groupWeight="190" instance="com.intellij.application.options.editor.EditorOptions" id="preferences.editor" key="title.editor"
bundle="messages.ApplicationBundle" order="after preferences.lookFeel"
childrenEPName="com.intellij.editorOptionsProvider"/>
<projectService serviceInterface="com.intellij.semantic.SemService" serviceImplementation="com.intellij.semantic.SemServiceImpl"/>
@@ -375,7 +375,7 @@
<applicationConfigurable groupId="editor" groupWeight="120" instance="com.intellij.openapi.fileTypes.impl.FileTypeConfigurable" id="preferences.fileTypes"
key="filetype.settings.title" bundle="messages.FileTypesBundle"/>
<applicationConfigurable groupId="editor" key="intention.settings" bundle="messages.CodeInsightBundle" instance="com.intellij.codeInsight.intention.impl.config.IntentionSettingsConfigurable" id="intentions"/>
<applicationConfigurable groupId="editor" key="intention.settings" bundle="messages.CodeInsightBundle" instance="com.intellij.codeInsight.intention.impl.config.IntentionSettingsConfigurable" id="preferences.intentionPowerPack"/>
<!-- Live Templates -->
<applicationConfigurable groupId="editor" groupWeight="130" instance="com.intellij.codeInsight.template.impl.LiveTemplatesConfigurable" id="editing.templates"
@@ -751,7 +751,7 @@
<psi.fileReferenceHelper implementation="com.intellij.psi.impl.source.resolve.reference.impl.providers.NullFileReferenceHelper" order="last"/>
<projectConfigurable groupId="editor" groupWeight="140" key="file.encodings.configurable" bundle="messages.IdeBundle" instance="com.intellij.openapi.vfs.encoding.FileEncodingConfigurable"/>
<projectConfigurable groupId="appearance" instance="com.intellij.ui.tabs.FileColorsConfigurable" id="fileColors" displayName="File Colors"/>
<projectConfigurable groupId="appearance" instance="com.intellij.ui.tabs.FileColorsConfigurable" id="reference.settings.ide.settings.file-colors" displayName="File Colors"/>
<uiDebuggerExtension implementation="com.intellij.ui.debugger.extensions.PlaybackDebugger"/>
<uiDebuggerExtension implementation="com.intellij.ui.debugger.extensions.ActionTracer"/>
platform/platform-resources/src/META-INF/PlatformExtensions.xml
+3 -3
View File
@@ -204,17 +204,17 @@
<applicationConfigurable groupId="appearance" groupWeight="120" key="title.general" bundle="messages.IdeBundle" id="preferences.general" instance="com.intellij.ide.GeneralSettingsConfigurable"/>
<!-- Appearance -->
<applicationConfigurable groupId="appearance" groupWeight="150" instance="com.intellij.ide.ui.AppearanceConfigurable" id="appearance" key="title.appearance"
<applicationConfigurable groupId="appearance" groupWeight="150" instance="com.intellij.ide.ui.AppearanceConfigurable" id="preferences.lookFeel" key="title.appearance"
bundle="messages.IdeBundle"/>
<!-- Keymap -->
<applicationConfigurable groupId="appearance" groupWeight="140" instance="com.intellij.openapi.keymap.impl.ui.KeymapPanel" id="preferences.keymap" key="keymap.display.name"
bundle="messages.KeyMapBundle"/>
<applicationConfigurable parentId="appearance" instance="com.intellij.openapi.keymap.impl.ui.QuickListsPanel" id="reference.idesettings.quicklists"
<applicationConfigurable parentId="preferences.lookFeel" instance="com.intellij.openapi.keymap.impl.ui.QuickListsPanel" id="reference.idesettings.quicklists"
displayName="Quick Lists"/>
<!-- Customizations -->
<applicationConfigurable parentId="appearance" instance="com.intellij.ide.ui.customization.CustomizationConfigurable" id="preferences.customizations"
<applicationConfigurable parentId="preferences.lookFeel" instance="com.intellij.ide.ui.customization.CustomizationConfigurable" id="preferences.customizations"
key="title.customizations" bundle="messages.IdeBundle"/>
<!-- Notifications -->
platform/platform-resources/src/META-INF/PlatformLangPlugin.xml
+1 -1
View File
@@ -81,7 +81,7 @@
<programRunner implementation="com.intellij.execution.runners.BasicProgramRunner" order="last"/>
<projectConfigurable groupId="editor" groupWeight="160" displayName="Inspections" provider="com.intellij.profile.codeInspection.ui.ProjectInspectionToolsConfigurableProvider" order="before intentions"/>
<projectConfigurable groupId="editor" groupWeight="160" displayName="Inspections" provider="com.intellij.profile.codeInspection.ui.ProjectInspectionToolsConfigurableProvider" order="before preferences.intentionPowerPack"/>
<projectConfigurable groupId="appearance" instance="com.intellij.ide.util.scopeChooser.ScopeChooserConfigurable" id="project.scopes" key="scopes.display.name" bundle="messages.IdeBundle" />
<checkoutCompletedListener implementation="com.intellij.openapi.vcs.checkout.PlatformProjectCheckoutListener" id="PlatformProjectCheckoutListener"/>
platform/platform-resources/src/META-INF/VcsExtensions.xml
+1 -1
View File
@@ -27,7 +27,7 @@
<search.topHitProvider implementation="com.intellij.openapi.vcs.configurable.VcsOptionsTopHitProvider"/>
<projectConfigurable groupId="root" groupWeight="45" dynamic="true" key="version.control.main.configurable.name" bundle="messages.VcsBundle"
provider="com.intellij.openapi.vcs.configurable.VcsManagerConfigurableProvider" id="vcs"/>
provider="com.intellij.openapi.vcs.configurable.VcsManagerConfigurableProvider" id="project.propVCSSupport.Mappings"/>
<changesViewContent tabName="Repository" className="com.intellij.openapi.vcs.changes.committed.CommittedChangesViewManager"
predicateClassName="com.intellij.openapi.vcs.changes.committed.CommittedChangesVisibilityPredicate"/>
resources-en/src/search/searchableOptions.xml
+13 -13
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<options>
<configurable id="fileColors" configurable_name="File Colors">
<configurable id="reference.settings.ide.settings.file-colors" configurable_name="File Colors">
<option name="" hit="" />
<option name="colors" hit="Enable File Colors" />
<option name="enable" hit="Enable File Colors" />
@@ -158,7 +158,7 @@
<option name="default" hit="Default project copyright:" />
<option name="project" hit="Default project copyright:" />
</configurable>
<configurable id="Configurable.PHP" configurable_name="PHP">
<configurable id="reference.webide.settings.project.settings.php" configurable_name="PHP">
<option name="" hit="" />
<option name="development" hit="Development environment" />
<option name="environment" hit="Development environment" />
@@ -1801,7 +1801,7 @@
<option name="found" hit="not found" />
<option name="not" hit="not found" />
</configurable>
<configurable id="Configurable.PHP.Debug.DBGPProxy" configurable_name="DBGp Proxy">
<configurable id="reference.settings.php.debug.xdebug.proxy" configurable_name="DBGp Proxy">
<option name="dbgp" hit="DBGp Proxy" />
<option name="proxy" hit="DBGp Proxy" />
<option name="host" hit="Host:" />
@@ -4128,7 +4128,7 @@
<option name="variable" hit="Static member variable" />
<option name="string" hit="String" />
</configurable>
<configurable id="editor" configurable_name="Editor">
<configurable id="preferences.editor" configurable_name="Editor">
<option name="" hit="" />
<option name="" hit=" Change font size (Zoom) with Ctrl+Mouse Wheel " />
<option name="change" hit=" Change font size (Zoom) with Ctrl+Mouse Wheel " />
@@ -4867,7 +4867,7 @@
<option name="" hit="" />
<option name="excludes" hit="Excludes" />
</configurable>
<configurable id="Configurable.PHP.PHPUnit" configurable_name="PHPUnit">
<configurable id="reference.webide.settings.project.settings.php.phpunit" configurable_name="PHPUnit">
<option name="" hit="" />
<option name="bootstrap" hit="Default bootstrap file:" />
<option name="default" hit="Default bootstrap file:" />
@@ -14600,7 +14600,7 @@
<option name="write" hit="Use &quot;safe write&quot; (save changes to a temporary file first)" />
<option name="sec" hit="sec." />
</configurable>
<configurable id="Configurable.PHP.Composer" configurable_name="Composer">
<configurable id="reference.webide.settings.project.settings.php.composer" configurable_name="Composer">
<option name="" hit="" />
<option name="composer" hit="Composer" />
<option name="composer" hit="Empty path to composer.phar" />
@@ -14717,7 +14717,7 @@
<option name="view" hit=" Select a scope to view or edit its details here " />
<option name="scopes" hit="Scopes" />
</configurable>
<configurable id="Configurable.PHP.MessDetector" configurable_name="Mess Detector">
<configurable id="com.jetbrains.php.tools.quality.messDetector.MessDetectorConfigurable" configurable_name="Mess Detector">
<option name="" hit="" />
<option name="files" hit="Ignored files:" />
<option name="ignored" hit="Ignored files:" />
@@ -17493,7 +17493,7 @@
<option name="modifier" hit="Wrap after modifier list" />
<option name="wrap" hit="Wrap after modifier list" />
</configurable>
<configurable id="Configurable.PHP.Servers" configurable_name="Servers">
<configurable id="settings.php.debug.servers" configurable_name="Servers">
<option name="" hit="" />
<option name="" hit=" " />
<option name="body" hit=" " />
@@ -19628,7 +19628,7 @@
<option name="tab" path="Tabs and Indents" hit="Use tab character" />
<option name="use" path="Tabs and Indents" hit="Use tab character" />
</configurable>
<configurable id="appearance" configurable_name="Appearance">
<configurable id="preferences.lookFeel" configurable_name="Appearance">
<option name="" hit="" />
<option name="" hit=" Automatically position mouse cursor on default button " />
<option name="automatically" hit=" Automatically position mouse cursor on default button " />
@@ -19993,7 +19993,7 @@
<option name="issue" hit="Issue Navigation" />
<option name="navigation" hit="Issue Navigation" />
</configurable>
<configurable id="Configurable.PHP.Smarty" configurable_name="Smarty">
<configurable id="reference.webide.settings.project.settings.smarty" configurable_name="Smarty">
<option name="changes" hit="Reopen editor for changes to take effect" />
<option name="editor" hit="Reopen editor for changes to take effect" />
<option name="effect" hit="Reopen editor for changes to take effect" />
@@ -21083,7 +21083,7 @@
<option name="password" hit="Password:" />
<option name="test" hit="Test" />
</configurable>
<configurable id="Configurable.PHP.Debug.SkippedPaths" configurable_name="Skipped Paths">
<configurable id="settings.php.debug.skipped.paths" configurable_name="Skipped Paths">
<option name="" hit="" />
<option name="about" hit="Notify about skipped files" />
<option name="files" hit="Notify about skipped files" />
@@ -21423,7 +21423,7 @@
<option name="line" hit="Use line comment" />
<option name="use" hit="Use line comment" />
</configurable>
<configurable id="Configurable.PHP.CodeSniffer" configurable_name="Code Sniffer">
<configurable id="com.jetbrains.php.tools.quality.phpcs.PhpCSConfigurable" configurable_name="Code Sniffer">
<option name="" hit="" />
<option name="code" hit="Code Sniffer" />
<option name="sniffer" hit="Code Sniffer" />
@@ -22593,7 +22593,7 @@
<option name="number" hit="Number" />
<option name="string" hit="String" />
</configurable>
<configurable id="Configurable.PHP.Debug" configurable_name="Debug">
<configurable id="reference.webide.settings.project.settings.php.debug" configurable_name="Debug">
<option name="" hit="" />
<option name="accept" hit="Can accept external connections" />
<option name="can" hit="Can accept external connections" />
resources/src/idea/RichPlatformPlugin.xml
+1 -1
View File
@@ -262,7 +262,7 @@
<applicationConfigurable groupId="build" instance="com.intellij.application.options.pathMacros.PathMacroConfigurable" id="preferences.pathVariables"
key="title.path.variables" bundle="messages.ApplicationBundle"/>
<applicationConfigurable parentId="editor" instance="com.intellij.execution.console.ConsoleFoldingConfigurable" id="Console Folding"
<applicationConfigurable parentId="preferences.editor" instance="com.intellij.execution.console.ConsoleFoldingConfigurable" id="Console Folding"
displayName="Console Folding"/>
<editorNotificationProvider implementation="com.intellij.codeInsight.daemon.impl.AttachSourcesNotificationProvider"/>