diff --git a/helpers/DATA/plymouth/background.png b/helpers/DATA/plymouth/background.png new file mode 100644 index 0000000000000000000000000000000000000000..bc7d94dae3f15cd1e7e5c8c4f17413083d1d3897 Binary files /dev/null and b/helpers/DATA/plymouth/background.png differ diff --git a/helpers/DATA/plymouth/brigantia.jpg b/helpers/DATA/plymouth/brigantia.jpg deleted file mode 100644 index eded587904155236215a194e340dd3e3fa71ddda..0000000000000000000000000000000000000000 Binary files a/helpers/DATA/plymouth/brigantia.jpg and /dev/null differ diff --git a/helpers/DATA/plymouth/brigantia.png b/helpers/DATA/plymouth/brigantia.png deleted file mode 100644 index 49c1af3347bd69b87c97778d5f5deaa435e1b6aa..0000000000000000000000000000000000000000 Binary files a/helpers/DATA/plymouth/brigantia.png and /dev/null differ diff --git a/helpers/DATA/plymouth/dagda.png b/helpers/DATA/plymouth/dagda.png deleted file mode 100644 index f339c5816f648b08de5d4668fc6b0277715f9feb..0000000000000000000000000000000000000000 Binary files a/helpers/DATA/plymouth/dagda.png and /dev/null differ diff --git a/helpers/DATA/plymouth/script.script b/helpers/DATA/plymouth/script.script index 91bb23388684159862138795b889537bc30fcd2f..c07fc5440bc1f5ebf5490a662572528baedf082f 100644 --- a/helpers/DATA/plymouth/script.script +++ b/helpers/DATA/plymouth/script.script @@ -7,7 +7,7 @@ if (bits_per_pixel == 4) { } else { logo.image = Image("special://logo"); - bg_image = Image("brigantia.png"); + bg_image = Image("background.png"); bg_sprite = Sprite(bg_image); customlogo.image = Image("custom.png"); @@ -26,9 +26,7 @@ if (bits_per_pixel == 4) { logo.sprite = Sprite(logo.image); logo.opacity_angle = 0; logo.sprite.SetX (Window.GetX() + Window.GetWidth() / 2 - logo.image.GetWidth() / 2); -logo.sprite.SetY (Window.GetY() + Window.GetHeight() / 4 - logo.image.GetHeight() / 2); -#logo.sprite.SetX (Window.GetX() + Window.GetWidth() / 2 - logo.image.GetWidth() / 2); -#logo.sprite.SetY (Window.GetY() + Window.GetHeight() / 2 - logo.image.GetHeight() / 2); +logo.sprite.SetY (Window.GetY() + Window.GetHeight() / 2 - logo.image.GetHeight() / 2); logo.sprite.SetOpacity (1); fun refresh_callback () diff --git a/helpers/DATA/plymouth/slaine.png b/helpers/DATA/plymouth/slaine.png deleted file mode 100644 index e12666e509a065377ce49de4a49e6796d4525ce1..0000000000000000000000000000000000000000 Binary files a/helpers/DATA/plymouth/slaine.png and /dev/null differ diff --git a/helpers/DATA/plymouth/taranis.png b/helpers/DATA/plymouth/taranis.png deleted file mode 100644 index a9e5b6f15bf9888bd5d58093336a238513b44de2..0000000000000000000000000000000000000000 Binary files a/helpers/DATA/plymouth/taranis.png and /dev/null differ diff --git a/helpers/DATA/plymouth/trisquel_logo.png b/helpers/DATA/plymouth/trisquel_logo.png index 3fcdc57a7a6433389ff533d53f8f6db4caff8034..af52d51db0d93e8bcac6d5413211bcc5451e7b9f 100644 Binary files a/helpers/DATA/plymouth/trisquel_logo.png and b/helpers/DATA/plymouth/trisquel_logo.png differ diff --git a/helpers/make-plymouth b/helpers/make-plymouth index 2b02bc16d6529ad813570e0d5aec5e4bf7cf24d6..5e4018b7ea5f653156494bb566722aac5dd650f8 100644 --- a/helpers/make-plymouth +++ b/helpers/make-plymouth @@ -17,7 +17,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=1 +VERSION=2 QUILT=skip . ./config @@ -67,7 +67,7 @@ cp $DATA/*.png themes/script cp $DATA/script.script themes/script/script.script cat << EOF > debian/source/include-binaries -themes/script/brigantia.png +themes/script/background.png themes/glow/sugar.png themes/script/trisquel_logo16.png themes/glow/trisquel_logo16.png @@ -76,8 +76,8 @@ EOF rm themes/trisquel-logo themes/glow -rf cp themes/script -a themes/trisquel-logo -cp $DATA/brigantia.png $DATA/trisquel_logo16.png themes/trisquel-logo/ -sed -i 's/progress_bar.png/progress_bar.png\\\n\t\tbrigantia.png\\\n\t\ttrisquel_logo16.png/' themes/trisquel-logo/Makefile* +cp $DATA/background.png $DATA/trisquel_logo16.png themes/trisquel-logo/ +sed -i 's/progress_bar.png/progress_bar.png\\\n\t\tbackground.png\\\n\t\ttrisquel_logo16.png/' themes/trisquel-logo/Makefile* sed s:/script:/trisquel-logo:g -i themes/trisquel-logo/script.plymouth.in sed 's:=Script:=Trisquel-logo:g' -i themes/trisquel-logo/script.plymouth.in sed 's/script\.script/trisquel-logo\.rtoken/g' -i themes/trisquel-logo/Make* @@ -93,7 +93,7 @@ sed 's/script\.script/glow\.rtoken/g' -i themes/glow/Make* sed 's/script/glow/g' -i themes/glow/Make* sed 's/rtoken/script/g' -i themes/glow/Make* cp $DATA/sugar.png $DATA/trisquel_logo16.png $DATA/trisquel_logo-sugar.png themes/glow/ -sed -i s/brigantia/sugar/g 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 rename s/script.script/glow.script/g themes/glow/* rename s/script.plymouth.in/glow.plymouth.in/g themes/glow/*