From a8c0979ef166deb3b68c052c426d7571dd9c9b6f Mon Sep 17 00:00:00 2001
From: Clement Desmidt <clement@desmidt.fr>
Date: Fri, 14 Jun 2024 17:32:44 +0200
Subject: [PATCH 1/2] =?UTF-8?q?=E2=9C=A8=20Add=20not=20cheated=20pause?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

For #36
---
 assets/icons/pause.png      | Bin 0 -> 300 bytes
 assets/icons/sand-clock.png | Bin 0 -> 543 bytes
 src/element/image.py        |  15 +++++++++++++++
 src/element/toolbar.py      |  19 ++++++++++++++++++-
 4 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 assets/icons/pause.png
 create mode 100644 assets/icons/sand-clock.png

diff --git a/assets/icons/pause.png b/assets/icons/pause.png
new file mode 100644
index 0000000000000000000000000000000000000000..3504889a6e04bcd7bb378adacd395007fb58485b
GIT binary patch
literal 300
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjEX7WqAsj$Z!;#Vf<Z~8yL>4nJ
zu>AsI#_LHrDL_HV64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1T6db&7<
zcyzv<X2{p%AmDm`(OOYa@dY3A)Lh;l^VHbEa6u~i><t|&9cyW>Ew?<E{j98y+u7Y=
zpdY}jTfkoRfXU)4%bw3Z@2zzM^d(rQA7Js=u)XDh)I;?JJ)E;RbPh}q;Bi|%b7s@~
zIi3Db=UBHcJg>F*^UkHL?#yf!IcLJQcd=|ao#H44LI>|Pr8iaQ0tL4$Fn$o|BA57L
m^Tih>Qh&}b{=Yi^v~<X<2iiMd{yqeBG=rzBpUXO@geCyy=WzA_

literal 0
HcmV?d00001

diff --git a/assets/icons/sand-clock.png b/assets/icons/sand-clock.png
new file mode 100644
index 0000000000000000000000000000000000000000..bdfd0090e2d2fba8b53788fc567f3b6b6f9a5b13
GIT binary patch
literal 543
zcmV+)0^t3LP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00004b3#c}2nYxW
zd<bNS00009a7bBm00027000270mdy!jQ{`u8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10h~!hK~zYIwbnmq6j2Zc@Lx=#iEWB>HYtQ4BnSa5QW!+Eh?piQ
zHWq?~5{P}Yh_*Iqv{D<bETV;=poL}97{q_rCMXvEiy$F#7H^i@JMOZ(m-B;RXW5x=
z-kbM5W~t*EYF)C0jI=LT;3@WF6w|neFUnyU7w`mcgR3ph$0`n&Bp0!@$Zf!$3M3t&
zui*PM1`1;SV7-$9d-1q{9R6Z5=Qp5Li$2Hm09H#BSXA%*n-cK`@ebc{T2e$SDQ@Gk
zq_!Gvmm$wEf)CijMcip3|AkpRkM~<T5X=x>1;JuiO}ZN=u@<|St4f^5K0FNKc|4Mo
zwT9m~vm5dZJ$Q*vn8JxDc&<!x)xPyqj4#B1dW)`NSr=QBKjfRZ5&l=4!fU%Y<Pm(7
zWO@nrHOh2TlIb%Y$aE0z@dGn>q5Va>g1ahSwBwO5i<LIydAp9K@DG(Kkj;Z5CCIa#
z91Z_$Gg&w0L2r;}e%A}^h@IxaHXfkAfMY9STOz-u2}#q(a8MdJ8~9dWKO<*67BeO(
haHF}{g8%T_@(-{BsJ~}=)Fc1^002ovPDHLkV1n4i;~M|~

literal 0
HcmV?d00001

diff --git a/src/element/image.py b/src/element/image.py
index 858ac14..bcf46d3 100644
--- a/src/element/image.py
+++ b/src/element/image.py
@@ -8,8 +8,10 @@ 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
         self.image_window = image_window
         self.images = images.copy()
 
@@ -61,3 +63,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):
+        if self.is_pause:
+            self.is_pause = False
+            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 61e3334..05950c9 100644
--- a/src/element/toolbar.py
+++ b/src/element/toolbar.py
@@ -29,6 +29,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 +63,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 +152,15 @@ class Toolbar:
             "fullscreen"] else Util.get_default_button_color())
 
         self.image_window.window.attributes("-fullscreen", self.image_window.option["fullscreen"])
+
+    def pause(self):
+        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()
-- 
2.30.2


From 5941da9ae5b3975d087d0a0df62944264a76ed0a Mon Sep 17 00:00:00 2001
From: Clement Desmidt <clement@desmidt.fr>
Date: Mon, 17 Jun 2024 14:16:58 +0200
Subject: [PATCH 2/2] =?UTF-8?q?=E2=9C=A8=20Add=20cheated=20pause?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

For #36
---
 src/element/image.py   | 17 ++++++++---------
 src/element/toolbar.py | 16 +++++++++++++---
 2 files changed, 21 insertions(+), 12 deletions(-)

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)
-- 
2.30.2