Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2025-12-25 05:14:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

use functions for colors in tools

Browse source
This commit is contained in:
Jakub Trllo 2022-03-14 15:26:08 +01:00
parent 8d81a91c1c
commit 9bbaf42a3b
11 changed files with 93 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

5
openpype/plugins/load/copy_file.py
View file

@ -1,4 +1,5 @@
from avalon import api, style
from avalon import api
from openpype.style import get_default_entity_icon_color
class CopyFile(api.Loader):
@ -10,7 +11,7 @@ class CopyFile(api.Loader):
label = "Copy File"
order = 10
icon = "copy"
color = style.colors.default
color = get_default_entity_icon_color()
def load(self, context, name=None, namespace=None, data=None):
self.log.info("Added copy to clipboard: {0}".format(self.fname))

19
openpype/tools/loader/model.py
View file

@ -3,15 +3,13 @@ import re
import math
from uuid import uuid4
from avalon import (
style,
schema
)
from Qt import QtCore, QtGui
import qtawesome
from avalon import schema
from avalon.lib import HeroVersionType
from openpype.style import get_default_entity_icon_color
from openpype.tools.utils.models import TreeModel, Item
from openpype.tools.utils import lib
@ -180,7 +178,10 @@ class SubsetsModel(TreeModel, BaseRepresentationModel):
self._sorter = None
self._grouping = grouping
self._icons = {
"subset": qtawesome.icon("fa.file-o", color=style.colors.default)
"subset": qtawesome.icon(
"fa.file-o",
color=get_default_entity_icon_color()
)
}
self._items_by_id = {}
@ -1066,8 +1067,10 @@ class RepresentationModel(TreeModel, BaseRepresentationModel):
self._docs = {}
self._icons = lib.get_repre_icons()
self._icons["repre"] = qtawesome.icon("fa.file-o",
color=style.colors.default)
self._icons["repre"] = qtawesome.icon(
"fa.file-o",
color=get_default_entity_icon_color()
)
self._items_by_id = {}
def set_version_ids(self, version_ids):
@ -1165,7 +1168,7 @@ class RepresentationModel(TreeModel, BaseRepresentationModel):
"remote_site_name": self.remote_site,
"icon": qtawesome.icon(
"fa.folder",
color=style.colors.default
color=get_default_entity_icon_color()
)
})
self._items_by_id[item_id] = group_item

13
openpype/tools/mayalookassigner/models.py
View file

