Merge branch 'develop' into 1593-yn-0303-thumbnail-and-review-colorspace-is-off

This commit is contained in:
Roy Nieterau 2025-12-10 00:40:50 +01:00 committed by GitHub
commit 9e34f628e6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 28 additions and 0 deletions

View file

@ -112,6 +112,7 @@ class HierarchyPage(QtWidgets.QWidget):
self._is_visible = False self._is_visible = False
self._controller = controller self._controller = controller
self._filters_widget = filters_widget
self._btn_back = btn_back self._btn_back = btn_back
self._projects_combobox = projects_combobox self._projects_combobox = projects_combobox
self._folders_widget = folders_widget self._folders_widget = folders_widget
@ -136,6 +137,10 @@ class HierarchyPage(QtWidgets.QWidget):
self._folders_widget.refresh() self._folders_widget.refresh()
self._tasks_widget.refresh() self._tasks_widget.refresh()
self._workfiles_page.refresh() self._workfiles_page.refresh()
# Update my tasks
self._on_my_tasks_checkbox_state_changed(
self._filters_widget.is_my_tasks_checked()
)
def _on_back_clicked(self): def _on_back_clicked(self):
self._controller.set_selected_project(None) self._controller.set_selected_project(None)
@ -155,6 +160,7 @@ class HierarchyPage(QtWidgets.QWidget):
) )
folder_ids = entity_ids["folder_ids"] folder_ids = entity_ids["folder_ids"]
task_ids = entity_ids["task_ids"] task_ids = entity_ids["task_ids"]
self._folders_widget.set_folder_ids_filter(folder_ids) self._folders_widget.set_folder_ids_filter(folder_ids)
self._tasks_widget.set_task_ids_filter(task_ids) self._tasks_widget.set_task_ids_filter(task_ids)

View file

@ -527,6 +527,10 @@ class LoaderWindow(QtWidgets.QWidget):
if not self._refresh_handler.project_refreshed: if not self._refresh_handler.project_refreshed:
self._projects_combobox.refresh() self._projects_combobox.refresh()
self._update_filters() self._update_filters()
# Update my tasks
self._on_my_tasks_checkbox_state_changed(
self._filters_widget.is_my_tasks_checked()
)
def _on_load_finished(self, event): def _on_load_finished(self, event):
error_info = event["error_info"] error_info = event["error_info"]

View file

@ -221,6 +221,7 @@ class CreateContextWidget(QtWidgets.QWidget):
filters_widget.text_changed.connect(self._on_folder_filter_change) filters_widget.text_changed.connect(self._on_folder_filter_change)
filters_widget.my_tasks_changed.connect(self._on_my_tasks_change) filters_widget.my_tasks_changed.connect(self._on_my_tasks_change)
self._filters_widget = filters_widget
self._current_context_btn = current_context_btn self._current_context_btn = current_context_btn
self._folders_widget = folders_widget self._folders_widget = folders_widget
self._tasks_widget = tasks_widget self._tasks_widget = tasks_widget
@ -290,6 +291,10 @@ class CreateContextWidget(QtWidgets.QWidget):
self._hierarchy_controller.set_expected_selection( self._hierarchy_controller.set_expected_selection(
self._last_project_name, folder_id, task_name self._last_project_name, folder_id, task_name
) )
# Update my tasks
self._on_my_tasks_change(
self._filters_widget.is_my_tasks_checked()
)
def _clear_selection(self): def _clear_selection(self):
self._folders_widget.set_selected_folder(None) self._folders_widget.set_selected_folder(None)

View file

@ -113,6 +113,7 @@ class FoldersDialog(QtWidgets.QDialog):
self._soft_reset_enabled = False self._soft_reset_enabled = False
self._folders_widget.set_project_name(self._project_name) self._folders_widget.set_project_name(self._project_name)
self._on_my_tasks_change(self._filters_widget.is_my_tasks_checked())
def get_selected_folder_path(self): def get_selected_folder_path(self):
"""Get selected folder path.""" """Get selected folder path."""

View file

@ -834,6 +834,12 @@ class FoldersFiltersWidget(QtWidgets.QWidget):
self._folders_filter_input = folders_filter_input self._folders_filter_input = folders_filter_input
self._my_tasks_checkbox = my_tasks_checkbox self._my_tasks_checkbox = my_tasks_checkbox
def is_my_tasks_checked(self) -> bool:
return self._my_tasks_checkbox.isChecked()
def text(self) -> str:
return self._folders_filter_input.text()
def set_text(self, text: str) -> None: def set_text(self, text: str) -> None:
self._folders_filter_input.setText(text) self._folders_filter_input.setText(text)

View file

@ -205,6 +205,8 @@ class WorkfilesToolWindow(QtWidgets.QWidget):
self._folders_widget = folder_widget self._folders_widget = folder_widget
self._filters_widget = filters_widget
return col_widget return col_widget
def _create_col_3_widget(self, controller, parent): def _create_col_3_widget(self, controller, parent):
@ -343,6 +345,10 @@ class WorkfilesToolWindow(QtWidgets.QWidget):
self._project_name = self._controller.get_current_project_name() self._project_name = self._controller.get_current_project_name()
self._folders_widget.set_project_name(self._project_name) self._folders_widget.set_project_name(self._project_name)
# Update my tasks
self._on_my_tasks_checkbox_state_changed(
self._filters_widget.is_my_tasks_checked()
)
def _on_save_as_finished(self, event): def _on_save_as_finished(self, event):
if event["failed"]: if event["failed"]: