From 3f1e50fd943840df7d2d51d229a16e509548aa2c Mon Sep 17 00:00:00 2001 From: Unit 193 Date: Tue, 5 Apr 2016 20:04:46 -0400 Subject: Move plymouth themes from /lib to /usr/share. --- debian/copyright | 4 +- debian/plymouth-theme-icebox-logo.install | 2 +- debian/plymouth-theme-icebox-logo.postinst | 4 +- debian/plymouth-theme-icebox-logo.prerm | 2 +- debian/plymouth-theme-icebox-text.install | 2 +- debian/plymouth-theme-icebox-text.postinst | 4 +- debian/plymouth-theme-icebox-text.prerm | 2 +- lib/plymouth/themes/icebox-logo/fsck-fade.png | Bin 326 -> 0 bytes .../themes/icebox-logo/fsck-fade_16bit.png | Bin 98 -> 0 bytes .../themes/icebox-logo/icebox-logo.plymouth | 8 - lib/plymouth/themes/icebox-logo/icebox-logo.script | 512 --------------------- lib/plymouth/themes/icebox-logo/logo.png | Bin 814 -> 0 bytes lib/plymouth/themes/icebox-logo/logo_16bit.png | Bin 633 -> 0 bytes lib/plymouth/themes/icebox-logo/passw-dialog.png | Bin 2975 -> 0 bytes lib/plymouth/themes/icebox-logo/progress-fade.png | Bin 269 -> 0 bytes .../themes/icebox-logo/progress-fade_16bit.png | Bin 88 -> 0 bytes lib/plymouth/themes/icebox-logo/progress-meter.png | Bin 236 -> 0 bytes .../themes/icebox-logo/progress-meter_16bit.png | Bin 89 -> 0 bytes lib/plymouth/themes/icebox-logo/spinner.png | Bin 1000 -> 0 bytes lib/plymouth/themes/icebox-logo/test.png | Bin 148 -> 0 bytes lib/plymouth/themes/icebox-logo/wallpaper.png | Bin 608258 -> 0 bytes .../themes/icebox-text/icebox-text.plymouth | 11 - .../plymouth/themes/icebox-logo/fsck-fade.png | Bin 0 -> 326 bytes .../themes/icebox-logo/fsck-fade_16bit.png | Bin 0 -> 98 bytes .../themes/icebox-logo/icebox-logo.plymouth | 8 + .../plymouth/themes/icebox-logo/icebox-logo.script | 512 +++++++++++++++++++++ usr/share/plymouth/themes/icebox-logo/logo.png | Bin 0 -> 814 bytes .../plymouth/themes/icebox-logo/logo_16bit.png | Bin 0 -> 633 bytes .../plymouth/themes/icebox-logo/passw-dialog.png | Bin 0 -> 2975 bytes .../plymouth/themes/icebox-logo/progress-fade.png | Bin 0 -> 269 bytes .../themes/icebox-logo/progress-fade_16bit.png | Bin 0 -> 88 bytes .../plymouth/themes/icebox-logo/progress-meter.png | Bin 0 -> 236 bytes .../themes/icebox-logo/progress-meter_16bit.png | Bin 0 -> 89 bytes usr/share/plymouth/themes/icebox-logo/spinner.png | Bin 0 -> 1000 bytes usr/share/plymouth/themes/icebox-logo/test.png | Bin 0 -> 148 bytes .../plymouth/themes/icebox-logo/wallpaper.png | Bin 0 -> 608258 bytes .../themes/icebox-text/icebox-text.plymouth | 11 + 37 files changed, 541 insertions(+), 541 deletions(-) delete mode 100644 lib/plymouth/themes/icebox-logo/fsck-fade.png delete mode 100644 lib/plymouth/themes/icebox-logo/fsck-fade_16bit.png delete mode 100644 lib/plymouth/themes/icebox-logo/icebox-logo.plymouth delete mode 100644 lib/plymouth/themes/icebox-logo/icebox-logo.script delete mode 100644 lib/plymouth/themes/icebox-logo/logo.png delete mode 100644 lib/plymouth/themes/icebox-logo/logo_16bit.png delete mode 100644 lib/plymouth/themes/icebox-logo/passw-dialog.png delete mode 100644 lib/plymouth/themes/icebox-logo/progress-fade.png delete mode 100644 lib/plymouth/themes/icebox-logo/progress-fade_16bit.png delete mode 100644 lib/plymouth/themes/icebox-logo/progress-meter.png delete mode 100644 lib/plymouth/themes/icebox-logo/progress-meter_16bit.png delete mode 100644 lib/plymouth/themes/icebox-logo/spinner.png delete mode 100644 lib/plymouth/themes/icebox-logo/test.png delete mode 100644 lib/plymouth/themes/icebox-logo/wallpaper.png delete mode 100644 lib/plymouth/themes/icebox-text/icebox-text.plymouth create mode 100644 usr/share/plymouth/themes/icebox-logo/fsck-fade.png create mode 100644 usr/share/plymouth/themes/icebox-logo/fsck-fade_16bit.png create mode 100644 usr/share/plymouth/themes/icebox-logo/icebox-logo.plymouth create mode 100644 usr/share/plymouth/themes/icebox-logo/icebox-logo.script create mode 100644 usr/share/plymouth/themes/icebox-logo/logo.png create mode 100644 usr/share/plymouth/themes/icebox-logo/logo_16bit.png create mode 100644 usr/share/plymouth/themes/icebox-logo/passw-dialog.png create mode 100644 usr/share/plymouth/themes/icebox-logo/progress-fade.png create mode 100644 usr/share/plymouth/themes/icebox-logo/progress-fade_16bit.png create mode 100644 usr/share/plymouth/themes/icebox-logo/progress-meter.png create mode 100644 usr/share/plymouth/themes/icebox-logo/progress-meter_16bit.png create mode 100644 usr/share/plymouth/themes/icebox-logo/spinner.png create mode 100644 usr/share/plymouth/themes/icebox-logo/test.png create mode 100644 usr/share/plymouth/themes/icebox-logo/wallpaper.png create mode 100644 usr/share/plymouth/themes/icebox-text/icebox-text.plymouth diff --git a/debian/copyright b/debian/copyright index b2a0c5a..6bb0de5 100644 --- a/debian/copyright +++ b/debian/copyright @@ -2,7 +2,7 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: Icebox Artwork Upstream-Contact: Unit 193 -Files: lib/* +Files: usr/share/plymouth/* Copyright: 2009 Canonical Ltd. 2011-2014 The Xubuntu Community License: GPL-3+ @@ -24,7 +24,7 @@ License: GPL-3+ in the `/usr/share/common-licenses/GPL-3' file. Files: debian/* -Copyright: 2013-2015, Unit 193 +Copyright: 2013-2016, Unit 193 2007-2009, Cody A.W. Somerville 2007-2012, Lionel Le Folgoc 2006-2008, Gauvain Pocentek diff --git a/debian/plymouth-theme-icebox-logo.install b/debian/plymouth-theme-icebox-logo.install index 9a87fac..a138ce0 100644 --- a/debian/plymouth-theme-icebox-logo.install +++ b/debian/plymouth-theme-icebox-logo.install @@ -1 +1 @@ -lib/plymouth/themes/icebox-logo/ +usr/share/plymouth/themes/icebox-logo/ diff --git a/debian/plymouth-theme-icebox-logo.postinst b/debian/plymouth-theme-icebox-logo.postinst index 2f50d18..77c06df 100755 --- a/debian/plymouth-theme-icebox-logo.postinst +++ b/debian/plymouth-theme-icebox-logo.postinst @@ -20,8 +20,8 @@ set -e case "$1" in configure) update-alternatives \ - --install /lib/plymouth/themes/default.plymouth default.plymouth \ - /lib/plymouth/themes/icebox-logo/icebox-logo.plymouth 150 + --install /usr/share/plymouth/themes/default.plymouth default.plymouth \ + /usr/share/plymouth/themes/icebox-logo/icebox-logo.plymouth 150 if which update-initramfs >/dev/null 2>&1 then diff --git a/debian/plymouth-theme-icebox-logo.prerm b/debian/plymouth-theme-icebox-logo.prerm index 0822aca..43c1240 100755 --- a/debian/plymouth-theme-icebox-logo.prerm +++ b/debian/plymouth-theme-icebox-logo.prerm @@ -31,7 +31,7 @@ set -e case "$1" in remove) update-alternatives \ - --remove default.plymouth /lib/plymouth/themes/icebox-logo/icebox-logo.plymouth + --remove default.plymouth /usr/share/plymouth/themes/icebox-logo/icebox-logo.plymouth if which update-initramfs >/dev/null 2>&1 then diff --git a/debian/plymouth-theme-icebox-text.install b/debian/plymouth-theme-icebox-text.install index 705515d..de7d036 100644 --- a/debian/plymouth-theme-icebox-text.install +++ b/debian/plymouth-theme-icebox-text.install @@ -1 +1 @@ -lib/plymouth/themes/icebox-text/ +usr/share/plymouth/themes/icebox-text/ diff --git a/debian/plymouth-theme-icebox-text.postinst b/debian/plymouth-theme-icebox-text.postinst index 6dc7717..ea288a7 100755 --- a/debian/plymouth-theme-icebox-text.postinst +++ b/debian/plymouth-theme-icebox-text.postinst @@ -20,8 +20,8 @@ set -e case "$1" in configure) update-alternatives \ - --install /lib/plymouth/themes/text.plymouth text.plymouth \ - /lib/plymouth/themes/icebox-text/icebox-text.plymouth 150 + --install /usr/share/plymouth/themes/text.plymouth text.plymouth \ + /usr/share/plymouth/themes/icebox-text/icebox-text.plymouth 150 if which update-initramfs >/dev/null 2>&1 then diff --git a/debian/plymouth-theme-icebox-text.prerm b/debian/plymouth-theme-icebox-text.prerm index 65c91e5..66cdaaa 100755 --- a/debian/plymouth-theme-icebox-text.prerm +++ b/debian/plymouth-theme-icebox-text.prerm @@ -31,7 +31,7 @@ set -e case "$1" in remove) update-alternatives \ - --remove text.plymouth /lib/plymouth/themes/icebox-text/icebox-text.plymouth + --remove text.plymouth /usr/share/plymouth/themes/icebox-text/icebox-text.plymouth if which update-initramfs >/dev/null 2>&1 then diff --git a/lib/plymouth/themes/icebox-logo/fsck-fade.png b/lib/plymouth/themes/icebox-logo/fsck-fade.png deleted file mode 100644 index 3ef161a..0000000 Binary files a/lib/plymouth/themes/icebox-logo/fsck-fade.png and /dev/null differ diff --git a/lib/plymouth/themes/icebox-logo/fsck-fade_16bit.png b/lib/plymouth/themes/icebox-logo/fsck-fade_16bit.png deleted file mode 100644 index 53b486f..0000000 Binary files a/lib/plymouth/themes/icebox-logo/fsck-fade_16bit.png and /dev/null differ diff --git a/lib/plymouth/themes/icebox-logo/icebox-logo.plymouth b/lib/plymouth/themes/icebox-logo/icebox-logo.plymouth deleted file mode 100644 index 88375d9..0000000 --- a/lib/plymouth/themes/icebox-logo/icebox-logo.plymouth +++ /dev/null @@ -1,8 +0,0 @@ -[Plymouth Theme] -Name=Icebox Logo -Description=A theme that features a background with a logo. -ModuleName=script - -[script] -ImageDir=/lib/plymouth/themes/icebox-logo -ScriptFile=/lib/plymouth/themes/icebox-logo/icebox-logo.script diff --git a/lib/plymouth/themes/icebox-logo/icebox-logo.script b/lib/plymouth/themes/icebox-logo/icebox-logo.script deleted file mode 100644 index 0f0c1e1..0000000 --- a/lib/plymouth/themes/icebox-logo/icebox-logo.script +++ /dev/null @@ -1,512 +0,0 @@ - /************************************************************************** - * - * Copyright (C) 2011 The Xubuntu Community - * Copyright (C) 2009 Canonical Ltd. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - * Written by: Mad Nick - * - **************************************************************************/ - -/* - * Related to the screen */ - -screen_width = Window.GetWidth(); -screen_height = Window.GetHeight(); -screen_x = Window.GetX(); -screen_y = Window.GetY(); - -/**/ - -/* - * Images, check bits per pixel - * and load images accordingly */ - -background_image = Image("wallpaper.png"); -passw_dialog_input_image = Image("passw-dialog.png"); -bullet_image = Image("test.png"); - -bpp = Window.GetBitsPerPixel(); - -if (bpp == 4) { - - logotype_image = Image("logo_16bit.png"); - progress_meter_image = Image("progress-meter_16bit.png"); - progress_fade_image = Image("progress-fade_16bit.png"); - fsck_progress_meter_image = Image("progress-meter_16bit.png"); - fsck_progress_fade_image = Image("fsck-fade_16bit.png"); - -} -else { - - logotype_image = Image("logo.png"); - progress_meter_image = Image("progress-meter.png"); - progress_fade_image = Image("progress-fade.png"); - fsck_progress_meter_image = Image("progress-meter.png"); - fsck_progress_fade_image = Image("fsck-fade.png"); - -} - -/**/ - -/* - * Sprites */ - -ratio = screen_height / screen_width; -background_ratio = background_image.GetHeight() / background_image.GetWidth(); -factor = 0; - -if (ratio > background_ratio) { - - factor = screen_height / background_image.GetHeight(); - -} -else { - - factor = screen_width / background_image.GetWidth(); - -} - -scaled = background_image.Scale(background_image.GetWidth() * factor, background_image.GetHeight() * factor); -background_sprite = Sprite(scaled); -background_sprite.SetX(screen_x + screen_width / 2 - scaled.GetWidth() / 2); -background_sprite.SetY(screen_y + screen_height / 2 - scaled.GetHeight() / 2); - -logotype_sprite = Sprite(logotype_image); - -fsck_progress_meter_sprite = Sprite(fsck_progress_meter_image); -fsck_progress_fade_sprite = Sprite(fsck_progress_fade_image.Scale(1, fsck_progress_fade_image.GetHeight())); - -passw_dialog_input_sprite = Sprite(passw_dialog_input_image); -passw_lbl_sprite = Sprite(); - -msg_label_sprite = Sprite(); - -/**/ - -/* - * Misc */ - -counter = 0; - -fade_pos_x = (screen_width / 2) - (progress_meter_image.GetWidth() / 2); -fade_dir = 0; /* 0 = right, 1 = left */ - -fsck_running = 0; -fsck_dev_array; -fsck_dev_counter = 0; -fsck_fade_in_counter = 0; -fsck_done_fading = 0; - -stars_array; -stars_n = 0; - -//full_msg = ""; -msgs_line = [NULL,NULL,NULL,NULL,NULL]; - -/**/ - -/* - * Debug related */ - -debug = 0; -debug_sprite = Sprite(); - -fun debugOutput(str) { - - /* - * This will print to the top left corner */ - debug_sprite.SetImage(Image.Text(str)); - -} - -/**/ - -/* - * Setup the graphics properties */ -logotype_sprite.SetPosition(screen_x + (screen_width / 2) - (logotype_image.GetWidth() / 2), screen_y + (screen_height / 2) - (logotype_image.GetHeight() / 2)); -fsck_progress_meter_sprite.SetPosition(screen_x + (screen_width / 2) - (progress_meter_image.GetWidth() / 2), screen_y + (screen_height / 2) + (logotype_image.GetHeight() / 2) + 25); -fsck_progress_fade_sprite.SetPosition(screen_x + (screen_width / 2) - (progress_meter_image.GetWidth() / 2), screen_y + (screen_height / 2) + (logotype_image.GetHeight() / 2) + 25); -fsck_progress_meter_sprite.SetOpacity(0); -fsck_progress_fade_sprite.SetOpacity(0); -passw_dialog_input_sprite.SetPosition(screen_x + (screen_width / 2) - (passw_dialog_input_image.GetWidth() / 2), screen_y + (screen_height / 2) + (logotype_image.GetHeight() / 2) + 70); -passw_dialog_input_sprite.SetOpacity(0); -passw_lbl_sprite.SetOpacity(0); - -spin = 0; - -/* - * this function only goes up to 100 - * because thats all thats needed for - * the progress meter bar */ -fun atoi(str) { - - int = -1; - - for (i = 0; i <= 100; i++) { - - if (i + "" == str) { - - int = i; - - break; - - } - - } - - return int; - -} - -/* - * This handler will/can be invoked - * 50 times per second. - * - * According to the previous author of the - * splash script, without this callback - * the screen is not updated correctly */ -spinner_sprite; -spinner; - -fun refreshHandler() { - - if (spin < 3.14 * 2) { - - spin = spin + 0.1; - - } - else { - - spin = 0; - - } - - /* if fsck is running or the password is prompted, hide the spinner */ - if (fsck_running == 1 || passw_dialog_input_sprite.GetOpacity() == 1) { - - spinner_sprite.SetOpacity(0); - - } else { - - spinner = Image("spinner.png"); - spinner = spinner.Rotate(spin); - spinner_sprite = Sprite(spinner); - spinner_sprite.SetPosition(screen_x + (screen_width / 2) - (spinner.GetWidth() / 2), screen_y + (screen_height / 2) - (spinner.GetHeight() / 2) + 80); - - } - - if (fade_dir == 0) { - - counter++; - - if (counter >= 200) { - - fade_dir = 1; - - } - - } - else { - - counter--; - - if (counter <= 0) { - - fade_dir = 0; - - } - - } - - if ((fsck_running == 1) && (fsck_done_fading == 0)) { - - - fsck_progress_meter_sprite.SetOpacity(fsck_fade_in_counter); - fsck_progress_fade_sprite.SetOpacity(fsck_fade_in_counter); - - if (fsck_fade_in_counter < 1) { - - fsck_fade_in_counter+= 0.025; - - } - else { - - fsck_done_fading = 1; - - } - - } - -} - -Plymouth.SetRefreshFunction (refreshHandler); - -/**/ - -/* - * This function will display the password related information - * when being prompt with entering a password */ -fun showPasswordHandler(prompt, stars) { - - if (passw_dialog_input_sprite.GetOpacity() == 0 && passw_lbl_sprite.GetOpacity() == 0) { - - passw_dialog_input_sprite.SetOpacity(1); - passw_lbl_sprite.SetOpacity(1); - - } - - tmp_prompt_image = Image.Text(prompt, 1, 1, 1); - - passw_lbl_sprite.SetImage(tmp_prompt_image); - passw_lbl_sprite.SetPosition(screen_x + (screen_width / 2) - (tmp_prompt_image.GetWidth() / 2), screen_y + (screen_height / 2) + (logotype_image.GetHeight() / 2) + 50); - - for(i = 0; i < stars_n; i++) { - - stars_array[i] = NULL; - - } - - stars_n = 0; - - for(i = 0; (i < stars) && (i < 15); i++) { - - stars_array[i] = Sprite(bullet_image); - stars_array[i].SetPosition(screen_x + (((screen_width / 2) - (passw_dialog_input_image.GetWidth() / 2)) + (18 * i)) + 2, screen_y + (screen_height / 2) + (logotype_image.GetHeight() / 2) + 75); - stars_n++; - - } - -} - -Plymouth.SetDisplayPasswordFunction(showPasswordHandler); - -/**/ - -fun displayNormalHandler() { - - /* - * Hide the password dialog and the bullets */ - - if (passw_dialog_input_sprite.GetOpacity() == 1) { - - passw_dialog_input_sprite.SetOpacity(0); - - } - - if (passw_lbl_sprite.GetOpacity() == 1) { - - passw_lbl_sprite.SetOpacity(0); - - } - - for(i = 0; i < stars_n; i++) { - - stars_array[i] = NULL; - - } - -} - -Plymouth.SetDisplayNormalFunction(displayNormalHandler); - -fun strlen(string) { - - i = 0; - - while (String(string).CharAt(i)) { - - i++; - - } - - return i; - -} - -/* - * This function will display the most current message */ -fun messageHandler(msg) { - - if ((msg == "") || !msg) { - - return 0; - - } - - if (msg.SubString(0, 5) == "keys:") { - - msg = msg.SubString(5, strlen(msg)); - - } - - # Get the message without the "fsckd-cancel-msg" prefix as we don't support i18n - if (msg.SubString(0, 17) == "fsckd-cancel-msg:") - msg = msg.SubString(17, strlen(msg)); - - //full_msg += msg + " "; - for(i = 4; i > 0; i--) { - - msgs_line[i] = msgs_line[i - 1]; - - } - - msgs_line[0] = Sprite(Image.Text(msg, 1, 1, 1)); - - dist = 1; - - for(i = 0; i < 5; i++) { - - if (msgs_line[i] != NULL) { - - msgs_line[i].SetPosition(screen_x + (screen_width / 2) - (msgs_line[i].GetImage().GetWidth() / 2), screen_y + (screen_height - msgs_line[i].GetImage().GetHeight()) - 20*dist); - dist++; - - } - - } - -} - -Plymouth.SetMessageFunction(messageHandler); - -/**/ - -/* - * Handles the updates passed to the plymouth daemon - * for example the FSCK data */ -fun statusHandler(status) { - - tmp_char; - status_array[0] = ""; - elem_count = 0; - - for (i = 0; String(status).CharAt(i) != ""; i++) { - - tmp_char = String(status).CharAt(i); - - if (tmp_char != ":") { - - status_array[elem_count] += tmp_char; - - } - else { - - elem_count++; - status_array[elem_count] = ""; - - } - - } - - if (status_array[0] == "fsck") { - - already_added = 0; - - if (fsck_running == 0) { - - /* - * use the dedicated message handler for this - * since there is no messages about fsck checks - * currently... */ - messageHandler("Routine disk drive check."); - - fsck_running = 1; - - } - - for(i = 0; i < fsck_dev_counter; i++) { - - /* - * check if the device already exist and update - * the progress only in that case */ - if (fsck_dev_array[i][0] == status_array[1]) { - - fsck_dev_array[i][1] = status_array[2]; /* progress */ - already_added = 1; - - } - - } - - /* - * if the device is not added, then add it */ - if (already_added == 0) { - - fsck_dev_array[fsck_dev_counter][0] = status_array[1]; /* device */ - fsck_dev_array[fsck_dev_counter][1] = status_array[2]; /* progress */ - fsck_dev_counter++; - - } - - /* - * update the progress */ - - total = 0; - - for(i = 0; i < fsck_dev_counter; i++) { - - total += atoi(fsck_dev_array[i][1]); - - } - - if (fsck_dev_counter > 0) { - - /* - * display the total percentage */ - fsck_progress_fade_sprite.SetImage(fsck_progress_fade_image.Scale((fsck_progress_meter_image.GetWidth() / 100) * (total / fsck_dev_counter), fsck_progress_fade_image.GetHeight())); - - } - - /**/ - - /* - * if the total progress is at maximum, - * make the progress meter go away, - * we might want to fade this out... */ - if (total == (100 * fsck_dev_counter)) { - - fsck_progress_meter_sprite.SetOpacity(0); - fsck_progress_fade_sprite.SetOpacity(0); - - } - - } - - # systemd-fsckd pass fsckd::: - if (status_array[0] == "fsckd") { - fsck_running = 1; - - # remove ",x" as we only care about integers - progress_str = status_array[2]; - progress = atoi(progress_str.SubString(0, strlen(progress_str) - 2)); - - fsck_progress_fade_sprite.SetImage(fsck_progress_fade_image.Scale((fsck_progress_meter_image.GetWidth() / 100) * progress, fsck_progress_fade_image.GetHeight())); - - /* - * if the total progress is at maximum, - * make the progress meter go away, - * we might want to fade this out... */ - if (progress == 100) { - fsck_progress_meter_sprite.SetOpacity(0); - fsck_progress_fade_sprite.SetOpacity(0); - } - } - -} - -Plymouth.SetUpdateStatusFunction(statusHandler); - -/**/ diff --git a/lib/plymouth/themes/icebox-logo/logo.png b/lib/plymouth/themes/icebox-logo/logo.png deleted file mode 100644 index 3913e1e..0000000 Binary files a/lib/plymouth/themes/icebox-logo/logo.png and /dev/null differ diff --git a/lib/plymouth/themes/icebox-logo/logo_16bit.png b/lib/plymouth/themes/icebox-logo/logo_16bit.png deleted file mode 100644 index a262452..0000000 Binary files a/lib/plymouth/themes/icebox-logo/logo_16bit.png and /dev/null differ diff --git a/lib/plymouth/themes/icebox-logo/passw-dialog.png b/lib/plymouth/themes/icebox-logo/passw-dialog.png deleted file mode 100644 index eae4ae3..0000000 Binary files a/lib/plymouth/themes/icebox-logo/passw-dialog.png and /dev/null differ diff --git a/lib/plymouth/themes/icebox-logo/progress-fade.png b/lib/plymouth/themes/icebox-logo/progress-fade.png deleted file mode 100644 index 0349311..0000000 Binary files a/lib/plymouth/themes/icebox-logo/progress-fade.png and /dev/null differ diff --git a/lib/plymouth/themes/icebox-logo/progress-fade_16bit.png b/lib/plymouth/themes/icebox-logo/progress-fade_16bit.png deleted file mode 100644 index 03e9d82..0000000 Binary files a/lib/plymouth/themes/icebox-logo/progress-fade_16bit.png and /dev/null differ diff --git a/lib/plymouth/themes/icebox-logo/progress-meter.png b/lib/plymouth/themes/icebox-logo/progress-meter.png deleted file mode 100644 index 4e8b719..0000000 Binary files a/lib/plymouth/themes/icebox-logo/progress-meter.png and /dev/null differ diff --git a/lib/plymouth/themes/icebox-logo/progress-meter_16bit.png b/lib/plymouth/themes/icebox-logo/progress-meter_16bit.png deleted file mode 100644 index c031097..0000000 Binary files a/lib/plymouth/themes/icebox-logo/progress-meter_16bit.png and /dev/null differ diff --git a/lib/plymouth/themes/icebox-logo/spinner.png b/lib/plymouth/themes/icebox-logo/spinner.png deleted file mode 100644 index 2302fc3..0000000 Binary files a/lib/plymouth/themes/icebox-logo/spinner.png and /dev/null differ diff --git a/lib/plymouth/themes/icebox-logo/test.png b/lib/plymouth/themes/icebox-logo/test.png deleted file mode 100644 index 0204902..0000000 Binary files a/lib/plymouth/themes/icebox-logo/test.png and /dev/null differ diff --git a/lib/plymouth/themes/icebox-logo/wallpaper.png b/lib/plymouth/themes/icebox-logo/wallpaper.png deleted file mode 100644 index 0c0bb3a..0000000 Binary files a/lib/plymouth/themes/icebox-logo/wallpaper.png and /dev/null differ diff --git a/lib/plymouth/themes/icebox-text/icebox-text.plymouth b/lib/plymouth/themes/icebox-text/icebox-text.plymouth deleted file mode 100644 index 4279979..0000000 --- a/lib/plymouth/themes/icebox-text/icebox-text.plymouth +++ /dev/null @@ -1,11 +0,0 @@ -[Plymouth Theme] -Name=Icebox Text -Description=Text mode theme based on icebox-logo theme -ModuleName=ubuntu-text - -[ubuntu-text] -title=Icebox 16.04 -black=0x000000 -white=0xffffff -brown=0x000000 -blue=0xffffff diff --git a/usr/share/plymouth/themes/icebox-logo/fsck-fade.png b/usr/share/plymouth/themes/icebox-logo/fsck-fade.png new file mode 100644 index 0000000..3ef161a Binary files /dev/null and b/usr/share/plymouth/themes/icebox-logo/fsck-fade.png differ diff --git a/usr/share/plymouth/themes/icebox-logo/fsck-fade_16bit.png b/usr/share/plymouth/themes/icebox-logo/fsck-fade_16bit.png new file mode 100644 index 0000000..53b486f Binary files /dev/null and b/usr/share/plymouth/themes/icebox-logo/fsck-fade_16bit.png differ diff --git a/usr/share/plymouth/themes/icebox-logo/icebox-logo.plymouth b/usr/share/plymouth/themes/icebox-logo/icebox-logo.plymouth new file mode 100644 index 0000000..88375d9 --- /dev/null +++ b/usr/share/plymouth/themes/icebox-logo/icebox-logo.plymouth @@ -0,0 +1,8 @@ +[Plymouth Theme] +Name=Icebox Logo +Description=A theme that features a background with a logo. +ModuleName=script + +[script] +ImageDir=/lib/plymouth/themes/icebox-logo +ScriptFile=/lib/plymouth/themes/icebox-logo/icebox-logo.script diff --git a/usr/share/plymouth/themes/icebox-logo/icebox-logo.script b/usr/share/plymouth/themes/icebox-logo/icebox-logo.script new file mode 100644 index 0000000..0f0c1e1 --- /dev/null +++ b/usr/share/plymouth/themes/icebox-logo/icebox-logo.script @@ -0,0 +1,512 @@ + /************************************************************************** + * + * Copyright (C) 2011 The Xubuntu Community + * Copyright (C) 2009 Canonical Ltd. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + * Written by: Mad Nick + * + **************************************************************************/ + +/* + * Related to the screen */ + +screen_width = Window.GetWidth(); +screen_height = Window.GetHeight(); +screen_x = Window.GetX(); +screen_y = Window.GetY(); + +/**/ + +/* + * Images, check bits per pixel + * and load images accordingly */ + +background_image = Image("wallpaper.png"); +passw_dialog_input_image = Image("passw-dialog.png"); +bullet_image = Image("test.png"); + +bpp = Window.GetBitsPerPixel(); + +if (bpp == 4) { + + logotype_image = Image("logo_16bit.png"); + progress_meter_image = Image("progress-meter_16bit.png"); + progress_fade_image = Image("progress-fade_16bit.png"); + fsck_progress_meter_image = Image("progress-meter_16bit.png"); + fsck_progress_fade_image = Image("fsck-fade_16bit.png"); + +} +else { + + logotype_image = Image("logo.png"); + progress_meter_image = Image("progress-meter.png"); + progress_fade_image = Image("progress-fade.png"); + fsck_progress_meter_image = Image("progress-meter.png"); + fsck_progress_fade_image = Image("fsck-fade.png"); + +} + +/**/ + +/* + * Sprites */ + +ratio = screen_height / screen_width; +background_ratio = background_image.GetHeight() / background_image.GetWidth(); +factor = 0; + +if (ratio > background_ratio) { + + factor = screen_height / background_image.GetHeight(); + +} +else { + + factor = screen_width / background_image.GetWidth(); + +} + +scaled = background_image.Scale(background_image.GetWidth() * factor, background_image.GetHeight() * factor); +background_sprite = Sprite(scaled); +background_sprite.SetX(screen_x + screen_width / 2 - scaled.GetWidth() / 2); +background_sprite.SetY(screen_y + screen_height / 2 - scaled.GetHeight() / 2); + +logotype_sprite = Sprite(logotype_image); + +fsck_progress_meter_sprite = Sprite(fsck_progress_meter_image); +fsck_progress_fade_sprite = Sprite(fsck_progress_fade_image.Scale(1, fsck_progress_fade_image.GetHeight())); + +passw_dialog_input_sprite = Sprite(passw_dialog_input_image); +passw_lbl_sprite = Sprite(); + +msg_label_sprite = Sprite(); + +/**/ + +/* + * Misc */ + +counter = 0; + +fade_pos_x = (screen_width / 2) - (progress_meter_image.GetWidth() / 2); +fade_dir = 0; /* 0 = right, 1 = left */ + +fsck_running = 0; +fsck_dev_array; +fsck_dev_counter = 0; +fsck_fade_in_counter = 0; +fsck_done_fading = 0; + +stars_array; +stars_n = 0; + +//full_msg = ""; +msgs_line = [NULL,NULL,NULL,NULL,NULL]; + +/**/ + +/* + * Debug related */ + +debug = 0; +debug_sprite = Sprite(); + +fun debugOutput(str) { + + /* + * This will print to the top left corner */ + debug_sprite.SetImage(Image.Text(str)); + +} + +/**/ + +/* + * Setup the graphics properties */ +logotype_sprite.SetPosition(screen_x + (screen_width / 2) - (logotype_image.GetWidth() / 2), screen_y + (screen_height / 2) - (logotype_image.GetHeight() / 2)); +fsck_progress_meter_sprite.SetPosition(screen_x + (screen_width / 2) - (progress_meter_image.GetWidth() / 2), screen_y + (screen_height / 2) + (logotype_image.GetHeight() / 2) + 25); +fsck_progress_fade_sprite.SetPosition(screen_x + (screen_width / 2) - (progress_meter_image.GetWidth() / 2), screen_y + (screen_height / 2) + (logotype_image.GetHeight() / 2) + 25); +fsck_progress_meter_sprite.SetOpacity(0); +fsck_progress_fade_sprite.SetOpacity(0); +passw_dialog_input_sprite.SetPosition(screen_x + (screen_width / 2) - (passw_dialog_input_image.GetWidth() / 2), screen_y + (screen_height / 2) + (logotype_image.GetHeight() / 2) + 70); +passw_dialog_input_sprite.SetOpacity(0); +passw_lbl_sprite.SetOpacity(0); + +spin = 0; + +/* + * this function only goes up to 100 + * because thats all thats needed for + * the progress meter bar */ +fun atoi(str) { + + int = -1; + + for (i = 0; i <= 100; i++) { + + if (i + "" == str) { + + int = i; + + break; + + } + + } + + return int; + +} + +/* + * This handler will/can be invoked + * 50 times per second. + * + * According to the previous author of the + * splash script, without this callback + * the screen is not updated correctly */ +spinner_sprite; +spinner; + +fun refreshHandler() { + + if (spin < 3.14 * 2) { + + spin = spin + 0.1; + + } + else { + + spin = 0; + + } + + /* if fsck is running or the password is prompted, hide the spinner */ + if (fsck_running == 1 || passw_dialog_input_sprite.GetOpacity() == 1) { + + spinner_sprite.SetOpacity(0); + + } else { + + spinner = Image("spinner.png"); + spinner = spinner.Rotate(spin); + spinner_sprite = Sprite(spinner); + spinner_sprite.SetPosition(screen_x + (screen_width / 2) - (spinner.GetWidth() / 2), screen_y + (screen_height / 2) - (spinner.GetHeight() / 2) + 80); + + } + + if (fade_dir == 0) { + + counter++; + + if (counter >= 200) { + + fade_dir = 1; + + } + + } + else { + + counter--; + + if (counter <= 0) { + + fade_dir = 0; + + } + + } + + if ((fsck_running == 1) && (fsck_done_fading == 0)) { + + + fsck_progress_meter_sprite.SetOpacity(fsck_fade_in_counter); + fsck_progress_fade_sprite.SetOpacity(fsck_fade_in_counter); + + if (fsck_fade_in_counter < 1) { + + fsck_fade_in_counter+= 0.025; + + } + else { + + fsck_done_fading = 1; + + } + + } + +} + +Plymouth.SetRefreshFunction (refreshHandler); + +/**/ + +/* + * This function will display the password related information + * when being prompt with entering a password */ +fun showPasswordHandler(prompt, stars) { + + if (passw_dialog_input_sprite.GetOpacity() == 0 && passw_lbl_sprite.GetOpacity() == 0) { + + passw_dialog_input_sprite.SetOpacity(1); + passw_lbl_sprite.SetOpacity(1); + + } + + tmp_prompt_image = Image.Text(prompt, 1, 1, 1); + + passw_lbl_sprite.SetImage(tmp_prompt_image); + passw_lbl_sprite.SetPosition(screen_x + (screen_width / 2) - (tmp_prompt_image.GetWidth() / 2), screen_y + (screen_height / 2) + (logotype_image.GetHeight() / 2) + 50); + + for(i = 0; i < stars_n; i++) { + + stars_array[i] = NULL; + + } + + stars_n = 0; + + for(i = 0; (i < stars) && (i < 15); i++) { + + stars_array[i] = Sprite(bullet_image); + stars_array[i].SetPosition(screen_x + (((screen_width / 2) - (passw_dialog_input_image.GetWidth() / 2)) + (18 * i)) + 2, screen_y + (screen_height / 2) + (logotype_image.GetHeight() / 2) + 75); + stars_n++; + + } + +} + +Plymouth.SetDisplayPasswordFunction(showPasswordHandler); + +/**/ + +fun displayNormalHandler() { + + /* + * Hide the password dialog and the bullets */ + + if (passw_dialog_input_sprite.GetOpacity() == 1) { + + passw_dialog_input_sprite.SetOpacity(0); + + } + + if (passw_lbl_sprite.GetOpacity() == 1) { + + passw_lbl_sprite.SetOpacity(0); + + } + + for(i = 0; i < stars_n; i++) { + + stars_array[i] = NULL; + + } + +} + +Plymouth.SetDisplayNormalFunction(displayNormalHandler); + +fun strlen(string) { + + i = 0; + + while (String(string).CharAt(i)) { + + i++; + + } + + return i; + +} + +/* + * This function will display the most current message */ +fun messageHandler(msg) { + + if ((msg == "") || !msg) { + + return 0; + + } + + if (msg.SubString(0, 5) == "keys:") { + + msg = msg.SubString(5, strlen(msg)); + + } + + # Get the message without the "fsckd-cancel-msg" prefix as we don't support i18n + if (msg.SubString(0, 17) == "fsckd-cancel-msg:") + msg = msg.SubString(17, strlen(msg)); + + //full_msg += msg + " "; + for(i = 4; i > 0; i--) { + + msgs_line[i] = msgs_line[i - 1]; + + } + + msgs_line[0] = Sprite(Image.Text(msg, 1, 1, 1)); + + dist = 1; + + for(i = 0; i < 5; i++) { + + if (msgs_line[i] != NULL) { + + msgs_line[i].SetPosition(screen_x + (screen_width / 2) - (msgs_line[i].GetImage().GetWidth() / 2), screen_y + (screen_height - msgs_line[i].GetImage().GetHeight()) - 20*dist); + dist++; + + } + + } + +} + +Plymouth.SetMessageFunction(messageHandler); + +/**/ + +/* + * Handles the updates passed to the plymouth daemon + * for example the FSCK data */ +fun statusHandler(status) { + + tmp_char; + status_array[0] = ""; + elem_count = 0; + + for (i = 0; String(status).CharAt(i) != ""; i++) { + + tmp_char = String(status).CharAt(i); + + if (tmp_char != ":") { + + status_array[elem_count] += tmp_char; + + } + else { + + elem_count++; + status_array[elem_count] = ""; + + } + + } + + if (status_array[0] == "fsck") { + + already_added = 0; + + if (fsck_running == 0) { + + /* + * use the dedicated message handler for this + * since there is no messages about fsck checks + * currently... */ + messageHandler("Routine disk drive check."); + + fsck_running = 1; + + } + + for(i = 0; i < fsck_dev_counter; i++) { + + /* + * check if the device already exist and update + * the progress only in that case */ + if (fsck_dev_array[i][0] == status_array[1]) { + + fsck_dev_array[i][1] = status_array[2]; /* progress */ + already_added = 1; + + } + + } + + /* + * if the device is not added, then add it */ + if (already_added == 0) { + + fsck_dev_array[fsck_dev_counter][0] = status_array[1]; /* device */ + fsck_dev_array[fsck_dev_counter][1] = status_array[2]; /* progress */ + fsck_dev_counter++; + + } + + /* + * update the progress */ + + total = 0; + + for(i = 0; i < fsck_dev_counter; i++) { + + total += atoi(fsck_dev_array[i][1]); + + } + + if (fsck_dev_counter > 0) { + + /* + * display the total percentage */ + fsck_progress_fade_sprite.SetImage(fsck_progress_fade_image.Scale((fsck_progress_meter_image.GetWidth() / 100) * (total / fsck_dev_counter), fsck_progress_fade_image.GetHeight())); + + } + + /**/ + + /* + * if the total progress is at maximum, + * make the progress meter go away, + * we might want to fade this out... */ + if (total == (100 * fsck_dev_counter)) { + + fsck_progress_meter_sprite.SetOpacity(0); + fsck_progress_fade_sprite.SetOpacity(0); + + } + + } + + # systemd-fsckd pass fsckd::: + if (status_array[0] == "fsckd") { + fsck_running = 1; + + # remove ",x" as we only care about integers + progress_str = status_array[2]; + progress = atoi(progress_str.SubString(0, strlen(progress_str) - 2)); + + fsck_progress_fade_sprite.SetImage(fsck_progress_fade_image.Scale((fsck_progress_meter_image.GetWidth() / 100) * progress, fsck_progress_fade_image.GetHeight())); + + /* + * if the total progress is at maximum, + * make the progress meter go away, + * we might want to fade this out... */ + if (progress == 100) { + fsck_progress_meter_sprite.SetOpacity(0); + fsck_progress_fade_sprite.SetOpacity(0); + } + } + +} + +Plymouth.SetUpdateStatusFunction(statusHandler); + +/**/ diff --git a/usr/share/plymouth/themes/icebox-logo/logo.png b/usr/share/plymouth/themes/icebox-logo/logo.png new file mode 100644 index 0000000..3913e1e Binary files /dev/null and b/usr/share/plymouth/themes/icebox-logo/logo.png differ diff --git a/usr/share/plymouth/themes/icebox-logo/logo_16bit.png b/usr/share/plymouth/themes/icebox-logo/logo_16bit.png new file mode 100644 index 0000000..a262452 Binary files /dev/null and b/usr/share/plymouth/themes/icebox-logo/logo_16bit.png differ diff --git a/usr/share/plymouth/themes/icebox-logo/passw-dialog.png b/usr/share/plymouth/themes/icebox-logo/passw-dialog.png new file mode 100644 index 0000000..eae4ae3 Binary files /dev/null and b/usr/share/plymouth/themes/icebox-logo/passw-dialog.png differ diff --git a/usr/share/plymouth/themes/icebox-logo/progress-fade.png b/usr/share/plymouth/themes/icebox-logo/progress-fade.png new file mode 100644 index 0000000..0349311 Binary files /dev/null and b/usr/share/plymouth/themes/icebox-logo/progress-fade.png differ diff --git a/usr/share/plymouth/themes/icebox-logo/progress-fade_16bit.png b/usr/share/plymouth/themes/icebox-logo/progress-fade_16bit.png new file mode 100644 index 0000000..03e9d82 Binary files /dev/null and b/usr/share/plymouth/themes/icebox-logo/progress-fade_16bit.png differ diff --git a/usr/share/plymouth/themes/icebox-logo/progress-meter.png b/usr/share/plymouth/themes/icebox-logo/progress-meter.png new file mode 100644 index 0000000..4e8b719 Binary files /dev/null and b/usr/share/plymouth/themes/icebox-logo/progress-meter.png differ diff --git a/usr/share/plymouth/themes/icebox-logo/progress-meter_16bit.png b/usr/share/plymouth/themes/icebox-logo/progress-meter_16bit.png new file mode 100644 index 0000000..c031097 Binary files /dev/null and b/usr/share/plymouth/themes/icebox-logo/progress-meter_16bit.png differ diff --git a/usr/share/plymouth/themes/icebox-logo/spinner.png b/usr/share/plymouth/themes/icebox-logo/spinner.png new file mode 100644 index 0000000..2302fc3 Binary files /dev/null and b/usr/share/plymouth/themes/icebox-logo/spinner.png differ diff --git a/usr/share/plymouth/themes/icebox-logo/test.png b/usr/share/plymouth/themes/icebox-logo/test.png new file mode 100644 index 0000000..0204902 Binary files /dev/null and b/usr/share/plymouth/themes/icebox-logo/test.png differ diff --git a/usr/share/plymouth/themes/icebox-logo/wallpaper.png b/usr/share/plymouth/themes/icebox-logo/wallpaper.png new file mode 100644 index 0000000..0c0bb3a Binary files /dev/null and b/usr/share/plymouth/themes/icebox-logo/wallpaper.png differ diff --git a/usr/share/plymouth/themes/icebox-text/icebox-text.plymouth b/usr/share/plymouth/themes/icebox-text/icebox-text.plymouth new file mode 100644 index 0000000..4279979 --- /dev/null +++ b/usr/share/plymouth/themes/icebox-text/icebox-text.plymouth @@ -0,0 +1,11 @@ +[Plymouth Theme] +Name=Icebox Text +Description=Text mode theme based on icebox-logo theme +ModuleName=ubuntu-text + +[ubuntu-text] +title=Icebox 16.04 +black=0x000000 +white=0xffffff +brown=0x000000 +blue=0xffffff -- cgit v1.2.3