Rename src directory to unique name to avoid install issues

21 files changed, 38 insertions, 36 deletions

diff --git a/MANIFEST.in b/MANIFEST.in
index fc1059f..31c06d2 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,3 +1,4 @@
+recursive-include assignment_list_pyqt *ui
 include data/assignment-list.desktop
 include data/assignment-list.ico
 include data/assignment-list.svg
diff --git a/assignment-list b/assignment-list
index cb0af8a..957b0d4 100755
--- a/assignment-list
+++ b/assignment-list
@@ -3,7 +3,7 @@ from __future__ import absolute_import
 import sys
 
 from PyQt5.QtWidgets import QApplication
-from src.main import AssignmentList as main
+from assignment_list_pyqt.main import AssignmentList as main
 
 app = QApplication(sys.argv)
 window = main()
diff --git a/src/__init__.py b/assignment_list_pyqt/__init__.py
index e69de29..e69de29 100644
--- a/src/__init__.py
+++ b/assignment_list_pyqt/__init__.py
diff --git a/src/add_entry_form.py b/assignment_list_pyqt/add_entry_form.py
index 9a2d260..59ed08a 100644
--- a/src/add_entry_form.py
+++ b/assignment_list_pyqt/add_entry_form.py
@@ -3,9 +3,9 @@ import sys
 from PyQt5 import uic
 from PyQt5.QtWidgets import QApplication, QDialog, QMessageBox
 from PyQt5.QtCore import QDate
-from src.entry import Entry
-import src.globals as Globals
-import src.db_sqlite as DB
+from assignment_list_pyqt.entry import Entry
+import assignment_list_pyqt.globals as Globals
+import assignment_list_pyqt.db_sqlite as DB
 
 class addEntryForm(QDialog):
     def __init__(self, parent):
diff --git a/src/add_entry_form.ui b/assignment_list_pyqt/add_entry_form.ui
index 3f8f9e7..3f8f9e7 100644
--- a/src/add_entry_form.ui
+++ b/assignment_list_pyqt/add_entry_form.ui
diff --git a/src/add_group_form.py b/assignment_list_pyqt/add_group_form.py
index 4a543e4..b6cb804 100644
--- a/src/add_group_form.py
+++ b/assignment_list_pyqt/add_group_form.py
@@ -3,9 +3,9 @@ import sys
 from PyQt5 import uic
 from PyQt5.QtWidgets import QApplication, QDialog, QMessageBox
 
-import src.globals as Globals
-from src.group import Group
-import src.db_sqlite as DB
+import assignment_list_pyqt.globals as Globals
+from assignment_list_pyqt.group import Group
+import assignment_list_pyqt.db_sqlite as DB
 
 class addGroupForm(QDialog):
     """
diff --git a/src/add_group_form.ui b/assignment_list_pyqt/add_group_form.ui
index c3c5c80..c3c5c80 100644
--- a/src/add_group_form.ui
+++ b/assignment_list_pyqt/add_group_form.ui
diff --git a/src/config.py b/assignment_list_pyqt/config.py
index 0fa034e..daf26e5 100644
--- a/src/config.py
+++ b/assignment_list_pyqt/config.py
@@ -7,7 +7,7 @@ import configparser
 import os
 import sys
 
-import src.globals as Globals
+import assignment_list_pyqt.globals as Globals
 
 class Config():
     def __init__(self):
diff --git a/src/db_sqlite.py b/assignment_list_pyqt/db_sqlite.py
index 00f4edb..b7bed41 100644
--- a/src/db_sqlite.py
+++ b/assignment_list_pyqt/db_sqlite.py
@@ -3,10 +3,10 @@ import sys
 from time import strptime
 from PyQt5.QtCore import QDate
 from PyQt5.QtSql import QSqlDatabase, QSqlQuery
-import src.globals as Globals
-from src.group import Group
-from src.entry import Entry
-from src.rule import Rule
+import assignment_list_pyqt.globals as Globals
+from assignment_list_pyqt.group import Group
+from assignment_list_pyqt.entry import Entry
+from assignment_list_pyqt.rule import Rule
 
 def initDB():
     """
diff --git a/src/edit_entry_form.py b/assignment_list_pyqt/edit_entry_form.py
index 3c7f8c2..20a8e23 100644
--- a/src/edit_entry_form.py
+++ b/assignment_list_pyqt/edit_entry_form.py
@@ -4,9 +4,9 @@ from PyQt5 import uic
 from PyQt5.QtWidgets import QApplication, QDialog, QMessageBox
 from PyQt5.QtCore import QDate
 
-import src.globals as Globals
-from src.entry import Entry
-import src.db_sqlite as DB
+import assignment_list_pyqt.globals as Globals
+from assignment_list_pyqt.entry import Entry
+import assignment_list_pyqt.db_sqlite as DB
 
 # Reuses the add_entry_form UI file
 class editEntryForm(QDialog):
diff --git a/src/edit_group_form.py b/assignment_list_pyqt/edit_group_form.py
index cd01162..5a89035 100644
--- a/src/edit_group_form.py
+++ b/assignment_list_pyqt/edit_group_form.py
@@ -3,9 +3,9 @@ import sys
 from PyQt5 import uic
 from PyQt5.QtWidgets import QApplication, QDialog, QMessageBox
 
