Remove "import as" for qtawesome imports

Author: BigRoy

avalon/tools/loader/model.py

@@ -1,6 +1,6 @@
 from ... import io, style
 from ...vendor.Qt import QtCore
-from ...vendor import qtawesome as qta
+from ...vendor import qtawesome
 
 from ..models import TreeModel, Item
 from .. import lib as tools_lib
@@ -35,8 +35,8 @@ def __init__(self, grouping=True, parent=None):
         self._asset_id = None
         self._sorter = None
         self._grouping = grouping
-        self._icons = {"subset": qta.icon("fa.file-o",
-                                          color=style.colors.default)}
+        self._icons = {"subset": qtawesome.icon("fa.file-o",
+                                                color=style.colors.default)}
 
     def set_asset(self, asset_id):
         self._asset_id = asset_id

avalon/tools/models.py

@@ -3,7 +3,7 @@
 import collections
 
 from ..vendor.Qt import QtCore, QtGui
-from ..vendor import qtawesome as awesome
+from ..vendor import qtawesome
 from .. import io
 from .. import style
 
@@ -194,7 +194,8 @@ def __init__(self):
         super(TasksModel, self).__init__()
         self._num_assets = 0
         self._icons = {
-            "__default__": awesome.icon("fa.male", color=style.colors.default)
+            "__default__": qtawesome.icon("fa.male",
+                                          color=style.colors.default)
         }
 
         self._get_task_icons()
@@ -206,8 +207,8 @@ def _get_task_icons(self):
         for task in tasks:
             icon_name = task.get("icon", None)
             if icon_name:
-                icon = awesome.icon("fa.{}".format(icon_name),
-                                    color=style.colors.default)
+                icon = qtawesome.icon("fa.{}".format(icon_name),
+                                      color=style.colors.default)
                 self._icons[task["name"]] = icon
 
     def set_assets(self, asset_ids):
@@ -399,7 +400,7 @@ def data(self, index, role):
 
                 try:
                     key = "fa.{0}".format(icon)  # font-awesome key
-                    icon = awesome.icon(key, color=color)
+                    icon = qtawesome.icon(key, color=color)
                     return icon
                 except Exception as exception:
                     # Log an error message instead of erroring out completely

avalon/tools/projectmanager/dialogs.py

@@ -1,5 +1,5 @@
 from ... import io
-from ...vendor import qtawesome as qta
+from ...vendor import qtawesome
 from ...vendor.Qt import QtWidgets, QtCore
 
 from . import lib
@@ -25,7 +25,7 @@ def __init__(self, parent=None):
 
         footer = QtWidgets.QHBoxLayout()
         cancel = QtWidgets.QPushButton("Cancel")
