[rkward-cvs] SF.net SVN: rkward:[3529] trunk/rkward

[tfry at users.sourceforge.net]

Revision: 3529
          http://rkward.svn.sourceforge.net/rkward/?rev=3529&view=rev
Author:   tfry
Date:     2011-04-27 07:30:30 +0000 (Wed, 27 Apr 2011)

Log Message:
-----------
Allow cancelling incomplete / partial commands, again.

Modified Paths:
--------------
    trunk/rkward/ChangeLog
    trunk/rkward/rkward/rkconsole.cpp

Modified: trunk/rkward/ChangeLog
===================================================================
--- trunk/rkward/ChangeLog	2011-04-25 13:35:13 UTC (rev 3528)
+++ trunk/rkward/ChangeLog	2011-04-27 07:30:30 UTC (rev 3529)
@@ -1,3 +1,4 @@
+- Fixed: Pressing Ctrl+C would not reset syntactically incomplete commands in the R console
 - Crosstabs N to 1 plugin gains options to compute proportions and margins (thanks to Andrés Necochea)		TODO: update / add automated test(s)
 - Added convenience R function rk.list() to allow simplification of plugin code		# TODO: ideally, this should be used in all applicable plugins
 - Added stack-based window switching using Ctrl+(Shift)+Tab; this replaces the old "Next Window" and "Previous Window" actions

Modified: trunk/rkward/rkward/rkconsole.cpp
===================================================================
--- trunk/rkward/rkward/rkconsole.cpp	2011-04-25 13:35:13 UTC (rev 3528)
+++ trunk/rkward/rkward/rkconsole.cpp	2011-04-27 07:30:30 UTC (rev 3529)
@@ -727,7 +727,7 @@
 			input_buffer.clear ();
 		}
 	}
-	interrupt_command_action->setEnabled (false);
+	interrupt_command_action->setEnabled (!incomplete_command.isEmpty ());
 }
 
 bool RKConsole::isBusy () const {
@@ -863,6 +863,7 @@
 		incomplete_command.clear ();
 
 		showPrompt ();
+		tryNextInBuffer ();		// well, the buffer is empty, but this also sets the interrupt_command_action's state, etc.
 	}
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.