Skip to content

Commit 2b61f79

Browse files
volayavolaya
committedSep 24, 2013
[processing] renmed setting group from ProcessingQGIS to Processing
·
ltr-3_40archive/master_2
1 parent 1ad2334 commit 2b61f79

File tree

10 files changed

+23
-25
lines changed

10 files changed

+23
-25
lines changed
 

‎python/plugins/processing/core/VectorWriter.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ def __init__(self, fileName, encoding, fields, geometryType, crs, options=None):
4747

4848
if encoding is None:
4949
settings = QSettings()
50-
encoding = settings.value("/ProcessingQGIS/encoding", "System")
50+
encoding = settings.value("/Processing/encoding", "System")
5151

5252
if self.fileName.startswith(self.MEMORY_LAYER_PREFIX):
5353
self.isMemory = True

‎python/plugins/processing/gui/BatchInputSelectionPanel.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,19 +57,19 @@ def showSelectionDialog(self):
5757
path = text
5858
elif os.path.isdir(os.path.dirname(text)):
5959
path = os.path.dirname(text)
60-
elif settings.contains("/ProcessingQGIS/LastInputPath"):
61-
path = unicode(settings.value( "/ProcessingQGIS/LastInputPath"))
60+
elif settings.contains("/Processing/LastInputPath"):
61+
path = unicode(settings.value( "/Processing/LastInputPath"))
6262
else:
6363
path = ""
6464

6565
ret = QtGui.QFileDialog.getOpenFileNames(self, "Open file", path, self.param.getFileFilter())
6666
if ret:
6767
files = list(ret)
6868
if len(files) == 1:
69-
settings.setValue("/ProcessingQGIS/LastInputPath", os.path.dirname(unicode(files[0])))
69+
settings.setValue("/Processing/LastInputPath", os.path.dirname(unicode(files[0])))
7070
self.text.setText(str(files[0]))
7171
else:
72-
settings.setValue("/ProcessingQGIS/LastInputPath", os.path.dirname(unicode(files[0])))
72+
settings.setValue("/Processing/LastInputPath", os.path.dirname(unicode(files[0])))
7373
if isinstance(self.param, ParameterMultipleInput):
7474
self.text.setText(";".join(unicode(f) for f in files))
7575
else:

‎python/plugins/processing/gui/FileSelectionPanel.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,21 +52,21 @@ def showSelectionDialog(self):
5252
path = text
5353
elif os.path.isdir( os.path.dirname(text) ):
5454
path = os.path.dirname(text)
55-
elif settings.contains("/ProcessingQGIS/LastInputPath"):
56-
path = settings.value( "/ProcessingQGIS/LastInputPath")
55+
elif settings.contains("/Processing/LastInputPath"):
56+
path = settings.value( "/Processing/LastInputPath")
5757
else:
5858
path = ""
5959

6060
if self.isFolder:
6161
folder = QtGui.QFileDialog.getExistingDirectory(self, "Select folder", path)
6262
if folder:
6363
self.text.setText(str(folder))
64-
settings.setValue("/ProcessingQGIS/LastInputPath", os.path.dirname(unicode(folder)))
64+
settings.setValue("/Processing/LastInputPath", os.path.dirname(unicode(folder)))
6565
else:
6666
filenames = QtGui.QFileDialog.getOpenFileNames(self, "Open file", path, "*.*")
6767
if filenames:
6868
self.text.setText(u";".join(filenames))
69-
settings.setValue("/ProcessingQGIS/LastInputPath", os.path.dirname(unicode(filenames[0])))
69+
settings.setValue("/Processing/LastInputPath", os.path.dirname(unicode(filenames[0])))
7070

7171
def getValue(self):
7272
s = unicode(self.text.text())

‎python/plugins/processing/gui/InputLayerSelectorPanel.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,16 @@ def showSelectionDialog(self):
5252
path = text
5353
elif os.path.isdir( os.path.dirname(text) ):
5454
path = os.path.dirname(text)
55-
elif settings.contains("/ProcessingQGIS/LastInputPath"):
56-
path = unicode(settings.value( "/ProcessingQGIS/LastInputPath"))
55+
elif settings.contains("/Processing/LastInputPath"):
56+
path = unicode(settings.value( "/Processing/LastInputPath"))
5757
else:
5858
path = ""
5959

6060
filename = QtGui.QFileDialog.getOpenFileName(self, "All files", path, "*.*")
6161
if filename:
6262
self.text.addItem(filename, filename)
6363
self.text.setCurrentIndex(self.text.count() - 1)
64-
settings.setValue("/ProcessingQGIS/LastInputPath", os.path.dirname(unicode(filename)))
64+
settings.setValue("/Processing/LastInputPath", os.path.dirname(unicode(filename)))
6565

6666
def getValue(self):
6767
return self.text.itemData(self.text.currentIndex())

