sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix rebase issues

Browse Source
This commit is contained in:
Alexander Bruy 2013-09-03 14:51:57 +03:00
parent ca22774589
commit 0c94067b32
5 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
python/plugins/processing/gui/LexerR.py
View File

@ -26,9 +26,10 @@ __revision__ = '$Format:%H$'
import sys
from PyQt4.QtCore import *
from PyQt4.QtGui import *
from PyQt4.Qsci import *
class LexerR(QcsiLexerCustom):
class LexerR(QsciLexerCustom):
QUOTES = ["'", '"']
SEPARATORS = ["(", "=", ".", "<"]

14
python/plugins/processing/gui/ScriptEdit.py
View File

@ -23,13 +23,15 @@ __copyright__ = '(C) 2013, Alexander Bruy'
# 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 @@ class ScriptEdit(QsciScintilla):
# 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 @@ class ScriptEdit(QsciScintilla):
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()

6
python/plugins/processing/gui/ScriptEditorDialog.py
View File

@ -37,7 +37,7 @@ from processing.gui.ParametersDialog import ParametersDialog
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 @@ class ScriptEditorDialog(QDialog, Ui_DlgScriptEditor):
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"))

4
python/plugins/processing/r/RAlgorithmProvider.py
View File

@ -33,8 +33,6 @@ from processing.core.ProcessingLog import ProcessingLog
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 @@ class RAlgorithmProvider(AlgorithmProvider):
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"

2
python/plugins/processing/script/ScriptAlgorithmProvider.py
View File

@ -60,7 +60,7 @@ class ScriptAlgorithmProvider(AlgorithmProvider):
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"