diff --git a/helpers/DATA/plymouth/script.script b/helpers/DATA/plymouth/script.script index 2f9f4e0..e2fba66 100644 --- a/helpers/DATA/plymouth/script.script +++ b/helpers/DATA/plymouth/script.script @@ -1,11 +1,13 @@ initialwidth = Window.GetWidth(); +logofile = "trisquel_logo.png"; + bits_per_pixel = Window.GetBitsPerPixel (); if (bits_per_pixel == 4) { Window.SetBackgroundColor (0, 0, 0); logo.image = Image("trisquel_logo16.png"); } else { - logo.image = Image("trisquel_logo.png"); + logo.image = Image(logofile); logobg.image = Image("trisquel_logo-bg.png"); bg.image = Image("background.png"); } @@ -52,7 +54,8 @@ fun init () { logobg.sprite = Sprite(resized_logobg_image); logobg.sprite.SetX (Window.GetX() + Window.GetWidth() / 2 - resized_logobg_image.GetWidth() / 2); logobg.sprite.SetY (Window.GetY() + Window.GetHeight() / 2.3 - resized_logobg_image.GetHeight() / 2); - logobg.sprite.SetOpacity (1); + if (logofile == "trisquel_logo.png") + logobg.sprite.SetOpacity (1); } if (bits_per_pixel != 4) @@ -74,7 +77,8 @@ fun refresh_callback () opacity *= 1 - min_opacity; opacity += min_opacity; logo.sprite.SetOpacity (opacity); - logobg.sprite.SetOpacity (1); + if (logofile == "trisquel_logo.png") + logobg.sprite.SetOpacity (1); } } diff --git a/helpers/make-plymouth b/helpers/make-plymouth index 8e39151..56c981f 100644 --- a/helpers/make-plymouth +++ b/helpers/make-plymouth @@ -153,7 +153,7 @@ sed 's/script/glow/g' -i themes/glow/meson.build sed 's/rtoken/script/g' -i themes/glow/meson.build cp $DATA/sugar.png $DATA/trisquel_logo16.png $DATA/trisquel_logo-sugar.png themes/glow/ /bin/sed -i s/background/sugar/g themes/glow/* -sed -i 's_special://logo_trisquel\_logo-sugar.png_g; s/0.3/0.8/' themes/glow/*.script +sed -i '/^logofile/s/trisquel_logo.png/trisquel_logo-sugar.png/g; s/0.3/0.8/' themes/glow/*.script rename s/script.script/glow.script/g themes/glow/* rename s/script.plymouth.in/glow.plymouth.in/g themes/glow/* for i in trisquel_logo-sugar.png trisquel_logo16.png sugar.png @@ -161,9 +161,6 @@ do sed -i "/'progress_bar.png'/a\ \ '$i'," themes/glow/meson.build done -# explicit calling logo -sed -i 's|special://logo|trisquel_logo.png|' themes/trisquel-logo/*.script - find -type d |xargs rename s/glow/sugar/g find -type f |xargs rename s/glow/sugar/g