@ -3,14 +3,19 @@ from collections import defaultdict
from Qt import QtCore
import qtawesome
from avalon.style import colors
from openpype.tools.utils import models
from openpype.style import get_default_entity_icon_color
class AssetModel(models.TreeModel):
Columns = ["label"]
def __init__(self, *args, **kwargs):
super(AssetModel, self).__init__(*args, **kwargs)
self._icon_color = get_default_entity_icon_color()
def add_items(self, items):
"""
Add items to model with needed data
@ -65,8 +70,10 @@ class AssetModel(models.TreeModel):
node = index.internalPointer()
icon = node.get("icon")
if icon:
return qtawesome.icon("fa.{0}".format(icon),
color=colors.default)
return qtawesome.icon(
"fa.{0}".format(icon),
color=self._icon_color
)
return super(AssetModel, self).data(index, role)

7
openpype/tools/sceneinventory/model.py
View file

@ -6,8 +6,9 @@ from collections import defaultdict
from Qt import QtCore, QtGui
import qtawesome
from avalon import api, io, style, schema
from avalon import api, io, schema
from avalon.lib import HeroVersionType
from openpype.style import get_default_entity_icon_color
from openpype.tools.utils.models import TreeModel, Item
from .lib import (
@ -38,6 +39,8 @@ class InventoryModel(TreeModel):
self._hierarchy_view = False
self._default_icon_color = get_default_entity_icon_color()
manager = ModulesManager()
sync_server = manager.modules_by_name["sync_server"]
self.sync_enabled = sync_server.enabled
@ -131,7 +134,7 @@ class InventoryModel(TreeModel):
if role == QtCore.Qt.DecorationRole:
if index.column() == 0:
# Override color
color = item.get("color", style.colors.default)
color = item.get("color", self._default_icon_color)
if item.get("isGroupNode"): # group-item
return qtawesome.icon("fa.folder", color=color)
if item.get("isNotSet"):

23
openpype/tools/standalonepublish/widgets/model_asset.py
View file

@ -1,10 +1,15 @@
import logging
import collections
from Qt import QtCore, QtGui
import qtawesome
from . import TreeModel, Node
from avalon import style
from openpype.style import (
get_default_entity_icon_color,
get_deprecated_entity_font_color,
)
from . import TreeModel, Node
log = logging.getLogger(__name__)
@ -49,6 +54,14 @@ class AssetModel(TreeModel):
def __init__(self, dbcon, parent=None):
super(AssetModel, self).__init__(parent=parent)
self.dbcon = dbcon
self._default_asset_icon_color = QtGui.QColor(
get_default_entity_icon_color()
)
self._deprecated_asset_font_color = QtGui.QColor(
get_deprecated_entity_font_color()
)
self.refresh()
def _add_hierarchy(self, assets, parent=None, silos=None):
@ -163,7 +176,7 @@ class AssetModel(TreeModel):
icon = data.get("icon", None)
if icon is None and node.get("type") == "silo":
icon = "database"
color = data.get("color", style.colors.default)
color = data.get("color", self._default_asset_icon_color)
if icon is None:
# Use default icons if no custom one is specified.
@ -188,8 +201,8 @@ class AssetModel(TreeModel):
return
if role == QtCore.Qt.ForegroundRole: # font color
if "deprecated" in node.get("tags", []):
return QtGui.QColor(style.colors.light).darker(250)
# if "deprecated" in node.get("tags", []):
return QtGui.QColor(self._deprecated_asset_font_color)
if role == self.ObjectIdRole:
return node.get("_id", None)

6
openpype/tools/standalonepublish/widgets/model_tasks_template.py
View file

@ -1,7 +1,9 @@
from Qt import QtCore
import qtawesome
from openpype.style import get_default_entity_icon_color
from . import Node, TreeModel
from avalon import style
class TasksTemplateModel(TreeModel):
@ -14,7 +16,7 @@ class TasksTemplateModel(TreeModel):
self.selectable = selectable
self.icon = qtawesome.icon(
'fa.calendar-check-o',
color=style.colors.default
color=get_default_entity_icon_color()
)
def set_tasks(self, tasks):

6
openpype/tools/standalonepublish/widgets/widget_asset.py
View file

@ -4,7 +4,7 @@ import qtawesome
from openpype.tools.utils import PlaceholderLineEdit
from avalon import style
from openpype.style import get_default_tools_icon_color
from . import RecursiveSortFilterProxyModel, AssetModel
from . import TasksTemplateModel, DeselectableTreeView
@ -165,7 +165,9 @@ class AssetWidget(QtWidgets.QWidget):
# Header
header = QtWidgets.QHBoxLayout()
icon = qtawesome.icon("fa.refresh", color=style.colors.light)
icon = qtawesome.icon(
"fa.refresh", color=get_default_tools_icon_color()
)
refresh = QtWidgets.QPushButton(icon, "")
refresh.setToolTip("Refresh items")

13
openpype/tools/utils/assets_widget.py
View file

@ -5,9 +5,10 @@ import Qt
from Qt import QtWidgets, QtCore, QtGui
import qtawesome
from avalon import style
from openpype.style import get_objected_colors
from openpype.style import (
get_objected_colors,
get_default_tools_icon_color,
)
from openpype.tools.flickcharm import FlickCharm
from .views import (
@ -589,7 +590,7 @@ class AssetsWidget(QtWidgets.QWidget):
view.setModel(proxy)
current_asset_icon = qtawesome.icon(
"fa.arrow-down", color=style.colors.light
"fa.arrow-down", color=get_default_tools_icon_color()
)
current_asset_btn = QtWidgets.QPushButton(self)
current_asset_btn.setIcon(current_asset_icon)
@ -597,7 +598,9 @@ class AssetsWidget(QtWidgets.QWidget):
# Hide by default
current_asset_btn.setVisible(False)
refresh_icon = qtawesome.icon("fa.refresh", color=style.colors.light)
refresh_icon = qtawesome.icon(
"fa.refresh", color=get_default_tools_icon_color()
)
refresh_btn = QtWidgets.QPushButton(self)
refresh_btn.setIcon(refresh_icon)
refresh_btn.setToolTip("Refresh items")

13
openpype/tools/utils/lib.py
View file

@ -7,8 +7,8 @@ from Qt import QtWidgets, QtCore, QtGui
import qtawesome
import avalon.api
from avalon import style
from openpype.style import get_default_entity_icon_color
from openpype.api import (
get_project_settings,
Logger
@ -128,7 +128,7 @@ def get_qta_icon_by_name_and_color(icon_name, icon_color):
def get_asset_icon(asset_doc, has_children=False):
asset_data = asset_doc.get("data") or {}
icon_color = asset_data.get("color") or style.colors.default
icon_color = asset_data.get("color") or get_default_entity_icon_color()
icon_name = asset_data.get("icon")
if not icon_name:
# Use default icons if no custom one is specified.
@ -149,7 +149,9 @@ def get_task_icon():
Icon should be defined by task type which is stored on project.
"""
return get_qta_icon_by_name_and_color("fa.male", style.colors.default)
return get_qta_icon_by_name_and_color(
"fa.male", get_default_entity_icon_color()
)
def schedule(func, time, channel="default"):
@ -412,6 +414,7 @@ class GroupsConfig:
def __init__(self, dbcon):
self.dbcon = dbcon
self.groups = {}
self._default_group_color = get_default_entity_icon_color()
@classmethod
def default_group_config(cls):
@ -419,7 +422,7 @@ class GroupsConfig:
cls._default_group_config = {
"icon": qtawesome.icon(
"fa.object-group",
color=style.colors.default
color=get_default_entity_icon_color()
),
"order": 0
}
@ -453,7 +456,7 @@ class GroupsConfig:
for config in group_configs:
name = config["name"]
icon = "fa." + config.get("icon", "object-group")
color = config.get("color", style.colors.default)
color = config.get("color", self._default_group_color)
order = float(config.get("order", 0))
self.groups[name] = {

14
openpype/tools/utils/tasks_widget.py
View file

@ -1,7 +1,10 @@
from Qt import QtWidgets, QtCore, QtGui
import qtawesome
from avalon import style
from openpype.style import (
get_default_entity_icon_color,
get_disabled_entity_icon_color,
)
from .views import DeselectableTreeView
@ -21,13 +24,14 @@ class TasksModel(QtGui.QStandardItemModel):
self.setHeaderData(
0, QtCore.Qt.Horizontal, "Tasks", QtCore.Qt.DisplayRole
)
default_color = get_default_entity_icon_color()
self._default_color = default_color
self._default_icon = qtawesome.icon(
"fa.male",
color=style.colors.default
"fa.male", color=default_color
)
self._no_tasks_icon = qtawesome.icon(
"fa.exclamation-circle",
color=style.colors.mid
color=get_disabled_entity_icon_color()
)
self._cached_icons = {}
self._project_task_types = {}
@ -62,7 +66,7 @@ class TasksModel(QtGui.QStandardItemModel):
try:
icon = qtawesome.icon(
"fa.{}".format(icon_name),
color=style.colors.default
color=self._default_color
)
except Exception:

16
openpype/tools/workfiles/model.py
View file

@ -4,7 +4,11 @@ import logging
from Qt import QtCore
import qtawesome
from avalon import style
from openpype.style import (
get_default_entity_icon_color,
get_disabled_entity_icon_color,
)
from openpype.tools.utils.models import TreeModel, Item
log = logging.getLogger(__name__)
@ -25,7 +29,10 @@ class FilesModel(TreeModel):
self._root = None
self._file_extensions = file_extensions
self._icons = {
"file": qtawesome.icon("fa.file-o", color=style.colors.default)
"file": qtawesome.icon(
"fa.file-o",
color=get_default_entity_icon_color()
)
}
def set_root(self, root):
@ -64,7 +71,10 @@ class FilesModel(TreeModel):
"date": None,
"filepath": None,
"enabled": False,
"icon": qtawesome.icon("fa.times", color=style.colors.mid)
"icon": qtawesome.icon(
"fa.times",
color=get_disabled_entity_icon_color()
)
})
self.add_child(item)
self.endResetModel()