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

Add placeholder to ProcessingConfig (Setting class); use the placeholder for 'results group name' setting

Browse Source
This commit is contained in:
Germán Carrillo 2020-07-20 14:54:50 -05:00
parent bf6f4c51e4
commit debe2209fe
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
python/plugins/processing/core/ProcessingConfig.py
View File

@ -171,15 +171,18 @@ class ProcessingConfig:
ProcessingConfig.addSetting(Setting(
ProcessingConfig.tr('General'),
ProcessingConfig.TEMP_PATH,
ProcessingConfig.tr('Override temporary output folder path (leave blank for default)'), None,
valuetype=Setting.FOLDER))
ProcessingConfig.tr('Override temporary output folder path'), None,
valuetype=Setting.FOLDER,
placeholder=ProcessingConfig.tr('Leave blank for default')))
ProcessingConfig.addSetting(Setting(
ProcessingConfig.tr('General'),
ProcessingConfig.RESULTS_GROUP_NAME,
ProcessingConfig.tr("Results group name"),
"",
valuetype=Setting.STRING))
valuetype=Setting.STRING,
placeholder=ProcessingConfig.tr("Leave blank to avoid loading results in a predetermined group")
))
@staticmethod
def setGroupIcon(group, icon):
@ -266,7 +269,7 @@ class Setting:
MULTIPLE_FOLDERS = 6
def __init__(self, group, name, description, default, hidden=False, valuetype=None,
validator=None, options=None):
validator=None, options=None, placeholder=""):
self.group = group
self.name = name
self.qname = "Processing/Configuration/" + self.name
@ -275,6 +278,7 @@ class Setting:
self.hidden = hidden
self.valuetype = valuetype
self.options = options
self.placeholder = placeholder
if self.valuetype is None:
if isinstance(default, int):

16
python/plugins/processing/gui/ConfigDialog.py
View File

@ -366,15 +366,15 @@ class SettingDelegate(QStyledItemDelegate):
def createEditor(self, parent, options, index):
setting = index.model().data(index, Qt.UserRole)
if setting.valuetype == Setting.FOLDER:
return FileDirectorySelector(parent)
return FileDirectorySelector(parent, placeholder=setting.placeholder)
elif setting.valuetype == Setting.FILE:
return FileDirectorySelector(parent, True)
return FileDirectorySelector(parent, True, setting.placeholder)
elif setting.valuetype == Setting.SELECTION:
combo = QComboBox(parent)
combo.addItems(setting.options)
return combo
elif setting.valuetype == Setting.MULTIPLE_FOLDERS:
return MultipleDirectorySelector(parent)
return MultipleDirectorySelector(parent, setting.placeholder)
else:
value = self.convertValue(index.model().data(index, Qt.EditRole))
if isinstance(value, int):
@ -387,7 +387,9 @@ class SettingDelegate(QStyledItemDelegate):
spnBox.setDecimals(6)
return spnBox
elif isinstance(value, str):
return QLineEdit(parent)
lineEdit = QLineEdit(parent)
lineEdit.setPlaceholderText(setting.placeholder)
return lineEdit
def setEditorData(self, editor, index):
value = self.convertValue(index.model().data(index, Qt.EditRole))
@ -433,13 +435,14 @@ class SettingDelegate(QStyledItemDelegate):
class FileDirectorySelector(QWidget):
def __init__(self, parent=None, selectFile=False):
def __init__(self, parent=None, selectFile=False, placeholder=""):
QWidget.__init__(self, parent)
# create gui
self.btnSelect = QToolButton()
self.btnSelect.setText('…')
self.lineEdit = QLineEdit()
self.lineEdit.setPlaceholderText(placeholder)
self.hbl = QHBoxLayout()
self.hbl.setMargin(0)
self.hbl.setSpacing(0)
@ -480,13 +483,14 @@ class FileDirectorySelector(QWidget):
class MultipleDirectorySelector(QWidget):
def __init__(self, parent=None):
def __init__(self, parent=None, placeholder=""):
QWidget.__init__(self, parent)
# create gui
self.btnSelect = QToolButton()
self.btnSelect.setText('…')
self.lineEdit = QLineEdit()
self.lineEdit.setPlaceholderText(placeholder)
self.hbl = QHBoxLayout()
self.hbl.setMargin(0)
self.hbl.setSpacing(0)