‎python/plugins/processing/gui/OutputSelectionPanel.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,11 @@ def saveToMemory(self):
7777
def saveToFile(self):
7878
filefilter = self.output.getFileFilter(self.alg)
7979
settings = QSettings()
80-
if settings.contains("/ProcessingQGIS/LastOutputPath"):
81-
path = settings.value( "/ProcessingQGIS/LastOutputPath")
80+
if settings.contains("/Processing/LastOutputPath"):
81+
path = settings.value( "/Processing/LastOutputPath")
8282
else:
8383
path = ProcessingConfig.getSetting(ProcessingConfig.OUTPUT_FOLDER)
84-
lastEncoding = settings.value("/ProcessingQGIS/encoding", "System")
84+
lastEncoding = settings.value("/Processing/encoding", "System")
8585
fileDialog = QgsEncodingFileDialog(self, "Save file", path, filefilter, lastEncoding)
8686
fileDialog.setFileMode(QFileDialog.AnyFile)
8787
fileDialog.setAcceptMode(QFileDialog.AcceptSave)
@@ -97,8 +97,8 @@ def saveToFile(self):
9797
if ext:
9898
filename = filename + ext.group(1)
9999
self.text.setText(filename)
100-
settings.setValue("/ProcessingQGIS/LastOutputPath", os.path.dirname(filename))
101-
settings.setValue("/ProcessingQGIS/encoding", encoding)
100+
settings.setValue("/Processing/LastOutputPath", os.path.dirname(filename))
101+
settings.setValue("/Processing/encoding", encoding)
102102

103103
def getValue(self):
104104
filename = unicode(self.text.text())

‎python/plugins/processing/gui/ProcessingToolbox.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242

4343
class ProcessingToolbox(QDockWidget, Ui_ProcessingToolbox):
4444

45-
USE_CATEGORIES = "/ProcessingQGIS/UseCategories"
45+
USE_CATEGORIES = "/Processing/UseSimplifiedInterface"
4646

4747
def __init__(self):
4848
QDockWidget.__init__(self, None)
@@ -53,7 +53,7 @@ def __init__(self):
5353
self.modeComboBox.addItems(['Simplified interface', 'Advanced interface'])
5454
settings = QSettings()
5555
if not settings.contains(self.USE_CATEGORIES):
56-
settings.setValue(self.USE_CATEGORIES, True)
56+
settings.setValue(self.USE_CATEGORIES, False)
5757
useCategories = settings.value(self.USE_CATEGORIES, type = bool)
5858
if useCategories:
5959
self.modeComboBox.setCurrentIndex(0)

‎python/plugins/processing/gui/ScriptEditorDialog.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ def saveScript(self, saveAs):
123123
filterName = self.tr("Python scripts (*.py)")
124124
elif self.algType == self.SCRIPT_R:
125125
scriptDir = RUtils.RScriptsFolder()
126-
filterName = self.tr("SEXTANTE R script (*.rsx)")
126+
filterName = self.tr("Processing R script (*.rsx)")
127127

128128
self.filename = unicode(QFileDialog.getSaveFileName(self,
129129
self.tr("Save script"),

‎python/plugins/processing/modeler/ModelerDialog.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,16 +45,14 @@
4545

4646
class ModelerDialog(QDialog, Ui_DlgModeler):
4747

48-
USE_CATEGORIES = "/ProcessingQGIS/UseCategories"
48+
USE_CATEGORIES = "/Processing/UseSimplifiedInterface"
4949

5050
def __init__(self, alg=None):
5151
QDialog.__init__(self)
5252

5353
self.hasChanged = False
5454
self.setupUi(self)
5555

56-
#self.setWindowFlags(self.windowFlags() | Qt.WindowSystemMenuHint |
57-
# Qt.WindowMinMaxButtonsHint)
5856
self.tabWidget.setCurrentIndex(0)
5957
self.scene = ModelerScene(self)
6058
self.scene.setSceneRect(QRectF(0, 0, 4000, 4000))

‎python/plugins/processing/outputs/OutputTable.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,6 @@ def getTableWriter(self, fields):
6767

6868
if self.encoding is None:
6969
settings = QSettings()
70-
self.encoding = settings.value("/ProcessingQGIS/encoding", "System")
70+
self.encoding = settings.value("/Processing/encoding", "System")
7171

7272
return TableWriter(self.value, self.encoding, fields)

‎python/plugins/processing/outputs/OutputVector.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ def getVectorWriter(self, fields, geomType, crs, options=None):
8080

8181
if self.encoding is None:
8282
settings = QSettings()
83-
self.encoding = settings.value("/ProcessingQGIS/encoding", "System")
83+
self.encoding = settings.value("/Processing/encoding", "System")
8484

8585
w = VectorWriter(self.value, self.encoding, fields, geomType, crs, options)
8686
self.memoryLayer = w.memLayer

0 commit comments

Comments
 (0)
Please sign in to comment.