PS-10.0.3 <sebastian@helium Merge branch 'master'

CodeGlance.xml

@@ -1,5 +1,5 @@
 <application>
   <component name="CodeGlance">
-    <option name="width" value="60" />
+    <option name="width" value="82" />
   </component>
 </application>

databaseDrivers.xml

@@ -40,10 +40,12 @@
     </driver>
     <driver id="db2.jtopen" name="DB2 (JTOpen)" dialect="DB2">
       <option name="auto-sync" value="false" />
+      <property name="prompt" value="false" />
     </driver>
     <driver id="mysql" name="MySQL" dialect="MySQL">
       <option name="auto-sync" value="true" />
       <option name="auto-commit" value="true" />
+      <property name="autoReconnect" value="true" />
       <property name="zeroDateTimeBehavior" value="convertToNull" />
       <property name="tinyInt1isBit" value="false" />
       <property name="characterEncoding" value="utf8" />

filetypes.xml

@@ -1,5 +1,5 @@
 <application>
-  <component name="FileTypeManager" version="16">
+  <component name="FileTypeManager" version="17">
     <ignoreFiles list="*.hprof;*.pyc;*.pyo;*.rbc;*~;.DS_Store;.git;.hg;.svn;CVS;RCS;SCCS;__pycache__;_svn;rcs;" />
     <extensionMap>
       <mapping ext="sxw" type="Native" />
@@ -22,7 +22,6 @@
       <removed_mapping ext="ts" type="TypeScript" />
       <mapping ext="ts" type="TypoScript File" />
       <mapping ext="t3s" type="TypoScript File" />
-      <mapping ext="svg" type="XML" />
       <mapping ext="xlf" type="XML" />
     </extensionMap>
   </component>

keymaps/Default copy.xml

@@ -1,7 +1,11 @@
 <keymap version="1" name="Default copy" parent="Default for XWin">
+  <action id="EditorToggleCase">
+    <keyboard-shortcut first-keystroke="ctrl alt u" />
+  </action>
   <action id="ReformatCode">
     <keyboard-shortcut first-keystroke="altGraph l" />
   </action>
+  <action id="ShowUmlDiagramPopup" />
   <action id="SwitchApply">
     <keyboard-shortcut first-keystroke="shift alt enter" />
   </action>