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

[tfry at users.sourceforge.net]

Revision: 4028
          http://rkward.svn.sourceforge.net/rkward/?rev=4028&view=rev
Author:   tfry
Date:     2011-11-10 09:02:44 +0000 (Thu, 10 Nov 2011)
Log Message:
-----------
Merge r4027 from release branch

Revision Links:
--------------
    http://rkward.svn.sourceforge.net/rkward/?rev=4027&view=rev

Modified Paths:
--------------
    trunk/rkward/windows_nsis/installer.nsi

Property Changed:
----------------
    trunk/rkward/windows_nsis/


Property changes on: trunk/rkward/windows_nsis
___________________________________________________________________
Added: svn:mergeinfo
   + /branches/release_branch_0.5.7:4027
/branches/release_branch_0.5.7/windows_nsis:4027

Modified: trunk/rkward/windows_nsis/installer.nsi
===================================================================
--- trunk/rkward/windows_nsis/installer.nsi	2011-11-10 08:59:01 UTC (rev 4027)
+++ trunk/rkward/windows_nsis/installer.nsi	2011-11-10 09:02:44 UTC (rev 4028)
@@ -157,9 +157,14 @@
 
 Function RHomeLeave
 	${If} $RHomeOk != "yes"
-		Messagebox MB_OK|MB_ICONINFORMATION \
-			"$FileSelectCurrent does not qualify as the directory of the R installation to use.$\r$\nEither R is not installed, there at all, or the installed version is to old."
-		Abort ;
+		Messagebox MB_YESNO|MB_ICONSTOP \
+			"$FileSelectCurrent does not qualify as the directory of the R installation to use.$\r$\nEither R is not installed, there at all, or the installed version is to old.$\r$\n \
+			If you think you now what you are doing, click $\"Yes$\" to continue with the installation, anyway. Otherwise click $\"No$\".$\r$\n$\r$\n \
+			Continue with the current settings?" \
+			/SD IDNO IDYES next IDNO stop
+		stop:
+			Abort ;
+		next:
 	${EndIf}
 FunctionEnd
 
@@ -200,9 +205,14 @@
 
 Function KDEHomeLeave
 	${If} $KDEPrefixOk != "yes"
-		Messagebox MB_OK|MB_ICONINFORMATION \
-			"$FileSelectCurrent does not seem to contain a KDE installation."
-		Abort ;
+		Messagebox MB_YESNO|MB_ICONSTOP \
+			"$FileSelectCurrent does not seem to contain a (valid) KDE installation.$\r$\n \
+			If you think you now what you are doing, click $\"Yes$\" to continue with the installation, anyway. Otherwise click $\"No$\".$\r$\n$\r$\n \
+			Continue with the current settings?" \
+			/SD IDNO IDYES next IDNO stop
+		stop:
+			Abort ;
+		next:
 	${EndIf}
 FunctionEnd
 

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