Version 1.5.0.39

Centered logo on plymouth theme to workaround mga#14864
Made the bubble of the "i" in Mageia dynamic too

9 files changed, 33 insertions, 15 deletions

diff --git a/Mageia-Default/plymouth/bubble0.png b/Mageia-Default/plymouth/bubble0.png
new file mode 100644
index 0000000..09e2508
--- /dev/null
+++ b/Mageia-Default/plymouth/bubble0.png
diff --git a/Mageia-Default/plymouth/bubble1.png b/Mageia-Default/plymouth/bubble1.png
index 150127d..91b9a20 100755
--- a/Mageia-Default/plymouth/bubble1.png
+++ b/Mageia-Default/plymouth/bubble1.png
diff --git a/Mageia-Default/plymouth/bubble2.png b/Mageia-Default/plymouth/bubble2.png
index 2b58005..c7c652c 100755
--- a/Mageia-Default/plymouth/bubble2.png
+++ b/Mageia-Default/plymouth/bubble2.png
diff --git a/Mageia-Default/plymouth/bubble3.png b/Mageia-Default/plymouth/bubble3.png
index 913914b..17fcf01 100755
--- a/Mageia-Default/plymouth/bubble3.png
+++ b/Mageia-Default/plymouth/bubble3.png
diff --git a/Mageia-Default/plymouth/bubble4.png b/Mageia-Default/plymouth/bubble4.png
index b001167..cf204c4 100755
--- a/Mageia-Default/plymouth/bubble4.png
+++ b/Mageia-Default/plymouth/bubble4.png
diff --git a/Mageia-Default/plymouth/bubble5.png b/Mageia-Default/plymouth/bubble5.png
index b76dfb1..12beb85 100755
--- a/Mageia-Default/plymouth/bubble5.png
+++ b/Mageia-Default/plymouth/bubble5.png
diff --git a/Mageia-Default/plymouth/logo.png b/Mageia-Default/plymouth/logo.png
index c1f67db..1cd069e 100755
--- a/Mageia-Default/plymouth/logo.png
+++ b/Mageia-Default/plymouth/logo.png
diff --git a/Makefile b/Makefile
index 993c52a..53c4902 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 NAME=mageia-theme
 PACKAGE=mageia-theme
-VERSION=1.5.0.38
+VERSION=1.5.0.39
 
 THEMES=Mageia-Default
 
diff --git a/common/plymouth/mga.script b/common/plymouth/mga.script
index 875d907..49ef946 100644
--- a/common/plymouth/mga.script
+++ b/common/plymouth/mga.script
@@ -58,41 +58,48 @@ offset = Window.GetWidth() / 2 - logo.sprite.GetImage().GetWidth()  / 2 ;
 logo.sprite.SetX (offset );
 logo.opacity_angle = 0;
 
-progressbar1.original_image = ImageNew("bubble1.png");
+progressbar1.original_image = ImageNew("bubble0.png");
 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.original_image = ImageNew("bubble1.png");
 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.original_image = ImageNew("bubble2.png");
 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.original_image = ImageNew("bubble3.png");
 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.original_image = ImageNew("bubble4.png");
 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;
 
+progressbar6.original_image = ImageNew("bubble5.png");
+progressbar6.image = progressbar6.original_image.Scale(progressbar6.original_image.GetWidth() * scaleheight, progressbar6.original_image.GetHeight() * scaleheight);
+progressbar6.sprite = SpriteNew();
+progressbar6.sprite.SetImage(progressbar6.image);
+progressbar6.sprite.SetX(offset );
+progressbar6.opacity_angle = 0;
+
 if (Plymouth.GetMode() == "shutdown") {
   progressbar9.sprite.SetOpacity(1);
 } else {
@@ -101,6 +108,7 @@ if (Plymouth.GetMode() == "shutdown") {
   progressbar3.sprite.SetOpacity(0);
   progressbar4.sprite.SetOpacity(0);
   progressbar5.sprite.SetOpacity(0);
+  progressbar6.sprite.SetOpacity(0);
 }
 
 background.image = background.original_image.Scale(Window.GetMaxWidth() , Window.GetMaxHeight());
@@ -277,49 +285,59 @@ if (Plymouth.GetMode() == "suspend" || Plymouth.GetMode() == "resume") {
   if (Plymouth.GetMode() == "shutdown") {
    #motif.opacity = progress;
     if ( progress > 0.1  ) {
+	progressbar6.sprite.SetOpacity(1);
+    }
+    if ( progress > 0.25 ) {
 	progressbar5.sprite.SetOpacity(1);
+	progressbar6.sprite.SetOpacity(0);
     }
-    if ( progress > 0.3  ) {
+    if ( progress > 0.4  ) {
 	progressbar4.sprite.SetOpacity(1);
 	progressbar5.sprite.SetOpacity(0);
+	progressbar6.sprite.SetOpacity(0);
     }
-    if ( progress > 0.5  ) {
+    if ( progress > 0.55 ) {
 	progressbar3.sprite.SetOpacity(1);
 	progressbar4.sprite.SetOpacity(0);
 	progressbar5.sprite.SetOpacity(0);
+	progressbar6.sprite.SetOpacity(0);
     }
     if ( progress > 0.7  ) {
 	progressbar2.sprite.SetOpacity(1);
 	progressbar3.sprite.SetOpacity(0);
 	progressbar4.sprite.SetOpacity(0);
 	progressbar5.sprite.SetOpacity(0);
+	progressbar6.sprite.SetOpacity(0);
     }
-    if ( progress > 0.9  ) {
+    if ( progress > 0.85 ) {
 	progressbar1.sprite.SetOpacity(1);
 	progressbar2.sprite.SetOpacity(0);
 	progressbar3.sprite.SetOpacity(0);
 	progressbar4.sprite.SetOpacity(0);
 	progressbar5.sprite.SetOpacity(0);
+	progressbar6.sprite.SetOpacity(0);
     }
-    
   }
   else {
    #motif.opacity = 1 - progress;
     if ( progress > 0.1  ) {
 	progressbar1.sprite.SetOpacity(1);
     }
-    if ( progress > 0.3  ) {
+    if ( progress > 0.25 ) {
 	progressbar2.sprite.SetOpacity(1);
     }
-    if ( progress > 0.5  ) {
+    if ( progress > 0.4  ) {
 	progressbar3.sprite.SetOpacity(1);
     }
-    if ( progress > 0.7  ) {
+    if ( progress > 0.55 ) {
 	progressbar4.sprite.SetOpacity(1);
     }
-    if ( progress > 0.9  ) {
+    if ( progress > 0.7  ) {
 	progressbar5.sprite.SetOpacity(1);
-   }
+    }
+    if ( progress > 0.85 ) {
+	progressbar6.sprite.SetOpacity(1);
+    }
   }
  }