From c5336de2260dada16a90e08e9de6bdde6a57a919 Mon Sep 17 00:00:00 2001
From: Jan Grewe <jan.grewe@g-node.org>
Date: Sat, 9 Jan 2021 12:13:36 +0100
Subject: [PATCH] [app] change imports to package imports

---
 nixview/central_widget.py | 10 +++++-----
 nixview/communicator.py   |  2 +-
 nixview/constants.py      |  7 ++++++-
 nixview/main_window.py    |  9 +++++----
 nixview/nixview.py        |  2 +-
 nixview/tree_model.py     |  2 +-
 6 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/nixview/central_widget.py b/nixview/central_widget.py
index 63ef8a7..ba947c5 100644
--- a/nixview/central_widget.py
+++ b/nixview/central_widget.py
@@ -3,11 +3,11 @@ from PyQt5.QtWidgets import QComboBox, QFrame, QGroupBox, QHBoxLayout, QLabel, Q
 from PyQt5.QtGui import QPixmap
 from PyQt5.QtCore import QItemSelectionModel, Qt, QSettings, pyqtSignal
 
-from file_handler import FileHandler, ItemDescriptor
-from plot_screen import PlotScreen
-import communicator as comm
-import constants as cnst
-from tree_model import NixTreeView, TreeModel, TreeType
+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
 
 class CentralWidget(QWidget):
     
diff --git a/nixview/communicator.py b/nixview/communicator.py
index d2755db..2c90639 100644
--- a/nixview/communicator.py
+++ b/nixview/communicator.py
@@ -1,4 +1,4 @@
-from tree_model import NixTreeItem
+from nixview.tree_model import NixTreeItem
 from PyQt5.QtCore import QObject, pyqtSignal
 
 class Communicate(QObject):
diff --git a/nixview/constants.py b/nixview/constants.py
index 4ec9052..42e5c75 100644
--- a/nixview/constants.py
+++ b/nixview/constants.py
@@ -1,7 +1,12 @@
+import os
+
 organization = "nixio"
 application = "nixview"
 version = 0.1
 
 settings_recent_files_key = "/".join([organization, application, "recent_files"])
 settings_recent_file_max_count_key =  "/".join([organization, application, "recent_files_max_count"])
-settings_recent_file_max_count = 10
\ No newline at end of file
+settings_recent_file_max_count = 10
+
+PACKAGE_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), os.pardir))
+ICONS_FOLDER = os.path.join(PACKAGE_ROOT, "icons")
diff --git a/nixview/main_window.py b/nixview/main_window.py
index e6a4119..2b06c5c 100644
--- a/nixview/main_window.py
+++ b/nixview/main_window.py
@@ -3,10 +3,11 @@ from PyQt5.QtWidgets import QWidget, QFileDialog, QMainWindow, QMenuBar, QToolBa
 from PyQt5.QtGui import QIcon, QKeySequence
 from PyQt5.QtCore import QSize, QSettings, Qt
 
-from file_handler import FileHandler, NodeType
-import constants as cnst
-import communicator as comm
-from central_widget import CentralWidget
+from nixview.file_handler import FileHandler, NodeType
+import nixview.constants as cnst
+import nixview.communicator as comm
+from nixview.central_widget import CentralWidget
+
 
 class NixView(QMainWindow):
     
diff --git a/nixview/nixview.py b/nixview/nixview.py
index e1815b2..c2db9e4 100755
--- a/nixview/nixview.py
+++ b/nixview/nixview.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python3
 import sys
 from PyQt5.QtWidgets import QApplication
-from main_window import NixView
+from nixview.main_window import NixView
 import argparse
 
 def main():
diff --git a/nixview/tree_model.py b/nixview/tree_model.py
index 37dfa17..c48be8c 100644
--- a/nixview/tree_model.py
+++ b/nixview/tree_model.py
@@ -3,7 +3,7 @@ from PyQt5.QtGui import QIcon
 from PyQt5.QtWidgets import QTreeView, QTreeWidgetItem, QAbstractItemView, QHeaderView
 from enum import Enum
 
-from file_handler import ItemDescriptor, NodeType
+from nixview.file_handler import ItemDescriptor, NodeType
 
 column_names = ['Name', 'Type', 'Value', 'Description', 'ID',]