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

[kapatp at users.sourceforge.net]

Revision: 2931
          http://rkward.svn.sourceforge.net/rkward/?rev=2931&view=rev
Author:   kapatp
Date:     2010-07-03 22:11:48 +0000 (Sat, 03 Jul 2010)

Log Message:
-----------
Cosmetics: rename resetHistory and rk.current.plot and fix some typos

Modified Paths:
--------------
    trunk/rkward/rkward/rbackend/rpackages/rkward/R/public_graphics.R
    trunk/rkward/rkward/windows/rkwindowcatcher.cpp

Modified: trunk/rkward/rkward/rbackend/rpackages/rkward/R/public_graphics.R
===================================================================
--- trunk/rkward/rkward/rbackend/rpackages/rkward/R/public_graphics.R	2010-07-03 21:38:35 UTC (rev 2930)
+++ trunk/rkward/rkward/rbackend/rpackages/rkward/R/public_graphics.R	2010-07-03 22:11:48 UTC (rev 2931)
@@ -201,7 +201,7 @@
 		recordUnsaved (deviceId)
 		replay(n = length(recorded), deviceId)
 	}
-	resetHistory <- function ()
+	clearHistory <- function ()
 	{
 		recorded <<- list()
 		isDuplicate <<- FALSE
@@ -264,8 +264,7 @@
 	rk.record.plot$showLast (deviceId)
 	rk.record.plot$printPars ()
 }
-## TODO: .addthis.
-"rk.current.plot" <- function (deviceId = dev.cur ())
+"rk.addthis.plot" <- function (deviceId = dev.cur ())
 {
 	# this call is not as simple as it looks; details are handled inside rk.record.plot$record ()
 	# 

Modified: trunk/rkward/rkward/windows/rkwindowcatcher.cpp
===================================================================
--- trunk/rkward/rkward/windows/rkwindowcatcher.cpp	2010-07-03 21:38:35 UTC (rev 2930)
+++ trunk/rkward/rkward/windows/rkwindowcatcher.cpp	2010-07-03 22:11:48 UTC (rev 2931)
@@ -417,16 +417,16 @@
 void RKCaughtX11Window::recordCurrentPlot () {
 	RK_TRACE (MISC);
 
-	RKGlobals::rInterface ()->issueCommand ("rk.current.plot (" + QString::number (device_number) + ')', RCommand::App, i18n ("Add current plot to history (device number %1)", device_number), error_dialog);
+	RKGlobals::rInterface ()->issueCommand ("rk.addthis.plot (" + QString::number (device_number) + ')', RCommand::App, i18n ("Add current plot to history (device number %1)", device_number), error_dialog);
 	//updateHistoryActions (history_length+1, history_length+1);
 }
 
 void RKCaughtX11Window::clearHistory () {
 	RK_TRACE (MISC);
 
-	if (KMessageBox::warningContinueCancel (this, i18n ("This will clear the plot history for all devices windows, not only this one. If this is not your intent, press cancel, below.")) != KMessageBox::Continue) return;
+	if (KMessageBox::warningContinueCancel (this, i18n ("This will clear the plot history for all device windows, not just this one. If this is not your intent, press cancel, below.")) != KMessageBox::Continue) return;
 
-	RKGlobals::rInterface ()->issueCommand ("rk.record.plot$resetHistory ()", RCommand::App, i18n ("Clear plot history"), error_dialog);
+	RKGlobals::rInterface ()->issueCommand ("rk.record.plot$clearHistory ()", RCommand::App, i18n ("Clear plot history"), error_dialog);
 	//updateHistoryActions (0, 0);
 }
 


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