summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Mageia-Default/plymouth/background.pngbin437080 -> 484796 bytes
-rw-r--r--Mageia-Default/plymouth/bubble1.pngbin0 -> 5023 bytes
-rw-r--r--Mageia-Default/plymouth/bubble2.pngbin0 -> 4956 bytes
-rw-r--r--Mageia-Default/plymouth/bubble3.pngbin0 -> 4863 bytes
-rw-r--r--Mageia-Default/plymouth/bubble4.pngbin0 -> 4818 bytes
-rw-r--r--Mageia-Default/plymouth/bubble5.pngbin0 -> 4733 bytes
-rw-r--r--Mageia-Default/plymouth/logo.pngbin0 -> 11640 bytes
-rw-r--r--Makefile2
-rw-r--r--common/plymouth/mga.script122
-rw-r--r--common/plymouth/suspend.pngbin321587 -> 379519 bytes
10 files changed, 19 insertions, 105 deletions
diff --git a/Mageia-Default/plymouth/background.png b/Mageia-Default/plymouth/background.png
index 840a855..e691fe6 100644
--- a/Mageia-Default/plymouth/background.png
+++ b/Mageia-Default/plymouth/background.png
Binary files differ
diff --git a/Mageia-Default/plymouth/bubble1.png b/Mageia-Default/plymouth/bubble1.png
new file mode 100644
index 0000000..bdc7e18
--- /dev/null
+++ b/Mageia-Default/plymouth/bubble1.png
Binary files differ
diff --git a/Mageia-Default/plymouth/bubble2.png b/Mageia-Default/plymouth/bubble2.png
new file mode 100644
index 0000000..3c0b8ad
--- /dev/null
+++ b/Mageia-Default/plymouth/bubble2.png
Binary files differ
diff --git a/Mageia-Default/plymouth/bubble3.png b/Mageia-Default/plymouth/bubble3.png
new file mode 100644
index 0000000..ee0b39b
--- /dev/null
+++ b/Mageia-Default/plymouth/bubble3.png
Binary files differ
diff --git a/Mageia-Default/plymouth/bubble4.png b/Mageia-Default/plymouth/bubble4.png
new file mode 100644
index 0000000..6fbfddf
--- /dev/null
+++ b/Mageia-Default/plymouth/bubble4.png
Binary files differ
diff --git a/Mageia-Default/plymouth/bubble5.png b/Mageia-Default/plymouth/bubble5.png
new file mode 100644
index 0000000..c7b683c
--- /dev/null
+++ b/Mageia-Default/plymouth/bubble5.png
Binary files differ
diff --git a/Mageia-Default/plymouth/logo.png b/Mageia-Default/plymouth/logo.png
new file mode 100644
index 0000000..ebb7c94
--- /dev/null
+++ b/Mageia-Default/plymouth/logo.png
Binary files differ
diff --git a/Makefile b/Makefile
index d18581b..0946f23 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
NAME=mageia-theme
PACKAGE=mageia-theme
-VERSION=1.5.0.20
+VERSION=1.5.0.21
THEMES=Mageia-Default
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
diff --git a/common/plymouth/suspend.png b/common/plymouth/suspend.png
index 70c2510..19f2ec9 100644
--- a/common/plymouth/suspend.png
+++ b/common/plymouth/suspend.png
Binary files differ
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-21 19:38:55 +0000