From ea75b495a0b8256099bee3b070659cdcf1c40d38 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Mon, 22 Mar 2021 10:51:38 +0100 Subject: [PATCH] removed with_arguments key from path schema --- pype/settings/entities/input_entities.py | 9 ++----- pype/settings/entities/item_entities.py | 15 +++-------- .../settings/settings/widgets/item_widgets.py | 27 +++---------------- 3 files changed, 9 insertions(+), 42 deletions(-) diff --git a/pype/settings/entities/input_entities.py b/pype/settings/entities/input_entities.py index c26cb249a6..1afeb9f311 100644 --- a/pype/settings/entities/input_entities.py +++ b/pype/settings/entities/input_entities.py @@ -366,13 +366,8 @@ class PathInput(InputEntity): schema_types = ["path-input"] def _item_initalization(self): - self.with_arguments = self.schema_data.get("with_arguments", False) - if self.with_arguments: - self.valid_value_types = (list, ) - self.value_on_not_set = ["", ""] - else: - self.valid_value_types = (STRING_TYPE, ) - self.value_on_not_set = "" + self.valid_value_types = (STRING_TYPE, ) + self.value_on_not_set = "" class RawJsonEntity(InputEntity): diff --git a/pype/settings/entities/item_entities.py b/pype/settings/entities/item_entities.py index 11e43e4fa6..42374c350c 100644 --- a/pype/settings/entities/item_entities.py +++ b/pype/settings/entities/item_entities.py @@ -53,15 +53,13 @@ class PathEntity(ItemEntity): self.multiplatform = self.schema_data.get("multiplatform", False) self.multipath = self.schema_data.get("multipath", False) - self.with_arguments = self.schema_data.get("with_arguments", False) # Create child object if not self.multiplatform and not self.multipath: valid_value_types = (STRING_TYPE, ) item_schema = { "type": "path-input", - "key": self.key, - "with_arguments": self.with_arguments + "key": self.key } elif not self.multiplatform: @@ -69,10 +67,7 @@ class PathEntity(ItemEntity): item_schema = { "type": "list", "key": self.key, - "object_type": { - "type": "path-input", - "with_arguments": self.with_arguments - } + "object_type": "path-input" } else: @@ -91,13 +86,9 @@ class PathEntity(ItemEntity): } if self.multipath: child_item["type"] = "list" - child_item["object_type"] = { - "type": "path-input", - "with_arguments": self.with_arguments - } + child_item["object_type"] = "path-input" else: child_item["type"] = "path-input" - child_item["with_arguments"] = self.with_arguments item_schema["children"].append(child_item) diff --git a/pype/tools/settings/settings/widgets/item_widgets.py b/pype/tools/settings/settings/widgets/item_widgets.py index 7cfcd84488..d7d6b8ab34 100644 --- a/pype/tools/settings/settings/widgets/item_widgets.py +++ b/pype/tools/settings/settings/widgets/item_widgets.py @@ -623,40 +623,21 @@ class PathWidget(BaseWidget): class PathInputWidget(InputWidget): def _add_inputs_to_layout(self): self.input_field = QtWidgets.QLineEdit(self.content_widget) - self.args_input_field = None - if self.entity.with_arguments: - self.input_field.setPlaceholderText("Executable path") - self.args_input_field = QtWidgets.QLineEdit(self) - self.args_input_field.setPlaceholderText("Arguments") + self.input_field.setPlaceholderText("Executable path") self.setFocusProxy(self.input_field) - self.content_layout.addWidget(self.input_field, 8) + self.content_layout.addWidget(self.input_field) self.input_field.textChanged.connect(self._on_value_change) - if self.args_input_field: - self.content_layout.addWidget(self.args_input_field, 2) - self.args_input_field.textChanged.connect(self._on_value_change) - def _on_entity_change(self): if self.entity.value != self.input_value(): self.set_entity_value() def set_entity_value(self): - value = self.entity.value - args = "" - if isinstance(value, list): - value, args = value - self.input_field.setText(value) - if self.args_input_field: - self.args_input_field.setText(args) + self.input_field.setText(self.entity.value) def input_value(self): - path_value = self.input_field.text() - if self.entity.with_arguments: - value = [path_value, self.args_input_field.text()] - else: - value = path_value - return value + return self.input_field.text() def _on_value_change(self): if self.ignore_input_changes: