Code cleanup and improvements.
This commit is contained in:
@@ -5,6 +5,130 @@ from __future__ import annotations
|
||||
from typing import Any
|
||||
|
||||
|
||||
def _settings_checkbox_image(
|
||||
root: Any,
|
||||
*,
|
||||
size: int,
|
||||
gap: int,
|
||||
fill: str,
|
||||
border: str,
|
||||
mark: str | None = None,
|
||||
) -> Any:
|
||||
"""Create one scaled checkbox indicator from the launcher palette."""
|
||||
|
||||
import tkinter as tk
|
||||
|
||||
image = tk.PhotoImage(master=root, width=size + gap, height=size)
|
||||
border_width = max(1, round(size / 16))
|
||||
image.put(fill, to=(0, 0, size, size))
|
||||
image.put(border, to=(0, 0, size, border_width))
|
||||
image.put(border, to=(0, size - border_width, size, size))
|
||||
image.put(border, to=(0, 0, border_width, size))
|
||||
image.put(border, to=(size - border_width, 0, size, size))
|
||||
if mark is not None:
|
||||
stroke = max(2, round(size / 8))
|
||||
for source_x, source_y in (
|
||||
(4, 8),
|
||||
(5, 9),
|
||||
(6, 10),
|
||||
(7, 11),
|
||||
(8, 10),
|
||||
(9, 9),
|
||||
(10, 8),
|
||||
(11, 7),
|
||||
(12, 6),
|
||||
):
|
||||
x = round(source_x * size / 16)
|
||||
y = round(source_y * size / 16)
|
||||
image.put(
|
||||
mark,
|
||||
to=(
|
||||
x,
|
||||
y,
|
||||
min(size - border_width, x + stroke),
|
||||
min(size - border_width, y + stroke),
|
||||
),
|
||||
)
|
||||
return image
|
||||
|
||||
|
||||
def _configure_settings_checkbox_indicator(
|
||||
root: Any,
|
||||
style: Any,
|
||||
launcher_ui_scale: float,
|
||||
) -> None:
|
||||
"""Replace the platform X indicator with the launcher's checkmark."""
|
||||
|
||||
element_name = "Settings.Checkbutton.indicator"
|
||||
if element_name in style.element_names():
|
||||
return
|
||||
size = max(16, round(16 * launcher_ui_scale))
|
||||
gap = max(9, round(9 * launcher_ui_scale))
|
||||
palettes = {
|
||||
"unchecked": ("#100d0c", "#6a4d38", None),
|
||||
"unchecked_active": ("#211916", "#d98927", None),
|
||||
"unchecked_focus": ("#100d0c", "#f4bd61", None),
|
||||
"checked": ("#d98927", "#f4bd61", "#24170f"),
|
||||
"checked_active": ("#efaa4c", "#fff0c2", "#24170f"),
|
||||
"checked_focus": ("#d98927", "#fff0c2", "#24170f"),
|
||||
"disabled": ("#171412", "#30251f", None),
|
||||
"checked_disabled": ("#6c4826", "#776b62", "#30251f"),
|
||||
}
|
||||
images = {
|
||||
name: _settings_checkbox_image(
|
||||
root,
|
||||
size=size,
|
||||
gap=gap,
|
||||
fill=fill,
|
||||
border=border,
|
||||
mark=mark,
|
||||
)
|
||||
for name, (fill, border, mark) in palettes.items()
|
||||
}
|
||||
style.element_create(
|
||||
element_name,
|
||||
"image",
|
||||
images["unchecked"],
|
||||
("disabled selected", images["checked_disabled"]),
|
||||
("disabled", images["disabled"]),
|
||||
("pressed selected", images["checked_active"]),
|
||||
("active selected", images["checked_active"]),
|
||||
("focus selected", images["checked_focus"]),
|
||||
("selected", images["checked"]),
|
||||
("pressed", images["unchecked_active"]),
|
||||
("active", images["unchecked_active"]),
|
||||
("focus", images["unchecked_focus"]),
|
||||
)
|
||||
style.layout(
|
||||
"Settings.TCheckbutton",
|
||||
[
|
||||
(
|
||||
"Checkbutton.padding",
|
||||
{
|
||||
"sticky": "nswe",
|
||||
"children": [
|
||||
(element_name, {"side": "left", "sticky": ""}),
|
||||
(
|
||||
"Checkbutton.focus",
|
||||
{
|
||||
"side": "left",
|
||||
"sticky": "w",
|
||||
"children": [
|
||||
(
|
||||
"Checkbutton.label",
|
||||
{"sticky": "nswe"},
|
||||
)
|
||||
],
|
||||
},
|
||||
),
|
||||
],
|
||||
},
|
||||
),
|
||||
],
|
||||
)
|
||||
setattr(root, "_ptlinux_settings_checkbox_images", tuple(images.values()))
|
||||
|
||||
|
||||
def configure_dashboard_style(root: Any, ttk: Any, launcher_ui_scale: float) -> None:
|
||||
style = ttk.Style(root)
|
||||
style.theme_use("clam")
|
||||
@@ -100,8 +224,8 @@ def configure_dashboard_style(root: Any, ttk: Any, launcher_ui_scale: float) ->
|
||||
style.configure(
|
||||
"SettingsText.TLabel",
|
||||
background="#191311",
|
||||
foreground="#d8cbbd",
|
||||
font=("Sans", 9),
|
||||
foreground="#e5b66c",
|
||||
font=("Sans", 8, "bold"),
|
||||
)
|
||||
style.configure(
|
||||
"SettingsHint.TLabel",
|
||||
@@ -165,30 +289,110 @@ def configure_dashboard_style(root: Any, ttk: Any, launcher_ui_scale: float) ->
|
||||
"Settings.TEntry",
|
||||
fieldbackground="#100d0c",
|
||||
foreground="#f8ead2",
|
||||
insertcolor="#f8fafc",
|
||||
insertcolor="#f4bd61",
|
||||
selectbackground="#6a482d",
|
||||
selectforeground="#fff8e9",
|
||||
font=("Sans", 9),
|
||||
padding=(10, 7),
|
||||
bordercolor="#4a3528",
|
||||
lightcolor="#4a3528",
|
||||
darkcolor="#4a3528",
|
||||
borderwidth=1,
|
||||
relief="flat",
|
||||
focuscolor="#f4bd61",
|
||||
focusthickness=2,
|
||||
focusthickness=1,
|
||||
)
|
||||
style.map(
|
||||
"Settings.TEntry",
|
||||
fieldbackground=[
|
||||
("disabled", "#171412"),
|
||||
("!disabled", "#100d0c"),
|
||||
],
|
||||
foreground=[
|
||||
("disabled", "#776b62"),
|
||||
("!disabled", "#f8ead2"),
|
||||
],
|
||||
bordercolor=[
|
||||
("disabled", "#30251f"),
|
||||
("focus", "#f4bd61"),
|
||||
("!disabled", "#4a3528"),
|
||||
],
|
||||
lightcolor=[
|
||||
("focus", "#f4bd61"),
|
||||
("!focus", "#4a3528"),
|
||||
],
|
||||
darkcolor=[
|
||||
("focus", "#f4bd61"),
|
||||
("!focus", "#4a3528"),
|
||||
],
|
||||
)
|
||||
style.map("Settings.TEntry", bordercolor=[("focus", "#f4bd61")])
|
||||
style.configure(
|
||||
"Settings.TCombobox",
|
||||
fieldbackground="#100d0c",
|
||||
background="#211916",
|
||||
background="#191311",
|
||||
foreground="#f8ead2",
|
||||
arrowcolor="#e5b66c",
|
||||
selectbackground="#6a482d",
|
||||
selectforeground="#fff8e9",
|
||||
font=("Sans", 9),
|
||||
padding=(10, 7),
|
||||
arrowsize=max(12, round(12 * launcher_ui_scale)),
|
||||
bordercolor="#4a3528",
|
||||
lightcolor="#4a3528",
|
||||
darkcolor="#4a3528",
|
||||
borderwidth=1,
|
||||
relief="flat",
|
||||
focuscolor="#f4bd61",
|
||||
focusthickness=2,
|
||||
focusthickness=1,
|
||||
)
|
||||
style.map(
|
||||
"Settings.TCombobox",
|
||||
fieldbackground=[("readonly", "#100d0c")],
|
||||
foreground=[("readonly", "#f8ead2")],
|
||||
bordercolor=[("focus", "#f4bd61")],
|
||||
fieldbackground=[
|
||||
("disabled", "#171412"),
|
||||
("readonly", "#100d0c"),
|
||||
],
|
||||
background=[
|
||||
("disabled", "#171412"),
|
||||
("pressed", "#32251f"),
|
||||
("active", "#2a201c"),
|
||||
("readonly", "#191311"),
|
||||
],
|
||||
foreground=[
|
||||
("disabled", "#776b62"),
|
||||
("readonly", "#f8ead2"),
|
||||
],
|
||||
arrowcolor=[
|
||||
("disabled", "#776b62"),
|
||||
("pressed", "#fff0c2"),
|
||||
("active", "#f4bd61"),
|
||||
("readonly", "#e5b66c"),
|
||||
],
|
||||
bordercolor=[
|
||||
("disabled", "#30251f"),
|
||||
("focus", "#f4bd61"),
|
||||
("active", "#6a4d38"),
|
||||
("readonly", "#4a3528"),
|
||||
],
|
||||
lightcolor=[
|
||||
("focus", "#f4bd61"),
|
||||
("!focus", "#4a3528"),
|
||||
],
|
||||
darkcolor=[
|
||||
("focus", "#f4bd61"),
|
||||
("!focus", "#4a3528"),
|
||||
],
|
||||
)
|
||||
root.option_add("*TCombobox*Listbox.background", "#100d0c")
|
||||
root.option_add("*TCombobox*Listbox.foreground", "#f8ead2")
|
||||
root.option_add("*TCombobox*Listbox.selectBackground", "#6a482d")
|
||||
root.option_add("*TCombobox*Listbox.selectForeground", "#fff8e9")
|
||||
root.option_add("*TCombobox*Listbox.font", "Sans 9")
|
||||
root.option_add("*TCombobox*Listbox.borderWidth", 1)
|
||||
root.option_add("*TCombobox*Listbox.highlightThickness", 1)
|
||||
root.option_add("*TCombobox*Listbox.highlightBackground", "#4a3528")
|
||||
root.option_add("*TCombobox*Listbox.highlightColor", "#f4bd61")
|
||||
root.option_add("*TCombobox*Listbox.relief", "flat")
|
||||
root.option_add("*TCombobox*Listbox.activeStyle", "none")
|
||||
style.configure(
|
||||
"Realm.TCombobox",
|
||||
fieldbackground="#211916",
|
||||
@@ -239,18 +443,31 @@ def configure_dashboard_style(root: Any, ttk: Any, launcher_ui_scale: float) ->
|
||||
root.option_add("*realm_selector*Listbox.highlightThickness", 0)
|
||||
root.option_add("*realm_selector*Listbox.relief", "flat")
|
||||
root.option_add("*realm_selector*Listbox.activeStyle", "none")
|
||||
_configure_settings_checkbox_indicator(root, style, launcher_ui_scale)
|
||||
style.configure(
|
||||
"Settings.TCheckbutton",
|
||||
background="#191311",
|
||||
background="#171210",
|
||||
foreground="#d8cbbd",
|
||||
font=("Sans", 9),
|
||||
padding=(9, 7),
|
||||
relief="flat",
|
||||
focuscolor="#f4bd61",
|
||||
focusthickness=2,
|
||||
focusthickness=1,
|
||||
)
|
||||
style.map(
|
||||
"Settings.TCheckbutton",
|
||||
background=[("active", "#191311")],
|
||||
foreground=[("active", "#fff0d2")],
|
||||
background=[
|
||||
("disabled", "#15110f"),
|
||||
("pressed", "#2a201c"),
|
||||
("active", "#241b17"),
|
||||
("selected", "#211916"),
|
||||
("!selected", "#171210"),
|
||||
],
|
||||
foreground=[
|
||||
("disabled", "#776b62"),
|
||||
("active", "#fff0d2"),
|
||||
("selected", "#f8ead2"),
|
||||
],
|
||||
)
|
||||
style.configure(
|
||||
"PreloaderStatus.TLabel",
|
||||
|
||||
Reference in New Issue
Block a user