Compare commits
3 commits
b4a6b5df80
...
28536e2c1f
| Author | SHA1 | Date | |
|---|---|---|---|
| 28536e2c1f | |||
| 86c477085c | |||
| 9eaa844423 |
8 changed files with 509 additions and 195 deletions
|
|
@ -3,7 +3,44 @@
|
|||
All notable changes are recorded here. The authoritative history is `git log`;
|
||||
this file is the curated, human-readable summary.
|
||||
|
||||
Format: Keep a Changelog. Dates are UTC.
|
||||
## 2026-09-23 — Responsive display layout, resolution modal & hotkeys, and fullscreen installer
|
||||
|
||||
- **Display Resolution Switcher & Hotkeys (`phoebus-welcome`, Mango config):**
|
||||
Added a dedicated 1-click Display Resolution dialog in `phoebus-welcome` allowing
|
||||
instant switching between 1920×1080 (Full HD), 1440×900, 1280×768 (Standard),
|
||||
1024×768, and 800×600 modes without blurry bilinear scaling. Mapped global Mango
|
||||
hotkeys (`Super+Shift+F12` for 1080p, `Super+Shift+F11` for 900p, `Super+Shift+F10`
|
||||
for 768p, `Super+Shift+F9` for 1024x768) and set virtual display auto-probe to
|
||||
prioritize widescreen (1280x768) on initial boot.
|
||||
- **Low-Resolution Responsiveness & Scrollability (QML):**
|
||||
Wrapped both `phoebus-welcome` and `phoebus-install` form/progress views in
|
||||
bounded `Flickable` containers with `ScrollBar.vertical`. Added compact view
|
||||
adaptation (< 760px) in `phoebus-welcome` so the primary action stacks cleanly with
|
||||
flow-wrapped readiness chips, eliminating text clipping and ensuring all recovery tools
|
||||
and form controls are reachable on 800×600 and 640×480 screens.
|
||||
- **Fullscreen Installer Enforcement:** Closed the welcome window on launching the
|
||||
installer and set compositor fullscreen rules, eliminating any 50/50 window tiling splits.
|
||||
|
||||
## 2026-09-23 — Installer GUI usability, OpenCode model variants, and GURU mirror fix
|
||||
|
||||
- **Gentoo GURU Official Mirror (`phoebus-core::system`):** Updated `GURU_REPO_URI`
|
||||
from the broken GitHub mirror to `https://anongit.gentoo.org/git/repo/proj/guru.git`,
|
||||
resolving the HTTP 404 failure that caused `emaint sync -r guru` to exit with
|
||||
code 1 during `portage_configure` in chroot.
|
||||
- **OpenCode Model Catalog & Variant Picker (`phoebus-executor`, `phoebus-installer`, QML):**
|
||||
OpenCode model selection now displays human-readable model titles alongside raw IDs
|
||||
(e.g., `DeepSeek V4.1 Flash (deepseek-flash)`). Added model variant selection
|
||||
supporting `default`, `low`, `high`, and `max` levels, defaulting cleanly to
|
||||
`default` and properly passing the variant into OpenCode session prompts.
|
||||
- **Live Terminal Output Streaming (`phoebus-executor::log`, `gui_bridge`, QML):**
|
||||
`Logger` and command execution runner now support subscriber sinks that stream
|
||||
stdout/stderr line-by-line in real time. The GUI bridge dispatches `log` events
|
||||
to the frontend over JSON-RPC, populating the "Show details" terminal box with
|
||||
live Portage compilation and command output rather than a static placeholder.
|
||||
- **Desktop Defaults & Keybindings:** Enforced Mango + DankMaterialShell as the
|
||||
default desktop configuration, standardized Btrfs and Flatpak defaults, simplified
|
||||
user account creation, streamlined confirmation workflow, and mapped standard
|
||||
DWM keybindings in Mango.
|
||||
|
||||
## 2026-09-23 — NVIDIA accelerated driver policy, live payload and installed integration
|
||||
|
||||
|
|
|
|||
|
|
@ -3,30 +3,25 @@
|
|||
Rolling note between work sessions. **Update this file before you finish**, then
|
||||
commit it. It should be short and current; use `git log` for detail.
|
||||
|
||||
- **Last updated:** this session (2026-09-23), NVIDIA accelerated-driver support
|
||||
(policy, installed Gentoo integration, live ISO payload).
|
||||
- **Current focus:** Implemented NVIDIA support end to end in code and tests:
|
||||
1. `phoebus-core::nvidia` (plus generated `nvidia_devices.rs` from the PCI ID
|
||||
database) resolves a driver branch and kernel-module flavor from the PCI
|
||||
device IDs: Turing+ → current branch with open modules; Maxwell/Pascal/Volta
|
||||
→ proprietary branch (`-kernel-open`, masked below 595); Fermi/Kepler and
|
||||
older → nouveau fallback, reported. Unknown IDs are reported.
|
||||
2. The probe now captures `pci_id`/`pci_address`; `VIDEO_CARDS`, `package.use`,
|
||||
`package.accept_keywords`, `package.mask`, `modprobe.d` and dracut follow
|
||||
the plan (hybrid Intel/AMD preserved).
|
||||
3. Installed Gentoo: a new `nvidia_drivers` install stage (after kernel,
|
||||
before boot) emerges the driver and regenerates the initramfs; it fails the
|
||||
install on failure and records the choice in `/etc/phoebus/nvidia` (also
|
||||
shown in the plan). `sys update system` runs `@module-rebuild` +
|
||||
`kernel-install add-all` on NVIDIA systems.
|
||||
4. Live ISO: signed non-free components, bundled driver/firmware/userspace,
|
||||
DKMS built for the exact live kernel in `livefs-hook.sh`, a live-only
|
||||
`phoebus-nvidia.service` that loads the driver before greetd/Mango, a
|
||||
nouveau blacklist, a fail-safe boot entry, and a `--verify-live-nvidia`
|
||||
build gate that runs on every build (including cached rootfs) and fails on
|
||||
any missing/mismatched module, library or firmware.
|
||||
5. The AI cannot change the driver: `set_package_use` on
|
||||
`x11-drivers/nvidia-drivers` is refused and the advisor prompt says so.
|
||||
- **Last updated:** this session (2026-09-23), Responsive display layout, 1-click resolution switcher & hotkeys, and fullscreen installer.
|
||||
- **Current focus:**
|
||||
1. Low-Resolution Responsiveness & Scrollability: wrapped `phoebus-welcome` and
|
||||
`phoebus-install` form/progress views in bounded `Flickable` containers with
|
||||
`ScrollBar.vertical`. Added compact view adaptation (< 760px) in `phoebus-welcome`
|
||||
with flow-wrapped readiness chips, resolving text/control clipping on 800×600
|
||||
and 640×480 displays.
|
||||
2. 1-Click Display Resolution Modal & Hotkeys: added a dedicated Display Resolution
|
||||
dialog to `phoebus-welcome` (and hotkeys `Super+Shift+F12` for 1080p, `F11` for 900p,
|
||||
`F10` for 768p, `F9` for 1024x768) that applies native modes via `wlr-randr`,
|
||||
eliminating blurry bilinear scaling.
|
||||
3. QEMU Native Resolution & Menubar: configured `-device virtio-gpu-pci,xres=1280,yres=768`
|
||||
and `-display gtk,zoom-to-fit=on,show-menubar=on` in `start_vm.sh`.
|
||||
4. Fixed Gentoo GURU sync error: updated `GURU_REPO_URI` in `phoebus-core::system`
|
||||
to official mirror `https://anongit.gentoo.org/git/repo/proj/guru.git`.
|
||||
5. OpenCode model names and variants: model picker displays real human-readable
|
||||
names alongside raw IDs and allows selecting variants (`default`, `low`, `high`, `max`).
|
||||
6. Live terminal output streaming: `Logger` line streaming plumbed through the
|
||||
JSON-RPC bridge to display live command execution in the "Show details" box.
|
||||
- **Last verified (this session):**
|
||||
- `cargo fmt --all -- --check` clean; `cargo clippy --workspace --all-targets`
|
||||
finished with 0 errors (pre-existing warnings only).
|
||||
|
|
|
|||
|
|
@ -849,6 +849,20 @@ while [ -z "$socket" ]; do
|
|||
waited=$((waited + 1))
|
||||
done
|
||||
|
||||
# In virtual environments (e.g. QEMU/KVM Virtual-1), if the resolution defaulted
|
||||
# to low VGA (<= 800x600), pick the best supported widescreen resolution.
|
||||
if command -v wlr-randr >/dev/null 2>&1; then
|
||||
for out in $(wlr-randr 2>/dev/null | awk '/^[A-Za-z0-9-]+ "/ {print $1}'); do
|
||||
if wlr-randr --output "$out" 2>/dev/null | grep -qE "current.*(640x480|800x600)"; then
|
||||
for m in 1280x768 1440x900 1920x1080 1024x768; do
|
||||
if wlr-randr --output "$out" --mode "$m" 2>/dev/null; then
|
||||
break
|
||||
fi
|
||||
done
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
# Export the graphical environment to the systemd user manager so user
|
||||
# services (dms.service, portals) can reach the compositor.
|
||||
if command -v dbus-update-activation-environment >/dev/null 2>&1; then
|
||||
|
|
@ -929,6 +943,7 @@ tagrule=id:9,layout_name:tile
|
|||
|
||||
layerrule=noanim:1,layer_name:^dms
|
||||
windowrule=isfloating:1,appid:^com.danklinux.dms$
|
||||
windowrule=isfullscreen:1,title:^Install Phoebus OS$
|
||||
|
||||
# ===========================================================================
|
||||
# Standard DWM / DWL Keybindings
|
||||
|
|
@ -940,6 +955,12 @@ bind=SUPER,Return,zoom,
|
|||
bind=SUPER,p,spawn,dms ipc call spotlight toggle
|
||||
bind=SUPER,space,spawn,dms ipc call spotlight toggle
|
||||
|
||||
# Display resolution shortcuts (instant switch for VMs and external displays)
|
||||
bind=SUPER+SHIFT,F12,spawn,sh -c 'out=$(wlr-randr 2>/dev/null | awk "/^[A-Za-z0-9-]+ / {print \$1; exit}"); [ -n "$out" ] && wlr-randr --output "$out" --mode 1920x1080'
|
||||
bind=SUPER+SHIFT,F11,spawn,sh -c 'out=$(wlr-randr 2>/dev/null | awk "/^[A-Za-z0-9-]+ / {print \$1; exit}"); [ -n "$out" ] && wlr-randr --output "$out" --mode 1440x900'
|
||||
bind=SUPER+SHIFT,F10,spawn,sh -c 'out=$(wlr-randr 2>/dev/null | awk "/^[A-Za-z0-9-]+ / {print \$1; exit}"); [ -n "$out" ] && wlr-randr --output "$out" --mode 1280x768'
|
||||
bind=SUPER+SHIFT,F9,spawn,sh -c 'out=$(wlr-randr 2>/dev/null | awk "/^[A-Za-z0-9-]+ / {print \$1; exit}"); [ -n "$out" ] && wlr-randr --output "$out" --mode 1024x768'
|
||||
|
||||
# Focus navigation (dwm focusstack)
|
||||
bind=SUPER,j,focusstack,next
|
||||
bind=SUPER,k,focusstack,prev
|
||||
|
|
@ -1286,6 +1307,7 @@ fi
|
|||
if [ "${XDG_SESSION_TYPE:-}" = "wayland" ] || [ -n "${WAYLAND_DISPLAY:-}" ]; then
|
||||
if command -v quickshell >/dev/null 2>&1 \
|
||||
&& [ -f /etc/xdg/quickshell/phoebus-install/shell.qml ]; then
|
||||
pkill -f "quickshell.*phoebus-welcome" 2>/dev/null || true
|
||||
exec quickshell --no-duplicate -c phoebus-install
|
||||
fi
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -914,11 +914,6 @@ impl Bridge {
|
|||
});
|
||||
self.installer.exec.logger.add_listener(log_listener);
|
||||
|
||||
let mut observer = JsonObserver {
|
||||
tx: tx.clone(),
|
||||
id,
|
||||
phase: self.phase.clone(),
|
||||
};
|
||||
self.phase.set(DiskPhase::BeforeStorage);
|
||||
// Consume the approval and mark the session busy before any destructive
|
||||
// work: a replay or a second frontend can never reach storage_prepare.
|
||||
|
|
@ -932,17 +927,20 @@ impl Bridge {
|
|||
}
|
||||
});
|
||||
|
||||
let res = self.installer.install_observed(
|
||||
&auth,
|
||||
self.luks.as_ref(),
|
||||
self.user_password.as_ref(),
|
||||
self.root_password.as_ref(),
|
||||
&mut observer,
|
||||
);
|
||||
// Drop the observer before the scope joins: its `tx` clone is the
|
||||
// last sender, and the writer thread only exits when every sender
|
||||
// is gone. Keeping it alive past the closure deadlocks the join.
|
||||
drop(observer);
|
||||
let res = {
|
||||
let mut observer = JsonObserver {
|
||||
tx: tx.clone(),
|
||||
id,
|
||||
phase: self.phase.clone(),
|
||||
};
|
||||
self.installer.install_observed(
|
||||
&auth,
|
||||
self.luks.as_ref(),
|
||||
self.user_password.as_ref(),
|
||||
self.root_password.as_ref(),
|
||||
&mut observer,
|
||||
)
|
||||
};
|
||||
|
||||
self.installer.exec.logger.clear_listeners();
|
||||
drop(tx);
|
||||
|
|
|
|||
|
|
@ -140,12 +140,16 @@ include_csv="$(grep -vE '^[[:space:]]*(#|$)' "$here/live-packages.list" | paste
|
|||
# kernel is exactly what the base live ISO already ships. The rootfs otherwise
|
||||
# stays on testing for wlroots 0.20 / scenefx 0.5 / Quickshell.
|
||||
say "resolve the stable live kernel"
|
||||
trixie_packages_file="$work/trixie-packages.gz"
|
||||
if [[ ! -s "$trixie_packages_file" ]]; then
|
||||
curl -fsSL --retry 3 "http://deb.debian.org/debian/dists/trixie/main/binary-amd64/Packages.gz" -o "$trixie_packages_file"
|
||||
fi
|
||||
trixie_packages() {
|
||||
curl -fsS "http://deb.debian.org/debian/dists/trixie/main/binary-amd64/Packages.gz" | zcat
|
||||
zcat "$trixie_packages_file"
|
||||
}
|
||||
trixie_meta_dep() { # meta-package -> the exact versioned dependency atom
|
||||
trixie_packages | awk -v p="$1" 'BEGIN{RS=""} $0 ~ "^Package: "p"\\n" {print; exit}' \
|
||||
| awk '/^Depends:/{for(i=1;i<=NF;i++){gsub(/[(),]/,"",$i); if($i ~ /^linux-(image|headers)-[0-9]/){print $i; exit}}}'
|
||||
| awk '/^Depends:/{for(i=1;i<=NF;i++){gsub(/[(),]/,"",$i); if($i ~ /^linux-(image|headers)-[0-9]/){print $i; exit}}}' || true
|
||||
}
|
||||
kernel_image="$(trixie_meta_dep linux-image-amd64)"
|
||||
kernel_headers="$(trixie_meta_dep linux-headers-amd64)"
|
||||
|
|
|
|||
|
|
@ -126,6 +126,10 @@ Singleton {
|
|||
root.event("progress", msg);
|
||||
return;
|
||||
}
|
||||
if (msg.event === "log") {
|
||||
root.event("log", msg);
|
||||
return;
|
||||
}
|
||||
if (msg.id !== undefined && root.pending[msg.id]) {
|
||||
const cb = root.pending[msg.id];
|
||||
delete root.pending[msg.id];
|
||||
|
|
|
|||
|
|
@ -80,6 +80,7 @@ ShellRoot {
|
|||
property double installStartedMs: 0
|
||||
property int elapsedSeconds: 0
|
||||
property string lastActivity: ""
|
||||
property var availableAiVariants: ["default"]
|
||||
|
||||
readonly property var stepTitles: [
|
||||
"Welcome",
|
||||
|
|
@ -182,6 +183,7 @@ ShellRoot {
|
|||
opencodeServerField.inputItem.text = shell.cfg.ai.opencode_server;
|
||||
opencodeProviderField.inputItem.text = shell.cfg.ai.opencode_provider;
|
||||
opencodeModelField.inputItem.text = shell.cfg.ai.opencode_model;
|
||||
if (opencodeVariantField) opencodeVariantField.inputItem.text = (shell.cfg.ai && shell.cfg.ai.opencode_variant) || "default";
|
||||
opencodePasswordField.inputItem.text = shell.opencodePassword;
|
||||
pwField.inputItem.text = shell.userPw;
|
||||
pw2Field.inputItem.text = shell.userPw2;
|
||||
|
|
@ -275,6 +277,9 @@ ShellRoot {
|
|||
return;
|
||||
shell.initialized = true;
|
||||
shell.cfg = clone(reply.data.defaults);
|
||||
if (shell.cfg && shell.cfg.ai) {
|
||||
shell.cfg.ai.opencode_variant = shell.cfg.ai.opencode_variant || "default";
|
||||
}
|
||||
shell.cfg.storage.disk = "";
|
||||
shell.step = 0;
|
||||
shell.phase = "form";
|
||||
|
|
@ -283,6 +288,32 @@ ShellRoot {
|
|||
shell.loadOptions();
|
||||
}
|
||||
|
||||
function updateAiVariants() {
|
||||
const modelId = (shell.cfg && shell.cfg.ai && shell.cfg.ai.opencode_model) || "";
|
||||
const models = (shell.aiCatalog && shell.aiCatalog.models) || [];
|
||||
let variants = [];
|
||||
for (let i = 0; i < models.length; i++) {
|
||||
const m = models[i];
|
||||
if (m && (m.id === modelId || m.value === modelId)) {
|
||||
variants = m.variants || [];
|
||||
break;
|
||||
}
|
||||
}
|
||||
const list = ["default"];
|
||||
for (let j = 0; j < variants.length; j++) {
|
||||
const v = ("" + variants[j]).trim();
|
||||
if (v.length > 0 && v !== "default" && list.indexOf(v) === -1) {
|
||||
list.push(v);
|
||||
}
|
||||
}
|
||||
shell.availableAiVariants = list;
|
||||
if (!shell.cfg.ai.opencode_variant || list.indexOf(shell.cfg.ai.opencode_variant) === -1) {
|
||||
shell.cfg.ai.opencode_variant = "default";
|
||||
}
|
||||
if (opencodeVariantField)
|
||||
opencodeVariantField.inputItem.text = shell.cfg.ai.opencode_variant;
|
||||
}
|
||||
|
||||
function refreshHandshake() {
|
||||
Bridge.refreshHandshake(null);
|
||||
}
|
||||
|
|
@ -367,6 +398,7 @@ ShellRoot {
|
|||
shell.aiCatalog = reply.data;
|
||||
shell.aiCatalogStatus = (reply.data.models || []).length > 0 ? "ok" : "empty";
|
||||
shell.aiCatalogError = "";
|
||||
shell.updateAiVariants();
|
||||
} else {
|
||||
shell.aiCatalog = { providers: [], models: [] };
|
||||
shell.aiCatalogStatus = reply.error_kind || "error";
|
||||
|
|
@ -609,9 +641,11 @@ ShellRoot {
|
|||
shell.cfg.ai.opencode_server = shell.cfg.ai.opencode_server || "http://127.0.0.1:4096";
|
||||
shell.cfg.ai.opencode_provider = shell.cfg.ai.opencode_provider || "deepseek";
|
||||
shell.cfg.ai.opencode_model = shell.cfg.ai.opencode_model || "deepseek-chat";
|
||||
shell.cfg.ai.opencode_variant = shell.cfg.ai.opencode_variant || "default";
|
||||
opencodeServerField.inputItem.text = shell.cfg.ai.opencode_server;
|
||||
opencodeProviderField.inputItem.text = shell.cfg.ai.opencode_provider;
|
||||
opencodeModelField.inputItem.text = shell.cfg.ai.opencode_model;
|
||||
opencodeVariantField.inputItem.text = shell.cfg.ai.opencode_variant;
|
||||
} else {
|
||||
shell.cfg.ai.backend = "direct";
|
||||
shell.cfg.ai.provider = value;
|
||||
|
|
@ -867,10 +901,23 @@ ShellRoot {
|
|||
const desc = (event.label || event.stage) + " (" + event.status + ")";
|
||||
let lines = shell.logLines.slice();
|
||||
lines.push(desc);
|
||||
if (lines.length > 1000)
|
||||
lines = lines.slice(lines.length - 1000);
|
||||
shell.logLines = lines;
|
||||
shell.lastActivity = desc;
|
||||
}
|
||||
|
||||
function onLogLine(line) {
|
||||
if (!line)
|
||||
return;
|
||||
let lines = shell.logLines.slice();
|
||||
lines.push(line);
|
||||
if (lines.length > 1000)
|
||||
lines = lines.slice(lines.length - 1000);
|
||||
shell.logLines = lines;
|
||||
shell.lastActivity = line;
|
||||
}
|
||||
|
||||
function restartBackend() {
|
||||
shell.status = "Restarting the installer backend…";
|
||||
shell.aiConnected = false;
|
||||
|
|
@ -947,6 +994,8 @@ ShellRoot {
|
|||
function onEvent(name, data) {
|
||||
if (name === "progress")
|
||||
shell.onProgress(data);
|
||||
else if (name === "log")
|
||||
shell.onLogLine(data.line || "");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1034,6 +1083,7 @@ ShellRoot {
|
|||
windowFocusTimer.start();
|
||||
}
|
||||
visible: true
|
||||
fullscreen: true
|
||||
color: Theme.charcoal
|
||||
implicitWidth: 1024
|
||||
implicitHeight: 720
|
||||
|
|
@ -1144,10 +1194,15 @@ ShellRoot {
|
|||
clip: true
|
||||
interactive: contentHeight > height
|
||||
visible: shell.phase === "form"
|
||||
boundsBehavior: Flickable.StopAtBounds
|
||||
ScrollBar.vertical: ScrollBar {
|
||||
active: true
|
||||
policy: flick.contentHeight > flick.height ? ScrollBar.AlwaysOn : ScrollBar.AsNeeded
|
||||
}
|
||||
|
||||
Column {
|
||||
id: stepColumn
|
||||
width: flick.width
|
||||
width: flick.width - (flick.contentHeight > flick.height ? 14 : 0)
|
||||
spacing: 16
|
||||
|
||||
// ============ STEP 0: welcome =========================
|
||||
|
|
@ -1159,7 +1214,7 @@ ShellRoot {
|
|||
width: parent.width
|
||||
padding: Theme.padLarge
|
||||
Text { width: parent.width; text: "Welcome to Phoebus OS"; color: Theme.warmWhite; font.family: Theme.family; font.pixelSize: Theme.fontDisplay; font.weight: Font.DemiBold }
|
||||
Text { width: parent.width; text: "This wizard installs Phoebus to your computer. It asks a few questions, explains each one, and changes nothing until you review the plan and type ERASE."; color: Theme.muted; font.family: Theme.family; font.pixelSize: Theme.fontBody; wrapMode: Text.WordWrap }
|
||||
Text { width: parent.width; text: "This wizard installs Phoebus to your computer. It asks a few questions, explains each one, and changes nothing until you review the plan and confirm installation."; color: Theme.muted; font.family: Theme.family; font.pixelSize: Theme.fontBody; wrapMode: Text.WordWrap }
|
||||
Text { width: parent.width; text: "You will choose language and keyboard, check the internet, connect an AI model, pick a disk, and set your account and encryption passphrase."; color: Theme.muted; font.family: Theme.family; font.pixelSize: Theme.fontBody; wrapMode: Text.WordWrap }
|
||||
PhoebusButton {
|
||||
id: welcomeNext
|
||||
|
|
@ -1373,8 +1428,25 @@ ShellRoot {
|
|||
placeholder: "choose a model"
|
||||
options: shell.aiCatalog.models
|
||||
visible: shell.isOpenCode
|
||||
onEdited: value => { shell.cfg.ai.opencode_model = value; shell.aiConnectionEdited(); }
|
||||
onSelected: value => { shell.cfg.ai.opencode_model = value; shell.aiConnectionEdited(); }
|
||||
onEdited: value => {
|
||||
shell.cfg.ai.opencode_model = value;
|
||||
shell.aiConnectionEdited();
|
||||
shell.updateAiVariants();
|
||||
}
|
||||
onSelected: value => {
|
||||
shell.cfg.ai.opencode_model = value;
|
||||
shell.aiConnectionEdited();
|
||||
shell.updateAiVariants();
|
||||
}
|
||||
}
|
||||
PhoebusCombo {
|
||||
id: opencodeVariantField
|
||||
label: "Variant"
|
||||
placeholder: "default"
|
||||
options: shell.availableAiVariants
|
||||
visible: shell.isOpenCode
|
||||
onEdited: value => { shell.cfg.ai.opencode_variant = value; shell.aiConnectionEdited(); }
|
||||
onSelected: value => { shell.cfg.ai.opencode_variant = value; shell.aiConnectionEdited(); }
|
||||
}
|
||||
Column {
|
||||
width: parent.width
|
||||
|
|
@ -1682,11 +1754,24 @@ ShellRoot {
|
|||
}
|
||||
|
||||
// -- progress / result ----------------------------------------
|
||||
Column {
|
||||
Flickable {
|
||||
id: progressFlick
|
||||
width: parent.width
|
||||
height: parent.height - 48 - 12
|
||||
spacing: 14
|
||||
contentWidth: width
|
||||
contentHeight: progressColumn.implicitHeight + 16
|
||||
clip: true
|
||||
boundsBehavior: Flickable.StopAtBounds
|
||||
visible: shell.phase !== "form"
|
||||
ScrollBar.vertical: ScrollBar {
|
||||
active: true
|
||||
policy: progressFlick.contentHeight > progressFlick.height ? ScrollBar.AlwaysOn : ScrollBar.AsNeeded
|
||||
}
|
||||
|
||||
Column {
|
||||
id: progressColumn
|
||||
width: progressFlick.width - (progressFlick.contentHeight > progressFlick.height ? 14 : 0)
|
||||
spacing: 14
|
||||
|
||||
Column {
|
||||
width: parent.width
|
||||
|
|
@ -1743,7 +1828,7 @@ ShellRoot {
|
|||
compact: true
|
||||
onClicked: {
|
||||
shell.showProgressDetails = !shell.showProgressDetails;
|
||||
if (shell.showProgressDetails)
|
||||
if (shell.showProgressDetails && shell.phase !== "progress")
|
||||
Bridge.logTail(150, r => { if (r.ok) shell.logLines = r.data.lines; });
|
||||
}
|
||||
}
|
||||
|
|
@ -1778,9 +1863,11 @@ ShellRoot {
|
|||
font.pixelSize: Theme.fontSmall
|
||||
wrapMode: Text.WrapAnywhere
|
||||
onTextChanged: {
|
||||
if (logFlickable.contentHeight > logFlickable.height) {
|
||||
logFlickable.contentY = logFlickable.contentHeight - logFlickable.height;
|
||||
}
|
||||
Qt.callLater(() => {
|
||||
if (logFlickable.contentHeight > logFlickable.height) {
|
||||
logFlickable.contentY = logFlickable.contentHeight - logFlickable.height;
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1840,6 +1927,7 @@ ShellRoot {
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// -- footer ----------------------------------------------------
|
||||
Item {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
import QtQuick
|
||||
import QtQuick.Controls
|
||||
import Quickshell
|
||||
import Quickshell.Io
|
||||
import "Common"
|
||||
|
|
@ -6,7 +7,7 @@ import "Common"
|
|||
// Phoebus OS live welcome. This is the ISO's launcher: it shows the identity,
|
||||
// the system's readiness, a dominant "Install Phoebus OS" action and secondary
|
||||
// troubleshooting tools under Advanced. It never authorizes or starts disk
|
||||
// changes; only the installer does that, behind its own ERASE confirmation.
|
||||
// changes; only the installer does that, behind its own confirmation.
|
||||
ShellRoot {
|
||||
id: shell
|
||||
|
||||
|
|
@ -15,6 +16,8 @@ ShellRoot {
|
|||
property string firmware: "UEFI"
|
||||
property string memory: "?"
|
||||
property string cores: "?"
|
||||
property string currentResolution: ""
|
||||
property bool showDisplay: false
|
||||
property bool showAdvanced: false
|
||||
property bool showPower: false
|
||||
property bool showKeyboardTest: false
|
||||
|
|
@ -23,6 +26,18 @@ ShellRoot {
|
|||
Quickshell.execDetached(cmd);
|
||||
}
|
||||
|
||||
function refreshDisplayModes() {
|
||||
displayDetect.running = true;
|
||||
}
|
||||
|
||||
function applyResolution(mode) {
|
||||
shell.run(["sh", "-c",
|
||||
"out=$(wlr-randr 2>/dev/null | awk '/^[A-Za-z0-9-]+ / {print $1; exit}'); " +
|
||||
"if [ -n \"$out\" ]; then wlr-randr --output \"$out\" --mode " + mode + "; fi"]);
|
||||
shell.currentResolution = mode;
|
||||
displayDetectTimer.start();
|
||||
}
|
||||
|
||||
Process {
|
||||
id: readiness
|
||||
command: ["sh", "-c",
|
||||
|
|
@ -48,6 +63,25 @@ ShellRoot {
|
|||
}
|
||||
}
|
||||
|
||||
Process {
|
||||
id: displayDetect
|
||||
command: ["sh", "-c", "out=$(wlr-randr 2>/dev/null | awk '/^[A-Za-z0-9-]+ / {print $1; exit}'); [ -n \"$out\" ] && wlr-randr --output \"$out\" 2>/dev/null | awk '/current/ {print $1; exit}'"]
|
||||
stdout: SplitParser {
|
||||
onRead: line => {
|
||||
const trimmed = ("" + line).trim();
|
||||
if (trimmed.length > 0)
|
||||
shell.currentResolution = trimmed;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Timer {
|
||||
id: displayDetectTimer
|
||||
interval: 600
|
||||
repeat: false
|
||||
onTriggered: displayDetect.running = true
|
||||
}
|
||||
|
||||
// The compositor may not have focused the tiled window yet at session
|
||||
// start; request activation and, shortly after, force focus on the primary
|
||||
// action so it is reachable with the keyboard (Enter).
|
||||
|
|
@ -69,6 +103,7 @@ ShellRoot {
|
|||
if (typeof window.requestActivate === "function")
|
||||
window.requestActivate();
|
||||
focusTimer.start();
|
||||
displayDetect.running = true;
|
||||
}
|
||||
visible: true
|
||||
color: Theme.charcoal
|
||||
|
|
@ -96,169 +131,207 @@ ShellRoot {
|
|||
color: Theme.overlay
|
||||
}
|
||||
|
||||
Column {
|
||||
id: page
|
||||
Flickable {
|
||||
id: flick
|
||||
anchors.fill: parent
|
||||
anchors.margins: Theme.padLarge
|
||||
spacing: 18
|
||||
contentWidth: width
|
||||
contentHeight: page.implicitHeight + (page.compactView ? 24 : (Theme.padLarge * 2))
|
||||
clip: true
|
||||
boundsBehavior: Flickable.StopAtBounds
|
||||
ScrollBar.vertical: ScrollBar {
|
||||
active: true
|
||||
policy: flick.contentHeight > flick.height ? ScrollBar.AlwaysOn : ScrollBar.AsNeeded
|
||||
}
|
||||
|
||||
// -- header ----------------------------------------------------
|
||||
Item {
|
||||
width: parent.width
|
||||
height: 56
|
||||
Column {
|
||||
id: page
|
||||
property bool compactView: flick.width < 760 || flick.height < 600
|
||||
width: flick.width - (compactView ? 24 : (Theme.padLarge * 2)) - (flick.contentHeight > flick.height ? 14 : 0)
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
anchors.top: parent.top
|
||||
anchors.topMargin: compactView ? 12 : Theme.padLarge
|
||||
spacing: compactView ? 12 : 18
|
||||
|
||||
Row {
|
||||
anchors.left: parent.left
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
spacing: 14
|
||||
// -- header ----------------------------------------------------
|
||||
Item {
|
||||
width: parent.width
|
||||
height: page.compactView ? 44 : 56
|
||||
|
||||
PhoebusEmblem {
|
||||
width: 56
|
||||
height: 56
|
||||
Row {
|
||||
anchors.left: parent.left
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
spacing: page.compactView ? 10 : 14
|
||||
|
||||
PhoebusEmblem {
|
||||
width: page.compactView ? 40 : 56
|
||||
height: page.compactView ? 40 : 56
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
}
|
||||
|
||||
Column {
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
spacing: 2
|
||||
Text {
|
||||
text: "PHOEBUS <font color=\"" + Theme.amber + "\">OS</font>"
|
||||
textFormat: Text.StyledText
|
||||
color: Theme.warmWhite
|
||||
font.family: Theme.family
|
||||
font.pixelSize: page.compactView ? 20 : 26
|
||||
font.weight: Font.DemiBold
|
||||
font.letterSpacing: page.compactView ? 2 : 3
|
||||
}
|
||||
Text {
|
||||
text: "A modern, encrypted, AI-first workstation"
|
||||
color: Theme.muted
|
||||
font.family: Theme.family
|
||||
font.pixelSize: page.compactView ? (Theme.fontSmall - 1) : Theme.fontSmall
|
||||
visible: !page.compactView || parent.width > 520
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Column {
|
||||
Rectangle {
|
||||
anchors.right: parent.right
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
spacing: 2
|
||||
height: page.compactView ? 26 : 30
|
||||
width: versionText.implicitWidth + 24
|
||||
radius: height / 2
|
||||
color: Theme.surface
|
||||
border.width: 1
|
||||
border.color: Theme.border
|
||||
Text {
|
||||
text: "PHOEBUS <font color=\"" + Theme.amber + "\">OS</font>"
|
||||
textFormat: Text.StyledText
|
||||
color: Theme.warmWhite
|
||||
font.family: Theme.family
|
||||
font.pixelSize: 26
|
||||
font.weight: Font.DemiBold
|
||||
font.letterSpacing: 3
|
||||
}
|
||||
Text {
|
||||
text: "A modern, encrypted, AI-first workstation"
|
||||
color: Theme.muted
|
||||
id: versionText
|
||||
anchors.centerIn: parent
|
||||
text: "Live medium · " + shell.isoVersion
|
||||
color: Theme.amber
|
||||
font.family: Theme.family
|
||||
font.pixelSize: Theme.fontSmall
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Rectangle {
|
||||
anchors.right: parent.right
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
height: 30
|
||||
width: versionText.implicitWidth + 24
|
||||
radius: 15
|
||||
color: Theme.surface
|
||||
border.width: 1
|
||||
border.color: Theme.border
|
||||
// -- hero + primary action ------------------------------------
|
||||
PhoebusCard {
|
||||
width: parent.width
|
||||
padding: page.compactView ? 14 : Theme.padLarge
|
||||
spacing: page.compactView ? 10 : 14
|
||||
|
||||
Text {
|
||||
id: versionText
|
||||
anchors.centerIn: parent
|
||||
text: "Live medium · " + shell.isoVersion
|
||||
color: Theme.amber
|
||||
width: parent.width
|
||||
text: "Welcome to Phoebus OS"
|
||||
color: Theme.warmWhite
|
||||
font.family: Theme.family
|
||||
font.pixelSize: Theme.fontSmall
|
||||
font.pixelSize: page.compactView ? Theme.fontTitle : Theme.fontDisplay
|
||||
font.weight: Font.DemiBold
|
||||
}
|
||||
Text {
|
||||
width: parent.width
|
||||
text: "This medium installs Phoebus to your computer. The installer guides you through language, networking, a connected AI model, the target disk, your account and encryption."
|
||||
color: Theme.muted
|
||||
font.family: Theme.family
|
||||
font.pixelSize: Theme.fontBody
|
||||
wrapMode: Text.WordWrap
|
||||
}
|
||||
|
||||
Item {
|
||||
id: heroActions
|
||||
width: parent.width
|
||||
property bool isNarrow: parent.width < 760
|
||||
implicitHeight: isNarrow ? (installButton.height + 14 + chipsCol.implicitHeight)
|
||||
: Math.max(installButton.height, chipsCol.implicitHeight)
|
||||
height: implicitHeight
|
||||
|
||||
PhoebusButton {
|
||||
id: installButton
|
||||
label: "Install Phoebus OS"
|
||||
primary: true
|
||||
height: page.compactView ? 48 : 58
|
||||
implicitHeight: height
|
||||
width: heroActions.isNarrow ? parent.width : 280
|
||||
implicitWidth: width
|
||||
anchors.left: parent.left
|
||||
anchors.top: parent.top
|
||||
focus: true
|
||||
activeFocusOnTab: true
|
||||
onClicked: {
|
||||
shell.run(["sh", "-c", "pkill -f 'quickshell.*phoebus-welcome' 2>/dev/null; exec /usr/local/bin/phoebus-install"]);
|
||||
}
|
||||
}
|
||||
|
||||
Column {
|
||||
id: chipsCol
|
||||
width: heroActions.isNarrow ? parent.width : (parent.width - installButton.width - 24)
|
||||
anchors.left: heroActions.isNarrow ? parent.left : installButton.right
|
||||
anchors.leftMargin: heroActions.isNarrow ? 0 : 24
|
||||
anchors.top: heroActions.isNarrow ? installButton.bottom : parent.top
|
||||
anchors.topMargin: heroActions.isNarrow ? 14 : 0
|
||||
spacing: 8
|
||||
|
||||
Flow {
|
||||
width: parent.width
|
||||
spacing: 8
|
||||
PhoebusChip {
|
||||
text: shell.networkUp ? "Network connected" : "Network offline"
|
||||
tone: shell.networkUp ? Theme.success : Theme.warning
|
||||
}
|
||||
PhoebusChip { text: shell.firmware; tone: Theme.muted }
|
||||
PhoebusChip { text: shell.memory + " RAM"; tone: Theme.muted }
|
||||
PhoebusChip { text: shell.cores + " cores"; tone: Theme.muted }
|
||||
}
|
||||
Text {
|
||||
width: parent.width
|
||||
text: "Nothing is written until you review the plan and confirm installation. An installed system boots without a network or a model."
|
||||
color: Theme.muted
|
||||
font.family: Theme.family
|
||||
font.pixelSize: Theme.fontSmall
|
||||
wrapMode: Text.WordWrap
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// -- hero + primary action ------------------------------------
|
||||
PhoebusCard {
|
||||
width: parent.width
|
||||
padding: Theme.padLarge
|
||||
|
||||
Text {
|
||||
// -- secondary actions ----------------------------------------
|
||||
Flow {
|
||||
width: parent.width
|
||||
text: "Welcome to Phoebus OS"
|
||||
color: Theme.warmWhite
|
||||
font.family: Theme.family
|
||||
font.pixelSize: Theme.fontDisplay
|
||||
font.weight: Font.DemiBold
|
||||
}
|
||||
Text {
|
||||
width: parent.width
|
||||
text: "This medium installs Phoebus to your computer. The installer guides you through language, networking, a connected AI model, the target disk, your account and encryption."
|
||||
color: Theme.muted
|
||||
font.family: Theme.family
|
||||
font.pixelSize: Theme.fontBody
|
||||
wrapMode: Text.WordWrap
|
||||
}
|
||||
|
||||
Row {
|
||||
width: parent.width
|
||||
spacing: 20
|
||||
spacing: page.compactView ? 8 : 12
|
||||
|
||||
PhoebusButton {
|
||||
id: installButton
|
||||
label: "Install Phoebus OS"
|
||||
primary: true
|
||||
implicitHeight: 58
|
||||
implicitWidth: 300
|
||||
focus: true
|
||||
activeFocusOnTab: true
|
||||
label: "Network"
|
||||
compact: page.compactView
|
||||
onClicked: shell.run(["sh", "-c",
|
||||
"command -v dms >/dev/null && exec dms ipc call settings focusOrToggle || exec kitty -e sh -c 'nmcli device status; read -r _'"])
|
||||
}
|
||||
PhoebusButton {
|
||||
label: "Display resolution"
|
||||
compact: page.compactView
|
||||
onClicked: {
|
||||
shell.run(["/usr/local/bin/phoebus-install"]);
|
||||
Qt.quit();
|
||||
shell.refreshDisplayModes();
|
||||
shell.showDisplay = true;
|
||||
}
|
||||
}
|
||||
|
||||
Column {
|
||||
width: parent.width - 320
|
||||
spacing: 6
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
Row {
|
||||
spacing: 8
|
||||
PhoebusChip {
|
||||
text: shell.networkUp ? "Network connected" : "Network offline"
|
||||
tone: shell.networkUp ? Theme.success : Theme.warning
|
||||
}
|
||||
PhoebusChip { text: shell.firmware; tone: Theme.muted }
|
||||
PhoebusChip { text: shell.memory + " RAM"; tone: Theme.muted }
|
||||
PhoebusChip { text: shell.cores + " cores"; tone: Theme.muted }
|
||||
}
|
||||
Text {
|
||||
width: parent.width
|
||||
text: "Nothing is written until you review the plan and type ERASE. An installed system boots without a network or a model."
|
||||
color: Theme.muted
|
||||
font.family: Theme.family
|
||||
font.pixelSize: Theme.fontSmall
|
||||
wrapMode: Text.WordWrap
|
||||
}
|
||||
PhoebusButton {
|
||||
label: "Accessibility"
|
||||
compact: page.compactView
|
||||
onClicked: shell.run(["sh", "-c",
|
||||
"command -v dms >/dev/null && dms ipc call settings focusOrToggle || true"])
|
||||
}
|
||||
PhoebusButton {
|
||||
label: "Installation help"
|
||||
compact: page.compactView
|
||||
onClicked: shell.run(["sh", "-c",
|
||||
"kitty -e sh -c 'cat /usr/share/phoebus/install-help.txt 2>/dev/null || echo Help is not installed; read -r || true'"])
|
||||
}
|
||||
PhoebusButton {
|
||||
label: "Keyboard test"
|
||||
compact: page.compactView
|
||||
onClicked: shell.showKeyboardTest = true
|
||||
}
|
||||
PhoebusButton {
|
||||
label: "Power"
|
||||
compact: page.compactView
|
||||
onClicked: shell.showPower = true
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// -- secondary actions ----------------------------------------
|
||||
Flow {
|
||||
width: parent.width
|
||||
spacing: 12
|
||||
|
||||
PhoebusButton {
|
||||
label: "Network"
|
||||
onClicked: shell.run(["sh", "-c",
|
||||
"command -v dms >/dev/null && exec dms ipc call settings focusOrToggle || exec kitty -e sh -c 'nmcli device status; read -r _'"])
|
||||
}
|
||||
PhoebusButton {
|
||||
label: "Display & keyboard"
|
||||
onClicked: shell.run(["sh", "-c",
|
||||
"command -v dms >/dev/null && dms ipc call settings focusOrToggle || kitty -e wlr-randr"])
|
||||
}
|
||||
PhoebusButton {
|
||||
label: "Accessibility"
|
||||
onClicked: shell.run(["sh", "-c",
|
||||
"command -v dms >/dev/null && dms ipc call settings focusOrToggle || true"])
|
||||
}
|
||||
PhoebusButton {
|
||||
label: "Installation help"
|
||||
onClicked: shell.run(["sh", "-c",
|
||||
"kitty -e sh -c 'cat /usr/share/phoebus/install-help.txt 2>/dev/null || echo Help is not installed; read -r || true'"])
|
||||
}
|
||||
PhoebusButton {
|
||||
label: "Keyboard test"
|
||||
onClicked: shell.showKeyboardTest = true
|
||||
}
|
||||
PhoebusButton {
|
||||
label: "Power"
|
||||
onClicked: shell.showPower = true
|
||||
}
|
||||
}
|
||||
|
||||
// -- advanced / troubleshooting -------------------------------
|
||||
PhoebusButton {
|
||||
|
|
@ -321,13 +394,106 @@ ShellRoot {
|
|||
|
||||
Item { width: 1; height: 1 }
|
||||
}
|
||||
}
|
||||
|
||||
// -- keyboard test overlay ----------------------------------------
|
||||
Rectangle {
|
||||
anchors.fill: parent
|
||||
color: Theme.overlay
|
||||
visible: shell.showKeyboardTest
|
||||
MouseArea { anchors.fill: parent; onClicked: shell.showKeyboardTest = false }
|
||||
// -- display resolution overlay ------------------------------------
|
||||
Rectangle {
|
||||
anchors.fill: parent
|
||||
color: Theme.overlay
|
||||
visible: shell.showDisplay
|
||||
MouseArea { anchors.fill: parent; onClicked: shell.showDisplay = false }
|
||||
|
||||
PhoebusCard {
|
||||
anchors.centerIn: parent
|
||||
width: Math.min(parent.width - 32, 540)
|
||||
padding: Theme.padLarge
|
||||
spacing: 14
|
||||
|
||||
Text {
|
||||
width: parent.width
|
||||
text: "Display Resolution"
|
||||
color: Theme.warmWhite
|
||||
font.family: Theme.family
|
||||
font.pixelSize: Theme.fontTitle
|
||||
font.weight: Font.DemiBold
|
||||
}
|
||||
Text {
|
||||
width: parent.width
|
||||
text: "Choose a screen resolution to match your monitor or VM window size. The change applies immediately."
|
||||
color: Theme.muted
|
||||
font.family: Theme.family
|
||||
font.pixelSize: Theme.fontBody
|
||||
wrapMode: Text.WordWrap
|
||||
}
|
||||
|
||||
Row {
|
||||
spacing: 8
|
||||
Text {
|
||||
text: "Current mode:"
|
||||
color: Theme.muted
|
||||
font.family: Theme.family
|
||||
font.pixelSize: Theme.fontSmall
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
}
|
||||
PhoebusChip {
|
||||
text: shell.currentResolution.length > 0 ? shell.currentResolution : "Detecting…"
|
||||
tone: Theme.amber
|
||||
}
|
||||
}
|
||||
|
||||
Flow {
|
||||
width: parent.width
|
||||
spacing: 10
|
||||
|
||||
Repeater {
|
||||
model: [
|
||||
{ label: "1920 × 1080 (Full HD)", mode: "1920x1080" },
|
||||
{ label: "1440 × 900 (Widescreen)", mode: "1440x900" },
|
||||
{ label: "1280 × 768 (Standard)", mode: "1280x768" },
|
||||
{ label: "1024 × 768 (4:3)", mode: "1024x768" },
|
||||
{ label: "800 × 600 (Compact)", mode: "800x600" }
|
||||
]
|
||||
delegate: PhoebusButton {
|
||||
required property var modelData
|
||||
label: modelData.label
|
||||
compact: true
|
||||
primary: shell.currentResolution.indexOf(modelData.mode) >= 0
|
||||
onClicked: {
|
||||
shell.applyResolution(modelData.mode);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Item { width: 1; height: 4 }
|
||||
|
||||
Row {
|
||||
width: parent.width
|
||||
spacing: 12
|
||||
PhoebusButton {
|
||||
label: "DMS Desktop Settings"
|
||||
compact: true
|
||||
onClicked: {
|
||||
shell.showDisplay = false;
|
||||
shell.run(["sh", "-c", "command -v dms >/dev/null && dms ipc call settings focusOrToggle"]);
|
||||
}
|
||||
}
|
||||
PhoebusButton {
|
||||
label: "Close"
|
||||
primary: true
|
||||
compact: true
|
||||
onClicked: shell.showDisplay = false
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// -- keyboard test overlay ----------------------------------------
|
||||
Rectangle {
|
||||
anchors.fill: parent
|
||||
color: Theme.overlay
|
||||
visible: shell.showKeyboardTest
|
||||
MouseArea { anchors.fill: parent; onClicked: shell.showKeyboardTest = false }
|
||||
|
||||
PhoebusCard {
|
||||
anchors.centerIn: parent
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue