|
From: <wi...@us...> - 2011-03-15 20:42:44
|
Revision: 6194
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6194&view=rev
Author: wis775
Date: 2011-03-15 20:42:37 +0000 (Tue, 15 Mar 2011)
Log Message:
-----------
3196153: When typing using shift, you must release shift to type space.
This one was related to the RSyntaxTextArea. Within the RSyntaxTextArea,
this is a feature (DumbCompleteWordAction is an action that completes the
word at the caret position with the last word in the document that starts
with the text up to the caret.).
For Squirrel, we have disabled (removed the key stroke binding) this functionality, so that SHIFT + SPACE
will insert a SPACE.
Modified Paths:
--------------
trunk/sql12/doc/src/main/resources/changes.txt
trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/rsyntax/SquirreLRSyntaxTextAreaUI.java
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2011-03-15 03:26:23 UTC (rev 6193)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2011-03-15 20:42:37 UTC (rev 6194)
@@ -25,6 +25,8 @@
Bug-fixes:
+3196153: When typing using shift, you must release shift to type space
+
3088572: Squirrel fails when user tries to edit DB fields which have particular characters.
3175871: On export to Excel, some numeric values are not exported correctly.
Modified: trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/rsyntax/SquirreLRSyntaxTextAreaUI.java
===================================================================
--- trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/rsyntax/SquirreLRSyntaxTextAreaUI.java 2011-03-15 03:26:23 UTC (rev 6193)
+++ trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/rsyntax/SquirreLRSyntaxTextAreaUI.java 2011-03-15 20:42:37 UTC (rev 6194)
@@ -66,9 +66,18 @@
shared.remove(KeyStroke.getKeyStroke(KeyEvent.VK_J, InputEvent.CTRL_MASK));
shared.remove(KeyStroke.getKeyStroke(KeyEvent.VK_D, InputEvent.CTRL_MASK));
+ /*
+ * Remove this Keystroke, because it triggers auto-complete of the current word with a matching most recent word,
+ * as long the shift and space key are pressed.
+ * See RTADefaultInputMap()
+ * put(KeyStroke.getKeyStroke(' '), RTextAreaEditorKit.rtaDumbCompleteWordAction);
+ */
+ shared.remove(KeyStroke.getKeyStroke(' '));
+
shared.put(KeyStroke.getKeyStroke(KeyEvent.VK_U, InputEvent.CTRL_MASK | InputEvent.SHIFT_MASK), RTextAreaEditorKit.rtaUpperSelectionCaseAction);
shared.put(KeyStroke.getKeyStroke(KeyEvent.VK_L, InputEvent.CTRL_MASK | InputEvent.SHIFT_MASK), RTextAreaEditorKit.rtaLowerSelectionCaseAction);
+
KeyStroke rsyntaxRedoStroke = KeyStroke.getKeyStroke(KeyEvent.VK_Y, InputEvent.CTRL_MASK);
KeyStroke squirrelRedoStroke = KeyStroke.getKeyStroke(KeyEvent.VK_R, InputEvent.CTRL_MASK);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
