From c9ca55e1832cb80fd6d99b9b780bdbcc1fe5e14a Mon Sep 17 00:00:00 2001 From: Adrien Bourmault Date: Wed, 7 Aug 2019 16:38:20 +0200 Subject: [PATCH 1/4] Add files via upload --- make.bat | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/make.bat b/make.bat index d33dd09..012174f 100644 --- a/make.bat +++ b/make.bat @@ -4,16 +4,13 @@ title Compilation de CNIRevelator -call pyinstaller -w -D --exclude-module PyQt5 --bootloader-ignore-signals --add-data "C:\Users\pf04950\AppData\Local\Continuum\anaconda3\Lib\site-packages\tld\res\effective_tld_names.dat.txt";"tld\res" --add-data "id-card.ico";"id-card.ico" -i "id-card.ico" --add-data "background.png";"background.png" -i "background.png" -n CNIRevelator src\CNIRevelator.py +call pyinstaller -c -D --exclude-module PyQt5 --bootloader-ignore-signals --add-data "C:\Users\pf04950\AppData\Local\Continuum\anaconda3\Lib\site-packages\tld\res\effective_tld_names.dat.txt";"tld\res" --add-data "id-card.ico";"id-card.ico" -i "id-card.ico" -n CNIRevelator src\CNIRevelator.py -copy LICENSE dist\CNIRevelator\ - -copy src\id-card.ico dist\CNIRevelator\ - -copy src\background.png dist\CNIRevelator\ - +copy LICENSE dist\CNIRevelator\LICENSE +copy src\id-card.ico dist\CNIRevelator\id-card.ico +copy src\background.png dist\CNIRevelator\background.png D:\Public\CNIRevelator-master\CNIRevelator-master\signtool_8.1\signtool\signtool.exe sign /n "CNIRevelator by Adrien Bourmault (neox95)" dist\CNIRevelator\CNIRevelator.exe From 3d58a8d3b8cc2552402c5606fc7bf68d1e82c505 Mon Sep 17 00:00:00 2001 From: Adrien Bourmault Date: Wed, 7 Aug 2019 16:39:37 +0200 Subject: [PATCH 2/4] Preparing release 3.0.6 --- src/ihm.py | 5 +++++ src/updater.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/ihm.py b/src/ihm.py index 2cb7b5a..e254cfe 100644 --- a/src/ihm.py +++ b/src/ihm.py @@ -125,6 +125,11 @@ class LauncherWindow(Tk): # Creating objects # Load an image using OpenCV + # if getattr(sys, 'frozen', False): + # cv_img = cv2.imread(sys._MEIPASS + r"\background.png\background.png") + # else: + cv_img = cv2.imread("background.png") + cv_img = cv2.imread("background.png") cv_img = cv2.cvtColor(cv_img, cv2.COLOR_BGR2RGB) cv_img = cv2.blur(cv_img, (15, 15)) diff --git a/src/updater.py b/src/updater.py index 4dbbf39..b02ca37 100644 --- a/src/updater.py +++ b/src/updater.py @@ -34,9 +34,9 @@ import hashlib import subprocess import psutil +import ihm # ihm.py import logger # logger.py import globs # globs.py -import ihm # ihm.py import downloader # downloader.py UPDATE_IS_MADE = False From 19fb395eeefb27d4d60f9fb6343305d1dbfc6e77 Mon Sep 17 00:00:00 2001 From: Adrien Bourmault Date: Wed, 7 Aug 2019 16:40:55 +0200 Subject: [PATCH 3/4] Minor correction --- make.bat | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/make.bat b/make.bat index 012174f..eefda6d 100644 --- a/make.bat +++ b/make.bat @@ -1,18 +1,18 @@ @echo off - -title Compilation de CNIRevelator - +title Compilation de CNIRevelator + + + +call pyinstaller -w -D --exclude-module PyQt5 --bootloader-ignore-signals --add-data "C:\Users\pf04950\AppData\Local\Continuum\anaconda3\Lib\site-packages\tld\res\effective_tld_names.dat.txt";"tld\res" --add-data "id-card.ico";"id-card.ico" -i "id-card.ico" -n CNIRevelator src\CNIRevelator.py + -call pyinstaller -c -D --exclude-module PyQt5 --bootloader-ignore-signals --add-data "C:\Users\pf04950\AppData\Local\Continuum\anaconda3\Lib\site-packages\tld\res\effective_tld_names.dat.txt";"tld\res" --add-data "id-card.ico";"id-card.ico" -i "id-card.ico" -n CNIRevelator src\CNIRevelator.py - - copy LICENSE dist\CNIRevelator\LICENSE copy src\id-card.ico dist\CNIRevelator\id-card.ico copy src\background.png dist\CNIRevelator\background.png D:\Public\CNIRevelator-master\CNIRevelator-master\signtool_8.1\signtool\signtool.exe sign /n "CNIRevelator by Adrien Bourmault (neox95)" dist\CNIRevelator\CNIRevelator.exe -pause - +pause + From 0f3d3d3855b9b4693074cb8825a8d501cd871b1f Mon Sep 17 00:00:00 2001 From: Adrien Bourmault Date: Wed, 7 Aug 2019 16:52:19 +0200 Subject: [PATCH 4/4] Update VERSIONS.LST --- VERSIONS.LST | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/VERSIONS.LST b/VERSIONS.LST index e242d68..856ab09 100644 --- a/VERSIONS.LST +++ b/VERSIONS.LST @@ -1,3 +1,2 @@ # ver|url|checksum, and | as separator, one version per || -3.0.4|https://github.com/neox95/CNIRevelator/releases/download/3.0.4/CNIRevelator.zip|d03a18b35dfbb20d90664dc2c0f990adc5522e46||3.0.5|https://github.com/neox95/CNIRevelator/releases/download/3.0.5/CNIRevelator.zip|8b52290fb0910d8b9c4ec43293b08017e0031ca2|| - +3.0.4|https://github.com/neox95/CNIRevelator/releases/download/3.0.4/CNIRevelator.zip|d03a18b35dfbb20d90664dc2c0f990adc5522e46||3.0.5|https://github.com/neox95/CNIRevelator/releases/download/3.0.5/CNIRevelator.zip|8b52290fb0910d8b9c4ec43293b08017e0031ca2||3.0.6|https://github.com/neox95/CNIRevelator/releases/download/3.0.6/CNIRevelator.zip|4bb4606dc9310d7b34b1fb38f9a0c2daf9518dc5||