Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Settings UI: Locked setting can't bypass lock #4066

Merged
merged 2 commits into from
Nov 4, 2022
Merged

Settings UI: Locked setting can't bypass lock #4066

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
406a7e0
project list does not trigger unsaved changes dialog if is not in edi…
iLLiCiTiT Nov 3, 2022
040ba43
added title to unsaved changes dialog
iLLiCiTiT Nov 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions openpype/tools/settings/settings/categories.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -892,6 +892,10 @@ class ProjectWidget(SettingsCategoryWidget):
def __init__(self, *args, **kwargs):
super(ProjectWidget, self).__init__(*args, **kwargs)

def set_edit_mode(self, enabled):
super(ProjectWidget, self).set_edit_mode(enabled)
self.project_list_widget.set_edit_mode(enabled)

def _check_last_saved_info(self):
if self.is_modifying_defaults:
return True
Expand Down
10 changes: 9 additions & 1 deletion openpype/tools/settings/settings/widgets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -646,6 +646,9 @@ class UnsavedChangesDialog(QtWidgets.QDialog):

def __init__(self, parent=None):
super(UnsavedChangesDialog, self).__init__(parent)

self.setWindowTitle("Unsaved changes")

message_label = QtWidgets.QLabel(self.message)

btns_widget = QtWidgets.QWidget(self)
Expand Down Expand Up @@ -1009,6 +1012,7 @@ def __init__(self, parent, only_active=False):

self._entity = None
self.current_project = None
self._edit_mode = True

super(ProjectListWidget, self).__init__(parent)
self.setObjectName("ProjectListWidget")
Expand Down Expand Up @@ -1061,6 +1065,10 @@ def __init__(self, parent, only_active=False):
self.project_model = project_model
self.inactive_chk = inactive_chk

def set_edit_mode(self, enabled):
if self._edit_mode is not enabled:
self._edit_mode = enabled

def set_entity(self, entity):
self._entity = entity

Expand Down Expand Up @@ -1112,7 +1120,7 @@ def on_item_clicked(self, new_index):

save_changes = False
change_project = False
if self.validate_context_change():
if not self._edit_mode or self.validate_context_change():
change_project = True

else:
Expand Down