diff --git a/examples/AdvancedPy/src/AdvancedPy/main.py b/examples/AdvancedPy/src/AdvancedPy/main.py index e6b78225..ab52b774 100644 --- a/examples/AdvancedPy/src/AdvancedPy/main.py +++ b/examples/AdvancedPy/src/AdvancedPy/main.py @@ -8,6 +8,7 @@ from PySide6.QtGui import QGuiApplication from PySide6.QtQml import QQmlApplicationEngine, qmlRegisterSingletonType from PySide6.QtCore import qInstallMessageHandler +from PySide6.QtGui import QIcon # It is usually assumed that the EasyApp package is already installed in the desired python environment. # If this is not the case, and if the example is run from the EasyApp repository, one need to add the path to the @@ -33,6 +34,7 @@ app = QGuiApplication(sys.argv) console.debug(f'Qt Application created {app}') + app.setWindowIcon(QIcon(str(CURRENT_DIR / 'Gui' / 'Resources' / 'Logos' / 'App.svg'))) engine = QQmlApplicationEngine() console.debug(f'QML application engine created {engine}') diff --git a/src/EasyApp/Gui/Resources/Fonts/FontAwesome/Font Awesome 5 Free-Solid-900.otf b/src/EasyApp/Gui/Resources/Fonts/FontAwesome/Font Awesome 5 Free-Solid-900.otf deleted file mode 100644 index 8fb28d58..00000000 Binary files a/src/EasyApp/Gui/Resources/Fonts/FontAwesome/Font Awesome 5 Free-Solid-900.otf and /dev/null differ diff --git a/src/EasyApp/Gui/Resources/Fonts/FontAwesome/Font Awesome 6 Free-Regular-400.otf b/src/EasyApp/Gui/Resources/Fonts/FontAwesome/Font Awesome 6 Free-Regular-400.otf deleted file mode 100644 index 597c320b..00000000 Binary files a/src/EasyApp/Gui/Resources/Fonts/FontAwesome/Font Awesome 6 Free-Regular-400.otf and /dev/null differ diff --git a/src/EasyApp/Gui/Resources/Fonts/FontAwesome/Font Awesome 6 Free-Solid-900.otf b/src/EasyApp/Gui/Resources/Fonts/FontAwesome/Font Awesome 6 Free-Solid-900.otf deleted file mode 100644 index a95c71e0..00000000 Binary files a/src/EasyApp/Gui/Resources/Fonts/FontAwesome/Font Awesome 6 Free-Solid-900.otf and /dev/null differ diff --git a/src/EasyApp/Gui/Resources/Fonts/FontAwesome/Font Awesome 7 Free-Solid-900.otf b/src/EasyApp/Gui/Resources/Fonts/FontAwesome/Font Awesome 7 Free-Solid-900.otf new file mode 100644 index 00000000..b00559cc Binary files /dev/null and b/src/EasyApp/Gui/Resources/Fonts/FontAwesome/Font Awesome 7 Free-Solid-900.otf differ diff --git a/src/EasyApp/Gui/Style/Fonts.qml b/src/EasyApp/Gui/Style/Fonts.qml index 03ca8482..06e17fd1 100644 --- a/src/EasyApp/Gui/Style/Fonts.qml +++ b/src/EasyApp/Gui/Style/Fonts.qml @@ -23,7 +23,7 @@ QtObject { property FontLoader nunitoLight: FontLoader { source: fontPath("Nunito", "Nunito-Light.ttf") } // font.weight: Font.Light property FontLoader nunitoSemiBold: FontLoader { source: fontPath("Nunito", "Nunito-SemiBold.ttf") } // font.weight: Font.DemiBold - property FontLoader fontAwesomeSolid: FontLoader { source: fontPath("FontAwesome", "Font Awesome 5 Free-Solid-900.otf") } + property FontLoader fontAwesomeSolid: FontLoader { source: fontPath("FontAwesome", "Font Awesome 7 Free-Solid-900.otf") } // Font families readonly property string fontFamily: ptSansRegular.name diff --git a/src/EasyApp/Logic/Utils/Utils.py b/src/EasyApp/Logic/Utils/Utils.py index b33f88fd..8013d303 100644 --- a/src/EasyApp/Logic/Utils/Utils.py +++ b/src/EasyApp/Logic/Utils/Utils.py @@ -4,11 +4,11 @@ # Utils -def generalizePath(fpath: str) -> str: +def generalize_path(fpath: str) -> str: """ Generalize the filepath to be platform-specific, so all file operations can be performed. - :param URI rcfPath: URI to the file + :param URI fpath: URI to the file :return URI filename: platform specific URI """ filename = urlparse(fpath).path