diff --git a/src/element/image.py b/src/element/image.py index bcf46d3..c491779 100644 --- a/src/element/image.py +++ b/src/element/image.py @@ -8,7 +8,6 @@ from PIL import ImageTk, Image, ImageOps class ImagePlaceholder: def __init__(self, image_window, images): self.is_break = False - self.is_pause = False self.current_image = None self.current_original_image = None self.paused_original_image = None @@ -64,15 +63,15 @@ class ImagePlaceholder: self.image_label.configure(image=image_to_display) self.image_label.image = image_to_display - def pause(self): - if self.is_pause: - self.is_pause = False + def pause(self, pause=True, cheat=False): + if pause: + self.paused_original_image = self.current_original_image + if not cheat: + image_path = 'assets/images/break.jpg' + self.current_original_image = Image.open(image_path) + else: self.current_original_image = self.paused_original_image self.paused_original_image = None - else: - self.is_pause = True - self.paused_original_image = self.current_original_image - image_path = 'assets/images/break.jpg' - self.current_original_image = Image.open(image_path) + self.current_image = copy.deepcopy(self.current_original_image) self.apply_options() diff --git a/src/element/toolbar.py b/src/element/toolbar.py index 05950c9..3c9f6fa 100644 --- a/src/element/toolbar.py +++ b/src/element/toolbar.py @@ -3,6 +3,7 @@ import subprocess import sys from tkinter import * from tkinter.ttk import Progressbar, Style +from tkinter.messagebox import * import customtkinter from CTkToolTip import * @@ -14,6 +15,7 @@ from src.util import Util class Toolbar: def __init__(self, image_window, timer): self.timers = [] + self.is_paused = False self.current_image = None self.current_original_image = None self.image_window = image_window @@ -154,13 +156,21 @@ class Toolbar: self.image_window.window.attributes("-fullscreen", self.image_window.option["fullscreen"]) def pause(self): + cheating = False + + if not self.is_paused: + cheating = askyesno("Pause", "Laisser l'image affichée ?") + self.is_paused = True + else: + self.is_paused = False + + # timer is paused whatever happened if self.timer_check is not None: self.image_window.window.after_cancel(self.timer_check) self.timer_check = None else: - print(self.timer) - print(100-self.progressbar['value']) self.timer_check = self.image_window.window.after( 1000, self.update_timer, int((100-self.progressbar['value'])*self.timer/100) ) - self.image_window.image.pause() + + self.image_window.image.pause(pause=self.is_paused, cheat=cheating)