From 60545c6f102d9babe3119eb7bdd0b23f74252415 Mon Sep 17 00:00:00 2001
From: Jason Hankins <tul53850@temple.edu>
Date: Wed, 24 Apr 2024 11:46:26 -0400
Subject: [PATCH 1/2] Primitive preset feature allows loading and saving of new
 presets as well as some basic ones already coded in :)))))

---
 app.py                     | 42 +++++++++++++++++++++++++++++++++-----
 officialVersion/config.ini |  8 ++++----
 officialVersion/preset.ini | 24 ++++++++++++++++++++++
 3 files changed, 65 insertions(+), 9 deletions(-)
 create mode 100644 officialVersion/preset.ini

diff --git a/app.py b/app.py
index 42c197d07..f5e520130 100644
--- a/app.py
+++ b/app.py
@@ -47,8 +47,6 @@ def load_settings(): #load from config file
     except Exception as e:
         messagebox.showerror('Error loading config, try saving settings first', f'fail {str(e)}')
 
-load_settings()
-
 def save_settings(selected_camera, selected_music_app, hotkey):
     # Update the global setting
     settings["selected_camera"] = selected_camera.get()
@@ -70,9 +68,34 @@ def save_settings(selected_camera, selected_music_app, hotkey):
 
     messagebox.showinfo("Save Setting", "Configuration saved！")
 
+def load_preset(preset, hotkey_entry_var):
+        config2 = configparser.ConfigParser()
+        config2.read('officialVersion/preset.ini')
+
+        hotkey_entry_var[0].set(config2.get(preset, 'h1'))
+        hotkey_entry_var[1].set(config2.get(preset, 'h2'))
+        hotkey_entry_var[2].set(config2.get(preset, 'h3'))
+        hotkey_entry_var[3].set(config2.get(preset, 'h4'))
+        hotkey_entry_var[4].set(config2.get(preset, 'h5'))
+
+def save_preset(preset, hotkey):
+    config2 = configparser.ConfigParser()
+    config2.read('officialVersion/preset.ini')
+    config2[preset.get()] = {
+        'preset': preset.get(),
+        'h1': hotkey[0].get(),
+        'h2': hotkey[1].get(),
+        'h3': hotkey[2].get(),
+        'h4': hotkey[3].get(),
+        'h5': hotkey[4].get()
+    }
+    with open('officialVersion/preset.ini', 'w') as configfile:
+        config2.write(configfile)
+    messagebox.showinfo(preset.get(), 'New preset saved')
 
 def open_settings():
-    
+    load_settings()
+
     # here to open the setting page
     settings_window = tk.Toplevel(root)
     settings_window.title("Setting")
@@ -87,6 +110,7 @@ def open_settings():
     selected_camera = tk.StringVar()
     selected_music_app = tk.StringVar()
     hotkey_entry_var = [tk.StringVar(), tk.StringVar(), tk.StringVar(), tk.StringVar(), tk.StringVar()]
+    preset = tk.StringVar()
 
     # Rollback to previous saved setting
     selected_camera.set(camera_options[0] if camera_options else "No available Camera ")
@@ -124,13 +148,21 @@ def open_settings():
     tk.Label(settings_window, text="Set hotkey 5:").grid(row=7, column=0, pady=10, padx=10, sticky="w")
     tk.Entry(settings_window, textvariable=hotkey_entry_var[4]).grid(row=7, column=1, padx=10, sticky="ew")
 
+    tk.Label(settings_window, text="Preset Settings").grid(row=8, column=0, pady=10, padx=10, sticky="ew", columnspan=2, rowspan=2)
+    tk.Button(settings_window, text="Default", command=lambda: load_preset('default', hotkey_entry_var)).grid(row=10, column=0, pady=10, padx=10, sticky="ew")
+    tk.Button(settings_window, text="PowerPoint", command=lambda: load_preset('powerpoint', hotkey_entry_var)).grid(row=10, column=1, pady=10, padx=10, sticky="ew")
+    tk.Entry(settings_window, textvariable=preset).grid(row=11, column=0, padx=10, sticky="ew", columnspan=2)
+    tk.Button(settings_window, text="Load", command=lambda: load_preset(preset.get(), hotkey_entry_var)).grid(row=12, column=0, pady=10, padx=10, sticky="ew", rowspan=2)
+    tk.Button(settings_window, text="Save New", command=lambda: save_preset(preset, hotkey_entry_var)).grid(row=12, column=1, pady=10, padx=10, sticky="ew", rowspan=2)
+
+
     # Create save and back button
     save_button = tk.Button(settings_window, text="Save",
                             command=lambda: save_settings(selected_camera, selected_music_app, hotkey_entry_var))
