✨ Add not cheated pause #37
BIN
assets/icons/pause.png
Normal file
BIN
assets/icons/pause.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 300 B |
BIN
assets/icons/sand-clock.png
Normal file
BIN
assets/icons/sand-clock.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 543 B |
@ -10,6 +10,7 @@ class ImagePlaceholder:
|
||||
self.is_break = False
|
||||
self.current_image = None
|
||||
self.current_original_image = None
|
||||
self.paused_original_image = None
|
||||
self.image_window = image_window
|
||||
self.images = images.copy()
|
||||
|
||||
@ -61,3 +62,16 @@ class ImagePlaceholder:
|
||||
self.image_label.configure(bg="#e8d4bc" if self.is_break else "#FFFFFF")
|
||||
self.image_label.configure(image=image_to_display)
|
||||
self.image_label.image = image_to_display
|
||||
|
||||
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
|
||||
|
||||
self.current_image = copy.deepcopy(self.current_original_image)
|
||||
self.apply_options()
|
||||
|
@ -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
|
||||
@ -29,6 +31,11 @@ class Toolbar:
|
||||
next_button.pack(side=LEFT, padx=0, pady=0)
|
||||
CTkToolTip(next_button, delay=0.1, message="Next", y_offset=-40, x_offset=-40)
|
||||
|
||||
pause_button = customtkinter.CTkButton(toolbar, image=ImageTk.PhotoImage(Image.open("assets/icons/pause.png")),
|
||||
text="", command=self.pause)
|
||||
pause_button.pack(side=LEFT, padx=0, pady=0)
|
||||
CTkToolTip(pause_button, delay=0.1, message="Next", y_offset=-40, x_offset=-40)
|
||||
|
||||
self.bw_button = customtkinter.CTkButton(toolbar, image=ImageTk.PhotoImage(Image.open("assets/icons/black-and"
|
||||
"-white.png")),
|
||||
text="", command=self.toggle_black_white)
|
||||
@ -58,7 +65,7 @@ class Toolbar:
|
||||
CTkToolTip(self.fullscreen_button, delay=0.1, message="Fullscreen", y_offset=-40, x_offset=-40)
|
||||
|
||||
timer_button = customtkinter.CTkButton(toolbar, command=self.toggle_timer, text="",
|
||||
image=ImageTk.PhotoImage(Image.open("assets/icons/timer.png")))
|
||||
image=ImageTk.PhotoImage(Image.open("assets/icons/sand-clock.png")))
|
||||
timer_button.pack(side=LEFT, padx=0, pady=0)
|
||||
CTkToolTip(timer_button, delay=0.1, message="Toggle timer", y_offset=-40, x_offset=-40)
|
||||
|
||||
@ -147,3 +154,23 @@ class Toolbar:
|
||||
"fullscreen"] else Util.get_default_button_color())
|
||||
|
||||
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:
|
||||
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(pause=self.is_paused, cheat=cheating)
|
||||
|
Loading…
Reference in New Issue
Block a user