From 0c6bb8b687a441ceec705a40fdf3d07e0f296447 Mon Sep 17 00:00:00 2001
From: Jan Grewe <jan.grewe@g-node.org>
Date: Sat, 9 Jan 2021 13:10:41 +0100
Subject: [PATCH] [app] change imports

---
 nixview.py                   | 4 ++--
 nixview/communicator.py      | 2 +-
 nixview/info.py              | 2 ++
 nixview/nixview.py           | 2 +-
 nixview/ui/central_widget.py | 3 +--
 nixview/ui/main_window.py    | 2 +-
 6 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/nixview.py b/nixview.py
index acf9b75..3069ff1 100644
--- a/nixview.py
+++ b/nixview.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-from nixview import nixview
+from nixview.nixview import main
 
 if __name__ == "__main__":
-    nixview.main()
\ No newline at end of file
+    main()
\ No newline at end of file
diff --git a/nixview/communicator.py b/nixview/communicator.py
index 2c90639..8246e5f 100644
--- a/nixview/communicator.py
+++ b/nixview/communicator.py
@@ -1,4 +1,4 @@
-from nixview.tree_model import NixTreeItem
+from nixview.data_models.tree_model import NixTreeItem
 from PyQt5.QtCore import QObject, pyqtSignal
 
 class Communicate(QObject):
diff --git a/nixview/info.py b/nixview/info.py
index 6aad060..884480b 100644
--- a/nixview/info.py
+++ b/nixview/info.py
@@ -6,9 +6,11 @@ _HERE = os.path.dirname(__file__)
 with open(os.path.join(_HERE, "info.json")) as infofile:
     _INFODICT = json.load(infofile)
 
+NAME = _INFODICT["NAME"]
 VERSION = _INFODICT["VERSION"]
 AUTHOR = _INFODICT["AUTHOR"]
 COPYRIGHT = _INFODICT["COPYRIGHT"]
 CONTACT = _INFODICT["CONTACT"]
 HOMEPAGE = _INFODICT["HOMEPAGE"]
 CLASSIFIERS = _INFODICT["CLASSIFIERS"]
+DESCRIPTION = _INFODICT["DESCRIPTION"]
diff --git a/nixview/nixview.py b/nixview/nixview.py
index c2db9e4..f3a40d3 100755
--- a/nixview/nixview.py
+++ b/nixview/nixview.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python3
 import sys
 from PyQt5.QtWidgets import QApplication
-from nixview.main_window import NixView
+from nixview.ui.main_window import NixView
 import argparse
 
 def main():
diff --git a/nixview/ui/central_widget.py b/nixview/ui/central_widget.py
index 23fab8d..ad30d0f 100644
--- a/nixview/ui/central_widget.py
+++ b/nixview/ui/central_widget.py
@@ -4,10 +4,9 @@ from PyQt5.QtGui import QPixmap
 from PyQt5.QtCore import QItemSelectionModel, Qt, QSettings, pyqtSignal
 
 from nixview.file_handler import FileHandler, ItemDescriptor
-from nixview.plot_screen import PlotScreen
 import nixview.communicator as comm
 import nixview.constants as cnst
-from nixview.tree_model import NixTreeView, TreeModel, TreeType
+from nixview.data_models.tree_model import NixTreeView, TreeModel, TreeType
 
 class CentralWidget(QWidget):
     
diff --git a/nixview/ui/main_window.py b/nixview/ui/main_window.py
index 2633405..8200e8d 100644
--- a/nixview/ui/main_window.py
+++ b/nixview/ui/main_window.py
@@ -7,7 +7,7 @@ from PyQt5.QtCore import QSize, QSettings, Qt
 from nixview.file_handler import FileHandler, NodeType
 import nixview.constants as cnst
 import nixview.communicator as comm
-from nixview.central_widget import CentralWidget
+from nixview.ui.central_widget import CentralWidget
 
 
 class NixView(QMainWindow):