diff --git a/images/src/META-INF/ImagesPlugin.xml b/images/src/META-INF/ImagesPlugin.xml index b6b12669da7f..8ff4e61b7bea 100644 --- a/images/src/META-INF/ImagesPlugin.xml +++ b/images/src/META-INF/ImagesPlugin.xml @@ -63,10 +63,8 @@ - - - + text="Zoom Out" + use-shortcut-of="CollapseAll"/> - - + icon="/actions/cancel.png" use-shortcut-of="CloseContent"/> diff --git a/platform/platform-resources/src/idea/Keymap_Default.xml b/platform/platform-resources/src/idea/Keymap_Default.xml index ef07605def23..9be0de8f8d0d 100644 --- a/platform/platform-resources/src/idea/Keymap_Default.xml +++ b/platform/platform-resources/src/idea/Keymap_Default.xml @@ -6,15 +6,6 @@ - - - - - - - - - @@ -76,12 +67,6 @@ - - - - - - @@ -253,9 +238,6 @@ - - - @@ -277,9 +259,6 @@ - - - @@ -497,10 +476,6 @@ - - - - @@ -519,9 +494,6 @@ - - - @@ -761,9 +733,6 @@ - - - @@ -920,7 +889,6 @@ - diff --git a/platform/platform-resources/src/idea/Keymap_Eclipse.xml b/platform/platform-resources/src/idea/Keymap_Eclipse.xml index 79815d72044a..e8013471b676 100644 --- a/platform/platform-resources/src/idea/Keymap_Eclipse.xml +++ b/platform/platform-resources/src/idea/Keymap_Eclipse.xml @@ -170,22 +170,16 @@ - - - - - - @@ -210,8 +204,6 @@ - - @@ -224,7 +216,6 @@ - diff --git a/platform/platform-resources/src/idea/Keymap_Emacs.xml b/platform/platform-resources/src/idea/Keymap_Emacs.xml index c355659dd23e..7939906f8bf1 100644 --- a/platform/platform-resources/src/idea/Keymap_Emacs.xml +++ b/platform/platform-resources/src/idea/Keymap_Emacs.xml @@ -182,10 +182,6 @@ - - - - diff --git a/platform/platform-resources/src/idea/Keymap_KDE.xml b/platform/platform-resources/src/idea/Keymap_KDE.xml index 0751bed27d80..549ec2025c9e 100644 --- a/platform/platform-resources/src/idea/Keymap_KDE.xml +++ b/platform/platform-resources/src/idea/Keymap_KDE.xml @@ -59,9 +59,6 @@ - - - diff --git a/platform/platform-resources/src/idea/Keymap_Mac.xml b/platform/platform-resources/src/idea/Keymap_Mac.xml index 1cc293ea7467..df64b0a22a8a 100644 --- a/platform/platform-resources/src/idea/Keymap_Mac.xml +++ b/platform/platform-resources/src/idea/Keymap_Mac.xml @@ -204,11 +204,6 @@ - - - - - @@ -299,13 +294,6 @@ - - - - - - - diff --git a/platform/platform-resources/src/idea/Keymap_MacClassic.xml b/platform/platform-resources/src/idea/Keymap_MacClassic.xml index 1e884b8d7e49..52bc398798bd 100644 --- a/platform/platform-resources/src/idea/Keymap_MacClassic.xml +++ b/platform/platform-resources/src/idea/Keymap_MacClassic.xml @@ -205,10 +205,6 @@ - - - - diff --git a/platform/platform-resources/src/idea/Keymap_Netbeans.xml b/platform/platform-resources/src/idea/Keymap_Netbeans.xml index dc1ba94a09b0..54c6f6fa0ab1 100644 --- a/platform/platform-resources/src/idea/Keymap_Netbeans.xml +++ b/platform/platform-resources/src/idea/Keymap_Netbeans.xml @@ -190,21 +190,9 @@ - - - - - - - - - - - - @@ -226,8 +214,6 @@ - - @@ -240,7 +226,7 @@ - + @@ -352,7 +338,6 @@ - diff --git a/platform/platform-resources/src/idea/Keymap_VisualStudio.xml b/platform/platform-resources/src/idea/Keymap_VisualStudio.xml index 1ba58f1e6185..5081e4564a20 100644 --- a/platform/platform-resources/src/idea/Keymap_VisualStudio.xml +++ b/platform/platform-resources/src/idea/Keymap_VisualStudio.xml @@ -70,9 +70,6 @@ - - - @@ -111,15 +108,9 @@ - - - - - - diff --git a/platform/platform-resources/src/idea/LangActions.xml b/platform/platform-resources/src/idea/LangActions.xml index 26cff651aac3..c8e32261c27e 100644 --- a/platform/platform-resources/src/idea/LangActions.xml +++ b/platform/platform-resources/src/idea/LangActions.xml @@ -157,7 +157,7 @@ - + @@ -587,9 +587,10 @@ - + - + diff --git a/platform/platform-resources/src/idea/PlatformActions.xml b/platform/platform-resources/src/idea/PlatformActions.xml index 8739484bb290..e3ee16e276a8 100644 --- a/platform/platform-resources/src/idea/PlatformActions.xml +++ b/platform/platform-resources/src/idea/PlatformActions.xml @@ -30,7 +30,7 @@ - + diff --git a/platform/platform-resources/src/idea/PlatformLangActionManager.xml b/platform/platform-resources/src/idea/PlatformLangActionManager.xml index 48ce2e847d23..0a43456b9ea9 100644 --- a/platform/platform-resources/src/idea/PlatformLangActionManager.xml +++ b/platform/platform-resources/src/idea/PlatformLangActionManager.xml @@ -36,7 +36,7 @@ - + diff --git a/plugins/ui-designer/src/META-INF/plugin.xml b/plugins/ui-designer/src/META-INF/plugin.xml index dbaa9da11a70..073110c20c35 100644 --- a/plugins/ui-designer/src/META-INF/plugin.xml +++ b/plugins/ui-designer/src/META-INF/plugin.xml @@ -161,10 +161,10 @@ - - - - + + + + - + diff --git a/resources/src/idea/IdeaActions.xml b/resources/src/idea/IdeaActions.xml index 7de13202c349..0359a6895886 100644 --- a/resources/src/idea/IdeaActions.xml +++ b/resources/src/idea/IdeaActions.xml @@ -63,7 +63,7 @@ - + @@ -376,8 +376,7 @@ - - + @@ -436,8 +435,8 @@ - - + + diff --git a/resources/src/idea/JBuilderKeymap.xml b/resources/src/idea/JBuilderKeymap.xml index 11f23f44f481..03762edca0a6 100644 --- a/resources/src/idea/JBuilderKeymap.xml +++ b/resources/src/idea/JBuilderKeymap.xml @@ -29,9 +29,6 @@ - - - @@ -90,8 +87,6 @@ - -