Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions mkpfs/gui/panels/batch.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from ..batch_preview import BatchQueuePreview
from ..i18n import tr
from ..theme import _BORDER_BRIGHT
from ..widgets import NeonCheckbox, PathRow, SectionLabel
from ..widgets import NeonCheckbox, OptionRow, PathRow, SectionLabel
from .base import BasePanel


Expand All @@ -27,6 +27,7 @@ def __init__(self, parent: Any) -> None:
"""
self._src: ctk.StringVar = ctk.StringVar()
self._out: ctk.StringVar = ctk.StringVar()
self._version: ctk.StringVar = ctk.StringVar(value="PS5")
self._compress: ctk.BooleanVar = ctk.BooleanVar(value=True)
self._overwrite: ctk.BooleanVar = ctk.BooleanVar(value=False)
self._dry_run: ctk.BooleanVar = ctk.BooleanVar(value=False)
Expand Down Expand Up @@ -72,13 +73,17 @@ def _build_controls(self, card: "GlassCard") -> None: # ruff: ignore[undefined-

opt: ctk.CTkFrame = ctk.CTkFrame(card, fg_color="transparent")
opt.grid(row=7, column=0, columnspan=2, sticky="ew", padx=16, pady=(0, 14))
opt.columnconfigure((0, 1), weight=1)
opt.columnconfigure((0, 1, 2), weight=1)

OptionRow(opt, tr("bt_version"), self._version, ["PS5", "PS4"], accent=self._accent).grid(
row=0, column=0, sticky="ew", padx=(0, 8), pady=(0, 8)
)

chk_left: ctk.CTkFrame = ctk.CTkFrame(opt, fg_color="transparent")
chk_left.grid(row=0, column=0, sticky="nw")
chk_left.grid(row=0, column=1, sticky="nw", padx=(8, 0))

chk_right: ctk.CTkFrame = ctk.CTkFrame(opt, fg_color="transparent")
chk_right.grid(row=0, column=1, sticky="nw", padx=(8, 0))
chk_right.grid(row=0, column=2, sticky="nw", padx=(8, 0))

# Left column: Compression, Overwrite
NeonCheckbox(chk_left, text=tr("bt_compress"), variable=self._compress, accent=self._accent).pack(
Expand Down Expand Up @@ -111,6 +116,8 @@ def _run_command(self) -> None:
"batch",
src,
out,
"--version",
self._version.get(),
]

if not self._compress.get():
Expand Down
9 changes: 7 additions & 2 deletions mkpfs/gui/panels/pack_file.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from ..i18n import tr
from ..metadata_preview import MetadataPreview
from ..theme import _BORDER_BRIGHT
from ..widgets import GlassCard, NeonCheckbox, PathRow, SectionLabel
from ..widgets import GlassCard, NeonCheckbox, OptionRow, PathRow, SectionLabel
from .base import BasePanel


Expand All @@ -28,6 +28,7 @@ def __init__(self, parent: Any) -> None:
"""
self._src: ctk.StringVar = ctk.StringVar()
self._out: ctk.StringVar = ctk.StringVar()
self._version: ctk.StringVar = ctk.StringVar(value="PS5")
self._compress: ctk.BooleanVar = ctk.BooleanVar(value=True)
self._temp_folder: ctk.StringVar = ctk.StringVar()
self._metadata_preview: MetadataPreview | None = None
Expand Down Expand Up @@ -86,6 +87,10 @@ def _build_controls(self, card: GlassCard) -> None:
opt.grid(row=7, column=0, columnspan=2, sticky="ew", padx=16, pady=(0, 14))
opt.columnconfigure((0, 1), weight=1)

OptionRow(opt, tr("pkf_version"), self._version, ["PS5", "PS4"], accent=self._accent).grid(
row=0, column=0, sticky="ew", padx=(0, 8), pady=(0, 8)
)

chk: ctk.CTkFrame = ctk.CTkFrame(opt, fg_color="transparent")
chk.grid(row=0, column=1, sticky="nw", padx=(8, 0))

Expand Down Expand Up @@ -128,7 +133,7 @@ def _run_command(self) -> None:
if not src or not out:
self._emit(tr("pkf_err"), "error")
return
args: list[str] = ["pack", "file", src, out]
args: list[str] = ["pack", "file", src, out, "--version", self._version.get()]
if not self._compress.get():
args.append("--no-compress")
if temp := self._temp_folder.get().strip():
Expand Down
15 changes: 10 additions & 5 deletions mkpfs/gui/panels/pack_folder.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from ..i18n import tr
from ..metadata_preview import MetadataPreview
from ..theme import _BORDER_BRIGHT
from ..widgets import GlassCard, NeonCheckbox, PathRow, SectionLabel
from ..widgets import GlassCard, NeonCheckbox, OptionRow, PathRow, SectionLabel
from .base import BasePanel


Expand All @@ -28,6 +28,7 @@ def __init__(self, parent: Any) -> None:
"""
self._src: ctk.StringVar = ctk.StringVar()
self._out: ctk.StringVar = ctk.StringVar()
self._version: ctk.StringVar = ctk.StringVar(value="PS5")
self._compress: ctk.BooleanVar = ctk.BooleanVar(value=True)
self._signed: ctk.BooleanVar = ctk.BooleanVar(value=False)
self._verify_after: ctk.BooleanVar = ctk.BooleanVar(value=False)
Expand Down Expand Up @@ -78,13 +79,17 @@ def _build_controls(self, card: GlassCard) -> None:
)
opt: ctk.CTkFrame = ctk.CTkFrame(card, fg_color="transparent")
opt.grid(row=7, column=0, columnspan=2, sticky="ew", padx=16, pady=(0, 14))
opt.columnconfigure((0, 1), weight=1)
opt.columnconfigure((0, 1, 2), weight=1)

OptionRow(opt, tr("pf_version"), self._version, ["PS5", "PS4"], accent=self._accent).grid(
row=0, column=0, sticky="ew", padx=(0, 8), pady=(0, 8)
)

chk_left: ctk.CTkFrame = ctk.CTkFrame(opt, fg_color="transparent")
chk_left.grid(row=0, column=0, sticky="nw")
chk_left.grid(row=0, column=1, sticky="nw", padx=(8, 0))

chk_right: ctk.CTkFrame = ctk.CTkFrame(opt, fg_color="transparent")
chk_right.grid(row=0, column=1, sticky="nw", padx=(8, 0))
chk_right.grid(row=0, column=2, sticky="nw", padx=(8, 0))

# Left column: Compression, Signed
NeonCheckbox(chk_left, text=tr("pf_compress"), variable=self._compress, accent=self._accent).pack(
Expand Down Expand Up @@ -140,7 +145,7 @@ def _run_command(self) -> None:
if not out:
self._emit(tr("pf_err_out"), "error")
return
args: list[str] = ["pack", "folder", src, out]
args: list[str] = ["pack", "folder", src, out, "--version", self._version.get()]
if not self._compress.get():
args.append("--no-compress")
if self._signed.get():
Expand Down
Loading