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

[kapatp at users.sourceforge.net]

Revision: 2995
          http://rkward.svn.sourceforge.net/rkward/?rev=2995&view=rev
Author:   kapatp
Date:     2010-09-03 23:04:51 +0000 (Fri, 03 Sep 2010)

Log Message:
-----------
Another typo. And rename device_properties as plot_properties.

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

Modified: trunk/rkward/rkward/rbackend/rpackages/rkward/R/public_graphics.R
===================================================================
--- trunk/rkward/rkward/rbackend/rpackages/rkward/R/public_graphics.R	2010-09-03 22:43:03 UTC (rev 2994)
+++ trunk/rkward/rkward/rbackend/rpackages/rkward/R/public_graphics.R	2010-09-03 23:04:51 UTC (rev 2995)
@@ -446,7 +446,7 @@
 		ans <- 'no'
 		if (len.max < len.r) {
 			ans <- rk.show.question (paste ("Current plot history has more plots than the maximum number specified in the settings.\n",
-				10 - 5, " of the foremost plots will be removed.\n\nDo you want to Continue?", sep =""))
+				len.r - len.max, " of the foremost plots will be removed.\n\nDo you want to Continue?", sep =""))
 			if (!is.null(ans) && ans)
 				remove (deviceId = NULL, pos = 1:(len.r - len.max))
 		}

Modified: trunk/rkward/rkward/windows/rkcatchedx11windowpart.rc
===================================================================
--- trunk/rkward/rkward/windows/rkcatchedx11windowpart.rc	2010-09-03 22:43:03 UTC (rev 2994)
+++ trunk/rkward/rkward/windows/rkcatchedx11windowpart.rc	2010-09-03 23:04:51 UTC (rev 2995)
@@ -22,7 +22,7 @@
 			<Separator/>
 			<Action name="plot_clear_history"/>
 			<Separator/>
-			<Action name="device_properties"/>
+			<Action name="plot_properties"/>
 		</Menu>
 		<Menu name="view"><text>&View</text>
 			<Action name="toggle_fixed_size"/>

Modified: trunk/rkward/rkward/windows/rkwindowcatcher.cpp
===================================================================
--- trunk/rkward/rkward/windows/rkwindowcatcher.cpp	2010-09-03 22:43:03 UTC (rev 2994)
+++ trunk/rkward/rkward/windows/rkwindowcatcher.cpp	2010-09-03 23:04:51 UTC (rev 2995)
@@ -417,7 +417,7 @@
 void RKCaughtX11Window::replacebyCurrentPlot () {
 	RK_TRACE (MISC);
 
-	RKGlobals::rInterface ()->issueCommand ("rk.replaceby.plot (" + QString::number (device_number) + ')', RCommand::App, i18n ("Replace previous plot by the current plot (device number %1)", device_number), error_dialog);
+	RKGlobals::rInterface ()->issueCommand ("rk.replaceby.plot (" + QString::number (device_number) + ')', RCommand::App, i18n ("Overwrite previous plot by the current plot (device number %1)", device_number), error_dialog);
 	//updateHistoryActions (history_length+1, history_length+1);
 }
 
@@ -439,7 +439,7 @@
 void RKCaughtX11Window::showPlotInfo () {
 	RK_TRACE (MISC);
 
-	RKGlobals::rInterface ()->issueCommand ("rk.record.plot$showPlotInfo (" + QString::number (device_number) + ")", RCommand::App, i18n ("Device properties (device number %1)", device_number), error_dialog);
+	RKGlobals::rInterface ()->issueCommand ("rk.record.plot$showPlotInfo (" + QString::number (device_number) + ")", RCommand::App, i18n ("Plot properties (device number %1)", device_number), error_dialog);
 }
 
 void RKCaughtX11Window::updateHistoryActions (int history_length, int position) {
@@ -457,6 +457,7 @@
 	plot_remove_action->setEnabled (history_length > 0);
 
 	plot_clear_history_action->setEnabled (history_length > 0);
+	plot_properties_action->setEnabled (history_length > 0);
 }
 
 void RKCaughtX11Window::setStatusMessage (const QString& message, RCommand *command) {
@@ -530,10 +531,10 @@
 	window->plot_last_action = (KAction*) action;
 
 	action = actionCollection ()->addAction ("plot_replaceby", window, SLOT (replacebyCurrentPlot()));
- 	action->setText (i18n ("Replace previous plot"));
+ 	action->setText (i18n ("Overwrite previous plot"));
 	window->plot_replaceby_action = (KAction*) action;
 	action = actionCollection ()->addAction ("plot_remove", window, SLOT (removeCurrentPlot()));
- 	action->setText (i18n ("Remove from history"));
+ 	action->setText (i18n ("Remove current plot"));
 	action->setIcon (RKStandardIcons::getIcon (RKStandardIcons::ActionRemovePlot));
 	window->plot_remove_action = (KAction*) action;
 
@@ -542,9 +543,9 @@
  	action->setText (i18n ("Clear history"));
 	action->setIcon (RKStandardIcons::getIcon (RKStandardIcons::ActionClear));
 
-	action = actionCollection ()->addAction ("device_properties", window, SLOT (showPlotInfo()));
-	window->device_properties_action = (KAction*) action;
-	action->setText (i18n ("Device properties"));
+	action = actionCollection ()->addAction ("plot_properties", window, SLOT (showPlotInfo()));
+	window->plot_properties_action = (KAction*) action;
+	action->setText (i18n ("Plot properties"));
 	action->setIcon (RKStandardIcons::getIcon (RKStandardIcons::ActionDocumentInfo));
 
 	action = actionCollection ()->addAction ("device_activate", window, SLOT (activateDevice()));

Modified: trunk/rkward/rkward/windows/rkwindowcatcher.h
===================================================================
--- trunk/rkward/rkward/windows/rkwindowcatcher.h	2010-09-03 22:43:03 UTC (rev 2994)
+++ trunk/rkward/rkward/windows/rkwindowcatcher.h	2010-09-03 23:04:51 UTC (rev 2995)
@@ -184,7 +184,7 @@
 	KAction *plot_replaceby_action;
 	KAction *plot_remove_action;
 	KAction *plot_clear_history_action;
-	KAction *device_properties_action;
+	KAction *plot_properties_action;
 
 	KPassivePopup* status_popup;
 	RCommand* status_change_command;


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