diff --git a/src/CNIRevelator.py b/src/CNIRevelator.py
index 44dbac7..ab73b40 100644
--- a/src/CNIRevelator.py
+++ b/src/CNIRevelator.py
@@ -6,6 +6,7 @@
* *
* Copyright © 2018-2019 Adrien Bourmault (neox95) *
* *
+* *
* This file is part of CNIRevelator. *
* *
* CNIRevelator is free software: you can redistribute it and/or modify *
diff --git a/src/background.png b/src/background.png
new file mode 100644
index 0000000..0a18525
Binary files /dev/null and b/src/background.png differ
diff --git a/src/background.svg b/src/background.svg
new file mode 100644
index 0000000..ec86690
--- /dev/null
+++ b/src/background.svg
@@ -0,0 +1,235 @@
+
+
+
+
diff --git a/src/globs.py b/src/globs.py
index 917624a..86a57f6 100644
--- a/src/globs.py
+++ b/src/globs.py
@@ -26,12 +26,13 @@ import os
# CNIRevelator version
verType = "alpha"
-version = [3, 0, 5]
+version = [3, 0, 6]
verstring_full = "{}.{}.{} {}".format(version[0], version[1], version[2], verType)
verstring = "{}.{}".format(version[0], version[1])
debug = True
-changelog = "Version 3.0.5 \nMise-à-jour mineure avec les corrections suivantes :\n- Changement de l'icône de l'exécutable afin de refléter le changement de version majeur accompli en 3.0\n\n" + \
+changelog = "Version 3.0.6 \nMise-à-jour mineure avec les corrections suivantes :\n- Changement de l'apparence du launcher de l'application\n\n" + \
+"Version 3.0.5 \nMise-à-jour mineure avec les corrections suivantes :\n- Changement de l'icône de l'exécutable afin de refléter le changement de version majeur accompli en 3.0\n\n" + \
"Version 3.0.4 \nMise-à-jour mineure avec les corrections suivantes :\n- Correction d'un bug affectant le système de mise-à-jour\n\n" + \
"Version 3.0.3 \nMise-à-jour mineure avec les corrections suivantes :\n- Correction d'un bug affectant le changelog\n- Correction d'une erreur avec la touche Suppr Arrière et Suppr causant une perte de données\n\n" + \
"Version 3.0.2 \nMise-à-jour mineure avec les corrections suivantes :\n- Changement d'icône de l'exécutable\n- Correction d'un bug affectant le logging\n- Correction d'un bug affectant la détection de documents\n- Et autres modifications mineures\n\n" + \
diff --git a/src/id-card.svg b/src/id-card.svg
index 13c5833..3b51ad0 100644
--- a/src/id-card.svg
+++ b/src/id-card.svg
@@ -16,7 +16,10 @@
version="1.1"
id="svg8"
inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
- sodipodi:docname="Icon.svg">
+ sodipodi:docname="id-card.svg"
+ inkscape:export-filename="D:\Public\CNIRevelator-master\CNIRevelator-master\id-card.ico.png"
+ inkscape:export-xdpi="96"
+ inkscape:export-ydpi="96">
+ gradientTransform="matrix(1.1362933,0,0,1.063401,-17.304581,-33.164658)">
+ inkscape:export-xdpi="96"
+ inkscape:export-ydpi="96" />
+ inkscape:export-xdpi="96"
+ inkscape:export-ydpi="96" />
+ width="195.50467"
+ height="111.73937"
+ x="7.0905566"
+ y="67.868561"
+ inkscape:export-xdpi="96"
+ inkscape:export-ydpi="96" />
+ d="m -79.962357,91.675934 a 27.00486,14.752526 0 0 1 -0.0023,0.190908 l -27.002602,-0.190908 z"
+ inkscape:export-xdpi="96"
+ inkscape:export-ydpi="96" />
+ d="m 69.381268,117.01824 a 19.252365,0.91162664 0 0 1 -0.0016,0.0118 l -19.250753,-0.0118 z"
+ inkscape:export-xdpi="96"
+ inkscape:export-ydpi="96" />
+ d="m 20.941047,126.92544 a 26.394371,14.586026 0 0 1 13.200663,-12.77315 26.394371,14.586026 0 0 1 26.61746,0.075 26.394371,14.586026 0 0 1 12.964242,12.84688"
+ sodipodi:open="true"
+ inkscape:export-xdpi="96"
+ inkscape:export-ydpi="96" />
+ d="m 38.577796,108.89433 a 10.402489,20.186018 0 0 1 1.284074,-27.112722 10.402489,20.186018 0 0 1 14.030908,0.03154 10.402489,20.186018 0 0 1 1.251703,27.118425"
+ inkscape:export-xdpi="96"
+ inkscape:export-ydpi="96" />
+ width="90.982964"
+ height="5.7302251"
+ x="100.43346"
+ y="87.195045"
+ inkscape:export-xdpi="96"
+ inkscape:export-ydpi="96" />
+ width="90.982964"
+ height="5.9906888"
+ x="100.43346"
+ y="-104.90665"
+ transform="scale(1,-1)"
+ inkscape:export-xdpi="96"
+ inkscape:export-ydpi="96" />
+ width="90.982964"
+ height="4.9488306"
+ x="100.744"
+ y="-115.06476"
+ transform="scale(1,-1)"
+ inkscape:export-xdpi="96"
+ inkscape:export-ydpi="96" />
+ width="90.982964"
+ height="5.2092953"
+ x="100.744"
+ y="120.53452"
+ inkscape:export-xdpi="96"
+ inkscape:export-ydpi="96" />
+ width="180.10278"
+ height="20.316252"
+ x="13.332048"
+ y="151.79028"
+ inkscape:export-xdpi="96"
+ inkscape:export-ydpi="96" />
+
+
+
+
diff --git a/src/ihm.py b/src/ihm.py
index f5d742c..b80ab2f 100644
--- a/src/ihm.py
+++ b/src/ihm.py
@@ -108,35 +108,41 @@ class LauncherWindow(Tk):
def __init__(self):
# Initialize the tkinter main class
Tk.__init__(self)
- self.configure(bg=globs.CNIRLColor)
self.resizable(width=False, height=False)
- self.queue = []
# Setting up the geometry
ws = self.winfo_screenwidth()
hs = self.winfo_screenheight()
- wheight = hs /4
- wwidth = ws /4
+ wheight = 274
+ wwidth = 480
+ # Centering
+ x = ws / 2 - wwidth / 2
+ y = hs / 2 - wheight / 2
+ self.geometry('%dx%d+%d+%d' % (wwidth, wheight, x, y))
# Creating objects
- self.mainCanvas = Canvas(self, width=wwidth, height=wheight*9/10, bg=globs.CNIRLColor, highlightthickness=0)
- self.pBarZone = Canvas(self, width=wwidth, height=wheight/10, bg=globs.CNIRLColor)
+ self.image = PhotoImage(file = "background.png")
+ self.mainCanvas = Canvas(self, width=wwidth, height=wheight, bg=globs.CNIRLColor, highlightthickness=0)
+ self.mainCanvas.create_image(wwidth /2, wheight /2, image=self.image)
- self.progressBar = ttk.Progressbar(self.pBarZone, orient=HORIZONTAL, length=wwidth-10, mode='determinate')
+ # Column
+ self.mainCanvas.grid_rowconfigure(0, weight=1, minsize=(wheight / 10 * 9))
+ self.mainCanvas.grid_rowconfigure(1, weight=1, minsize=(wheight / 10 * 1))
self.mainCanvas.create_text((wwidth / 2), (wheight / 3), text=(globs.CNIRName), font='Helvetica 30', fill='white')
self.mainCanvas.create_text((wwidth / 2), (wheight / 2), text="version " + (globs.verstring_full), font='Helvetica 8', fill='white')
self.msg = self.mainCanvas.create_text((wwidth / 2), (wheight / 1.20), text='Booting up...', font='Helvetica 9', fill='white')
+ #self.pBarZone = Frame(self.mainCanvas, width=wwidth, height=wheight/10)
+ self.update()
+
+ self.progressBar = ttk.Progressbar(self.mainCanvas, orient=HORIZONTAL, length=wwidth, mode='determinate')
+
self.wm_title(globs.CNIRName)
- # Centering
- x = ws / 2 - wwidth / 2
- y = hs / 2 - wheight / 2
- self.geometry('%dx%d+%d+%d' % (wwidth, wheight, x, y))
- self.mainCanvas.grid()
- self.pBarZone.grid()
- self.progressBar.grid()
+ self.mainCanvas.grid(row=0)
+ self.update()
+ self.progressBar.grid(row=1, sticky='S')
if getattr(sys, 'frozen', False):
diff --git a/src/image.py b/src/image.py
index d51f369..db67367 100644
--- a/src/image.py
+++ b/src/image.py
@@ -24,7 +24,7 @@
"""
class CanvasImage:
-
+
def __init__(self, placeholder, file, type):
""" Initialize the ImageFrame """
self.type = type