PS-10.0.3 <sebastian@helium Merge branch 'master'
This commit is contained in:
commit
adbfc8dd7c
@ -1,5 +1,5 @@
|
|||||||
<application>
|
<application>
|
||||||
<component name="CodeGlance">
|
<component name="CodeGlance">
|
||||||
<option name="width" value="60" />
|
<option name="width" value="82" />
|
||||||
</component>
|
</component>
|
||||||
</application>
|
</application>
|
||||||
@ -40,10 +40,12 @@
|
|||||||
</driver>
|
</driver>
|
||||||
<driver id="db2.jtopen" name="DB2 (JTOpen)" dialect="DB2">
|
<driver id="db2.jtopen" name="DB2 (JTOpen)" dialect="DB2">
|
||||||
<option name="auto-sync" value="false" />
|
<option name="auto-sync" value="false" />
|
||||||
|
<property name="prompt" value="false" />
|
||||||
</driver>
|
</driver>
|
||||||
<driver id="mysql" name="MySQL" dialect="MySQL">
|
<driver id="mysql" name="MySQL" dialect="MySQL">
|
||||||
<option name="auto-sync" value="true" />
|
<option name="auto-sync" value="true" />
|
||||||
<option name="auto-commit" value="true" />
|
<option name="auto-commit" value="true" />
|
||||||
|
<property name="autoReconnect" value="true" />
|
||||||
<property name="zeroDateTimeBehavior" value="convertToNull" />
|
<property name="zeroDateTimeBehavior" value="convertToNull" />
|
||||||
<property name="tinyInt1isBit" value="false" />
|
<property name="tinyInt1isBit" value="false" />
|
||||||
<property name="characterEncoding" value="utf8" />
|
<property name="characterEncoding" value="utf8" />
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
<application>
|
<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;" />
|
<ignoreFiles list="*.hprof;*.pyc;*.pyo;*.rbc;*~;.DS_Store;.git;.hg;.svn;CVS;RCS;SCCS;__pycache__;_svn;rcs;" />
|
||||||
<extensionMap>
|
<extensionMap>
|
||||||
<mapping ext="sxw" type="Native" />
|
<mapping ext="sxw" type="Native" />
|
||||||
@ -22,7 +22,6 @@
|
|||||||
<removed_mapping ext="ts" type="TypeScript" />
|
<removed_mapping ext="ts" type="TypeScript" />
|
||||||
<mapping ext="ts" type="TypoScript File" />
|
<mapping ext="ts" type="TypoScript File" />
|
||||||
<mapping ext="t3s" type="TypoScript File" />
|
<mapping ext="t3s" type="TypoScript File" />
|
||||||
<mapping ext="svg" type="XML" />
|
|
||||||
<mapping ext="xlf" type="XML" />
|
<mapping ext="xlf" type="XML" />
|
||||||
</extensionMap>
|
</extensionMap>
|
||||||
</component>
|
</component>
|
||||||
|
|||||||
@ -1,7 +1,11 @@
|
|||||||
<keymap version="1" name="Default copy" parent="Default for XWin">
|
<keymap version="1" name="Default copy" parent="Default for XWin">
|
||||||
|
<action id="EditorToggleCase">
|
||||||
|
<keyboard-shortcut first-keystroke="ctrl alt u" />
|
||||||
|
</action>
|
||||||
<action id="ReformatCode">
|
<action id="ReformatCode">
|
||||||
<keyboard-shortcut first-keystroke="altGraph l" />
|
<keyboard-shortcut first-keystroke="altGraph l" />
|
||||||
</action>
|
</action>
|
||||||
|
<action id="ShowUmlDiagramPopup" />
|
||||||
<action id="SwitchApply">
|
<action id="SwitchApply">
|
||||||
<keyboard-shortcut first-keystroke="shift alt enter" />
|
<keyboard-shortcut first-keystroke="shift alt enter" />
|
||||||
</action>
|
</action>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user