Merge pull request #65 from pypeclub/feature/PYPE-484_refactor_tools_gui

Feature/PYPE-484_refator_tools_gui

Author: mkolar

avalon/tools/_views/__init__.py

@@ -5,16 +5,16 @@
 from ... import api, io, style
 from .. import lib
 
-from .._models import AssetModel
-from .._models.lib import (
-    refresh_family_config,
-    refresh_group_config,
-    get_active_group_config,
+from ..gui.models import AssetModel
+from ..gui.widgets import (
+    SubsetsWidget, VersionWidget, FamiliesListWidget, AssetsWidget
 )
-from .._widgets import (
-    SubsetWidget, VersionWidget, FamilyListWidget, AssetWidget
+from ..gui.lib import refresh_family_config
+from ..gui.models.lib import (
+    refresh_group_config,
+    get_active_group_config
 )
-from .._widgets.lib import preserve_selection
+from ..gui.widgets.lib import preserve_selection
 
 module = sys.modules[__name__]
 module.window = None
@@ -43,9 +43,9 @@ def __init__(self, parent=None):
 
         container = QtWidgets.QWidget()
 
-        assets = AssetWidget(silo_creatable=False)
-        families = FamilyListWidget()
-        subsets = SubsetWidget(parent=self)
+        assets = AssetsWidget(silo_creatable=False)
+        families = FamiliesListWidget()
+        subsets = SubsetsWidget(parent=self)
         version = VersionWidget()
 
         # Create splitter to show / hide family filters
@@ -255,7 +255,7 @@ def _set_context(self, context, refresh=True):
             self._refresh()
 
         asset_widget = self.data['model']['assets']
-        asset_widget.select_assets([asset], expand=True)
+        asset_widget.select_assets(asset)
 
     def echo(self, message):
         widget = self.data["label"]["message"]

avalon/tools/_widgets/__init__.py

@@ -1,6 +1,7 @@
 import os
 import sys
 import logging
+import collections
 from functools import partial
 import re
 
@@ -9,19 +10,16 @@
 from ... import io, api, style
 from .. import lib as tools_lib
 
-# todo(roy): refactor loading from other tools
-from ..projectmanager.widget import (
+from ..gui.delegates import VersionDelegate
+from ..gui.models import FilterProxyModel, InventoryModel
+
+from ..gui.lib import refresh_family_config
+from ..gui.widgets.lib import (
     preserve_expanded_rows,
     preserve_selection,
-    _iter_model_rows,
+    _iter_model_rows
 )
-from .._delegates import VersionDelegate
-from ..cbloader.lib import refresh_family_config
-
-from .proxy import FilterProxyModel
-from .model import InventoryModel
 from .lib import switch_item
-import collections
 
 DEFAULT_COLOR = "#fb9c15"
 

avalon/tools/cbloader/app.py

@@ -1,4 +1,4 @@
-from avalon import io, api
+from ... import io, api
 
 
 def switch_item(container,
@@ -71,14 +71,3 @@ def switch_item(container,
     api.switch(container, representation)
 
     return representation
-
-
-def walk_hierarchy(node):
-    """Recursively yield group node
-    """
-    for child in node.children():
-        if child.get("isGroupNode"):
-            yield child
-
-        for _child in walk_hierarchy(child):
-            yield _child

avalon/tools/cbloader/lib.py

@@ -1,17 +1,15 @@
 import sys
 import logging
 
-import avalon.api as api
-
-from avalon.vendor.Qt import QtWidgets, QtCore
-from .._widgets import AssetWidget
-from .._models import TasksModel
+from ... import api
 
+from ...vendor.Qt import QtWidgets, QtCore
+from ..gui.widgets import AssetsWidget
+from ..gui.models import TaskModel
 
 module = sys.modules[__name__]
 module.window = None
 
-
 log = logging.getLogger(__name__)
 
 
@@ -33,15 +31,15 @@ def __init__(self, parent=None):
         accept_btn = QtWidgets.QPushButton("Accept")
 
         # Asset picker
-        assets = AssetWidget(silo_creatable=False)
+        assets = AssetsWidget(silo_creatable=False)
 
         # Task picker
         tasks_widgets = QtWidgets.QWidget()
         tasks_widgets.setContentsMargins(0, 0, 0, 0)
         tasks_layout = QtWidgets.QVBoxLayout(tasks_widgets)
         task_view = QtWidgets.QTreeView()
         task_view.setIndentation(0)
-        task_model = TasksModel()
+        task_model = TaskModel()
         task_view.setModel(task_model)
         tasks_layout.addWidget(task_view)
         tasks_layout.addWidget(accept_btn)
@@ -188,7 +186,7 @@ def select_asset(self, assetname):
         Returns:
             None
         """
-        self._assets.select_assets([assetname], expand=True)
+        self._assets.select_assets(assetname)
 
 
 def show(parent=None):

avalon/tools/cbsceneinventory/app.py

@@ -1,5 +1,11 @@
-from ...vendor.Qt import QtWidgets, QtCore
-from ... import io
+from . import lib
 
 from .delegate_pretty_time import PrettyTimeDelegate
 from .delegate_version import VersionDelegate
+
+__all__ = [
+    "lib",
+
+    "PrettyTimeDelegate",
+    "VersionDelegate"
+]

avalon/tools/cbsceneinventory/lib.py

@@ -1,4 +1,4 @@
-from . import QtWidgets
+from ....vendor.Qt import QtWidgets
 from .lib import pretty_timestamp