Merge branch 'version-1.4.1' into main

Author: TheKliko

GitHub Files/version.json

@@ -1,3 +1,3 @@
 {
-  "latest": "1.4.0"
+  "latest": "1.4.1"
 }

modules/functions/interface/CTkHyperlink.py

@@ -0,0 +1,14 @@
+import customtkinter as ctk
+import webbrowser
+
+
+class CTkHyperlink(ctk.CTkLabel):
+    color: str | tuple[str, str] = ("#0000EE", "#2fa8ff")
+    hover_color: str | tuple[str, str] = ("#0000CC", "#58bbff")
+
+    def __init__(self, master, url: str, text: str | None = None, fg_color: str | tuple[str, str] = "transparent"):
+        super().__init__(master, text=text or url, cursor="hand2", fg_color=fg_color, text_color=self.color)
+
+        self.bind("<Button-1>", lambda _: webbrowser.open_new_tab(url))
+        self.bind("<Enter>", lambda _: self.configure(text_color=self.hover_color))
+        self.bind("<Leave>", lambda _: self.configure(text_color=self.color))

modules/functions/interface/image.py

@@ -11,7 +11,7 @@
 _image_cache: dict[str, CTkImage] = {}
 
 
-def load(light: str | Path, dark: str | Path | None = None, size: tuple[int, int] = (24,24)) -> CTkImage | Literal[""]:
+def load(light: str | Path, dark: str | Path | None = None, size: tuple[int, int] = (24,24), squared: bool = False) -> CTkImage | Literal[""]:
     light = Path(light)
     if dark is None:
         dark = light
@@ -33,8 +33,8 @@ def load(light: str | Path, dark: str | Path | None = None, size: tuple[int, int
         dark_image = Image.open(dark)
 
         image: CTkImage = CTkImage(
-            light_image=light_image,
-            dark_image=dark_image,
+            light_image=_squared(light_image) if squared else light_image,
+            dark_image=_squared(dark_image) if squared else dark_image,
             size=size
         )
         _image_cache[key] = image
@@ -85,4 +85,18 @@ def load_from_image(pil_image: Image.Image, identifier: str, size: tuple[int, in
 
     except Exception as e:
         Logger.error(f"Failed to load image from PIL.Image object! {type(e).__name__}: {str(e)}")
-        return ""
+        return ""
+
+
+# Generated by ChatGPT
+def _squared(image: Image.Image) -> Image.Image:
+    width, height = image.size
+    biggest = max(width, height)
+
+    new_image = Image.new("RGBA", (biggest, biggest), (255, 255, 255, 0))
+
+    paste_x = (biggest - width) // 2
+    paste_y = (biggest - height) // 2
+    new_image.paste(image, (paste_x, paste_y))
+
+    return new_image

modules/info.py

@@ -3,7 +3,7 @@ class ProjectData:
     DESCRIPTION: str = "A Python tool made for Roblox mod developers"
     AUTHOR: str = "TheKliko"
     REPOSITORY: str = r"https://github.com/TheKliko/klikos-modding-tool"
-    VERSION: str = "1.4.0"
+    VERSION: str = "1.4.1"
 
 class Help:
     DISCORD: str = r"https://discord.gg/nEjUwdSP9P"
@@ -88,4 +88,4 @@ class Help:
 ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE."""
     }
-]
+]

modules/menu/sections/mod_generator.py

@@ -2,7 +2,6 @@
 import re
 from tkinter import messagebox
 from threading import Thread
-import webbrowser
 from tkinter import filedialog
 from typing import Literal
 import uuid
@@ -12,6 +11,7 @@
 from modules import filesystem
 from modules.filesystem import Directory, restore_from_meipass
 from modules.functions.interface.image import load as load_image, load_from_image
+from modules.functions.interface.CTkHyperlink import CTkHyperlink
 from modules.config import settings
 from modules import mod_generator
 from modules.mod_generator.get_mask import get_mask
@@ -149,13 +149,9 @@ def _load_content(self) -> None:
         possible_colors_frame.grid(column=0, row=3, sticky="w", pady=(4, 0))
         ctk.CTkLabel(possible_colors_frame, text="A list of available color formats can be found at ").grid(column=0, row=0)
         url: str = r"https://pillow.readthedocs.io/en/stable/reference/ImageColor.html#color-names"
-        unhover_color: str | tuple[str ,str] = ("#0000EE", "#2fa8ff")
-        hover_color: str | tuple[str ,str] = ("#0000CC", "#58bbff")
-        hyperlink: ctk.CTkLabel = ctk.CTkLabel(possible_colors_frame, text=url, cursor="hand2", text_color=unhover_color)
-        hyperlink.bind("<Button-1>", lambda _: self._open_in_browser(url))
+        
+        hyperlink: CTkHyperlink = CTkHyperlink(possible_colors_frame, url)
         hyperlink.grid(column=1, row=0)
-        hyperlink.bind("<Enter>", lambda _: hyperlink.configure(text_color=hover_color))
-        hyperlink.bind("<Leave>", lambda _: hyperlink.configure(text_color=unhover_color))
 
         # Color Preview
         preview_frame: ctk.CTkFrame = ctk.CTkFrame(container, fg_color="transparent")
@@ -347,10 +343,6 @@ def _load_user_selected_files(self) -> None:
         self.user_selected_files_container.grid(column=0, row=3, sticky="nsew", pady=(8, 0))
 
 
-    def _open_in_browser(self, url: str) -> None:
-        webbrowser.open_new_tab(url)
-
-
     def _generate_preview(self, default: bool = False) -> None:
         if default:
             self.default_image: Image.Image = get_mask(ImageColor.getcolor("black", "RGBA"), None, 0, size=(self.Constants.PREVIEW_SIZE, self.Constants.PREVIEW_SIZE))