python/plugins/sextante/grass/GrassAlgorithmProvider.py

@@ -92,7 +92,7 @@ def getPostProcessingErrorMessage(self, wrongLayers):
             html += "GRASS seems to be correctly installed and configured</li></ul>"
         else:
             html += msg + "</i></li></ul>"
-            html += '<p><a href= "http://docs.qgis.org/html/en/docs/user_manual/sextante/3rdParty.html">Click here</a> to know more about how to install and configure GRASS to be used with SEXTANTE</p>'
+            html += '<p><a href= "http://docs.qgis.org/2.0/html/en/docs/user_manual/sextante/3rdParty.html">Click here</a> to know more about how to install and configure GRASS to be used with SEXTANTE</p>'
 
         return html
 

python/plugins/sextante/gui/AlgorithmExecutionDialog.py

@@ -327,8 +327,8 @@ def cancel(self):
     def resetGUI(self):
         QApplication.restoreOverrideCursor()
         self.progressLabel.setText("")
-        self.progress.setValue(0)
-        self.progress.setMaximum(100)
+        self.progress.setValue(100)
+        #self.progress.setMaximum(100)        
         self.buttonBox.button(QtGui.QDialogButtonBox.Ok).setEnabled(True)
         self.buttonBox.button(QtGui.QDialogButtonBox.Close).setEnabled(True)
         self.buttonBox.button(QtGui.QDialogButtonBox.Cancel).setEnabled(False)

python/plugins/sextante/r/RAlgorithm.py

@@ -27,6 +27,7 @@
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
 from PyQt4 import QtGui, QtCore
+from sextante.core.SextanteConfig import SextanteConfig
 from sextante.core.GeoAlgorithm import GeoAlgorithm
 from sextante.parameters.ParameterRaster import ParameterRaster
 from sextante.parameters.ParameterTable import ParameterTable
@@ -389,16 +390,24 @@ def checkBeforeOpeningParametersDialog(self):
             path = RUtils.RFolder()
             if path == "":
                 return "R folder is not configured.\nPlease configure it before running R scripts."
+
+        R_INSTALLED = "R_INSTALLED"
+        settings = QSettings()
+        if settings.contains(R_INSTALLED):
+            return
+        if SextanteUtils.isWindows(): 
+            if SextanteConfig.getSetting(RUtils.R_USE64):
+                execDir = "x64"
+            else:
+                execDir = "i386"
+            command = [RUtils.RFolder() + os.sep + "bin" + os.sep + execDir + os.sep + "R.exe --version"]
         else:
-            R_INSTALLED = "R_INSTALLED"
-            settings = QSettings()
-            if settings.contains(R_INSTALLED):
-                return
             command = ["R --version"]
-            proc = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE, stdin=subprocess.PIPE,stderr=subprocess.STDOUT, universal_newlines=True).stdout
-            for line in iter(proc.readline, ""):
-                if "R version" in line:
-                    settings.setValue(R_INSTALLED, True)
-                    return
-            return "It seems that R is not correctly installed in your system.\nPlease install it before running R Scripts."
+        proc = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE, stdin=subprocess.PIPE,stderr=subprocess.STDOUT, universal_newlines=True).stdout
+
+        for line in iter(proc.readline, ""):
+            if "R version" in line:
+                settings.setValue(R_INSTALLED, True)
+                return
+        return "It seems that R is not correctly installed in your system.\nPlease install it before running R Scripts."
 

python/plugins/sextante/saga/SagaAlgorithmProvider.py

@@ -101,7 +101,7 @@ def getPostProcessingErrorMessage(self, wrongLayers):
             html += "SAGA seems to be correctly installed and configured</li></ul>"
         else:
             html += msg + "</i></li></ul>"
-            html += '<p><a href= "http://docs.qgis.org/html/en/docs/user_manual/sextante/3rdParty.html">Click here</a> to know more about how to install and configure SAGA to be used with SEXTANTE</p>'
+            html += '<p><a href= "http://docs.qgis.org/2.0/html/en/docs/user_manual/sextante/3rdParty.html">Click here</a> to know more about how to install and configure SAGA to be used with SEXTANTE</p>'
 
         return html