From 11373742d701166f2580cfe67015eac012cda1a9 Mon Sep 17 00:00:00 2001 From: Louie Shprung Date: Thu, 21 Dec 2023 12:20:20 -0800 Subject: Fix UI file loading --- debian/changelog | 5 +++-- debian/control | 4 ++-- setup.cfg | 1 + setup.py | 1 + src/add_entry_form.py | 3 ++- src/add_group_form.py | 3 ++- src/edit_entry_form.py | 3 ++- src/edit_group_form.py | 3 ++- src/main.py | 3 ++- 9 files changed, 17 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4076445..ef16534 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ -assignment-list (0.0.1-1) UNRELEASED; urgency=low +assignment-list (0.0.1+git20231221-1) UNRELEASED; urgency=low * Initial release + * Newer upstream version - -- louie Wed, 27 Sep 2023 16:17:44 -0400 + -- louie Thu, 21 Dec 2023 11:37:46 -0800 diff --git a/debian/control b/debian/control index 86ff3d3..4fd2f7a 100644 --- a/debian/control +++ b/debian/control @@ -1,13 +1,13 @@ Source: assignment-list Section: utils Priority: optional -Maintainer: louie +Maintainer: louie Build-Depends: debhelper-compat (= 13), dh-python, python3-all, python3-setuptools Standards-Version: 4.5.1 -#Homepage: +Homepage: https://github.com/lshprung/assignment-list-pyqt Rules-Requires-Root: no #Vcs-Git: https://salsa.debian.org/debian/assignment-list.git #Vcs-Browser: https://salsa.debian.org/debian/assignment-list diff --git a/setup.cfg b/setup.cfg index 7234da5..4984b64 100644 --- a/setup.cfg +++ b/setup.cfg @@ -8,3 +8,4 @@ packages = src scripts = assignment-list +include_package_data = True diff --git a/setup.py b/setup.py index 36f7fe7..f4b6670 100755 --- a/setup.py +++ b/setup.py @@ -1,4 +1,5 @@ #!/usr/bin/env python3 from setuptools import setup +# For getting a git snapshot: ./setup.py egg_info -b "+git`date '+%Y%m%d'`" build sdist setup() diff --git a/src/add_entry_form.py b/src/add_entry_form.py index ff66a19..9a2d260 100644 --- a/src/add_entry_form.py +++ b/src/add_entry_form.py @@ -10,7 +10,8 @@ import src.db_sqlite as DB class addEntryForm(QDialog): def __init__(self, parent): super().__init__() - uic.loadUi(os.path.join("src", "add_entry_form.ui"), self) + uic.loadUi(os.path.join(os.path.dirname(os.path.abspath(__file__)), + "add_entry_form.ui"), self) self.initializeUI(parent) def initializeUI(self, parent): diff --git a/src/add_group_form.py b/src/add_group_form.py index 0d35777..4a543e4 100644 --- a/src/add_group_form.py +++ b/src/add_group_form.py @@ -13,7 +13,8 @@ class addGroupForm(QDialog): """ def __init__(self): super().__init__() - uic.loadUi(os.path.join("src", "add_group_form.ui"), self) + uic.loadUi(os.path.join(os.path.dirname(os.path.abspath(__file__)), + "add_group_form.ui"), self) self.initializeUI() def initializeUI(self): diff --git a/src/edit_entry_form.py b/src/edit_entry_form.py index c1d3664..3c7f8c2 100644 --- a/src/edit_entry_form.py +++ b/src/edit_entry_form.py @@ -16,7 +16,8 @@ class editEntryForm(QDialog): def __init__(self, id): self.id = id super().__init__() - uic.loadUi(os.path.join("src", "add_entry_form.ui"), self) + uic.loadUi(os.path.join(os.path.dirname(os.path.abspath(__file__)), + "add_entry_form.ui"), self) self.initializeUI() def initializeUI(self): diff --git a/src/edit_group_form.py b/src/edit_group_form.py index e29a0fb..cd01162 100644 --- a/src/edit_group_form.py +++ b/src/edit_group_form.py @@ -14,7 +14,8 @@ class editGroupForm(QDialog): def __init__(self, id): self.id = id super().__init__() - uic.loadUi(os.path.join("src", "add_group_form.ui"), self) + uic.loadUi(os.path.join(os.path.dirname(os.path.abspath(__file__)), + "add_group_form.ui"), self) self.initializeUI() def initializeUI(self): diff --git a/src/main.py b/src/main.py index 91ddeca..88e0cda 100644 --- a/src/main.py +++ b/src/main.py @@ -19,7 +19,8 @@ from src.rules_dialog import RulesDialog class AssignmentList(QMainWindow): def __init__(self): super().__init__() - uic.loadUi(os.path.join("src", "main.ui"), self) + uic.loadUi(os.path.join(os.path.dirname(os.path.abspath(__file__)), + "main.ui"), self) self.initializeUI() -- cgit