Skip to content
This repository has been archived by the owner on Sep 20, 2024. It is now read-only.

General: Update MacOs to PySide6 #4255

Merged
merged 45 commits into from
Jan 17, 2023
Merged

General: Update MacOs to PySide6 #4255

Changes from 1 commit
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
4775bec
Merge branch 'release/3.15.x' into feature/OP-4634_Use-qtpy-in-tools
iLLiCiTiT Dec 21, 2022
227c61d
use qtpy in publisher tool
iLLiCiTiT Dec 21, 2022
fa48c9d
use qtpy in workfiles tool
iLLiCiTiT Dec 21, 2022
0b5b7f5
use qtpy in subset manager
iLLiCiTiT Dec 21, 2022
e6a7de5
use qtpy in scene inventory
iLLiCiTiT Dec 21, 2022
40d4489
use qtpy in pyblish pype
iLLiCiTiT Dec 21, 2022
d8d99f8
use qtpy in loader
iLLiCiTiT Dec 21, 2022
678f6c6
use qtpy in library loader
iLLiCiTiT Dec 21, 2022
9f616c2
use qtpy in mayalookassigner
iLLiCiTiT Dec 21, 2022
e9ca36d
use qtpy in creator
iLLiCiTiT Dec 21, 2022
8893954
use qtpy in attribute definitions
iLLiCiTiT Dec 21, 2022
3468a28
use qtpy in remaining qt utils
iLLiCiTiT Dec 21, 2022
5361cfa
use qtpy in style
iLLiCiTiT Dec 21, 2022
c45c1c7
non-python host launch script uses qtpy
iLLiCiTiT Dec 21, 2022
ab2299f
use qtpy in helper widgets
iLLiCiTiT Dec 21, 2022
b03947b
use qtpy in qargparse
iLLiCiTiT Dec 21, 2022
ddba174
scriptsmenu is using qtpy
iLLiCiTiT Dec 21, 2022
e514534
global loader plugins are using qtpy
iLLiCiTiT Dec 21, 2022
727b17b
added qtpy 1.11.3 into python 2 vendor
iLLiCiTiT Dec 21, 2022
8277adc
updated QtPy to 2.3.0
iLLiCiTiT Dec 21, 2022
8e19d09
use class attributes from classes instead of objects
iLLiCiTiT Dec 21, 2022
7cd57e0
support new method for regex filtering
iLLiCiTiT Dec 21, 2022
c849c83
added pyside6 resources
iLLiCiTiT Dec 21, 2022
1fdf261
added ability to define qtbinding per platform
iLLiCiTiT Dec 21, 2022
b5b8119
use class attributes from classes
iLLiCiTiT Dec 21, 2022
940cb35
fix usage of filteregexp
iLLiCiTiT Dec 21, 2022
7ce1dfb
fix center window 'maybe'
iLLiCiTiT Dec 21, 2022
dd8a7e5
fix usage of qtpy in assets widget
iLLiCiTiT Dec 21, 2022
fd611bd
changed PySide2 to PySide2 in pyproject toml
iLLiCiTiT Dec 21, 2022
0aa0111
fix checked int for pyside6
iLLiCiTiT Jan 6, 2023
679becc
fix work with checkstate constants
iLLiCiTiT Jan 6, 2023
77df80a
removed unused import
iLLiCiTiT Jan 6, 2023
aaf9be0
keep Pyside6 only for macos
iLLiCiTiT Jan 9, 2023
bc61b45
use right constants
iLLiCiTiT Jan 16, 2023
681364b
fix custom UserType items
iLLiCiTiT Jan 16, 2023
118d1ee
Fix 'QRegExpValidator' vs. 'QRegularExpressionValidator'
iLLiCiTiT Jan 16, 2023
1d2cf74
fix also 'QRegExp' vs. 'QRegularExpression'
iLLiCiTiT Jan 16, 2023
0aad4cd
ignore 'QT_API' before application launch
iLLiCiTiT Jan 16, 2023
2546274
Fix whitespace
iLLiCiTiT Jan 16, 2023
459ed76
fix access to 'CE_ItemViewItem' constant
iLLiCiTiT Jan 16, 2023
782957b
Merge branch 'release/3.15.x' into feature/OP-4634_Use-qtpy-in-tools
iLLiCiTiT Jan 16, 2023
da99fb2
update qtpy
iLLiCiTiT Jan 16, 2023
9c01caf
again fix constant changes
iLLiCiTiT Jan 17, 2023
aac0860
Merge branch 'release/3.15.x' into feature/OP-4634_Use-qtpy-in-tools
iLLiCiTiT Jan 17, 2023
0994795
fix another one constant usage
iLLiCiTiT Jan 17, 2023
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
Prev Previous commit
Next Next commit
fix custom UserType items
  • Loading branch information
@iLLiCiTiT
iLLiCiTiT committed Jan 16, 2023
commit 681364bbea80b33bf34507cf1934eda42b78e3f5
13 changes: 8 additions & 5 deletions openpype/tools/pyblish_pype/model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,14 @@


# ItemTypes
InstanceType = QtGui.QStandardItem.UserType
PluginType = QtGui.QStandardItem.UserType + 1
GroupType = QtGui.QStandardItem.UserType + 2
TerminalLabelType = QtGui.QStandardItem.UserType + 3
TerminalDetailType = QtGui.QStandardItem.UserType + 4
UserType = QtGui.QStandardItem.UserType
if hasattr(UserType, "value"):
UserType = UserType.value
InstanceType = UserType
PluginType = UserType + 1
GroupType = UserType + 2
TerminalLabelType = UserType + 3
TerminalDetailType = UserType + 4


class QAwesomeTextIconFactory:
Expand Down