[rkward-cvs] SF.net SVN: rkward:[2398] trunk/rkward/rkward/rkconsole.cpp

[sjar at users.sourceforge.net]

Revision: 2398
          http://rkward.svn.sourceforge.net/rkward/?rev=2398&view=rev
Author:   sjar
Date:     2009-01-22 23:31:55 +0000 (Thu, 22 Jan 2009)

Log Message:
-----------
patch by Roy Qu
* In rkward's R Console, the up/down/left/right arrow key didn't work properly because in kde 4.2, katepart's  internal actions implementation has changed
* patch was briefly reviewed by Thomas (looks very sane, may need further testing)

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

Modified: trunk/rkward/rkward/rkconsole.cpp
===================================================================
--- trunk/rkward/rkward/rkconsole.cpp	2008-11-24 14:00:35 UTC (rev 2397)
+++ trunk/rkward/rkward/rkconsole.cpp	2009-01-22 23:31:55 UTC (rev 2398)
@@ -83,15 +83,18 @@
 	/* We need to disable kactions that were plugged to the KateViewInternal in kateview.cpp.
 	These actions include Key_Up, Key_Down, etc. */
 	kate_edit_actions = view->findChild<KActionCollection*> ("edit_actions");
+	if (!kate_edit_actions) {
+		kate_edit_actions=view->actionCollection();
+	}
 	if (kate_edit_actions) {
 		// make sure these actions never get triggered by a shortcut
+
 		QList<QKeySequence> noshort;
 		noshort.append (QKeySequence ());	// no primary
 		noshort.append (QKeySequence ());	// no secondary
 		noshort.append (QKeySequence ());	// for good measure
 
 		QList<QAction*> keas = kate_edit_actions->actions ();
-		keas += view->actionCollection ()->actions ();
 		for (int i = 0; i < keas.size (); ++i) {
 			keas[i]->setShortcuts (noshort);
 		}


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