summaryrefslogtreecommitdiff
path: root/resources/src/idea
diff options
context:
space:
mode:
Diffstat (limited to 'resources/src/idea')
-rw-r--r--resources/src/idea/JavaActions.xml3
-rw-r--r--resources/src/idea/RichPlatformActions.xml15
-rw-r--r--resources/src/idea/RichPlatformPlugin.xml7
3 files changed, 8 insertions, 17 deletions
diff --git a/resources/src/idea/JavaActions.xml b/resources/src/idea/JavaActions.xml
index bcfa7f37dda1..81a791f42208 100644
--- a/resources/src/idea/JavaActions.xml
+++ b/resources/src/idea/JavaActions.xml
@@ -162,9 +162,6 @@
<action id="Debugger.ViewText" class="com.intellij.debugger.actions.ViewTextAction">
<add-to-group group-id="XDebugger.ValueGroup" anchor="last"/>
</action>
- <action id="Debugger.ShowReferring" internal="true" class="com.intellij.debugger.actions.ShowReferringObjectsAction">
- <add-to-group group-id="XDebugger.ValueGroup" anchor="last"/>
- </action>
<action id="Debugger.CopyValue" class="com.intellij.debugger.actions.CopyValueAction"/>
<action id="Debugger.CompareValueWithClipboard" class="com.intellij.debugger.actions.CompareValueWithClipboardAction"/>
<action id="Debugger.CustomizeThreadsView" class="com.intellij.debugger.actions.CustomizeThreadsViewAction">
diff --git a/resources/src/idea/RichPlatformActions.xml b/resources/src/idea/RichPlatformActions.xml
index 562f7c4177c7..324f2fe29c6e 100644
--- a/resources/src/idea/RichPlatformActions.xml
+++ b/resources/src/idea/RichPlatformActions.xml
@@ -50,17 +50,10 @@
<action id="NewModule" class="com.intellij.openapi.roots.ui.configuration.actions.NewModuleAction"/>
<action id="ImportProject" class="com.intellij.ide.actions.ImportProjectAction" text="Import Project..."/>
<action id="ImportModule" class="com.intellij.ide.actions.ImportModuleAction" text="Import Module..."/>
- <action id="OpenProject" class="com.intellij.ide.actions.OpenProjectAction"/>
-
+ <action id="NewElement" class="com.intellij.ide.actions.NewElementAction"/>
<add-to-group group-id="FileOpenGroup" anchor="first"/>
</group>
- <action id="NewElement" class="com.intellij.ide.actions.NewElementAction">
- <add-to-group group-id="OpenProjectGroup" anchor="before" relative-to-action="OpenFile"/>
- </action>
- <group>
- <add-to-group group-id="ExportImportGroup" anchor="first"/>
- </group>
<action id="SaveAsNewFormat" class="com.intellij.ide.actions.SaveAsDirectoryBasedFormatAction" text="Save as Directory-Based Format...">
<add-to-group group-id="ExportImportGroup" anchor="last"/>
</action>
@@ -362,11 +355,9 @@
<!-- ****************************************************************** -->
<group id="WelcomeScreen.QuickStart.IDEA">
- <action id="WelcomeScreen.CreateNewProject" class="com.intellij.ide.actions.NewProjectAction"
- icon="AllIcons.General.CreateNewProject"/>
+ <action id="WelcomeScreen.CreateNewProject" class="com.intellij.ide.actions.NewProjectAction" icon="AllIcons.General.CreateNewProject"/>
<action id="WelcomeScreen.ImportProject" class="com.intellij.ide.actions.ImportProjectAction" icon="AllIcons.General.ImportProject"/>
- <action id="WelcomeScreen.OpenProject" class="com.intellij.ide.actions.OpenFileAction"
- icon="AllIcons.General.OpenProject"/>
+ <action id="WelcomeScreen.OpenProject" class="com.intellij.ide.actions.OpenFileAction" icon="AllIcons.General.OpenProject"/>
<add-to-group group-id="WelcomeScreen.QuickStart" anchor="first"/>
</group>
diff --git a/resources/src/idea/RichPlatformPlugin.xml b/resources/src/idea/RichPlatformPlugin.xml
index 2b1794d236a3..444336338b1a 100644
--- a/resources/src/idea/RichPlatformPlugin.xml
+++ b/resources/src/idea/RichPlatformPlugin.xml
@@ -239,10 +239,10 @@
<!-- Errors -->
<!-- Show full error options configurable only in full IDEA - platform supports only default IDE profile for now -->
- <projectConfigurable groupId="editor" displayName="Inspections" provider="com.intellij.profile.codeInspection.ui.ProjectInspectionToolsConfigurableProvider"/>
+ <projectConfigurable groupId="editor" groupWeight="160" displayName="Inspections" provider="com.intellij.profile.codeInspection.ui.ProjectInspectionToolsConfigurableProvider"/>
<!-- Compiler -->
- <projectConfigurable groupId="build" instance="com.intellij.compiler.options.CompilerConfigurable" id="project.propCompiler" order="after project"
+ <projectConfigurable groupId="build" groupWeight="130" instance="com.intellij.compiler.options.CompilerConfigurable" id="project.propCompiler" order="after project"
key="compiler.configurable.display.name" bundle="messages.CompilerBundle" childrenEPName="com.intellij.compilerSettingsFactory">
<configurable instance="com.intellij.openapi.compiler.options.ExcludedEntriesConfigurable" id="reference.projectsettings.compiler.excludes"
displayName="Excludes"/>
@@ -312,6 +312,8 @@
implementationClass="com.intellij.openapi.roots.ui.configuration.libraryEditor.JavadocOrderRootTypeUIFactory"/>
<OrderRootTypeUI key="ANNOTATIONS"
implementationClass="com.intellij.openapi.roots.ui.configuration.libraryEditor.AnnotationsOrderRootTypeUIFactory"/>
+ <OrderRootTypeUI key="NATIVE"
+ implementationClass="com.intellij.openapi.roots.ui.configuration.libraryEditor.NativeLibraryOrderRootTypeUIFactory"/>
<OrderRootTypeUI key="CLASSES"
implementationClass="com.intellij.openapi.roots.ui.configuration.libraryEditor.ClassesOrderRootTypeUIFactory"/>
<OrderRootTypeUI key="SOURCES"
@@ -332,6 +334,7 @@
<moduleExtension implementation="com.intellij.openapi.roots.impl.JavaModuleExternalPathsImpl"/>
<orderRootType implementation="com.intellij.openapi.roots.AnnotationOrderRootType"/>
+ <orderRootType implementation="com.intellij.openapi.roots.NativeLibraryOrderRootType"/>
<orderRootType implementation="com.intellij.openapi.roots.JavadocOrderRootType"/>