fix rebase issues

qgis · Sep 15, 2013 · 0c94067 · 0c94067
1 parent ca22774
commit 0c94067
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 14 deletions.
diff --git a/python/plugins/processing/gui/LexerR.py b/python/plugins/processing/gui/LexerR.py
@@ -26,9 +26,10 @@
 import sys
 
 from PyQt4.QtCore import *
+from PyQt4.QtGui import *
 from PyQt4.Qsci import *
 
-class LexerR(QcsiLexerCustom):
+class LexerR(QsciLexerCustom):
 
     QUOTES = ["'", '"']
     SEPARATORS = ["(", "=", ".", "<"]

diff --git a/python/plugins/processing/gui/ScriptEdit.py b/python/plugins/processing/gui/ScriptEdit.py
@@ -23,13 +23,15 @@
 # This will get replaced with a git SHA1 when you do a git archive
 __revision__ = '$Format:%H$'
 
+import os
+
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
 from PyQt4.Qsci import *
 
 from qgis.core import *
 
-from sextante.gui.LexerR import LexerR
+from processing.gui.LexerR import LexerR
 
 class ScriptEdit(QsciScintilla):
 
@@ -101,8 +103,8 @@ def setCommonOptions(self):
 
         # load font from Python console settings
         settings = QSettings()
-        fontName = settings.value("pythonConsole/fontfamilytext", "Monospace").toString()
-        fontSize = settings.value("pythonConsole/fontsize", 10).toInt()[0]
+        fontName = settings.value("pythonConsole/fontfamilytext", "Monospace")
+        fontSize = int(settings.value("pythonConsole/fontsize", 10))
 
         self.defaultFont = QFont(fontName)
         self.defaultFont.setFixedPitch(True)
@@ -178,13 +180,13 @@ def initLexer(self):
             self.api = QsciAPIs(self.lexer)
 
             settings = QSettings()
-            useDefaultAPI = settings.value("pythonConsole/preloadAPI", True).toBool()
+            useDefaultAPI = bool(settings.value("pythonConsole/preloadAPI", True))
             if useDefaultAPI:
                 # load QGIS API shipped with Python console
-                self.api.loadPrepared(QgsApplication.pkgDataPath() + "/python/qsci_apis/pyqgis_master.pap")
+                self.api.loadPrepared(os.path.join(QgsApplication.pkgDataPath(), "python", "qsci_apis", "pyqgis.pap"))
             else:
                 # load user-defined API files
-                apiPaths = settings.value("pythonConsole/userAPI").toStringList()
+                apiPaths = settings.value("pythonConsole/userAPI", [])
                 for path in apiPaths:
                     self.api.load(path)
                 self.api.prepare()

diff --git a/python/plugins/processing/gui/ScriptEditorDialog.py b/python/plugins/processing/gui/ScriptEditorDialog.py
@@ -37,7 +37,7 @@
 from processing.gui.HelpEditionDialog import HelpEditionDialog
 from processing.gui.ScriptEdit import ScriptEdit
 
-from sextante.modeler.Providers import Providers
+from processing.modeler.Providers import Providers
 
 from processing.r.RAlgorithm import RAlgorithm
 from processing.r.RUtils import RUtils
@@ -58,8 +58,8 @@ def __init__(self, algType, alg):
         self.setupUi(self)
 
         # set icons
-        self.btnSave.setIcon(QgsApplication.getThemeIcon("/mActionFileSave.png"))
-        self.btnSaveAs.setIcon(QgsApplication.getThemeIcon("/mActionFileSaveAs.png"))
+        self.btnSave.setIcon(QgsApplication.getThemeIcon("/mActionFileSave.svg"))
+        self.btnSaveAs.setIcon(QgsApplication.getThemeIcon("/mActionFileSaveAs.svg"))
         self.btnEditHelp.setIcon(QIcon(":/processing/images/edithelp.png"))
         self.btnRun.setIcon(QIcon(":/processing/images/runalgorithm.png"))
         self.btnCut.setIcon(QgsApplication.getThemeIcon("/mActionEditCut.png"))

diff --git a/python/plugins/processing/r/RAlgorithmProvider.py b/python/plugins/processing/r/RAlgorithmProvider.py
@@ -33,8 +33,6 @@
 from processing.core.AlgorithmProvider import AlgorithmProvider
 from processing.core.ProcessingUtils import ProcessingUtils
 
-from processing.core.SextanteUtils import SextanteUtils
-
 from processing.gui.EditScriptAction import EditScriptAction
 from processing.gui.DeleteScriptAction import DeleteScriptAction
 from processing.gui.CreateNewScriptAction import CreateNewScriptAction
@@ -71,7 +69,7 @@ def unload(self):
             ProcessingConfig.removeSetting(RUtils.R_USE64)
 
     def getIcon(self):
-        return QIcon(":/sextante/images/r.png")
+        return QIcon(":/processing/images/r.png")
 
     def getDescription(self):
         return "R scripts"

diff --git a/python/plugins/processing/script/ScriptAlgorithmProvider.py b/python/plugins/processing/script/ScriptAlgorithmProvider.py
@@ -60,7 +60,7 @@ def unload(self):
         ProcessingConfig.addSetting(ScriptUtils.SCRIPTS_FOLDER)
 
     def getIcon(self):
-        return QIcon(":/sextante/images/script.png")
+        return QIcon(":/processing/images/script.png")
 
     def getName(self):
         return "script"