Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2026-01-01 08:24:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into feature/OP-3292_Map-where-database-queries-and-changes

Browse source
This commit is contained in:
Jakub Trllo 2022-06-13 16:07:19 +02:00
commit 153491f781
15 changed files with 413 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

6
openpype/tools/project_manager/project_manager/delegates.py
View file

@ -205,3 +205,9 @@ class ToolsDelegate(QtWidgets.QStyledItemDelegate):
def setModelData(self, editor, model, index):
model.setData(index, editor.value(), QtCore.Qt.EditRole)
def displayText(self, value, locale):
if value:
return ", ".join(value)
else:
return

6
openpype/tools/project_manager/project_manager/view.py
View file

@ -378,7 +378,7 @@ class HierarchyView(QtWidgets.QTreeView):
self._source_model.delete_indexes(indexes)
def _on_ctrl_shift_enter_pressed(self):
self._add_task_and_edit()
self.add_task_and_edit()
def add_asset(self, parent_index=None):
if parent_index is None:
@ -420,9 +420,9 @@ class HierarchyView(QtWidgets.QTreeView):
self.edit(new_index)
def _add_task_action(self):
self._add_task_and_edit()
self.add_task_and_edit()
def _add_task_and_edit(self):
def add_task_and_edit(self):
new_index = self.add_task()
if new_index is None:
return

2
openpype/tools/project_manager/project_manager/window.py
View file

@ -245,7 +245,7 @@ class ProjectManagerWindow(QtWidgets.QWidget):
self.hierarchy_view.add_asset()
def _on_add_task(self):
self.hierarchy_view.add_task()
self.hierarchy_view.add_task_and_edit()
def _on_create_folders(self):
project_name = self._current_project()