diff --git a/gui/AddCustomer.qml b/Gui/AddCustomer.qml similarity index 100% rename from gui/AddCustomer.qml rename to Gui/AddCustomer.qml diff --git a/gui/CustomerTables.qml b/Gui/CustomerTables.qml similarity index 100% rename from gui/CustomerTables.qml rename to Gui/CustomerTables.qml diff --git a/gui/Dashboard.qml b/Gui/Dashboard.qml similarity index 100% rename from gui/Dashboard.qml rename to Gui/Dashboard.qml diff --git a/gui/EmployeTables.qml b/Gui/EmployeTables.qml similarity index 100% rename from gui/EmployeTables.qml rename to Gui/EmployeTables.qml diff --git a/gui/SearchBar.qml b/Gui/SearchBar.qml similarity index 100% rename from gui/SearchBar.qml rename to Gui/SearchBar.qml diff --git a/gui/TopBar.qml b/Gui/TopBar.qml similarity index 100% rename from gui/TopBar.qml rename to Gui/TopBar.qml diff --git a/gui/firststart.qml b/Gui/firststart.qml similarity index 100% rename from gui/firststart.qml rename to Gui/firststart.qml diff --git a/gui/main.qml b/Gui/main.qml similarity index 98% rename from gui/main.qml rename to Gui/main.qml index 4477532..8228ea4 100644 --- a/gui/main.qml +++ b/Gui/main.qml @@ -1,7 +1,7 @@ import QtQuick import QtQuick.Layouts import QtQuick.Controls -import gui +import Gui ApplicationWindow { diff --git a/gui/qmldir b/Gui/qmldir similarity index 100% rename from gui/qmldir rename to Gui/qmldir diff --git a/gui/test.qml b/Gui/test.qml similarity index 100% rename from gui/test.qml rename to Gui/test.qml diff --git a/images/account.png b/images/account.png deleted file mode 100644 index f7116d5..0000000 Binary files a/images/account.png and /dev/null differ diff --git a/images/account.svg b/images/account.svg new file mode 100644 index 0000000..f2f119d --- /dev/null +++ b/images/account.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/filter.png b/images/filter.png deleted file mode 100644 index cc8b102..0000000 Binary files a/images/filter.png and /dev/null differ diff --git a/images/info.png b/images/info.png deleted file mode 100644 index b87c9da..0000000 Binary files a/images/info.png and /dev/null differ diff --git a/images/menu.png b/images/menu.png deleted file mode 100644 index 03c9bb6..0000000 Binary files a/images/menu.png and /dev/null differ diff --git a/images/search.png b/images/search.png deleted file mode 100644 index 9f2956b..0000000 Binary files a/images/search.png and /dev/null differ diff --git a/images/settings.png b/images/settings.png deleted file mode 100644 index 4e3e1a9..0000000 Binary files a/images/settings.png and /dev/null differ diff --git a/images/timer.png b/images/timer.png deleted file mode 100644 index 33a11d8..0000000 Binary files a/images/timer.png and /dev/null differ diff --git a/main.py b/main.py index 5d7e917..07fed73 100644 --- a/main.py +++ b/main.py @@ -49,7 +49,7 @@ 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" diff --git a/pyqcrm.pyproject b/pyqcrm.pyproject index bdf08f1..fbd53dd 100644 --- a/pyqcrm.pyproject +++ b/pyqcrm.pyproject @@ -1,22 +1,29 @@ { "files": [ - "gui/firststart.qml", + "Gui/firststart.qml", "lib/ConfigLoader.py", "lib/__init__.py", "main.py", - "gui/main.qml", - "gui/Dashboard.qml", + "Gui/main.qml", + "Gui/Dashboard.qml", "js/qmldict.js", "lib/Vermasseln.py", - "gui/CustomerTables.qml", - "gui/SearchBar.qml", - "gui/test.qml", + "Gui/CustomerTables.qml", + "Gui/SearchBar.qml", + "Gui/test.qml", "lib/DataBase.py", - "gui/EmployeTables.qml", - "gui/AddCustomer.qml", + "Gui/EmployeTables.qml", + "Gui/AddCustomer.qml", "pyqcrm.qrc", - "gui/qmldir", - "gui/TopBar.qml", - "qml.qrc" + "Gui/qmldir", + "Gui/TopBar.qml", + "qml.qrc", + "images/account.svg", + "images/add.svg", + "images/addbusiness.svg", + "images/addperson.svg", + "images/filter.svg", + "images/menu.svg", + "images/search.svg" ] } diff --git a/qml.qrc b/qml.qrc index 1d8dc5b..118ad9f 100644 --- a/qml.qrc +++ b/qml.qrc @@ -1,6 +1,6 @@ - gui/TopBar.qml - gui/qmldir + Gui/TopBar.qml + Gui/qmldir diff --git a/rc_qml.py b/rc_qml.py index 5185fd6..f3eeefd 100644 --- a/rc_qml.py +++ b/rc_qml.py @@ -45,8 +45,8 @@ odule gui\x0aTopBar\ qt_resource_name = b"\ \x00\x03\ -\x00\x00n\xb9\ -\x00g\ +\x00\x00N\xb9\ +\x00G\ \x00u\x00i\ \x00\x0a\ \x08\x8e<\xbc\