VesperOS/desktop-base
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Plymouth/{softWaves,Lines,Joy}: provide fsckd progress support. (Closes: #850181)

Browse Source
This commit is contained in:
Aurélien COUDERC
2017-01-09 14:55:02 +00:00
parent 4767a2e56a
commit b5c5317fd0
4 changed files with 71 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@@ -1,6 +1,8 @@
desktop-base (9.0.1) UNRELEASED; urgency=medium
[ Aurélien COUDERC ]
* Plymouth/{softWaves,Lines,Joy}: provide fsckd progress support.
(Closes: #850181)
* Plymouth/softWaves: raise messages and password field a little.
* Plymouth/Lines: ensure password field doesn’t bump into the Debian image
even for smaller height screens. (Closes: #774226)

23
joy-theme/plymouth/joy.script
View File

@@ -511,6 +511,12 @@ fun message_callback (message)
if (keys != NULL)
message = StringCopy (message, keys + StringLength(local.substring), NULL);
# Get the message without the "fsckd-cancel-msg" prefix as we don't support i18n
substring = "fsckd-cancel-msg:";
keys = StringString(message, substring);
if (keys != NULL)
message = StringCopy(message, keys + StringLength(substring), NULL);
local.label.is_fake = is_fake;
label = get_message_label(message, is_fake, is_action_line);
label.z = 10000;
@@ -1021,6 +1027,23 @@ fun update_status_callback (status) {
}
# systemd-fsckd pass fsckd:<number_devices>:<progress>:<l10n_string>
if (update_strings[0] == "fsckd") {
number_devices = StringToInteger(update_strings[1]);
if (number_devices > 0) {
label = update_strings[3];
progress_label = get_fsck_label (label, 0);
progress_label.sprite = Sprite (progress_label.image);
progress_label.sprite.SetPosition(progress_label.x, progress_label.y, 1);
progress_label.sprite.SetOpacity (1);
} else {
if (progress_label.sprite)
progress_label.sprite.SetOpacity (0);
}
}
}
Plymouth.SetUpdateStatusFunction (update_status_callback);

23
lines-theme/plymouth/lines.script
View File

@@ -473,6 +473,12 @@ fun message_callback (message)
local.label.is_fake = is_fake;
label = get_message_label(message, is_fake, is_action_line);
label.z = 10000;
# Get the message without the "fsckd-cancel-msg" prefix as we don't support i18n
substring = "fsckd-cancel-msg:";
keys = StringString(message, substring);
if (keys != NULL)
message = StringCopy(message, keys + StringLength(substring), NULL);
setup_message (message, label.x, label.y, label.z, is_action_line);
if (prompt_active && local.is_action_line)
@@ -980,6 +986,23 @@ fun update_status_callback (status) {
}
# systemd-fsckd pass fsckd:<number_devices>:<progress>:<l10n_string>
if (update_strings[0] == "fsckd") {
number_devices = StringToInteger(update_strings[1]);
if (number_devices > 0) {
label = update_strings[3];
progress_label = get_fsck_label (label, 0);
progress_label.sprite = Sprite (progress_label.image);
progress_label.sprite.SetPosition(progress_label.x, progress_label.y, 1);
progress_label.sprite.SetOpacity (1);
} else {
if (progress_label.sprite)
progress_label.sprite.SetOpacity (0);
}
}
}
Plymouth.SetUpdateStatusFunction (update_status_callback);

23
softwaves-theme/plymouth/softwaves.script
View File

@@ -430,6 +430,12 @@ fun message_callback (message)
if (keys != NULL)
message = StringCopy (message, keys + StringLength(local.substring), NULL);
# Get the message without the "fsckd-cancel-msg" prefix as we don't support i18n
substring = "fsckd-cancel-msg:";
keys = StringString(message, substring);
if (keys != NULL)
message = StringCopy(message, keys + StringLength(substring), NULL);
local.label.is_fake = is_fake;
label = get_message_label(message, is_fake, is_action_line);
label.z = 10000;
@@ -941,6 +947,23 @@ fun update_status_callback (status) {
}
# systemd-fsckd pass fsckd:<number_devices>:<progress>:<l10n_string>
if (update_strings[0] == "fsckd") {
number_devices = StringToInteger(update_strings[1]);
if (number_devices > 0) {
label = update_strings[3];
progress_label = get_fsck_label (label, 0);
progress_label.sprite = Sprite (progress_label.image);
progress_label.sprite.SetPosition(progress_label.x, progress_label.y, 1);
progress_label.sprite.SetOpacity (1);
} else {
if (progress_label.sprite)
progress_label.sprite.SetOpacity (0);
}
}
}
Plymouth.SetUpdateStatusFunction (update_status_callback);