-        create = QtWidgets.QPushButton(qta.icon("fa.plus", color="grey"),
+        create = QtWidgets.QPushButton(qtawesome.icon("fa.plus", color="grey"),
                                        "Create")
         footer.addWidget(create)
         footer.addWidget(cancel)
@@ -82,7 +82,7 @@ def __init__(self, parent=None):
         name.setReadOnly(True)
         name.setStyleSheet("background-color: #333333;")  # greyed out
 
-        icon = qta.icon("fa.plus", color="grey")
+        icon = qtawesome.icon("fa.plus", color="grey")
         add_asset = QtWidgets.QPushButton(icon, "Add")
         add_asset.setAutoDefault(True)
 

avalon/tools/sceneinventory/app.py

@@ -4,7 +4,7 @@
 from functools import partial
 
 from ...vendor.Qt import QtWidgets, QtCore
-from ...vendor import qtawesome as qta
+from ...vendor import qtawesome
 from ... import io, api, style
 
 from .. import lib as tools_lib
@@ -72,45 +72,45 @@ def _on_update_to_latest(items):
                 api.update(item, -1)
             self.data_changed.emit()
 
-        update_icon = qta.icon("fa.angle-double-up", color=DEFAULT_COLOR)
+        update_icon = qtawesome.icon("fa.angle-double-up", color=DEFAULT_COLOR)
         updatetolatest_action = QtWidgets.QAction(update_icon,
                                                   "Update to latest",
                                                   menu)
         updatetolatest_action.triggered.connect(
             lambda: _on_update_to_latest(items))
 
         # set version
-        set_version_icon = qta.icon("fa.hashtag", color=DEFAULT_COLOR)
+        set_version_icon = qtawesome.icon("fa.hashtag", color=DEFAULT_COLOR)
         set_version_action = QtWidgets.QAction(set_version_icon,
                                                "Set version",
                                                menu)
         set_version_action.triggered.connect(
             lambda: self.show_version_dialog(items))
 
         # switch asset
-        switch_asset_icon = qta.icon("fa.sitemap", color=DEFAULT_COLOR)
+        switch_asset_icon = qtawesome.icon("fa.sitemap", color=DEFAULT_COLOR)
         switch_asset_action = QtWidgets.QAction(switch_asset_icon,
                                                 "Switch Asset",
                                                 menu)
         switch_asset_action.triggered.connect(
             lambda: self.show_switch_dialog(items))
 
         # remove
-        remove_icon = qta.icon("fa.remove", color=DEFAULT_COLOR)
+        remove_icon = qtawesome.icon("fa.remove", color=DEFAULT_COLOR)
         remove_action = QtWidgets.QAction(remove_icon, "Remove items", menu)
         remove_action.triggered.connect(
             lambda: self.show_remove_warning_dialog(items))
 
         # go back to flat view
         if self._hierarchy_view:
-            back_to_flat_icon = qta.icon("fa.list", color=DEFAULT_COLOR)
+            back_to_flat_icon = qtawesome.icon("fa.list", color=DEFAULT_COLOR)
             back_to_flat_action = QtWidgets.QAction(back_to_flat_icon,
                                                     "Back to Full-View",
                                                     menu)
             back_to_flat_action.triggered.connect(self.leave_hierarchy)
 
         # send items to hierarchy view
-        enter_hierarchy_icon = qta.icon("fa.indent", color="#d8d8d8")
+        enter_hierarchy_icon = qtawesome.icon("fa.indent", color="#d8d8d8")
         enter_hierarchy_action = QtWidgets.QAction(enter_hierarchy_icon,
                                                    "Cherry-Pick (Hierarchy)",
                                                    menu)
@@ -148,7 +148,7 @@ def _on_update_to_latest(items):
             for action in custom_actions:
 
                 color = action.color or DEFAULT_COLOR
-                icon = qta.icon("fa.%s" % action.icon, color=color)
+                icon = qtawesome.icon("fa.%s" % action.icon, color=color)
                 action_item = QtWidgets.QAction(icon, action.label, submenu)
                 action_item.triggered.connect(
                     partial(self.process_custom_action, action, items))
@@ -490,7 +490,7 @@ def __init__(self, parent=None, items=None):
         subset_layout = QtWidgets.QVBoxLayout()
         repre_layout = QtWidgets.QVBoxLayout()
 
-        accept_icon = qta.icon("fa.check", color="white")
+        accept_icon = qtawesome.icon("fa.check", color="white")
         accept_btn = QtWidgets.QPushButton()
         accept_btn.setIcon(accept_icon)
         accept_btn.setFixedWidth(24)
@@ -846,7 +846,7 @@ def __init__(self, parent=None):
         outdated_only.setToolTip("Show outdated files only")
         outdated_only.setChecked(False)
 
-        icon = qta.icon("fa.refresh", color="white")
+        icon = qtawesome.icon("fa.refresh", color="white")
         refresh_button = QtWidgets.QPushButton()
         refresh_button.setIcon(icon)
 

avalon/tools/sceneinventory/model.py

@@ -4,7 +4,7 @@
 
 from ... import api, io, style
 from ...vendor.Qt import QtCore, QtGui
-from ...vendor import qtawesome as qta
+from ...vendor import qtawesome
 
 from .. import lib as tools_lib
 from ..models import TreeModel, Item
@@ -79,9 +79,9 @@ def data(self, index, role):
                 # Override color
                 color = item.get("color", style.colors.default)
                 if item.get("isGroupNode"):  # group-item
-                    return qta.icon("fa.folder", color=color)
+                    return qtawesome.icon("fa.folder", color=color)
                 else:
-                    return qta.icon("fa.file-o", color=color)
+                    return qtawesome.icon("fa.file-o", color=color)
 
             if index.column() == 3:
                 # Family icon

avalon/tools/widgets.py

@@ -7,7 +7,7 @@
 )
 from .models import AssetModel, RecursiveSortFilterProxyModel
 from .views import DeselectableTreeView
-from ..vendor import qtawesome as awesome
+from ..vendor import qtawesome
 from ..vendor.Qt import QtWidgets, QtCore, QtGui
 
 from .. import style
@@ -44,7 +44,7 @@ def __init__(self, silo_creatable=True, parent=None):
 
         silo = SiloTabWidget(silo_creatable=silo_creatable)
 
-        icon = awesome.icon("fa.refresh", color=style.colors.light)
+        icon = qtawesome.icon("fa.refresh", color=style.colors.light)
         refresh = QtWidgets.QPushButton(icon, "")
         refresh.setToolTip("Refresh items")