[rkward-cvs] SF.net SVN: rkward: [2354] branches/release_branch_0.4.9/rkward

[tfry at users.sourceforge.net]

Revision: 2354
          http://rkward.svn.sourceforge.net/rkward/?rev=2354&view=rev
Author:   tfry
Date:     2008-03-12 12:42:41 -0700 (Wed, 12 Mar 2008)

Log Message:
-----------
Backport 2352 and 2353

Modified Paths:
--------------
    branches/release_branch_0.4.9/rkward/rkconsole.cpp
    branches/release_branch_0.4.9/rkward/rkward.desktop

Modified: branches/release_branch_0.4.9/rkward/rkconsole.cpp
===================================================================
--- branches/release_branch_0.4.9/rkward/rkconsole.cpp	2008-03-12 19:41:19 UTC (rev 2353)
+++ branches/release_branch_0.4.9/rkward/rkconsole.cpp	2008-03-12 19:42:41 UTC (rev 2354)
@@ -817,7 +817,7 @@
 
 	activate (false);
 	if ((!command_was_piped) && (isBusy () || (!currentCommand ().isEmpty ()))) {
-		int res = KMessageBox::questionYesNo (this, i18n ("You have configured RKWrad to run script commands through the console. However, the console is currently busy (either a command is running, or you have started to enter text in the console). Do you want to bypass the console this one time, or do you want to try again later?"), i18n ("Console is busy"), KGuiItem (i18n ("Bypass console")), KGuiItem (i18n ("Cancel")));
+		int res = KMessageBox::questionYesNo (this, i18n ("You have configured RKWard to run script commands through the console. However, the console is currently busy (either a command is running, or you have started to enter text in the console). Do you want to bypass the console this one time, or do you want to try again later?"), i18n ("Console is busy"), KGuiItem (i18n ("Bypass console")), KGuiItem (i18n ("Cancel")));
 		if (res == KMessageBox::Yes) {
 			RKGlobals::rInterface ()->issueCommand (command);
 		} else {

Modified: branches/release_branch_0.4.9/rkward/rkward.desktop
===================================================================
--- branches/release_branch_0.4.9/rkward/rkward.desktop	2008-03-12 19:41:19 UTC (rev 2353)
+++ branches/release_branch_0.4.9/rkward/rkward.desktop	2008-03-12 19:42:41 UTC (rev 2354)
@@ -5,7 +5,7 @@
 Comment=GUI for the R-project
 Comment[pl]=Graficzny interfejs dla projektu R
 Comment[fr]=Interface graphique pour R
-Icon=rkward.png
+Icon=rkward
 Exec=rkward -caption "%c" %i %m  
 Terminal=false
 Type=Application


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