diff --git a/Gui/AddCustomer.qml b/Gui/AddCustomer.qml index 80bb485..2665c95 100644 --- a/Gui/AddCustomer.qml +++ b/Gui/AddCustomer.qml @@ -2,7 +2,6 @@ import QtQuick import QtQuick.Layouts import QtQuick.Controls import QtQuick.Controls.Fusion -import Gui import "../js/qmldict.js" as JsLib ColumnLayout diff --git a/Gui/main.qml b/Gui/main.qml index 01041ab..be261a8 100644 --- a/Gui/main.qml +++ b/Gui/main.qml @@ -1,7 +1,6 @@ import QtQuick import QtQuick.Layouts import QtQuick.Controls -import Gui import QtQuick.Dialogs import QtCore diff --git a/main.py b/main.py index 1083e86..b1b27a2 100644 --- a/main.py +++ b/main.py @@ -47,6 +47,8 @@ def publishContext(): engine.rootContext().setContextProperty("bm", bm) engine.rootContext().setContextProperty("am", am) + + if __name__ == "__main__": #QResource.registerResource("rc_qml.py") app = QGuiApplication(sys.argv) @@ -60,9 +62,9 @@ if __name__ == "__main__": - qml_file = Path(__file__).resolve().parent / "Gui/main.qml" + # qml_file = Path(__file__).resolve().parent / "Gui/main.qml" - #qml_file = ":/gui/main.qml" + qml_file = "qrc:/Gui/main.qml" config = ConfigLoader() diff --git a/pyqcrm.pyproject b/pyqcrm.pyproject index 330fe6b..339a454 100644 --- a/pyqcrm.pyproject +++ b/pyqcrm.pyproject @@ -10,12 +10,10 @@ "lib/Vermasseln.py", "Gui/CustomerTables.qml", "Gui/SearchBar.qml", - "Gui/test.qml", "lib/DB/BusinessModel.py", "Gui/EmployeTables.qml", "Gui/AddCustomer.qml", "pyqcrm.qrc", - "Gui/qmldir", "Gui/TopBar.qml", "qml.qrc", "images/account.svg", diff --git a/qml.qrc b/qml.qrc index 22b4004..1ca1881 100644 --- a/qml.qrc +++ b/qml.qrc @@ -1,11 +1,18 @@ Gui/TopBar.qml - Gui/qmldir Gui/AdminUserConfig.qml Gui/EncryptionKey.qml Gui/DbConfiguration.qml Gui/LoginScreen.qml Gui/AddContact.qml + Gui/AddCustomer.qml + Gui/CustomerTables.qml + Gui/Dashboard.qml + Gui/EmployeTables.qml + Gui/firststart.qml + Gui/main.qml + Gui/SearchBar.qml + js/qmldict.js