From ab5814681a16cfb5f0b4b0e6f14ed13da591d846 Mon Sep 17 00:00:00 2001 From: Romain d'Alverny Date: Fri, 11 Feb 2011 12:26:16 +0000 Subject: rename theme script and path --- common/plymouth/mga.script | 277 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 277 insertions(+) create mode 100644 common/plymouth/mga.script (limited to 'common/plymouth/mga.script') diff --git a/common/plymouth/mga.script b/common/plymouth/mga.script new file mode 100644 index 0000000..fda7b0a --- /dev/null +++ b/common/plymouth/mga.script @@ -0,0 +1,277 @@ +# Mdv splashy like theme + +Window.GetMaxWidth = fun (){ + i = 0; + width = 0; + while (Window.GetWidth(i)){ + width = Math.Max(width, Window.GetWidth(i)); + i++; + } + return width; +}; + +Window.GetMaxHeight = fun (){ + i = 0; + height = 0; + while (Window.GetHeight(i)){ + height = Math.Max(height, Window.GetHeight(i)); + i++; + } + return height; +}; + +anim.imagecount = 32; +anim.target_width = 0.5* 0.46 * Window.GetWidth(); +anim.target_height = 0.5* 0.11 * Window.GetWidth(); + +fun RotatedImage (index){ + index = Math.Int(index); + if (!RotatedImageCache[index]) + RotatedImageCache[index] = anim.original_image.Rotate((Math.Pi*2*index)/anim.imagecount).Scale(anim.target_width, anim.target_height); + + return RotatedImageCache[index]; + } + + +if (Plymouth.GetMode() == "suspend" || Plymouth.GetMode() == "resume") { + background.original_image = ImageNew("suspend.png"); + Window.SetBackgroundTopColor(1, 0, 0); + Window.SetBackgroundBottomColor(0, 1, 0); +} +else { + logo.original_image = ImageNew("logo_mageia.png"); + background.original_image = ImageNew("background.png"); + Window.SetBackgroundTopColor(0.234, 0.43, 0.705); + Window.SetBackgroundBottomColor(0.16, 0.25, 0.44); + + anim.image= ImageNew("animation.png"); + anim.original_image= anim.image.Scale(anim.target_width, anim.target_width); + + anim.sprite = SpriteNew(); + anim.sprite.SetImage(RotatedImage (0)); + anim.sprite.SetX((Window.GetX() + Window.GetWidth() - RotatedImage(0).GetWidth()) / 2); + anim.sprite.SetY(Window.GetY() + Window.GetHeight() * 0.82); + anim.angle = 0; + anim.index = 0; + + motif.original_image = ImageNew("motif.png"); + motif.image = motif.original_image.Scale(motif.original_image.GetWidth() * Window.GetMaxWidth() / background.original_image.GetWidth(), motif.original_image.GetHeight() * Window.GetMaxHeight() / background.original_image.GetHeight()); + motif.sprite = SpriteNew(); + motif.sprite.SetImage(motif.image); + motif.sprite.SetOpacity(0); + motif.sprite.SetY((Window.GetMaxHeight() - motif.image.GetHeight()) / 2); + if (Plymouth.GetMode() == "shutdown") { + motif.opacity = 1; + } + else { + motif.opacity = 0; + } +} + +ratio = logo.original_image.GetWidth() / logo.original_image.GetHeight(); +reduction = 0.4; +logo.image = logo.original_image.Scale(reduction * Window.GetMaxWidth() , reduction / ratio * Window.GetMaxWidth()); +logo.sprite = SpriteNew(); +logo.sprite.SetImage(logo.image); +logo.opacity_angle = 0; +logo.sprite.SetX((Window.GetX() + Window.GetMaxWidth() - logo.image.GetWidth()) / 2); +logo.sprite.SetY(Window.GetY() + 50); + +background.image = background.original_image.Scale(Window.GetMaxWidth() , Window.GetMaxHeight()); +background.sprite = SpriteNew(); +background.sprite.SetImage(background.image); +background.sprite.SetPosition(Window.GetX(), Window.GetY(), -10); + +sprite_prompt = SpriteNew(); + +fun refresh_callback () + { + if (status == "normal") + { + anim.index += 1; + anim.index %= anim.imagecount; + anim.sprite.SetImage(RotatedImage (anim.index)); + #anim.sprite.SetOpacity (1); + motif.sprite.SetOpacity(motif.opacity); + } + else + { + anim.sprite.SetOpacity(0); + motif.sprite.SetOpacity(0); + } + + } + +if (Plymouth.GetMode() != "suspend" && Plymouth.GetMode() != "resume") { + Plymouth.SetRefreshFunction (refresh_callback); +} + +#----------------------------------------- Dialog -------------------------------- + +status = "normal"; + +fun dialog_setup() + { + local.box; + local.lock; + local.entry; + local.prompt_sprite; + + box.image = ImageNew("box.png"); + lock.image = ImageNew("lock.png"); + entry.image = ImageNew("entry.png"); + + box.sprite = SpriteNew(); + box.sprite.SetImage(box.image); + box.x = Window.GetX() + Window.GetWidth() / 2 - box.image.GetWidth()/2; + box.y = Window.GetY() + Window.GetHeight() / 2 - box.image.GetHeight()/2; + box.z = 10000; + box.sprite.SetPosition(box.x, box.y, box.z); + + lock.sprite = SpriteNew(); + lock.sprite.SetImage(lock.image); + lock.x = box.x + box.image.GetWidth()/2 - (lock.image.GetWidth() + entry.image.GetWidth()) / 2; + lock.y = box.y + box.image.GetHeight()/2 - lock.image.GetHeight()/2; + lock.z = box.z + 1; + lock.sprite.SetPosition(lock.x, lock.y, lock.z); + + entry.sprite = SpriteNew(); + entry.sprite.SetImage(entry.image); + entry.x = lock.x + lock.image.GetWidth(); + entry.y = box.y + box.image.GetHeight()/2 - entry.image.GetHeight()/2; + entry.z = box.z + 1; + entry.sprite.SetPosition(entry.x, entry.y, entry.z); + + prompt_sprite = SpriteNew(); + prompt_sprite.SetPosition(box.x, box.y - 20, box.z); + + global.dialog.box = box; + global.dialog.lock = lock; + global.dialog.entry = entry; + global.dialog.bullet_image = ImageNew("bullet.png"); + global.dialog.prompt_sprite = prompt_sprite; + dialog_opacity (1); + } + +fun dialog_opacity(opacity) + { + dialog.box.sprite.SetOpacity(opacity); + dialog.lock.sprite.SetOpacity(opacity); + dialog.entry.sprite.SetOpacity(opacity); + dialog.prompt_sprite.SetOpacity(opacity); + for (index = 0; dialog.bullet[index]; index++) + { + dialog.bullet[index].sprite.SetOpacity(opacity); + } + } + +fun display_normal_callback () + { + global.status = "normal"; + if (global.dialog) + dialog_opacity (0); + } + +fun display_password_callback (prompt, bullets) + { + global.status = "password"; + if (!global.dialog) + dialog_setup(); + else + dialog_opacity(1); + motif.sprite.SetOpacity(0); + anim.sprite.SetOpacity(0); + + dialog.prompt_sprite.SetImage(Image.Text(prompt, 1.0, 1.0, 1.0)); + for (index = 0; dialog.bullet[index] || index < bullets; index++) + { + + if (!dialog.bullet[index]) + { + dialog.bullet[index].sprite = SpriteNew(); + dialog.bullet[index].sprite.SetImage(dialog.bullet_image); + dialog.bullet[index].x = dialog.entry.x + index * dialog.bullet_image.GetWidth(); + dialog.bullet[index].y = dialog.entry.y + dialog.entry.image.GetHeight() / 2 - dialog.bullet_image.GetHeight() / 2; + dialog.bullet[index].z = dialog.entry.z + 1; + dialog.bullet[index].sprite.SetPosition(dialog.bullet[index].x, dialog.bullet[index].y, dialog.bullet[index].z); + } + if (index < bullets) + dialog.bullet[index].sprite.SetOpacity(1); + else + dialog.bullet[index].sprite.SetOpacity(0); + } + } + +fun display_message_callback (prompt) + { + +prompt = Image.Text(prompt,1.0, 1.0, 1.0); +sprite_prompt.SetImage(prompt); +sprite_prompt.SetPosition(Window.GetX() + (Window.GetWidth() - prompt.GetWidth()) / 2, Window.GetY() + Window.GetHeight() * 0.93, 2); + } + +/* instantiate dialog at startup, to ensure all icons are loaded in memory before initrd is unmounted, in case /usr isn't mounted yet */ +dialog_setup(); dialog_opacity(0); +Plymouth.SetDisplayNormalFunction(display_normal_callback); +Plymouth.SetDisplayPasswordFunction(display_password_callback); +Plymouth.SetMessageFunction(display_message_callback); + +#----------------------------------------- Progress Bar -------------------------------- + +if (Plymouth.GetMode() == "suspend" || Plymouth.GetMode() == "resume") { + progress_box.original_image = ImageNew("progress_box_background.png"); + progress_box.image = progress_box.original_image.Scale(Window.GetMaxWidth() * 0.44, progress_box.original_image.GetHeight()); + progress_box.edge = ImageNew("progress_box_edge.png"); + progress_box.left_edge_sprite = SpriteNew(); + progress_box.right_edge_sprite = SpriteNew(); + progress_box.sprite = SpriteNew(); + progress_box.sprite.SetImage(progress_box.image); + progress_box.left_edge_sprite.SetImage(progress_box.edge); + progress_box.right_edge_sprite.SetImage(progress_box.edge); + + progress_box.x = Window.GetX() + Window.GetWidth() / 2 - progress_box.image.GetWidth() / 2; + progress_box.y = Window.GetY() + Window.GetHeight() * 0.86 - progress_box.image.GetHeight() / 2; + + progress_box.sprite.SetPosition(progress_box.x, progress_box.y, 0); + progress_box.left_edge_sprite.SetPosition(progress_box.x-1, progress_box.y, 0); + progress_box.right_edge_sprite.SetPosition(progress_box.x + progress_box.image.GetWidth() , progress_box.y, 0); + + progress_bar.original_image = ImageNew("progress_bar.png"); + progress_bar.sprite = SpriteNew(); + + progress_bar.sprite.SetPosition(progress_box.x + 1, progress_box.y + 2, 1); +} + +fun progress_callback (duration, progress) + { +if (Plymouth.GetMode() == "suspend" || Plymouth.GetMode() == "resume") { + new_width = (progress_box.image.GetWidth() - 2) * progress; + if (progress_bar.image.GetWidth() != Math.Int (new_width)) + { + progress_bar.image = progress_bar.original_image.Scale(new_width, progress_bar.original_image.GetHeight()); + progress_bar.sprite.SetImage(progress_bar.image); + } + } + + if (Plymouth.GetMode() == "shutdown") { + motif.opacity = 1 - progress; + } + else { + motif.opacity = progress; + } + } + +Plymouth.SetBootProgressFunction(progress_callback); + +#----------------------------------------- Quit -------------------------------- + +fun quit_callback () +{ + anim.sprite.SetOpacity (0); + if (Plymouth.GetMode() == "shutdown") { + motif.sprite.SetOpacity(0); + } +} + +Plymouth.SetQuitFunction(quit_callback); + -- cgit v1.2.1 From f7992ae2235c24451846c279c3ab631586e14b54 Mon Sep 17 00:00:00 2001 From: Dexter Morgan Date: Thu, 31 Mar 2011 08:44:02 +0000 Subject: Add patch from Thorsten van Lil for new plymouth animation --- common/plymouth/mga.script | 212 ++++++++++++++++++++++++++++++++++++--------- 1 file changed, 170 insertions(+), 42 deletions(-) (limited to 'common/plymouth/mga.script') diff --git a/common/plymouth/mga.script b/common/plymouth/mga.script index fda7b0a..27dae2b 100644 --- a/common/plymouth/mga.script +++ b/common/plymouth/mga.script @@ -1,4 +1,4 @@ -# Mdv splashy like theme +# Mga splashy like theme Window.GetMaxWidth = fun (){ i = 0; @@ -20,17 +20,7 @@ Window.GetMaxHeight = fun (){ return height; }; -anim.imagecount = 32; -anim.target_width = 0.5* 0.46 * Window.GetWidth(); -anim.target_height = 0.5* 0.11 * Window.GetWidth(); -fun RotatedImage (index){ - index = Math.Int(index); - if (!RotatedImageCache[index]) - RotatedImageCache[index] = anim.original_image.Rotate((Math.Pi*2*index)/anim.imagecount).Scale(anim.target_width, anim.target_height); - - return RotatedImageCache[index]; - } if (Plymouth.GetMode() == "suspend" || Plymouth.GetMode() == "resume") { @@ -39,43 +29,97 @@ if (Plymouth.GetMode() == "suspend" || Plymouth.GetMode() == "resume") { Window.SetBackgroundBottomColor(0, 1, 0); } else { - logo.original_image = ImageNew("logo_mageia.png"); + logo.original_image = ImageNew("progress-bar0.png"); background.original_image = ImageNew("background.png"); Window.SetBackgroundTopColor(0.234, 0.43, 0.705); Window.SetBackgroundBottomColor(0.16, 0.25, 0.44); - anim.image= ImageNew("animation.png"); - anim.original_image= anim.image.Scale(anim.target_width, anim.target_width); - - anim.sprite = SpriteNew(); - anim.sprite.SetImage(RotatedImage (0)); - anim.sprite.SetX((Window.GetX() + Window.GetWidth() - RotatedImage(0).GetWidth()) / 2); - anim.sprite.SetY(Window.GetY() + Window.GetHeight() * 0.82); - anim.angle = 0; - anim.index = 0; - - motif.original_image = ImageNew("motif.png"); + motif.original_image = ImageNew("shadow.png"); motif.image = motif.original_image.Scale(motif.original_image.GetWidth() * Window.GetMaxWidth() / background.original_image.GetWidth(), motif.original_image.GetHeight() * Window.GetMaxHeight() / background.original_image.GetHeight()); motif.sprite = SpriteNew(); motif.sprite.SetImage(motif.image); motif.sprite.SetOpacity(0); - motif.sprite.SetY((Window.GetMaxHeight() - motif.image.GetHeight()) / 2); + #motif.sprite.SetY((Window.GetMaxHeight() - motif.image.GetHeight()) / 2); if (Plymouth.GetMode() == "shutdown") { - motif.opacity = 1; + motif.opacity = 0; } else { motif.opacity = 0; } } -ratio = logo.original_image.GetWidth() / logo.original_image.GetHeight(); -reduction = 0.4; -logo.image = logo.original_image.Scale(reduction * Window.GetMaxWidth() , reduction / ratio * Window.GetMaxWidth()); logo.sprite = SpriteNew(); -logo.sprite.SetImage(logo.image); +logo.sprite.SetImage(logo.original_image); logo.opacity_angle = 0; -logo.sprite.SetX((Window.GetX() + Window.GetMaxWidth() - logo.image.GetWidth()) / 2); -logo.sprite.SetY(Window.GetY() + 50); +logo.sprite.SetY(Window.GetHeight() * 0.7 - logo.original_image.GetHeight() / 2); + +progressbar1 = ImageNew("progress-bar1.png"); +progressbar1.sprite = SpriteNew(); +progressbar1.sprite.SetImage(progressbar1); +progressbar1.opacity_angle = 0; +progressbar1.sprite.SetY(Window.GetHeight() * 0.7 - progressbar1.GetHeight() / 2); + +progressbar2 = ImageNew("progress-bar2.png"); +progressbar2.sprite = SpriteNew(); +progressbar2.sprite.SetImage(progressbar2); +progressbar2.opacity_angle = 0; +progressbar2.sprite.SetY(Window.GetHeight() * 0.7 - progressbar2.GetHeight() / 2); + +progressbar3 = ImageNew("progress-bar3.png"); +progressbar3.sprite = SpriteNew(); +progressbar3.sprite.SetImage(progressbar3); +progressbar3.opacity_angle = 0; +progressbar3.sprite.SetY(Window.GetHeight() * 0.7 - progressbar3.GetHeight() / 2); + +progressbar4 = ImageNew("progress-bar4.png"); +progressbar4.sprite = SpriteNew(); +progressbar4.sprite.SetImage(progressbar4); +progressbar4.opacity_angle = 0; +progressbar4.sprite.SetY(Window.GetHeight() * 0.7 - progressbar4.GetHeight() / 2); + +progressbar5 = ImageNew("progress-bar5.png"); +progressbar5.sprite = SpriteNew(); +progressbar5.sprite.SetImage(progressbar5); +progressbar5.opacity_angle = 0; +progressbar5.sprite.SetY(Window.GetHeight() * 0.7 - progressbar5.GetHeight() / 2); + +progressbar6 = ImageNew("progress-bar6.png"); +progressbar6.sprite = SpriteNew(); +progressbar6.sprite.SetImage(progressbar6); +progressbar6.opacity_angle = 0; +progressbar6.sprite.SetY(Window.GetHeight() * 0.7 - progressbar6.GetHeight() / 2); + +progressbar7 = ImageNew("progress-bar7.png"); +progressbar7.sprite = SpriteNew(); +progressbar7.sprite.SetImage(progressbar7); +progressbar7.opacity_angle = 0; +progressbar7.sprite.SetY(Window.GetHeight() * 0.7 - progressbar7.GetHeight() / 2); + +progressbar8 = ImageNew("progress-bar8.png"); +progressbar8.sprite = SpriteNew(); +progressbar8.sprite.SetImage(progressbar8); +progressbar8.opacity_angle = 0; +progressbar8.sprite.SetY(Window.GetHeight() * 0.7 - progressbar8.GetHeight() / 2); + +progressbar9 = ImageNew("progress-bar9.png"); +progressbar9.sprite = SpriteNew(); +progressbar9.sprite.SetImage(progressbar9); +progressbar9.opacity_angle = 0; +progressbar9.sprite.SetY(Window.GetHeight() * 0.7 - progressbar9.GetHeight() / 2); + +if (Plymouth.GetMode() == "shutdown") { + progressbar9.sprite.SetOpacity(1); +} else { + progressbar1.sprite.SetOpacity(0); + progressbar2.sprite.SetOpacity(0); + progressbar3.sprite.SetOpacity(0); + progressbar4.sprite.SetOpacity(0); + progressbar5.sprite.SetOpacity(0); + progressbar6.sprite.SetOpacity(0); + progressbar7.sprite.SetOpacity(0); + progressbar8.sprite.SetOpacity(0); + progressbar9.sprite.SetOpacity(0); +} background.image = background.original_image.Scale(Window.GetMaxWidth() , Window.GetMaxHeight()); background.sprite = SpriteNew(); @@ -88,15 +132,10 @@ fun refresh_callback () { if (status == "normal") { - anim.index += 1; - anim.index %= anim.imagecount; - anim.sprite.SetImage(RotatedImage (anim.index)); - #anim.sprite.SetOpacity (1); motif.sprite.SetOpacity(motif.opacity); } else { - anim.sprite.SetOpacity(0); motif.sprite.SetOpacity(0); } @@ -180,9 +219,8 @@ fun display_password_callback (prompt, bullets) else dialog_opacity(1); motif.sprite.SetOpacity(0); - anim.sprite.SetOpacity(0); - dialog.prompt_sprite.SetImage(Image.Text(prompt, 1.0, 1.0, 1.0)); + dialog.prompt_sprite.SetImage(Image.Text(prompt, 0, 0, 0.2)); for (index = 0; dialog.bullet[index] || index < bullets; index++) { @@ -205,7 +243,7 @@ fun display_password_callback (prompt, bullets) fun display_message_callback (prompt) { -prompt = Image.Text(prompt,1.0, 1.0, 1.0); +prompt = Image.Text(prompt, 0, 0, 0.2); sprite_prompt.SetImage(prompt); sprite_prompt.SetPosition(Window.GetX() + (Window.GetWidth() - prompt.GetWidth()) / 2, Window.GetY() + Window.GetHeight() * 0.93, 2); } @@ -245,6 +283,7 @@ if (Plymouth.GetMode() == "suspend" || Plymouth.GetMode() == "resume") { fun progress_callback (duration, progress) { if (Plymouth.GetMode() == "suspend" || Plymouth.GetMode() == "resume") { + motif.opacity = progress; new_width = (progress_box.image.GetWidth() - 2) * progress; if (progress_bar.image.GetWidth() != Math.Int (new_width)) { @@ -254,10 +293,100 @@ if (Plymouth.GetMode() == "suspend" || Plymouth.GetMode() == "resume") { } if (Plymouth.GetMode() == "shutdown") { - motif.opacity = 1 - progress; + #motif.opacity = progress; + if ( progress > 0.1 ) { + progressbar9.sprite.SetOpacity(1); + } + if ( progress > 0.2 ) { + progressbar8.sprite.SetOpacity(1); + progressbar9.sprite.SetOpacity(0); + } + if ( progress > 0.3 ) { + progressbar7.sprite.SetOpacity(1); + progressbar8.sprite.SetOpacity(0); + progressbar9.sprite.SetOpacity(0); + } + if ( progress > 0.4 ) { + progressbar6.sprite.SetOpacity(1); + progressbar7.sprite.SetOpacity(0); + progressbar8.sprite.SetOpacity(0); + progressbar9.sprite.SetOpacity(0); + } + if ( progress > 0.5 ) { + progressbar5.sprite.SetOpacity(1); + progressbar6.sprite.SetOpacity(0); + progressbar7.sprite.SetOpacity(0); + progressbar8.sprite.SetOpacity(0); + progressbar9.sprite.SetOpacity(0); + } + if ( progress > 0.6 ) { + progressbar4.sprite.SetOpacity(1); + progressbar5.sprite.SetOpacity(0); + progressbar6.sprite.SetOpacity(0); + progressbar7.sprite.SetOpacity(0); + progressbar8.sprite.SetOpacity(0); + progressbar9.sprite.SetOpacity(0); + } + if ( progress > 0.7 ) { + progressbar3.sprite.SetOpacity(1); + progressbar4.sprite.SetOpacity(0); + progressbar5.sprite.SetOpacity(0); + progressbar6.sprite.SetOpacity(0); + progressbar7.sprite.SetOpacity(0); + progressbar8.sprite.SetOpacity(0); + progressbar9.sprite.SetOpacity(0); + } + if ( progress > 0.8 ) { + progressbar2.sprite.SetOpacity(1); + progressbar3.sprite.SetOpacity(0); + progressbar4.sprite.SetOpacity(0); + progressbar5.sprite.SetOpacity(0); + progressbar6.sprite.SetOpacity(0); + progressbar7.sprite.SetOpacity(0); + progressbar8.sprite.SetOpacity(0); + progressbar9.sprite.SetOpacity(0); + } + if ( progress > 0.9 ) { + progressbar1.sprite.SetOpacity(1); + progressbar2.sprite.SetOpacity(0); + progressbar3.sprite.SetOpacity(0); + progressbar4.sprite.SetOpacity(0); + progressbar5.sprite.SetOpacity(0); + progressbar6.sprite.SetOpacity(0); + progressbar7.sprite.SetOpacity(0); + progressbar8.sprite.SetOpacity(0); + progressbar9.sprite.SetOpacity(0); + } } else { - motif.opacity = progress; + #motif.opacity = 1 - progress; + if ( progress > 0.1 ) { + progressbar1.sprite.SetOpacity(1); + } + if ( progress > 0.2 ) { + progressbar2.sprite.SetOpacity(1); + } + if ( progress > 0.3 ) { + progressbar3.sprite.SetOpacity(1); + } + if ( progress > 0.4 ) { + progressbar4.sprite.SetOpacity(1); + } + if ( progress > 0.5 ) { + progressbar5.sprite.SetOpacity(1); + } + if ( progress > 0.6 ) { + progressbar6.sprite.SetOpacity(1); + } + if ( progress > 0.7 ) { + progressbar7.sprite.SetOpacity(1); + } + if ( progress > 0.8 ) { + progressbar8.sprite.SetOpacity(1); + } + if ( progress > 0.9 ) { + progressbar9.sprite.SetOpacity(1); + } } } @@ -267,7 +396,6 @@ Plymouth.SetBootProgressFunction(progress_callback); fun quit_callback () { - anim.sprite.SetOpacity (0); if (Plymouth.GetMode() == "shutdown") { motif.sprite.SetOpacity(0); } -- cgit v1.2.1 From a13b538cfda64b6ffb29c8a8fa7cfc2160447d1b Mon Sep 17 00:00:00 2001 From: Donald Date: Sun, 2 Oct 2011 18:47:44 +0000 Subject: Mew mga.script - fixes mgabug 1332 (dots offset when booting with non default resolution) 1.5.0.18 --- common/plymouth/mga.script | 68 +++++++++++++++++++++++++++------------------- 1 file changed, 40 insertions(+), 28 deletions(-) (limited to 'common/plymouth/mga.script') diff --git a/common/plymouth/mga.script b/common/plymouth/mga.script index 27dae2b..dd6bf12 100644 --- a/common/plymouth/mga.script +++ b/common/plymouth/mga.script @@ -48,64 +48,76 @@ else { } } +scalewidth = Window.GetMaxWidth() / background.original_image.GetWidth(); +scaleheight = Window.GetMaxHeight() / background.original_image.GetHeight(); +logo.image = logo.original_image.Scale(logo.original_image.GetWidth() * scalewidth, logo.original_image.GetHeight() * scaleheight); logo.sprite = SpriteNew(); -logo.sprite.SetImage(logo.original_image); +logo.sprite.SetImage(logo.image); logo.opacity_angle = 0; logo.sprite.SetY(Window.GetHeight() * 0.7 - logo.original_image.GetHeight() / 2); -progressbar1 = ImageNew("progress-bar1.png"); +progressbar1.original_image = ImageNew("progress-bar1.png"); +progressbar1.image = progressbar1.original_image.Scale(progressbar1.original_image.GetWidth() * scalewidth, progressbar1.original_image.GetHeight() * scaleheight); progressbar1.sprite = SpriteNew(); -progressbar1.sprite.SetImage(progressbar1); +progressbar1.sprite.SetImage(progressbar1.image); progressbar1.opacity_angle = 0; -progressbar1.sprite.SetY(Window.GetHeight() * 0.7 - progressbar1.GetHeight() / 2); +progressbar1.sprite.SetY(Window.GetHeight() * 0.7 - progressbar1.original_image.GetHeight() / 2); -progressbar2 = ImageNew("progress-bar2.png"); +progressbar2.original_image = ImageNew("progress-bar2.png"); +progressbar2.image = progressbar2.original_image.Scale(progressbar2.original_image.GetWidth() * scalewidth, progressbar2.original_image.GetHeight() * scaleheight); progressbar2.sprite = SpriteNew(); -progressbar2.sprite.SetImage(progressbar2); +progressbar2.sprite.SetImage(progressbar2.image); progressbar2.opacity_angle = 0; -progressbar2.sprite.SetY(Window.GetHeight() * 0.7 - progressbar2.GetHeight() / 2); +progressbar2.sprite.SetY(Window.GetHeight() * 0.7 - progressbar2.original_image.GetHeight() / 2); -progressbar3 = ImageNew("progress-bar3.png"); +progressbar3.original_image = ImageNew("progress-bar3.png"); +progressbar3.image = progressbar3.original_image.Scale(progressbar3.original_image.GetWidth() * scalewidth, progressbar3.original_image.GetHeight() * scaleheight); progressbar3.sprite = SpriteNew(); -progressbar3.sprite.SetImage(progressbar3); +progressbar3.sprite.SetImage(progressbar3.image); progressbar3.opacity_angle = 0; -progressbar3.sprite.SetY(Window.GetHeight() * 0.7 - progressbar3.GetHeight() / 2); +progressbar3.sprite.SetY(Window.GetHeight() * 0.7 - progressbar3.original_image.GetHeight() / 2); -progressbar4 = ImageNew("progress-bar4.png"); +progressbar4.original_image = ImageNew("progress-bar4.png"); +progressbar4.image = progressbar4.original_image.Scale(progressbar4.original_image.GetWidth() * scalewidth, progressbar4.original_image.GetHeight() * scaleheight); progressbar4.sprite = SpriteNew(); -progressbar4.sprite.SetImage(progressbar4); +progressbar4.sprite.SetImage(progressbar4.image); progressbar4.opacity_angle = 0; -progressbar4.sprite.SetY(Window.GetHeight() * 0.7 - progressbar4.GetHeight() / 2); +progressbar4.sprite.SetY(Window.GetHeight() * 0.7 - progressbar4.original_image.GetHeight() / 2); -progressbar5 = ImageNew("progress-bar5.png"); +progressbar5.original_image = ImageNew("progress-bar5.png"); +progressbar5.image = progressbar5.original_image.Scale(progressbar5.original_image.GetWidth() * scalewidth, progressbar5.original_image.GetHeight() * scaleheight); progressbar5.sprite = SpriteNew(); -progressbar5.sprite.SetImage(progressbar5); +progressbar5.sprite.SetImage(progressbar5.image); progressbar5.opacity_angle = 0; -progressbar5.sprite.SetY(Window.GetHeight() * 0.7 - progressbar5.GetHeight() / 2); +progressbar5.sprite.SetY(Window.GetHeight() * 0.7 - progressbar5.original_image.GetHeight() / 2); -progressbar6 = ImageNew("progress-bar6.png"); +progressbar6.original_image = ImageNew("progress-bar6.png"); +progressbar6.image = progressbar6.original_image.Scale(progressbar6.original_image.GetWidth() * scalewidth, progressbar6.original_image.GetHeight() * scaleheight); progressbar6.sprite = SpriteNew(); -progressbar6.sprite.SetImage(progressbar6); +progressbar6.sprite.SetImage(progressbar6.image); progressbar6.opacity_angle = 0; -progressbar6.sprite.SetY(Window.GetHeight() * 0.7 - progressbar6.GetHeight() / 2); +progressbar6.sprite.SetY(Window.GetHeight() * 0.7 - progressbar6.original_image.GetHeight() / 2); -progressbar7 = ImageNew("progress-bar7.png"); +progressbar7.original_image = ImageNew("progress-bar7.png"); +progressbar7.image = progressbar7.original_image.Scale(progressbar7.original_image.GetWidth() * scalewidth, progressbar7.original_image.GetHeight() * scaleheight); progressbar7.sprite = SpriteNew(); -progressbar7.sprite.SetImage(progressbar7); +progressbar7.sprite.SetImage(progressbar7.image); progressbar7.opacity_angle = 0; -progressbar7.sprite.SetY(Window.GetHeight() * 0.7 - progressbar7.GetHeight() / 2); +progressbar7.sprite.SetY(Window.GetHeight() * 0.7 - progressbar7.original_image.GetHeight() / 2); -progressbar8 = ImageNew("progress-bar8.png"); +progressbar8.original_image = ImageNew("progress-bar8.png"); +progressbar8.image = progressbar8.original_image.Scale(progressbar8.original_image.GetWidth() * scalewidth, progressbar8.original_image.GetHeight() * scaleheight); progressbar8.sprite = SpriteNew(); -progressbar8.sprite.SetImage(progressbar8); +progressbar8.sprite.SetImage(progressbar8.image); progressbar8.opacity_angle = 0; -progressbar8.sprite.SetY(Window.GetHeight() * 0.7 - progressbar8.GetHeight() / 2); +progressbar8.sprite.SetY(Window.GetHeight() * 0.7 - progressbar8.original_image.GetHeight() / 2); -progressbar9 = ImageNew("progress-bar9.png"); +progressbar9.original_image = ImageNew("progress-bar9.png"); +progressbar9.image = progressbar9.original_image.Scale(progressbar9.original_image.GetWidth() * scalewidth, progressbar9.original_image.GetHeight() * scaleheight); progressbar9.sprite = SpriteNew(); -progressbar9.sprite.SetImage(progressbar9); +progressbar9.sprite.SetImage(progressbar9.image); progressbar9.opacity_angle = 0; -progressbar9.sprite.SetY(Window.GetHeight() * 0.7 - progressbar9.GetHeight() / 2); +progressbar9.sprite.SetY(Window.GetHeight() * 0.7 - progressbar9.original_image.GetHeight() / 2); if (Plymouth.GetMode() == "shutdown") { progressbar9.sprite.SetOpacity(1); -- cgit v1.2.1 From b7c712ebcbd25d630980a0bb63a60125b92208ee Mon Sep 17 00:00:00 2001 From: Donald Date: Wed, 5 Oct 2011 11:05:37 +0000 Subject: add fix for bug1332 for mga1 branch update mga1 branch to 1.5.0.18 --- common/plymouth/mga.script | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'common/plymouth/mga.script') diff --git a/common/plymouth/mga.script b/common/plymouth/mga.script index dd6bf12..f0fb428 100644 --- a/common/plymouth/mga.script +++ b/common/plymouth/mga.script @@ -1,3 +1,4 @@ + # Mga splashy like theme Window.GetMaxWidth = fun (){ @@ -414,4 +415,3 @@ fun quit_callback () } Plymouth.SetQuitFunction(quit_callback); - -- cgit v1.2.1 From 47b8d40f390773548cf90677d81ecafbe52d8347 Mon Sep 17 00:00:00 2001 From: Anne Nicolas Date: Fri, 13 Apr 2012 15:30:00 +0000 Subject: Mageia 2: new theme for plymouth --- common/plymouth/mga.script | 122 +++++++-------------------------------------- 1 file changed, 18 insertions(+), 104 deletions(-) (limited to 'common/plymouth/mga.script') diff --git a/common/plymouth/mga.script b/common/plymouth/mga.script index f0fb428..9735817 100644 --- a/common/plymouth/mga.script +++ b/common/plymouth/mga.script @@ -1,4 +1,5 @@ + # Mga splashy like theme Window.GetMaxWidth = fun (){ @@ -30,7 +31,7 @@ if (Plymouth.GetMode() == "suspend" || Plymouth.GetMode() == "resume") { Window.SetBackgroundBottomColor(0, 1, 0); } else { - logo.original_image = ImageNew("progress-bar0.png"); + logo.original_image = ImageNew("logo.png"); background.original_image = ImageNew("background.png"); Window.SetBackgroundTopColor(0.234, 0.43, 0.705); Window.SetBackgroundBottomColor(0.16, 0.25, 0.44); @@ -40,7 +41,7 @@ else { motif.sprite = SpriteNew(); motif.sprite.SetImage(motif.image); motif.sprite.SetOpacity(0); - #motif.sprite.SetY((Window.GetMaxHeight() - motif.image.GetHeight()) / 2); + motif.sprite.SetY((Window.GetMaxHeight() - motif.image.GetHeight()) / 2); if (Plymouth.GetMode() == "shutdown") { motif.opacity = 0; } @@ -55,70 +56,36 @@ logo.image = logo.original_image.Scale(logo.original_image.GetWidth() * scalewid logo.sprite = SpriteNew(); logo.sprite.SetImage(logo.image); logo.opacity_angle = 0; -logo.sprite.SetY(Window.GetHeight() * 0.7 - logo.original_image.GetHeight() / 2); -progressbar1.original_image = ImageNew("progress-bar1.png"); +progressbar1.original_image = ImageNew("bubble1.png"); progressbar1.image = progressbar1.original_image.Scale(progressbar1.original_image.GetWidth() * scalewidth, progressbar1.original_image.GetHeight() * scaleheight); progressbar1.sprite = SpriteNew(); progressbar1.sprite.SetImage(progressbar1.image); progressbar1.opacity_angle = 0; -progressbar1.sprite.SetY(Window.GetHeight() * 0.7 - progressbar1.original_image.GetHeight() / 2); -progressbar2.original_image = ImageNew("progress-bar2.png"); +progressbar2.original_image = ImageNew("bubble2.png"); progressbar2.image = progressbar2.original_image.Scale(progressbar2.original_image.GetWidth() * scalewidth, progressbar2.original_image.GetHeight() * scaleheight); progressbar2.sprite = SpriteNew(); progressbar2.sprite.SetImage(progressbar2.image); progressbar2.opacity_angle = 0; -progressbar2.sprite.SetY(Window.GetHeight() * 0.7 - progressbar2.original_image.GetHeight() / 2); -progressbar3.original_image = ImageNew("progress-bar3.png"); +progressbar3.original_image = ImageNew("bubble3.png"); progressbar3.image = progressbar3.original_image.Scale(progressbar3.original_image.GetWidth() * scalewidth, progressbar3.original_image.GetHeight() * scaleheight); progressbar3.sprite = SpriteNew(); progressbar3.sprite.SetImage(progressbar3.image); progressbar3.opacity_angle = 0; -progressbar3.sprite.SetY(Window.GetHeight() * 0.7 - progressbar3.original_image.GetHeight() / 2); -progressbar4.original_image = ImageNew("progress-bar4.png"); +progressbar4.original_image = ImageNew("bubble4.png"); progressbar4.image = progressbar4.original_image.Scale(progressbar4.original_image.GetWidth() * scalewidth, progressbar4.original_image.GetHeight() * scaleheight); progressbar4.sprite = SpriteNew(); progressbar4.sprite.SetImage(progressbar4.image); progressbar4.opacity_angle = 0; -progressbar4.sprite.SetY(Window.GetHeight() * 0.7 - progressbar4.original_image.GetHeight() / 2); -progressbar5.original_image = ImageNew("progress-bar5.png"); +progressbar5.original_image = ImageNew("bubble5.png"); progressbar5.image = progressbar5.original_image.Scale(progressbar5.original_image.GetWidth() * scalewidth, progressbar5.original_image.GetHeight() * scaleheight); progressbar5.sprite = SpriteNew(); progressbar5.sprite.SetImage(progressbar5.image); progressbar5.opacity_angle = 0; -progressbar5.sprite.SetY(Window.GetHeight() * 0.7 - progressbar5.original_image.GetHeight() / 2); - -progressbar6.original_image = ImageNew("progress-bar6.png"); -progressbar6.image = progressbar6.original_image.Scale(progressbar6.original_image.GetWidth() * scalewidth, progressbar6.original_image.GetHeight() * scaleheight); -progressbar6.sprite = SpriteNew(); -progressbar6.sprite.SetImage(progressbar6.image); -progressbar6.opacity_angle = 0; -progressbar6.sprite.SetY(Window.GetHeight() * 0.7 - progressbar6.original_image.GetHeight() / 2); - -progressbar7.original_image = ImageNew("progress-bar7.png"); -progressbar7.image = progressbar7.original_image.Scale(progressbar7.original_image.GetWidth() * scalewidth, progressbar7.original_image.GetHeight() * scaleheight); -progressbar7.sprite = SpriteNew(); -progressbar7.sprite.SetImage(progressbar7.image); -progressbar7.opacity_angle = 0; -progressbar7.sprite.SetY(Window.GetHeight() * 0.7 - progressbar7.original_image.GetHeight() / 2); - -progressbar8.original_image = ImageNew("progress-bar8.png"); -progressbar8.image = progressbar8.original_image.Scale(progressbar8.original_image.GetWidth() * scalewidth, progressbar8.original_image.GetHeight() * scaleheight); -progressbar8.sprite = SpriteNew(); -progressbar8.sprite.SetImage(progressbar8.image); -progressbar8.opacity_angle = 0; -progressbar8.sprite.SetY(Window.GetHeight() * 0.7 - progressbar8.original_image.GetHeight() / 2); - -progressbar9.original_image = ImageNew("progress-bar9.png"); -progressbar9.image = progressbar9.original_image.Scale(progressbar9.original_image.GetWidth() * scalewidth, progressbar9.original_image.GetHeight() * scaleheight); -progressbar9.sprite = SpriteNew(); -progressbar9.sprite.SetImage(progressbar9.image); -progressbar9.opacity_angle = 0; -progressbar9.sprite.SetY(Window.GetHeight() * 0.7 - progressbar9.original_image.GetHeight() / 2); if (Plymouth.GetMode() == "shutdown") { progressbar9.sprite.SetOpacity(1); @@ -128,10 +95,6 @@ if (Plymouth.GetMode() == "shutdown") { progressbar3.sprite.SetOpacity(0); progressbar4.sprite.SetOpacity(0); progressbar5.sprite.SetOpacity(0); - progressbar6.sprite.SetOpacity(0); - progressbar7.sprite.SetOpacity(0); - progressbar8.sprite.SetOpacity(0); - progressbar9.sprite.SetOpacity(0); } background.image = background.original_image.Scale(Window.GetMaxWidth() , Window.GetMaxHeight()); @@ -308,56 +271,22 @@ if (Plymouth.GetMode() == "suspend" || Plymouth.GetMode() == "resume") { if (Plymouth.GetMode() == "shutdown") { #motif.opacity = progress; if ( progress > 0.1 ) { - progressbar9.sprite.SetOpacity(1); - } - if ( progress > 0.2 ) { - progressbar8.sprite.SetOpacity(1); - progressbar9.sprite.SetOpacity(0); - } - if ( progress > 0.3 ) { - progressbar7.sprite.SetOpacity(1); - progressbar8.sprite.SetOpacity(0); - progressbar9.sprite.SetOpacity(0); - } - if ( progress > 0.4 ) { - progressbar6.sprite.SetOpacity(1); - progressbar7.sprite.SetOpacity(0); - progressbar8.sprite.SetOpacity(0); - progressbar9.sprite.SetOpacity(0); - } - if ( progress > 0.5 ) { progressbar5.sprite.SetOpacity(1); - progressbar6.sprite.SetOpacity(0); - progressbar7.sprite.SetOpacity(0); - progressbar8.sprite.SetOpacity(0); - progressbar9.sprite.SetOpacity(0); } - if ( progress > 0.6 ) { + if ( progress > 0.3 ) { progressbar4.sprite.SetOpacity(1); progressbar5.sprite.SetOpacity(0); - progressbar6.sprite.SetOpacity(0); - progressbar7.sprite.SetOpacity(0); - progressbar8.sprite.SetOpacity(0); - progressbar9.sprite.SetOpacity(0); } - if ( progress > 0.7 ) { + if ( progress > 0.5 ) { progressbar3.sprite.SetOpacity(1); progressbar4.sprite.SetOpacity(0); progressbar5.sprite.SetOpacity(0); - progressbar6.sprite.SetOpacity(0); - progressbar7.sprite.SetOpacity(0); - progressbar8.sprite.SetOpacity(0); - progressbar9.sprite.SetOpacity(0); } - if ( progress > 0.8 ) { + if ( progress > 0.7 ) { progressbar2.sprite.SetOpacity(1); progressbar3.sprite.SetOpacity(0); progressbar4.sprite.SetOpacity(0); progressbar5.sprite.SetOpacity(0); - progressbar6.sprite.SetOpacity(0); - progressbar7.sprite.SetOpacity(0); - progressbar8.sprite.SetOpacity(0); - progressbar9.sprite.SetOpacity(0); } if ( progress > 0.9 ) { progressbar1.sprite.SetOpacity(1); @@ -365,41 +294,26 @@ if (Plymouth.GetMode() == "suspend" || Plymouth.GetMode() == "resume") { progressbar3.sprite.SetOpacity(0); progressbar4.sprite.SetOpacity(0); progressbar5.sprite.SetOpacity(0); - progressbar6.sprite.SetOpacity(0); - progressbar7.sprite.SetOpacity(0); - progressbar8.sprite.SetOpacity(0); - progressbar9.sprite.SetOpacity(0); } + } else { #motif.opacity = 1 - progress; if ( progress > 0.1 ) { progressbar1.sprite.SetOpacity(1); } - if ( progress > 0.2 ) { - progressbar2.sprite.SetOpacity(1); - } if ( progress > 0.3 ) { - progressbar3.sprite.SetOpacity(1); - } - if ( progress > 0.4 ) { - progressbar4.sprite.SetOpacity(1); + progressbar2.sprite.SetOpacity(1); } if ( progress > 0.5 ) { - progressbar5.sprite.SetOpacity(1); - } - if ( progress > 0.6 ) { - progressbar6.sprite.SetOpacity(1); + progressbar3.sprite.SetOpacity(1); } if ( progress > 0.7 ) { - progressbar7.sprite.SetOpacity(1); - } - if ( progress > 0.8 ) { - progressbar8.sprite.SetOpacity(1); + progressbar4.sprite.SetOpacity(1); } if ( progress > 0.9 ) { - progressbar9.sprite.SetOpacity(1); - } + progressbar5.sprite.SetOpacity(1); + } } } @@ -414,4 +328,4 @@ fun quit_callback () } } -Plymouth.SetQuitFunction(quit_callback); +Plymouth.SetQuitFunction(quit_callback); \ No newline at end of file -- cgit v1.2.1 From 72b3df783cfcf570a26a79dd125dca463aafaf1e Mon Sep 17 00:00:00 2001 From: Donald Date: Thu, 19 Apr 2012 08:05:50 +0000 Subject: fix scaling issues in plymouth, ty TeaAge --- common/plymouth/mga.script | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) (limited to 'common/plymouth/mga.script') diff --git a/common/plymouth/mga.script b/common/plymouth/mga.script index 9735817..0ea310b 100644 --- a/common/plymouth/mga.script +++ b/common/plymouth/mga.script @@ -50,41 +50,47 @@ else { } } -scalewidth = Window.GetMaxWidth() / background.original_image.GetWidth(); -scaleheight = Window.GetMaxHeight() / background.original_image.GetHeight(); -logo.image = logo.original_image.Scale(logo.original_image.GetWidth() * scalewidth, logo.original_image.GetHeight() * scaleheight); +scaleheight = Window.GetHeight() / logo.original_image.GetHeight(); +logo.image = logo.original_image.Scale(logo.original_image.GetWidth() * scaleheight, logo.original_image.GetHeight() * scaleheight); logo.sprite = SpriteNew(); logo.sprite.SetImage(logo.image); +offset = Window.GetWidth() / 2 - logo.sprite.GetImage().GetWidth() / 2 ; +logo.sprite.SetX (offset ); logo.opacity_angle = 0; progressbar1.original_image = ImageNew("bubble1.png"); -progressbar1.image = progressbar1.original_image.Scale(progressbar1.original_image.GetWidth() * scalewidth, progressbar1.original_image.GetHeight() * scaleheight); +progressbar1.image = progressbar1.original_image.Scale(progressbar1.original_image.GetWidth() * scaleheight, progressbar1.original_image.GetHeight() * scaleheight); progressbar1.sprite = SpriteNew(); progressbar1.sprite.SetImage(progressbar1.image); +progressbar1.sprite.SetX(offset ); progressbar1.opacity_angle = 0; progressbar2.original_image = ImageNew("bubble2.png"); -progressbar2.image = progressbar2.original_image.Scale(progressbar2.original_image.GetWidth() * scalewidth, progressbar2.original_image.GetHeight() * scaleheight); +progressbar2.image = progressbar2.original_image.Scale(progressbar2.original_image.GetWidth() * scaleheight, progressbar2.original_image.GetHeight() * scaleheight); progressbar2.sprite = SpriteNew(); progressbar2.sprite.SetImage(progressbar2.image); +progressbar2.sprite.SetX(offset ); progressbar2.opacity_angle = 0; progressbar3.original_image = ImageNew("bubble3.png"); -progressbar3.image = progressbar3.original_image.Scale(progressbar3.original_image.GetWidth() * scalewidth, progressbar3.original_image.GetHeight() * scaleheight); +progressbar3.image = progressbar3.original_image.Scale(progressbar3.original_image.GetWidth() * scaleheight, progressbar3.original_image.GetHeight() * scaleheight); progressbar3.sprite = SpriteNew(); progressbar3.sprite.SetImage(progressbar3.image); +progressbar3.sprite.SetX(offset ); progressbar3.opacity_angle = 0; progressbar4.original_image = ImageNew("bubble4.png"); -progressbar4.image = progressbar4.original_image.Scale(progressbar4.original_image.GetWidth() * scalewidth, progressbar4.original_image.GetHeight() * scaleheight); +progressbar4.image = progressbar4.original_image.Scale(progressbar4.original_image.GetWidth() * scaleheight, progressbar4.original_image.GetHeight() * scaleheight); progressbar4.sprite = SpriteNew(); progressbar4.sprite.SetImage(progressbar4.image); +progressbar4.sprite.SetX(offset ); progressbar4.opacity_angle = 0; progressbar5.original_image = ImageNew("bubble5.png"); -progressbar5.image = progressbar5.original_image.Scale(progressbar5.original_image.GetWidth() * scalewidth, progressbar5.original_image.GetHeight() * scaleheight); +progressbar5.image = progressbar5.original_image.Scale(progressbar5.original_image.GetWidth() * scaleheight, progressbar5.original_image.GetHeight() * scaleheight); progressbar5.sprite = SpriteNew(); progressbar5.sprite.SetImage(progressbar5.image); +progressbar5.sprite.SetX(offset ); progressbar5.opacity_angle = 0; if (Plymouth.GetMode() == "shutdown") { -- cgit v1.2.1 From 8f08150d8ff97eeccf99396d79d63c736216ecd0 Mon Sep 17 00:00:00 2001 From: Anne Nicolas Date: Thu, 10 May 2012 08:58:15 +0000 Subject: use white to make text readable (#5676) --- common/plymouth/mga.script | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'common/plymouth/mga.script') diff --git a/common/plymouth/mga.script b/common/plymouth/mga.script index 0ea310b..875d907 100644 --- a/common/plymouth/mga.script +++ b/common/plymouth/mga.script @@ -202,7 +202,7 @@ fun display_password_callback (prompt, bullets) dialog_opacity(1); motif.sprite.SetOpacity(0); - dialog.prompt_sprite.SetImage(Image.Text(prompt, 0, 0, 0.2)); + dialog.prompt_sprite.SetImage(Image.Text(prompt, 1, 1, 1)); for (index = 0; dialog.bullet[index] || index < bullets; index++) { @@ -225,7 +225,7 @@ fun display_password_callback (prompt, bullets) fun display_message_callback (prompt) { -prompt = Image.Text(prompt, 0, 0, 0.2); +prompt = Image.Text(prompt, 1, 1, 1); sprite_prompt.SetImage(prompt); sprite_prompt.SetPosition(Window.GetX() + (Window.GetWidth() - prompt.GetWidth()) / 2, Window.GetY() + Window.GetHeight() * 0.93, 2); } @@ -334,4 +334,4 @@ fun quit_callback () } } -Plymouth.SetQuitFunction(quit_callback); \ No newline at end of file +Plymouth.SetQuitFunction(quit_callback); -- cgit v1.2.1