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

updated base with new changes

Browse source
This commit is contained in:
iLLiCiTiT 2020-11-27 03:33:49 +01:00
parent 0ebd6466e9
commit b873c9bc82
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
pype/tools/settings/settings/widgets/base.py
View file

@ -21,7 +21,11 @@ from pype.settings.lib import (
save_studio_settings, save_studio_settings,
save_project_settings, save_project_settings,
save_project_anatomy save_project_anatomy,
apply_overrides,
find_environments,
DuplicatedEnvGroups
) )
from .widgets import UnsavedChangesDialog from .widgets import UnsavedChangesDialog
from . import lib from . import lib
@ -216,6 +220,9 @@ class SystemWidget(QtWidgets.QWidget):
values = lib.convert_gui_data_to_overrides(_data.get("system", {})) values = lib.convert_gui_data_to_overrides(_data.get("system", {}))
if not self.duplicated_env_group_validation(overrides=values):
return
save_studio_settings(values) save_studio_settings(values)
self._update_values() self._update_values()
@ -528,7 +535,7 @@ class ProjectWidget(QtWidgets.QWidget):
layout.addWidget(project_list_widget, 0) layout.addWidget(project_list_widget, 0)
layout.addWidget(configurations_widget, 1) layout.addWidget(configurations_widget, 1)
save_btn.clicked.connect(self._save) save_btn.clicked.connect(self._save_overrides)
project_list_widget.project_changed.connect(self._on_project_change) project_list_widget.project_changed.connect(self._on_project_change)
self.project_list_widget = project_list_widget self.project_list_widget = project_list_widget
@ -655,7 +662,7 @@ class ProjectWidget(QtWidgets.QWidget):
has_invalid = True has_invalid = True
if not has_invalid: if not has_invalid:
return self._save_overrides() return True
invalid_items = [] invalid_items = []
for item in self.input_fields: for item in self.input_fields:
@ -673,6 +680,7 @@ class ProjectWidget(QtWidgets.QWidget):
self.scroll_widget.ensureWidgetVisible(first_invalid_item) self.scroll_widget.ensureWidgetVisible(first_invalid_item)
if first_invalid_item.isVisible(): if first_invalid_item.isVisible():
first_invalid_item.setFocus(True) first_invalid_item.setFocus(True)
return False
def _on_refresh(self): def _on_refresh(self):
self.reset() self.reset()