Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Port to Blueprint #244

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@
/debian/vanilla-installer.substvars
/debian/vanilla-installer.debhelper.log
install/
.buildconfig
.buildconfig
/subprojects/blueprint-compiler
8 changes: 8 additions & 0 deletions subprojects/blueprint-compiler.wrap
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[wrap-git]
directory = blueprint-compiler
url = https://gitlab.gnome.org/jwestman/blueprint-compiler.git
revision = v0.10.1
depth = 1

[provide]
program_names = blueprint-compiler
40 changes: 40 additions & 0 deletions vanilla_installer/gtk/confirm.blp
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
using Gtk 4.0;

template $VanillaConfirm : $AdwBin {
halign: "fill";
valign: "fill";
hexpand: "true";

$AdwStatusPage status_page {
title: _("Confirm Installation");
description: _("The following changes will be made to your system:");

$AdwClamp {
maximum-size: "570";

Box {
orientation: vertical;

$AdwPreferencesPage {
hexpand: "true";

$AdwPreferencesGroup group_changes {
}

$AdwPreferencesGroup {
Button btn_confirm {
label: _("Install Vanilla OS");
valign: center;
halign: center;

styles [
"destructive-action",
"pill",
]
}
}
}
}
}
}
}
48 changes: 0 additions & 48 deletions vanilla_installer/gtk/confirm.ui

This file was deleted.

88 changes: 88 additions & 0 deletions vanilla_installer/gtk/default-disk.blp
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
using Gtk 4.0;

template $VanillaDefaultDisk : $AdwBin {
halign: "0";
valign: "0";
hexpand: "true";

Overlay {
valign: center;

[overlay]
Button btn_next {
margin-end: 12;
margin-start: 12;
icon-name: "go-next-symbolic";
halign: end;
valign: center;
visible: false;
tooltip-text: _("Next");

styles [
"circular",
"suggested-action",
]
}

$AdwStatusPage status_page {
icon-name: "vanilla-installer-harddisk-symbolic";
title: _("Install Location");
description: _("Select the disk where you want to install Vanilla OS. Alternatively, you can select one or more disks to configure manually.");

$AdwPreferencesPage {
$AdwPreferencesGroup group_disks {
}

$AdwPreferencesGroup {
Box {
halign: center;
spacing: 10;

Button btn_auto {
label: _("Use entire disk");
margin-top: 20;
halign: center;
sensitive: false;

styles [
"pill",
"suggested-action",
]
}

Button btn_manual {
label: _("Manual");
margin-top: 20;
halign: center;
sensitive: false;

styles [
"pill",
]
}
}
}

$AdwPreferencesGroup {
styles [
"error",
]

Box disk_space_err_box {
visible: false;
halign: center;
spacing: 5;

Image {
icon-name: "drive-harddisk-symbolic";
}

Label disk_space_err_label {
label: _("You need at least %s of disk space to proceed with installation.");
}
}
}
}
}
}
}
100 changes: 0 additions & 100 deletions vanilla_installer/gtk/default-disk.ui

This file was deleted.

59 changes: 59 additions & 0 deletions vanilla_installer/gtk/default-encryption.blp
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
using Gtk 4.0;

template $VanillaDefaultEncryption : $AdwBin {
halign: "0";
valign: "0";
hexpand: "true";

Overlay {
valign: center;

[overlay]
Button btn_next {
margin-end: 12;
margin-start: 12;
icon-name: "go-next-symbolic";
halign: end;
valign: center;
tooltip-text: _("Next");

styles [
"circular",
"suggested-action",
]
}

$AdwStatusPage status_page {
icon-name: "channel-secure-symbolic";
title: _("Device Encryption");
description: _("Vanilla OS provides full-disk encryption through LUKS2 to protect your personal information in case your device gets stolen.");

$AdwPreferencesPage {
$AdwPreferencesGroup {
$AdwActionRow {
title: _("Encrypt device");
subtitle: _("Use a memorable password to encrypt your data");

[suffix]
Switch use_encryption_switch {
valign: center;
active: true;
}

activatable-widget: "use_encryption_switch";
}

$AdwPasswordEntryRow encryption_pass_entry {
title: _("Password");
sensitive: bind use_encryption_switch.active;
}

$AdwPasswordEntryRow encryption_pass_entry_confirm {
title: _("Confirm Password");
sensitive: bind use_encryption_switch.active;
}
}
}
}
}
}
Loading