Skip to content

Commit

Permalink
Merge branch 'main' into ocioview-mac
Browse files Browse the repository at this point in the history
Signed-off-by: Michael Dolan <[email protected]>
  • Loading branch information
michdolan committed Oct 30, 2023
2 parents 99f7c07 + 0d00b2c commit c1fa6d7
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ expected to validate the behavior of every part of OCIO:
* Any change to existing functionality should have tests added if they
don't already exist.

The test should should be run, via ``ctest``, before submitting a pull request.
The test should be run, via ``ctest``, before submitting a pull request.

## Versioning Policy

Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Houdini, Silhouette FX, and
[others](https://opencolorio.org/#supported_apps).

OpenColorIO is free and open source software ([LICENSE](LICENSE)), and
one of several projects actvively sponsored by the ASWF
one of several projects actively sponsored by the ASWF
([Academy Software Foundation](https://www.aswf.io/)).

OpenColorIO Project Mission
Expand All @@ -50,12 +50,12 @@ content creation applications and pipelines.

OpenColorIO aims to:

* be stable, secure, and thouroughly tested on Linux, macOS, and Windows
* be stable, secure, and thoroughly tested on Linux, macOS, and Windows
* be performant on modern CPUs and GPUs
* be simple, scalable, and well documented
* be compatible with critical color and imaging standards
* provide lossless color processing wherever possible
* maintain config backwards compatability across major versions
* maintain config backwards compatibility across major versions
* have every new feature carefully reviewed by leaders from the motion picture,
VFX, animation, and video game industries
* have a healthy and active community
Expand All @@ -65,7 +65,7 @@ OpenColorIO Project Governance
------------------------------

OpenColorIO is governed by the Academy Software Foundation (ASWF). See
[GOVERNANCE.md](GOVERNANCE.md) for detailed infomation about how the project
[GOVERNANCE.md](GOVERNANCE.md) for detailed information about how the project
operates.

Web Resources
Expand Down
7 changes: 4 additions & 3 deletions src/apps/ocioview/ocioview/widgets/list_widget.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright Contributors to the OpenColorIO Project.

from typing import Callable, Optional, Union
from typing import Callable, Optional, TYPE_CHECKING, Union

from PySide6 import QtCore, QtGui, QtWidgets

from ..items.config_item_model import BaseConfigItemModel
from ..utils import SignalsBlocked, next_name
from .item_view import BaseItemView

if TYPE_CHECKING:
from ..items.config_item_model import BaseConfigItemModel

class StringListWidget(BaseItemView):
"""
Expand Down Expand Up @@ -221,7 +222,7 @@ class ItemModelListWidget(BaseItemView):

def __init__(
self,
model: BaseConfigItemModel,
model: "BaseConfigItemModel",
model_column: int,
item_flags: QtCore.Qt.ItemFlags = BaseItemView.DEFAULT_ITEM_FLAGS,
item_icon: Optional[QtGui.QIcon] = None,
Expand Down

0 comments on commit c1fa6d7

Please sign in to comment.