Merge branch 'master' of openslx.org:openslx/core

5 files changed, 101 insertions, 22 deletions

diff --git a/src/os-plugins/plugins/plymouth/files/lib/plymouth/themes/unifr-rz/progress_bar.png b/src/os-plugins/plugins/plymouth/files/lib/plymouth/themes/unifr-rz/progress_bar.png
deleted file mode 100644
index dd1e747a..00000000
--- a/src/os-plugins/plugins/plymouth/files/lib/plymouth/themes/unifr-rz/progress_bar.png
+++ /dev/null
diff --git a/src/os-plugins/plugins/plymouth/files/lib/plymouth/themes/unifr-rz/progress_box.png b/src/os-plugins/plugins/plymouth/files/lib/plymouth/themes/unifr-rz/progress_box.png
deleted file mode 100644
index c485cfbc..00000000
--- a/src/os-plugins/plugins/plymouth/files/lib/plymouth/themes/unifr-rz/progress_box.png
+++ /dev/null
diff --git a/src/os-plugins/plugins/plymouth/files/lib/plymouth/themes/unifr-rz/unifr-rz.script b/src/os-plugins/plugins/plymouth/files/lib/plymouth/themes/unifr-rz/unifr-rz.script
index 00b6970a..f2d8bd28 100644
--- a/src/os-plugins/plugins/plymouth/files/lib/plymouth/themes/unifr-rz/unifr-rz.script
+++ b/src/os-plugins/plugins/plymouth/files/lib/plymouth/themes/unifr-rz/unifr-rz.script
@@ -5,33 +5,112 @@ title_left_image = Image("rz_banner_trans.png");
 title_right_image = Image("rz_logo_trans.png");
 title_left_sprite = Sprite(title_left_image);
 title_right_sprite = Sprite(title_right_image);
-screen_width = Window.GetWidth();
 
-title_right_sprite.SetX(screen_width - title_right_image.GetWidth());
+title_right_sprite.SetX(Window.GetWidth() - title_right_image.GetWidth());
 
-#----------------------------------------- Progress Bar --------------------------------
+dot.image = Image("white_dot_small.png");
+dot.sprite1 = Sprite(dot.image);
+dot.sprite2 = Sprite(dot.image);
+dot.sprite3 = Sprite(dot.image);
+dot.sprite4 = Sprite(dot.image);
+dot.sprite5 = Sprite(dot.image);
 
-progress_box.image = Image("progress_box.png");
-progress_box.sprite = Sprite(progress_box.image);
+#----------------------------------------- Progress Dots --------------------------------
 
-progress_box.x = Window.GetWidth()  / 2 -    progress_box.image.GetWidth()  / 2;
-progress_box.y = Window.GetHeight() * 0.75 - progress_box.image.GetHeight() / 2;
-progress_box.sprite.SetPosition(progress_box.x, progress_box.y, 0);
+dot.x = Window.GetWidth()  / 2 - dot.image.GetWidth() / 2;
+dot.y = Window.GetHeight() * 0.75 - dot.image.GetHeight() / 2;
+dot.spacing = Window.GetWidth() / 15;
 
-progress_bar.original_image = Image("progress_bar.png");
-progress_bar.sprite = Sprite();
+# place 5 centered dots
+dot.sprite1.SetPosition(dot.x - 2 * dot.spacing, dot.y, 1);
+dot.sprite2.SetPosition(dot.x - dot.spacing, dot.y, 1);
+dot.sprite3.SetPosition(dot.x, dot.y, 1);
+dot.sprite4.SetPosition(dot.x + dot.spacing, dot.y, 1);
+dot.sprite5.SetPosition(dot.x + 2 * dot.spacing, dot.y, 1);
 
