python/console_help.py

@@ -35,7 +35,7 @@ def __init__(self):
         QtGui.QDialog.__init__(self)
         self.setModal(True)
         self.setupUi()
-        
+
     def setupUi(self):
         self.setMaximumSize(500, 300)
         self.webView = QtWebKit.QWebView()
@@ -58,15 +58,16 @@ def setupUi(self):
         qgisDataDir = QgsApplication.pkgDataPath()
         listFile = os.listdir(qgisDataDir + "/python/console_help/i18n")
         localeFullName = QSettings().value( "locale/userLocale", QVariant( "" ) ).toString()
+        locale = "en_US"
         for i in listFile:
             lang = i[0:5]
             if localeFullName in (lang[0:2], lang):
                 locale = lang
-                
+
         filename = qgisDataDir + "/python/console_help/help.htm? \
                                                 lang=" + locale \
                                                 + "&pkgDir=" + qgisDataDir
-                                                
+
         url = QtCore.QUrl(filename)
         self.webView.load(url)
 

python/plugins/sextante/CMakeLists.txt

@@ -1,6 +1,5 @@
 SET (SEXTANTE_PLUGIN_DIR ${QGIS_DATA_DIR}/python/plugins/sextante)
 
-ADD_SUBDIRECTORY(about)
 ADD_SUBDIRECTORY(algs)
 ADD_SUBDIRECTORY(core)
 ADD_SUBDIRECTORY(ftools)
@@ -27,6 +26,4 @@ FILE(GLOB PY_FILES *.py)
 
 PYQT4_ADD_RESOURCES(PYRC_FILES resources.qrc)
 
-
-
 PLUGIN_INSTALL(sextante . ${PY_FILES} ${OTHER_FILES} ${PYRC_FILES})

python/plugins/sextante/SextantePlugin.py

@@ -102,12 +102,6 @@ def initGui(self):
         QObject.connect(self.helpAction, SIGNAL("triggered()"), self.openHelp)
         self.menu.addAction(self.helpAction)
 
-        self.aboutAction = QAction(QIcon(":/sextante/images/info.png"),
-            QCoreApplication.translate("SEXTANTE", "&About SEXTANTE"),
-            self.iface.mainWindow())
-        QObject.connect(self.aboutAction, SIGNAL("triggered()"), self.openAbout)
-        self.menu.addAction(self.aboutAction)
-
         menuBar = self.iface.mainWindow().menuBar()
         menuBar.insertMenu(menuBar.actions()[-1], self.menu)
 
@@ -145,9 +139,5 @@ def openConfig(self):
         dlg = ConfigDialog(self.toolbox)
         dlg.exec_()
 
-    def openAbout(self):
-        dlg = AboutDialog()
-        dlg.exec_()
-
     def openHelp(self):
         QDesktopServices.openUrl(QUrl(os.path.dirname(__file__) + "/help/index.html"))

python/plugins/sextante/resources.qrc

@@ -5,7 +5,6 @@
         <file>images/grass.png</file>
         <file>images/help.png</file>
         <file>images/history.gif</file>
-        <file>images/info.png</file>
         <file>images/input.png</file>
         <file>images/iterate.png</file>
         <file>images/model.png</file>