diff --git a/pyproject.toml b/pyproject.toml index 8b5567b2..7c480ae2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,7 @@ [tool.briefcase] project_name = "MyCartable" bundle = "coding.cacahuete" -version = "0.9.2" +version = "0.9.3" url = "https://github.com/jgirardet/MyCartable" license = "GNU General Public License v3 (GPLv3)" author = 'Jimmy Girardet' @@ -9,8 +9,9 @@ author_email = "ijkl@netc.fr" [tool.briefcase.app.mycartable] formal_name = "MyCartable" -description = "My first application" -#icon = "src/mycartable/resources/mycartable" +description = "L'école sur ordinateur, tout un un !!!" +icon = "src/data/icons/mycartable" +installer_icon = "src/data/icons/mycartable" sources = ['src/mycartable'] requires = ['pyside2==5.15.0', 'pony>=0.7.11,<0.8', diff --git a/src/data/icons/Icon.ico b/src/data/icons/Icon.ico deleted file mode 100644 index 3312d860..00000000 Binary files a/src/data/icons/Icon.ico and /dev/null differ diff --git a/src/data/icons/mycartable-128.png b/src/data/icons/mycartable-128.png new file mode 100644 index 00000000..52c1bcf4 Binary files /dev/null and b/src/data/icons/mycartable-128.png differ diff --git a/src/data/icons/mycartable-16.png b/src/data/icons/mycartable-16.png new file mode 100644 index 00000000..8c33593f Binary files /dev/null and b/src/data/icons/mycartable-16.png differ diff --git a/src/data/icons/mycartable-256.png b/src/data/icons/mycartable-256.png new file mode 100644 index 00000000..eb371ba5 Binary files /dev/null and b/src/data/icons/mycartable-256.png differ diff --git a/src/data/icons/mycartable-32.png b/src/data/icons/mycartable-32.png new file mode 100644 index 00000000..29c3315f Binary files /dev/null and b/src/data/icons/mycartable-32.png differ diff --git a/src/data/icons/appicon-512.png b/src/data/icons/mycartable-512.png similarity index 100% rename from src/data/icons/appicon-512.png rename to src/data/icons/mycartable-512.png diff --git a/src/data/icons/mycartable-64.png b/src/data/icons/mycartable-64.png new file mode 100644 index 00000000..c8c74a70 Binary files /dev/null and b/src/data/icons/mycartable-64.png differ diff --git a/src/data/icons/appicon.ico b/src/data/icons/mycartable.ico similarity index 100% rename from src/data/icons/appicon.ico rename to src/data/icons/mycartable.ico diff --git a/src/data/icons/mycartable.png b/src/data/icons/mycartable.png new file mode 100644 index 00000000..8df6627e Binary files /dev/null and b/src/data/icons/mycartable.png differ diff --git a/src/mycartable/main.py b/src/mycartable/main.py index 50646bc9..c30dc711 100755 --- a/src/mycartable/main.py +++ b/src/mycartable/main.py @@ -1,7 +1,7 @@ import sys from pathlib import Path -from PySide2.QtGui import QFont, QFontDatabase +from PySide2.QtGui import QFont, QFontDatabase, QIcon, QPixmap from package import get_prod from package.constantes import APPNAME, ORGNAME, BASE_FONT from PySide2.QtCore import ( @@ -10,6 +10,7 @@ QSettings, QCoreApplication, QLocale, + QFile, ) # from fbs_runtime.application_context.PySide2 import ApplicationContext @@ -154,9 +155,12 @@ def main(filename=None): # import qrc engine = setup_qml(databaseObject, ui_manager) + + # Manifestement l'acces au qrc n'est pas immediat apres creation de l'app + # donc on met tout ça un peu plus "loin" + app.setWindowIcon(QIcon(":/icons/mycartable.png")) QFontDatabase.addApplicationFont(":/fonts/Verdana.ttf") font = QFont(BASE_FONT, 12, QFont.Normal) - # font = QFont('Verdana', 12, QFont.Normal) app.setFont(font) # run the app diff --git a/src/qml.qrc b/src/qml.qrc index 2896d2c1..a2e3500c 100644 --- a/src/qml.qrc +++ b/src/qml.qrc @@ -97,6 +97,8 @@ + data/icons/mycartable.png + data/icons/mycartable.ico data/icons/base/pack/png/sphere.png data/icons/base/pack/png/fillrect.png data/icons/base/divers/png/003-edit.png