Move generic GUI classes up to the setoolsgui package.

setoolsgui/apol/__init__.py

@@ -17,8 +17,4 @@
 # <http://www.gnu.org/licenses/>.
 #
 
-from .mainwindow import ApolMainWindow, ChooseAnalysis
-
-from .models import PermListModel, SEToolsListModel
-from .rulemodels import TERuleListModel
-from .terulequery import TERuleQueryTab
+from .mainwindow import ApolMainWindow

setoolsgui/apol/mlsrulequery.py

@@ -25,9 +25,9 @@ from PyQt5.QtWidgets import QCompleter, QHeaderView, QMessageBox, QProgressDialo
 from setools import MLSRuleQuery
 
 from ..logtosignal import LogHandlerToSignal
+from ..models import SEToolsListModel, invert_list_selection
+from ..rulemodels import MLSRuleListModel
 from ..widget import SEToolsWidget
-from .rulemodels import MLSRuleListModel
-from .models import SEToolsListModel, invert_list_selection
 
 
 class MLSRuleQueryTab(SEToolsWidget, QScrollArea):

setoolsgui/apol/rbacrulequery.py

@@ -25,9 +25,9 @@ from PyQt5.QtWidgets import QCompleter, QHeaderView, QMessageBox, QProgressDialo
 from setools import RBACRuleQuery
 
 from ..logtosignal import LogHandlerToSignal
+from ..models import SEToolsListModel, invert_list_selection
+from ..rulemodels import RBACRuleListModel
 from ..widget import SEToolsWidget
-from .rulemodels import RBACRuleListModel
-from .models import SEToolsListModel, invert_list_selection
 
 
 class RBACRuleQueryTab(SEToolsWidget, QScrollArea):

setoolsgui/apol/rolequery.py

@@ -25,9 +25,9 @@ from PyQt5.QtWidgets import QCompleter, QHeaderView, QMessageBox, QProgressDialo
 from setools import RoleQuery
 
 from ..logtosignal import LogHandlerToSignal
+from ..models import SEToolsListModel, invert_list_selection
+from ..rolemodel import RoleTableModel, role_detail
 from ..widget import SEToolsWidget
-from .models import SEToolsListModel, invert_list_selection
-from .rolemodel import RoleTableModel, role_detail
 
 
 class RoleQueryTab(SEToolsWidget, QScrollArea):

setoolsgui/apol/terulequery.py

@@ -25,9 +25,9 @@ from PyQt5.QtWidgets import QCompleter, QHeaderView, QMessageBox, QProgressDialo
 from setools import TERuleQuery
 
 from ..logtosignal import LogHandlerToSignal
+from ..models import PermListModel, SEToolsListModel, invert_list_selection
+from ..rulemodels import TERuleListModel
 from ..widget import SEToolsWidget
-from .rulemodels import TERuleListModel
-from .models import PermListModel, SEToolsListModel, invert_list_selection
 
 
 class TERuleQueryTab(SEToolsWidget, QScrollArea):

setoolsgui/apol/userquery.py

@@ -25,9 +25,9 @@ from PyQt5.QtWidgets import QCompleter, QHeaderView, QMessageBox, QProgressDialo
 from setools import UserQuery
 
 from ..logtosignal import LogHandlerToSignal
+from ..models import SEToolsListModel, invert_list_selection
+from ..usermodel import UserTableModel, user_detail
 from ..widget import SEToolsWidget
-from .models import SEToolsListModel, invert_list_selection
-from .usermodel import UserTableModel, user_detail
 
 
 class UserQueryTab(SEToolsWidget, QScrollArea):

setoolsgui/details.py

@@ -21,7 +21,7 @@ import logging
 from PyQt5.QtGui import QFont, QTextCursor
 from PyQt5.QtWidgets import QDialog
 
-from ..widget import SEToolsWidget
+from .widget import SEToolsWidget
 
 
 class DetailsPopup(SEToolsWidget, QDialog):