-import src.globals as Globals
-from src.group import Group
-import src.db_sqlite as DB
+import assignment_list_pyqt.globals as Globals
+from assignment_list_pyqt.group import Group
+import assignment_list_pyqt.db_sqlite as DB
 
 class editGroupForm(QDialog):
     """
diff --git a/src/entry.py b/assignment_list_pyqt/entry.py
index 3b639ab..48df534 100644
--- a/src/entry.py
+++ b/assignment_list_pyqt/entry.py
@@ -2,7 +2,7 @@ from datetime import date
 from PyQt5.QtCore import QDate, Qt
 from PyQt5.QtGui import QFont
 from PyQt5.QtWidgets import QHBoxLayout, QLabel
-import src.globals as Globals
+import assignment_list_pyqt.globals as Globals
 
 class Entry:
     def __init__(self, id, parent_id, desc, due = "", due_alt = "", link = "", color = "", highlight = "", done = False, hidden = False):
diff --git a/src/globals.py b/assignment_list_pyqt/globals.py
index bb6f717..bb6f717 100644
--- a/src/globals.py
+++ b/assignment_list_pyqt/globals.py
diff --git a/src/group.py b/assignment_list_pyqt/group.py
index 18b4836..01f5427 100644
--- a/src/group.py
+++ b/assignment_list_pyqt/group.py
@@ -1,7 +1,7 @@
 from PyQt5.QtCore import Qt
 from PyQt5.QtGui import QFont
 from PyQt5.QtWidgets import QLabel, QVBoxLayout
-import src.globals as Globals
+import assignment_list_pyqt.globals as Globals
 
 class Group:
     def __init__(self, id, name, column = "left", link = "", hidden = False):
diff --git a/src/main.py b/assignment_list_pyqt/main.py
index 88e0cda..3b19fd6 100644
--- a/src/main.py
+++ b/assignment_list_pyqt/main.py
@@ -6,15 +6,15 @@ from PyQt5 import uic
 from PyQt5.QtWidgets import QAction, QApplication, QMainWindow, QMenu, QMessageBox, QVBoxLayout
 from PyQt5.QtGui import QCursor
 from PyQt5.QtCore import QDate, Qt
-from src.config import Config
-from src.preferences_dialog import PreferencesDialog
-from src.add_group_form import addGroupForm
-from src.edit_group_form import editGroupForm
-from src.add_entry_form import addEntryForm
-from src.edit_entry_form import editEntryForm
-import src.globals as Globals
-import src.db_sqlite as DB
-from src.rules_dialog import RulesDialog
+from assignment_list_pyqt.config import Config
+from assignment_list_pyqt.preferences_dialog import PreferencesDialog
+from assignment_list_pyqt.add_group_form import addGroupForm
+from assignment_list_pyqt.edit_group_form import editGroupForm
+from assignment_list_pyqt.add_entry_form import addEntryForm
+from assignment_list_pyqt.edit_entry_form import editEntryForm
+import assignment_list_pyqt.globals as Globals
+import assignment_list_pyqt.db_sqlite as DB
+from assignment_list_pyqt.rules_dialog import RulesDialog
 
 class AssignmentList(QMainWindow):
     def __init__(self):
diff --git a/src/main.ui b/assignment_list_pyqt/main.ui
index bc3c0fb..bc3c0fb 100644
--- a/src/main.ui
+++ b/assignment_list_pyqt/main.ui
diff --git a/src/preferences_dialog.py b/assignment_list_pyqt/preferences_dialog.py
index e6d4187..276e59a 100644
--- a/src/preferences_dialog.py
+++ b/assignment_list_pyqt/preferences_dialog.py
@@ -2,7 +2,7 @@ import os
 import sys
 from PyQt5 import uic
 from PyQt5.QtWidgets import QApplication, QDialog, QFileDialog
-from src.config import Config
+from assignment_list_pyqt.config import Config
 
 class PreferencesDialog(QDialog):
     """
@@ -10,7 +10,8 @@ class PreferencesDialog(QDialog):
     """
     def __init__(self):
         super().__init__()
-        uic.loadUi(os.path.join("src", "preferences_dialog.ui"), self)
+        uic.loadUi(os.path.join(os.path.dirname(os.path.abspath(__file__)), 
+                                   "preferences_dialog.ui"), self)
         
         # class globals
         self.config = Config()
diff --git a/src/preferences_dialog.ui b/assignment_list_pyqt/preferences_dialog.ui
index 244eb26..244eb26 100644
--- a/src/preferences_dialog.ui
+++ b/assignment_list_pyqt/preferences_dialog.ui
diff --git a/src/rule.py b/assignment_list_pyqt/rule.py
index 414ccf0..414ccf0 100644
--- a/src/rule.py
+++ b/assignment_list_pyqt/rule.py
diff --git a/src/rules_dialog.py b/assignment_list_pyqt/rules_dialog.py
index 0980fdd..971b95a 100644
--- a/src/rules_dialog.py
+++ b/assignment_list_pyqt/rules_dialog.py
@@ -1,10 +1,10 @@
 import sys
 from PyQt5.QtCore import QDate
 from PyQt5.QtWidgets import QApplication, QDialog, QHBoxLayout, QPushButton, QScrollArea, QVBoxLayout
-from src.config import Config
-from src.rule import Rule
-import src.db_sqlite as DB
-import src.globals as Globals
+from assignment_list_pyqt.config import Config
+from assignment_list_pyqt.rule import Rule
+import assignment_list_pyqt.db_sqlite as DB
+import assignment_list_pyqt.globals as Globals
 
 class RulesDialog(QDialog):
     """
diff --git a/setup.cfg b/setup.cfg
index 4984b64..1a39c91 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -5,7 +5,7 @@ author = Louie S
 
 [options]
 packages =
-	src
+	assignment_list_pyqt
 scripts =
 	assignment-list
 include_package_data = True