diff --git a/default/plymouth/omarchy.plymouth b/default/plymouth/omarchy.plymouth index b824473..d59f00b 100644 --- a/default/plymouth/omarchy.plymouth +++ b/default/plymouth/omarchy.plymouth @@ -1,6 +1,6 @@ [Plymouth Theme] Name=Omarchy -Description=Script example plugin. +Description=Omarchy splash screen. ModuleName=script [script] diff --git a/default/plymouth/omarchy.script b/default/plymouth/omarchy.script index 8f4998f..cc63e87 100644 --- a/default/plymouth/omarchy.script +++ b/default/plymouth/omarchy.script @@ -9,19 +9,6 @@ logo.sprite.SetX (Window.GetX() + Window.GetWidth() / 2 - logo.image.GetWidth() logo.sprite.SetY (Window.GetY() + Window.GetHeight() / 2 - logo.image.GetHeight() / 2); logo.sprite.SetOpacity (1); -fun refresh_callback () - { - # Always animate spinner - it will be invisible when not needed - if (global.spinner_sprite) - { - global.spinner_frame++; - frame_index = Math.Int(global.spinner_frame / 3) % global.spinner_frame_count; - global.spinner_sprite.SetImage(global.spinner_images[frame_index]); - } - } - -Plymouth.SetRefreshFunction (refresh_callback); - #----------------------------------------- Dialogue -------------------------------- status = "normal"; @@ -67,16 +54,12 @@ fun display_normal_callback () global.status = "normal"; if (global.dialog) dialog_opacity (0); - spinner_show(); # Show spinner when no password dialog } fun display_password_callback (prompt, bullets) { global.status = "password"; - # Always hide spinner when showing password dialog - spinner_hide(); - # Setup dialog if it doesn't exist if (!global.dialog) dialog_setup(); @@ -107,57 +90,6 @@ fun display_password_callback (prompt, bullets) Plymouth.SetDisplayNormalFunction(display_normal_callback); Plymouth.SetDisplayPasswordFunction(display_password_callback); -#----------------------------------------- Spinner -------------------------------- - -global.spinner_sprite = NULL; -global.spinner_frame = 0; -global.spinner_frame_count = 30; -global.spinner_visible = false; -global.spinner_images = []; - -fun spinner_setup() - { - if (!global.spinner_sprite) - { - # Load all throbber frames - for (i = 1; i <= global.spinner_frame_count; i++) - { - if (i < 10) - filename = "throbber-000" + i + ".png"; - else - filename = "throbber-00" + i + ".png"; - global.spinner_images[i-1] = Image(filename); - } - - # Create spinner sprite - global.spinner_sprite = Sprite(global.spinner_images[0]); - global.spinner_x = Window.GetX() + Window.GetWidth() / 2 - global.spinner_images[0].GetWidth() / 2; - global.spinner_y = Window.GetY() + Window.GetHeight() / 2 - logo.image.GetHeight() / 2 + logo.image.GetHeight() + 40; - global.spinner_sprite.SetPosition(global.spinner_x, global.spinner_y, 10002); - global.spinner_sprite.SetOpacity(0); - } - } - -fun spinner_show() - { - if (global.spinner_sprite) - { - global.spinner_sprite.SetOpacity(1); - global.spinner_visible = true; - } - } - -fun spinner_hide() - { - if (global.spinner_sprite) - { - global.spinner_sprite.SetOpacity(0); - global.spinner_visible = false; - } - } - -# Initialize spinner -spinner_setup(); #----------------------------------------- Progress Bar -------------------------------- progress_box.image = Image("progress_box.png"); @@ -179,7 +111,7 @@ progress_bar.sprite.SetOpacity(0); global.progress_visible = false; fun progress_callback (duration, progress) { - if (progress > 0.01 && Plymouth.GetMode() != "shutdown" && Plymouth.GetMode() != "reboot" && Plymouth.GetMode() != "suspend") + if (progress > 0.01) { if (!global.progress_visible) { diff --git a/default/plymouth/throbber-01.png b/default/plymouth/throbber-01.png deleted file mode 100644 index 85367eb..0000000 Binary files a/default/plymouth/throbber-01.png and /dev/null differ diff --git a/default/plymouth/throbber-02.png b/default/plymouth/throbber-02.png deleted file mode 100644 index 6eae3e6..0000000 Binary files a/default/plymouth/throbber-02.png and /dev/null differ diff --git a/default/plymouth/throbber-03.png b/default/plymouth/throbber-03.png deleted file mode 100644 index 2e28ef7..0000000 Binary files a/default/plymouth/throbber-03.png and /dev/null differ diff --git a/default/plymouth/throbber-04.png b/default/plymouth/throbber-04.png deleted file mode 100644 index cd32248..0000000 Binary files a/default/plymouth/throbber-04.png and /dev/null differ diff --git a/default/plymouth/throbber-05.png b/default/plymouth/throbber-05.png deleted file mode 100644 index f4bfb21..0000000 Binary files a/default/plymouth/throbber-05.png and /dev/null differ diff --git a/default/plymouth/throbber-06.png b/default/plymouth/throbber-06.png deleted file mode 100644 index 5b1a5cd..0000000 Binary files a/default/plymouth/throbber-06.png and /dev/null differ diff --git a/default/plymouth/throbber-07.png b/default/plymouth/throbber-07.png deleted file mode 100644 index 2c93f47..0000000 Binary files a/default/plymouth/throbber-07.png and /dev/null differ diff --git a/default/plymouth/throbber-08.png b/default/plymouth/throbber-08.png deleted file mode 100644 index 10cc347..0000000 Binary files a/default/plymouth/throbber-08.png and /dev/null differ diff --git a/default/plymouth/throbber-09.png b/default/plymouth/throbber-09.png deleted file mode 100644 index c511351..0000000 Binary files a/default/plymouth/throbber-09.png and /dev/null differ diff --git a/default/plymouth/throbber-10.png b/default/plymouth/throbber-10.png deleted file mode 100644 index ccd1b32..0000000 Binary files a/default/plymouth/throbber-10.png and /dev/null differ diff --git a/default/plymouth/throbber-11.png b/default/plymouth/throbber-11.png deleted file mode 100644 index dc82348..0000000 Binary files a/default/plymouth/throbber-11.png and /dev/null differ diff --git a/default/plymouth/throbber-12.png b/default/plymouth/throbber-12.png deleted file mode 100644 index 76565d5..0000000 Binary files a/default/plymouth/throbber-12.png and /dev/null differ diff --git a/default/plymouth/throbber-13.png b/default/plymouth/throbber-13.png deleted file mode 100644 index da5a995..0000000 Binary files a/default/plymouth/throbber-13.png and /dev/null differ diff --git a/default/plymouth/throbber-14.png b/default/plymouth/throbber-14.png deleted file mode 100644 index b3097d7..0000000 Binary files a/default/plymouth/throbber-14.png and /dev/null differ diff --git a/default/plymouth/throbber-15.png b/default/plymouth/throbber-15.png deleted file mode 100644 index a3a5e04..0000000 Binary files a/default/plymouth/throbber-15.png and /dev/null differ diff --git a/default/plymouth/throbber-16.png b/default/plymouth/throbber-16.png deleted file mode 100644 index 32a5fd5..0000000 Binary files a/default/plymouth/throbber-16.png and /dev/null differ diff --git a/default/plymouth/throbber-17.png b/default/plymouth/throbber-17.png deleted file mode 100644 index e726b5c..0000000 Binary files a/default/plymouth/throbber-17.png and /dev/null differ diff --git a/default/plymouth/throbber-18.png b/default/plymouth/throbber-18.png deleted file mode 100644 index 19d0242..0000000 Binary files a/default/plymouth/throbber-18.png and /dev/null differ diff --git a/default/plymouth/throbber-19.png b/default/plymouth/throbber-19.png deleted file mode 100644 index 86ef4f7..0000000 Binary files a/default/plymouth/throbber-19.png and /dev/null differ diff --git a/default/plymouth/throbber-20.png b/default/plymouth/throbber-20.png deleted file mode 100644 index d00033f..0000000 Binary files a/default/plymouth/throbber-20.png and /dev/null differ diff --git a/default/plymouth/throbber-21.png b/default/plymouth/throbber-21.png deleted file mode 100644 index 7d8b06b..0000000 Binary files a/default/plymouth/throbber-21.png and /dev/null differ diff --git a/default/plymouth/throbber-22.png b/default/plymouth/throbber-22.png deleted file mode 100644 index a3a1944..0000000 Binary files a/default/plymouth/throbber-22.png and /dev/null differ diff --git a/default/plymouth/throbber-23.png b/default/plymouth/throbber-23.png deleted file mode 100644 index 8355e65..0000000 Binary files a/default/plymouth/throbber-23.png and /dev/null differ diff --git a/default/plymouth/throbber-24.png b/default/plymouth/throbber-24.png deleted file mode 100644 index a26816b..0000000 Binary files a/default/plymouth/throbber-24.png and /dev/null differ diff --git a/default/plymouth/throbber-25.png b/default/plymouth/throbber-25.png deleted file mode 100644 index 5251b08..0000000 Binary files a/default/plymouth/throbber-25.png and /dev/null differ diff --git a/default/plymouth/throbber-26.png b/default/plymouth/throbber-26.png deleted file mode 100644 index fa79cbc..0000000 Binary files a/default/plymouth/throbber-26.png and /dev/null differ diff --git a/default/plymouth/throbber-27.png b/default/plymouth/throbber-27.png deleted file mode 100644 index 1831e15..0000000 Binary files a/default/plymouth/throbber-27.png and /dev/null differ diff --git a/default/plymouth/throbber-28.png b/default/plymouth/throbber-28.png deleted file mode 100644 index 91cd396..0000000 Binary files a/default/plymouth/throbber-28.png and /dev/null differ diff --git a/default/plymouth/throbber-29.png b/default/plymouth/throbber-29.png deleted file mode 100644 index 00a392b..0000000 Binary files a/default/plymouth/throbber-29.png and /dev/null differ diff --git a/default/plymouth/throbber-30.png b/default/plymouth/throbber-30.png deleted file mode 100644 index 688f443..0000000 Binary files a/default/plymouth/throbber-30.png and /dev/null differ