-progress_bar.x = Window.GetWidth()  / 2 -        progress_bar.original_image.GetWidth() / 2;
-progress_bar.y = Window.GetHeight() / 2 * 1.5  - progress_box.image.GetHeight() / 2 + (progress_box.image.GetHeight() - progress_bar.original_image.GetHeight()) / 2;
-progress_bar.sprite.SetPosition(progress_bar.x, progress_bar.y, 1);
+# set opacity
+dot.sprite1.SetOpacity(0.1);
+dot.sprite2.SetOpacity(0.1);
+dot.sprite3.SetOpacity(0.1);
+dot.sprite4.SetOpacity(0.1);
+dot.sprite5.SetOpacity(0.1);
 
 fun progress_callback (duration, progress)
   {
-    if (progress_bar.image.GetWidth () != Math.Int (progress_bar.original_image.GetWidth () * progress))
-      {
-        progress_bar.image = progress_bar.original_image.Scale(progress_bar.original_image.GetWidth(progress_bar.original_image) * progress, progress_bar.original_image.GetHeight());
-        progress_bar.sprite.SetImage (progress_bar.image);
-      }
+    phase = Math.Int(duration * 2) % 10;
+
+    if ( phase == 1 )
+	{ 
+		fade_out(dot.sprite5);
+		fade_in(dot.sprite1);
+	}
+
+    if ( phase == 2 )
+	{ 
+		fade_out(dot.sprite1);
+		fade_in(dot.sprite2);
+	}
+
+    if ( phase == 3 )
+	{ 
+		fade_out(dot.sprite2);
+		fade_in(dot.sprite3);
+	}
+
+    if ( phase == 4 )
+	{ 
+		fade_out(dot.sprite3);
+		fade_in(dot.sprite4);
+	}
+
+    if ( phase == 5 )
+	{ 
+		fade_out(dot.sprite4);
+		fade_in(dot.sprite5);
+	}
+
+    if ( phase == 6 )
+	{ 
+		fade_out(dot.sprite5);
+		fade_in(dot.sprite1);
+	}
+
+    if ( phase == 7 )
+	{ 
+		fade_out(dot.sprite1);
+		fade_in(dot.sprite2);
+	}
+
+    if ( phase == 8 )
+	{
+		fade_out(dot.sprite2);
+		fade_in(dot.sprite3);
+	}
+
+    if ( phase == 9 )
+	{ 
+		fade_out(dot.sprite3);
+		fade_in(dot.sprite4);
+	}
+
+    if ( phase == 0 )
+	{ 
+		fade_out(dot.sprite4);
+		if ( Math.Int(duration) > 0 ) 
+		  { fade_in(dot.sprite5); }
+	}
   }
 
+fun fade_in(sprite)
+{
+  if ( sprite.GetOpacity() + 0.1 < 1 )
+    { sprite.SetOpacity(sprite.GetOpacity() + 0.1);}
+}
+
+fun fade_out(sprite)
+{
+  if ( sprite.GetOpacity() - 0.1 > 0.1 )
+    { sprite.SetOpacity(sprite.GetOpacity() - 0.1);}
+}
+
 Plymouth.SetBootProgressFunction(progress_callback);
diff --git a/src/os-plugins/plugins/plymouth/files/lib/plymouth/themes/unifr-rz/white_dot_small.png b/src/os-plugins/plugins/plymouth/files/lib/plymouth/themes/unifr-rz/white_dot_small.png
new file mode 100644
index 00000000..4fd4be30
--- /dev/null
+++ b/src/os-plugins/plugins/plymouth/files/lib/plymouth/themes/unifr-rz/white_dot_small.png
diff --git a/src/os-plugins/plugins/plymouth/init-hooks/40-started-hw-config/plymouth.sh b/src/os-plugins/plugins/plymouth/init-hooks/40-started-hw-config/plymouth.sh
index 97094a07..19c26862 100644
--- a/src/os-plugins/plugins/plymouth/init-hooks/40-started-hw-config/plymouth.sh
+++ b/src/os-plugins/plugins/plymouth/init-hooks/40-started-hw-config/plymouth.sh
@@ -1,4 +1,4 @@
-plymouthd && plymouth show-splash
-
-echo "Plymouth init hook successfully called!" >> /tmp/plymouth.log
-echo "Plymouth init hook successfully called!"
+# only start with no debug level
+if [ $DEBUGLEVEL -eq 0 ]; then
+  plymouthd && plymouth show-splash
+fi