some fix
This commit is contained in:
2
.idea/misc.xml
generated
2
.idea/misc.xml
generated
@@ -3,7 +3,7 @@
|
|||||||
<component name="Black">
|
<component name="Black">
|
||||||
<option name="sdkName" value="Python 3.13 (oxapp25)" />
|
<option name="sdkName" value="Python 3.13 (oxapp25)" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.13 (oxapp25)" project-jdk-type="Python SDK" />
|
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.12 (oxapp25)" project-jdk-type="Python SDK" />
|
||||||
<component name="PythonCompatibilityInspectionAdvertiser">
|
<component name="PythonCompatibilityInspectionAdvertiser">
|
||||||
<option name="version" value="3" />
|
<option name="version" value="3" />
|
||||||
</component>
|
</component>
|
||||||
|
|||||||
2
.idea/oxapp25.iml
generated
2
.idea/oxapp25.iml
generated
@@ -4,7 +4,7 @@
|
|||||||
<content url="file://$MODULE_DIR$">
|
<content url="file://$MODULE_DIR$">
|
||||||
<excludeFolder url="file://$MODULE_DIR$/.venv" />
|
<excludeFolder url="file://$MODULE_DIR$/.venv" />
|
||||||
</content>
|
</content>
|
||||||
<orderEntry type="jdk" jdkName="Python 3.13 (oxapp25)" jdkType="Python SDK" />
|
<orderEntry type="jdk" jdkName="Python 3.12 (oxapp25)" jdkType="Python SDK" />
|
||||||
<orderEntry type="sourceFolder" forTests="false" />
|
<orderEntry type="sourceFolder" forTests="false" />
|
||||||
</component>
|
</component>
|
||||||
</module>
|
</module>
|
||||||
@@ -7,10 +7,15 @@ if "%1"=="resources" (
|
|||||||
pyinstaller OxApp.spec --noconfirm
|
pyinstaller OxApp.spec --noconfirm
|
||||||
) else if "%1"=="installer" (
|
) else if "%1"=="installer" (
|
||||||
"C:\Program Files (x86)\Inno Setup 6\ISCC.exe" "setup.iss"
|
"C:\Program Files (x86)\Inno Setup 6\ISCC.exe" "setup.iss"
|
||||||
|
) else if "%1"=="clean" (
|
||||||
|
echo Nettoyage des packages non requis...
|
||||||
|
pip freeze > unins && pip uninstall -y -r unins && pip install -r requirements.txt && del unins
|
||||||
|
echo Nettoyage terminé.
|
||||||
) else (
|
) else (
|
||||||
echo Commandes disponibles:
|
echo Commandes disponibles:
|
||||||
echo build.bat resources - Compile les ressources
|
echo build.bat resources - Compile les ressources
|
||||||
echo build.bat deploy - Déploie l'application
|
echo build.bat deploy - Déploie l'application
|
||||||
echo build.bat pyinstaller - Crée l'exécutable avec PyInstaller
|
echo build.bat pyinstaller - Crée l'exécutable avec PyInstaller
|
||||||
echo build.bat installer - Crée l'installateur avec Inno Setup
|
echo build.bat installer - Crée l'installateur avec Inno Setup
|
||||||
|
echo build.bat clean - Nettoie les packages non requis dans requirements.txt
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ input_file = D:\Dev\oxapp25\main.py
|
|||||||
exec_directory = .
|
exec_directory = .
|
||||||
|
|
||||||
# path to .pyproject project file
|
# path to .pyproject project file
|
||||||
project_file =
|
project_file =
|
||||||
|
|
||||||
# application icon
|
# application icon
|
||||||
icon = D:\Dev\oxapp25\oxpanel.ico
|
icon = D:\Dev\oxapp25\oxpanel.ico
|
||||||
@@ -37,13 +37,13 @@ android_packages = buildozer==1.5.0,cython==0.29.33
|
|||||||
|
|
||||||
# comma separated path to qml files required
|
# comma separated path to qml files required
|
||||||
# normally all the qml files required by the project are added automatically
|
# normally all the qml files required by the project are added automatically
|
||||||
qml_files =
|
qml_files =
|
||||||
|
|
||||||
# excluded qml plugin binaries
|
# excluded qml plugin binaries
|
||||||
excluded_qml_plugins =
|
excluded_qml_plugins =
|
||||||
|
|
||||||
# qt modules used. comma separated
|
# qt modules used. comma separated
|
||||||
modules = Network,WebEngineCore,Widgets,Gui,WebEngineWidgets,Core,WebChannel
|
modules = WebChannel,Core,WebEngineCore,WebEngineWidgets,Gui,Widgets,Network
|
||||||
|
|
||||||
# qt plugins used by the application. only relevant for desktop deployment. for qt plugins used
|
# qt plugins used by the application. only relevant for desktop deployment. for qt plugins used
|
||||||
# in android application see [android][plugins]
|
# in android application see [android][plugins]
|
||||||
@@ -52,26 +52,26 @@ plugins = networkinformation,styles,networkaccess,tls
|
|||||||
[android]
|
[android]
|
||||||
|
|
||||||
# path to pyside wheel
|
# path to pyside wheel
|
||||||
wheel_pyside =
|
wheel_pyside =
|
||||||
|
|
||||||
# path to shiboken wheel
|
# path to shiboken wheel
|
||||||
wheel_shiboken =
|
wheel_shiboken =
|
||||||
|
|
||||||
# plugins to be copied to libs folder of the packaged application. comma separated
|
# plugins to be copied to libs folder of the packaged application. comma separated
|
||||||
plugins =
|
plugins =
|
||||||
|
|
||||||
[nuitka]
|
[nuitka]
|
||||||
|
|
||||||
# usage description for permissions requested by the app as found in the info.plist file
|
# usage description for permissions requested by the app as found in the info.plist file
|
||||||
# of the app bundle
|
# of the app bundle
|
||||||
# eg = extra_args = --show-modules --follow-stdlib
|
# eg = extra_args = --show-modules --follow-stdlib
|
||||||
macos.permissions =
|
macos.permissions =
|
||||||
|
|
||||||
# mode of using nuitka. accepts standalone or onefile. default is onefile.
|
# mode of using nuitka. accepts standalone or onefile. default is onefile.
|
||||||
mode = standalone
|
mode = standalone
|
||||||
|
|
||||||
# (str) specify any extra nuitka arguments
|
# (str) specify any extra nuitka arguments
|
||||||
extra_args = --quiet --noinclude-qt-translations --windows-console-mode=disable --output-filename=oxapp --company-name=Oxpanel --product-name=OxApp --file-description="Application légitime OxApp" --copyright="Oxpanel (c) 2023" --file-version=1.0.0 --product-version=1.0.0 --unstripped --no-deployment-flag=self-execution --disable-ccache --disable-console
|
extra_args = --quiet --noinclude-qt-translations --windows-console-mode=disable --output-filename=oxapp --company-name=Oxpanel --product-name=OxApp --file-description="OxApp" --copyright="Oxpanel (c) 2023" --file-version=1.0.0 --product-version=1.0.0 --unstripped --no-deployment-flag=self-execution --disable-ccache --disable-console
|
||||||
|
|
||||||
[buildozer]
|
[buildozer]
|
||||||
|
|
||||||
@@ -81,21 +81,22 @@ extra_args = --quiet --noinclude-qt-translations --windows-console-mode=disable
|
|||||||
mode = release
|
mode = release
|
||||||
|
|
||||||
# contrains path to pyside6 and shiboken6 recipe dir
|
# contrains path to pyside6 and shiboken6 recipe dir
|
||||||
recipe_dir =
|
recipe_dir =
|
||||||
|
|
||||||
# path to extra qt android jars to be loaded by the application
|
# path to extra qt android jars to be loaded by the application
|
||||||
jars_dir =
|
jars_dir =
|
||||||
|
|
||||||
# if empty uses default ndk path downloaded by buildozer
|
# if empty uses default ndk path downloaded by buildozer
|
||||||
ndk_path =
|
ndk_path =
|
||||||
|
|
||||||
# if empty uses default sdk path downloaded by buildozer
|
# if empty uses default sdk path downloaded by buildozer
|
||||||
sdk_path =
|
sdk_path =
|
||||||
|
|
||||||
# other libraries to be loaded. comma separated.
|
# other libraries to be loaded. comma separated.
|
||||||
# loaded at app startup
|
# loaded at app startup
|
||||||
local_libs =
|
local_libs =
|
||||||
|
|
||||||
# architecture of deployed platform
|
# architecture of deployed platform
|
||||||
# possible values = ["aarch64", "armv7a", "i686", "x86_64"]
|
# possible values = ["aarch64", "armv7a", "i686", "x86_64"]
|
||||||
arch =
|
arch =
|
||||||
|
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import pickle
|
|||||||
import pathlib
|
import pathlib
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def cookie_qt_to_py(cookie: QNetworkCookie):
|
def cookie_qt_to_py(cookie: QNetworkCookie):
|
||||||
return Cookie(
|
return Cookie(
|
||||||
version=0,
|
version=0,
|
||||||
|
|||||||
@@ -1,5 +1,3 @@
|
|||||||
import threading
|
|
||||||
|
|
||||||
from PySide6.QtCore import QTimer
|
from PySide6.QtCore import QTimer
|
||||||
from PySide6.QtGui import QIcon
|
from PySide6.QtGui import QIcon
|
||||||
from PySide6.QtWidgets import QMainWindow
|
from PySide6.QtWidgets import QMainWindow
|
||||||
|
|||||||
Reference in New Issue
Block a user