SyncServer GUI - solve conflict, merged ProjectListWidget move

pype/modules/sync_server/tray/app.py

@@ -2,10 +2,15 @@ from Qt import QtWidgets, QtCore, QtGui
 from Qt.QtCore import Qt
 import attr
 import os
+
 import sys
 import subprocess
-from pype.tools.settings.settings.widgets.base import ProjectListWidget
-from pype.tools.settings.settings import style
+
+from pype.tools.settings import (
+    ProjectListWidget,
+    style
+)
+
 from avalon.tools.delegates import PrettyTimeDelegate, pretty_timestamp
 from bson.objectid import ObjectId
 

pype/tools/settings/__init__.py

@@ -1,7 +1,11 @@
 import sys
 from Qt import QtWidgets, QtGui
 
-from .settings import style, MainWidget
+from .settings import (
+    style,
+    MainWidget,
+    ProjectListWidget
+)
 
 
 def main(user_role=None):
@@ -28,5 +32,6 @@ def main(user_role=None):
 __all__ = (
     "style",
     "MainWidget",
+    "ProjectListWidget",
     "main"
 )

pype/tools/settings/settings/__init__.py

@@ -1,8 +1,12 @@
 from . import style
-from .widgets import MainWidget
+from .widgets import (
+    MainWidget,
+    ProjectListWidget
+)
 
 
 __all__ = (
     "style",
-    "MainWidget"
+    "MainWidget",
+    "ProjectListWidget"
 )

pype/tools/settings/settings/widgets/__init__.py

@@ -1,9 +1,11 @@
 from .window import MainWidget
+from .categories import ProjectListWidget
 from . import item_types
 from . import anatomy_types
 
 __all__ = [
     "MainWidget",
+    "ProjectListWidget",
     "item_types",
     "anatomy_types"
 ]