-    save_button.grid(row=8, column=0, pady=10, padx=10, sticky="ew")
+    save_button.grid(row=14, column=0, pady=10, padx=10, sticky="ew")
 
     back_button = tk.Button(settings_window, text="Back", command=settings_window.destroy)
-    back_button.grid(row=8, column=1, pady=10, padx=10, sticky="ew")
+    back_button.grid(row=14, column=1, pady=10, padx=10, sticky="ew")
 
     settings_window.grid_columnconfigure(1, weight=1)
 
diff --git a/officialVersion/config.ini b/officialVersion/config.ini
index cf7963884..84d5c43d8 100644
--- a/officialVersion/config.ini
+++ b/officialVersion/config.ini
@@ -1,15 +1,15 @@
 [hotkey]
-value = volumeup
+value = w
 
 [hotkey2]
-value = volumedown
+value = a
 
 [hotkey3]
-value = a
+value = s
 
 [hotkey4]
 value = d
 
 [hotkey5]
-value = ctrl
+value = space
 
diff --git a/officialVersion/preset.ini b/officialVersion/preset.ini
new file mode 100644
index 000000000..6b711b6ff
--- /dev/null
+++ b/officialVersion/preset.ini
@@ -0,0 +1,24 @@
+[default]
+preset = default
+h1 = volumeup
+h2 = volumedown
+h3 = a
+h4 = d
+h5 = space
+
+[powerpoint]
+preset = powerpoint
+h1 = leftarrow
+h2 = rightarrow
+h3 = f
+h4 = d
+h5 = a
+
+[gamer]
+preset = gamer
+h1 = w
+h2 = a
+h3 = s
+h4 = d
+h5 = space
+

From 9cae43a3d4bfb916bf74bfc703c7828fd8a8523d Mon Sep 17 00:00:00 2001
From: Jason Hankins <tul53850@temple.edu>
Date: Wed, 24 Apr 2024 11:57:22 -0400
Subject: [PATCH 2/2] playsound downgrade verion 1.2.2

---
 app.py                     | 9 +++++----
 officialVersion/config.ini | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app.py b/app.py
index f5e520130..aec0e685e 100644
--- a/app.py
+++ b/app.py
@@ -8,7 +8,7 @@
 from oldversion.cleanup import cleanup
 from tkinter import messagebox, ttk
 import configparser
-#from playsound import playsound
+from playsound import playsound
 
 import time
 import os
@@ -152,9 +152,10 @@ def open_settings():
     tk.Button(settings_window, text="Default", command=lambda: load_preset('default', hotkey_entry_var)).grid(row=10, column=0, pady=10, padx=10, sticky="ew")
     tk.Button(settings_window, text="PowerPoint", command=lambda: load_preset('powerpoint', hotkey_entry_var)).grid(row=10, column=1, pady=10, padx=10, sticky="ew")
     tk.Entry(settings_window, textvariable=preset).grid(row=11, column=0, padx=10, sticky="ew", columnspan=2)
-    tk.Button(settings_window, text="Load", command=lambda: load_preset(preset.get(), hotkey_entry_var)).grid(row=12, column=0, pady=10, padx=10, sticky="ew", rowspan=2)
-    tk.Button(settings_window, text="Save New", command=lambda: save_preset(preset, hotkey_entry_var)).grid(row=12, column=1, pady=10, padx=10, sticky="ew", rowspan=2)
+    tk.Button(settings_window, text="Load", command=lambda: load_preset(preset.get(), hotkey_entry_var)).grid(row=12, column=0, pady=10, padx=10, sticky="ew")
+    tk.Button(settings_window, text="Save New", command=lambda: save_preset(preset, hotkey_entry_var)).grid(row=12, column=1, pady=10, padx=10, sticky="ew")
 
+    tk.Label(settings_window, text="‧₊˚ ☁️⋅♡𓂃 ࣪ ִֶָ☾. ⋆｡°•☁️.").grid(row=13, column=0, pady=10, padx=10, sticky="ew", columnspan=2)
 
     # Create save and back button
     save_button = tk.Button(settings_window, text="Save",
@@ -251,6 +252,6 @@ def update(ind):
                          background='#87CEEB', fg="white")
 exit_button.grid(row=3, column=2, padx=8, pady=8, ipadx=30, ipady=5, sticky='ew')
 
-#playsound('.assets/bird_audio.wav')
+playsound('.assets/bird_audio.wav')
 # start the evert loop
 root.mainloop()
diff --git a/officialVersion/config.ini b/officialVersion/config.ini
index 84d5c43d8..229fc95e1 100644
--- a/officialVersion/config.ini
+++ b/officialVersion/config.ini
@@ -8,7 +8,7 @@ value = a
 value = s
 
 [hotkey4]
-value = d
+value = f
 
 [hotkey5]
 value = space