Merge branch 'master' into no-reformat-dialog-on-reformat-code-action
[idea/community.git] / platform / platform-resources / src / idea / Keymap_Default.xml
index 107cfd8b76a69be588841e24c60e974b60e9f577..c6cbf44e4aa01b3db1b986ae412d92700133b91d 100644 (file)
   <action id="GotoClass">
     <keyboard-shortcut first-keystroke="control N"/>
   </action>
+  <action id="GotoChangedFile">
+    <keyboard-shortcut first-keystroke="control N"/>
+  </action>
   <action id="GotoSymbol">
     <keyboard-shortcut first-keystroke="control shift alt N"/>
   </action>
   <action id="CompareTwoFiles">
     <keyboard-shortcut first-keystroke="control D"/>
   </action>
-  <action id="CompareDirs">
-    <keyboard-shortcut first-keystroke="control D"/>
+  <action id="Diff.ShowSettingsPopup">
+    <keyboard-shortcut first-keystroke="control shift D"/>
   </action>
   <action id="SendEOF">
     <keyboard-shortcut first-keystroke="control D"/>
   <action id="VcsHistory.ShowAllAffected">
     <keyboard-shortcut first-keystroke="alt shift A" />
   </action>
+  <action id="ShelveChanges.UnshelveWithDialog">
+    <keyboard-shortcut first-keystroke="ctrl shift U" />
+  </action>
 
-  <action id="DatabaseView.PropertiesAction" />
-
-  <action id="Jdbc.OpenConsole"><keyboard-shortcut first-keystroke="control shift F10"/></action>
-  <action id="Jpa.OpenConsole"><keyboard-shortcut first-keystroke="control shift F10"/></action>
-
-  <action id="Console.TableResult.PreviousPage"><keyboard-shortcut first-keystroke="control alt UP"/></action>
-  <action id="Console.TableResult.NextPage"><keyboard-shortcut first-keystroke="control alt DOWN"/></action>
-  <action id="Console.TableResult.Reload"><keyboard-shortcut first-keystroke="control R"/></action>
-  <action id="Console.TableResult.EditValue"><keyboard-shortcut first-keystroke="F2"/><keyboard-shortcut first-keystroke="alt ENTER"/></action>
+  <action id="Console.Open"><keyboard-shortcut first-keystroke="control shift F10"/></action>
+  <action id="Console.Execute"><keyboard-shortcut first-keystroke="ENTER"/></action>
+  <action id="Console.Execute.Multiline"><keyboard-shortcut first-keystroke="control ENTER"/></action>
 
   <action id="Console.History.Next" />
   <action id="Console.History.Previous" />
   <action id="Console.History.Browse"><keyboard-shortcut first-keystroke="control alt E"/></action>
 
-  <action id="Console.Jdbc.Execute"><keyboard-shortcut first-keystroke="control ENTER"/></action>
-  <action id="Console.Jdbc.Terminate"><keyboard-shortcut first-keystroke="control alt shift DELETE"/></action>
-
-  <action id="Console.Jpa.Execute"><keyboard-shortcut first-keystroke="control ENTER"/></action>
-  <action id="Console.Jpa.Terminate"><keyboard-shortcut first-keystroke="control alt shift DELETE"/></action>
-  <action id="Console.Jpa.GenerateSql"><keyboard-shortcut first-keystroke="control shift ENTER"/></action>
-  <action id="Console.Jpa.GenerateDDL"><keyboard-shortcut first-keystroke="control alt shift ENTER"/></action>
-
-  <action id="Jdbc.RunSqlScript"><keyboard-shortcut first-keystroke="control shift F10"/></action>
-
-  <action id="Console.Execute"><keyboard-shortcut first-keystroke="ENTER"/></action>
   <action id ="Refactorings.QuickListPopupAction">
     <keyboard-shortcut first-keystroke="control alt shift T"/>
   </action>