diff --git a/Auth/login.py b/Auth/login.py index e32c662..baf2b41 100644 --- a/Auth/login.py +++ b/Auth/login.py @@ -3,12 +3,14 @@ from __future__ import unicode_literals import sys import os +from PIL import Image,ImageTk +from tkinter import * DOSSIER_COURRANT = os.path.dirname(os.path.abspath(__file__)) DOSSIER_PARENT = os.path.dirname(DOSSIER_COURRANT) sys.path.append(DOSSIER_PARENT) -from tkinter import * -import Auth.authentification as auth -from PIL import Image,ImageTk + +import Auth.authentication as auth + class Login(): """Classe gérant l'affichage de la fenêtre de login""" @@ -17,13 +19,9 @@ class Login(): def __init__(self): self.fenetre = Tk() - + self.fenetre.title('login') - try: - self.fenetre.iconbitmap("..\\icon.ico") - except Exception: - self.fenetre.iconbitmap("icon.ico") - + # Création de nos widgets self.message = Label(self.fenetre, text="Merci de vous identifier") self.message.pack() @@ -49,4 +47,3 @@ class Login(): if auth.Auth.access == True: self.fenetre.destroy() - diff --git a/Images/Icone.ico b/Images/Icone.ico new file mode 100644 index 0000000..edec35f Binary files /dev/null and b/Images/Icone.ico differ diff --git a/Images/Logo.png b/Images/Logo.png new file mode 100644 index 0000000..b71c8cd Binary files /dev/null and b/Images/Logo.png differ diff --git a/Images/add.png b/Images/add.png new file mode 100644 index 0000000..b108253 Binary files /dev/null and b/Images/add.png differ diff --git a/Images/browse.png b/Images/browse.png new file mode 100644 index 0000000..8edb226 Binary files /dev/null and b/Images/browse.png differ diff --git a/Images/quicktask.png b/Images/quicktask.png new file mode 100644 index 0000000..dceb2f2 Binary files /dev/null and b/Images/quicktask.png differ diff --git a/Images/quit.png b/Images/quit.png new file mode 100644 index 0000000..cd4a718 Binary files /dev/null and b/Images/quit.png differ diff --git a/Images/stats.png b/Images/stats.png new file mode 100644 index 0000000..99ac76c Binary files /dev/null and b/Images/stats.png differ diff --git a/Menu/barreOutils.py b/Menu/barreOutils.py index 44fb9f1..554be33 100644 --- a/Menu/barreOutils.py +++ b/Menu/barreOutils.py @@ -1,12 +1,13 @@ # -*- coding: utf-8 -*- import sys import os -DOSSIER_COURRANT = os.path.dirname(os.path.abspath(__file__)) -DOSSIER_PARENT = os.path.dirname(DOSSIER_COURRANT) -sys.path.append(DOSSIER_PARENT) from tkinter import * from tkinter.messagebox import * from PIL import Image, ImageTk +DOSSIER_COURRANT = os.path.dirname(os.path.abspath(__file__)) +DOSSIER_PARENT = os.path.dirname(DOSSIER_COURRANT) +sys.path.append(DOSSIER_PARENT) +from Views.quickTask import QuickTask class BarreOutils(): @@ -17,12 +18,7 @@ class BarreOutils(): def __init__(self): # céation de la fenetre self.fenetre = Tk() - # icone fenetre - try: - self.fenetre.iconbitmap("..\icon.ico") - except Exception: - self.fenetre.iconbitmap("icon.ico") - + # Booleen fermer : devient true quand on appuie sur le bouton deconnexion self.fermer = False # Dimension et position fenetre @@ -66,13 +62,13 @@ class BarreOutils(): graphe2 = "Menu\\graphe.png" loupe2 = "Menu\\loupe.jpg" plus2 = "Menu\\plus4.png" - + ################################################################################################################ try: - image = Image.open(fleche) + image = Image.open("./Images/quicktask.png") except Exception: image = Image.open(fleche2) - + photo = ImageTk.PhotoImage(image) self.bouton_tache_rapide = Button(self.fenetre, image=photo,width=self.largeurBoutons,height=self.hauteurBoutons, command=self.open_taches_rapides) self.bouton_tache_rapide.grid(row=3,column=1, padx = self.largeur * 0.02) @@ -80,7 +76,7 @@ class BarreOutils(): ################################################################################################################ # Bouton Nouveau Projet try: - image = Image.open(plus) + image = Image.open("./Images/add.png") except Exception: image = Image.open(plus2) photo = ImageTk.PhotoImage(image) @@ -90,7 +86,7 @@ class BarreOutils(): ################################################################################################################ # Bouton Rapports try: - image = Image.open(graphe) + image = Image.open("./Images/stats.png") except Exception: image = Image.open(graphe2) photo = ImageTk.PhotoImage(image) @@ -100,7 +96,7 @@ class BarreOutils(): ################################################################################################################ # Bouton Naviguer try: - image = Image.open(loupe) + image = Image.open("./Images/browse.png") except Exception: image = Image.open(loupe2) photo = ImageTk.PhotoImage(image) @@ -110,7 +106,7 @@ class BarreOutils(): ################################################################################################################ # Bouton Deconnexion try: - image = Image.open(deco) + image = Image.open("./Images/quit.png") except Exception: image = Image.open(deco2) photo = ImageTk.PhotoImage(image) @@ -118,38 +114,35 @@ class BarreOutils(): self.bouton_deconnexion.grid(row=7,column=1) self.bouton_deconnexion.image = photo ################################################################################################################ - def deconnexion(self,*args): + def deconnexion(self): """L'utilisateur veut fermer le programme et se deconnecter""" self.callback() if self.fermer == True: self.fenetre.destroy() - def open_taches_rapides(self,*args): + def open_taches_rapides(self): """L'utilisateur veut ouvrir la fenetre des taches rapides""" - toplevel = Toplevel(self.fenetre) - toplevel.title('Subroot') + QuickTask(mother=self.fenetre) # TODO : ouvrir la fenetre des taches rapides - def open_nouveau_projet(self,*args): + def open_nouveau_projet(self): """L'utilisateur veut ouvrir la fenetre des nouveaux projets""" # TODO : ouvrir la fenetre des nouveaux projets - def open_rapports(self,*args): + def open_rapports(self): """L'utilisateur veut ouvrir la fenetre des rapports""" # TODO : ouvrir la fenetre des rapports - def naviguer(self,*args): + def naviguer(self): """L'utilisateur veut ouvrir la fenetre des rapports""" # TODO : ouvrir la fenetre de navigation self.fenetre.state('iconic') - def geoliste(self,g): + def geoliste(self, g): r=[i for i in range(0,len(g)) if not g[i].isdigit()] return [int(g[0:r[0]]),int(g[r[0]+1:r[1]]),int(g[r[1]+1:r[2]]),int(g[r[2]+1:])] def callback(self): - if askyesno('Deconnexion', 'Êtes-vous sûr de vouloir vous deconnecter ?'): - self.fermer = True - else: + self.fermer = askyesno('Deconnexion', 'Êtes-vous sûr de vouloir vous deconnecter ?') #showinfo('Titre 3', 'Vous avez peur!') #showerror("Titre 4", "Aha") - self.fermer = False + def resource_path(self, relative_path): """ Get absolute path to resource, works for dev and for PyInstaller """ try: diff --git a/Menu/deco.jpg b/Menu/deco.jpg deleted file mode 100644 index abf43e2..0000000 Binary files a/Menu/deco.jpg and /dev/null differ diff --git a/Menu/fleche.png b/Menu/fleche.png deleted file mode 100644 index 6d2f1d7..0000000 Binary files a/Menu/fleche.png and /dev/null differ diff --git a/Menu/graphe.png b/Menu/graphe.png deleted file mode 100644 index d063895..0000000 Binary files a/Menu/graphe.png and /dev/null differ diff --git a/Menu/loupe.jpg b/Menu/loupe.jpg deleted file mode 100644 index 534b977..0000000 Binary files a/Menu/loupe.jpg and /dev/null differ diff --git a/Menu/plus4.png b/Menu/plus4.png deleted file mode 100644 index 35b50b6..0000000 Binary files a/Menu/plus4.png and /dev/null differ