fixed theme

Signed-off-by: kokkiemouse <kokkiemouse@gmail.com>

diff --git a/channels/serene/airootfs/etc/skel/Desktop/calamares.desktop b/channels/serene/airootfs/etc/skel/Desktop/calamares.desktop
index 08d3496..5c05244 100755 (executable)
--- a/channels/serene/airootfs/etc/skel/Desktop/calamares.desktop
+++ b/channels/serene/airootfs/etc/skel/Desktop/calamares.desktop
@@ -5,7 +5,7 @@ Name=Install %OS_NAME%
 GenericName=%OS_NAME% Installer
 Keywords=calamares;serene;linux;installer;
 TryExec=calamares
-Exec=sudo -E /usr/bin/calamares
+Exec=sudo /usr/bin/calamares
 Comment=%OS_NAME% Installer - by Calamares
 Icon=/usr/share/icons/hicolor/scalable/apps/calamares.svg
 Terminal=false

diff --git a/channels/share/airootfs/usr/share/calamares/branding/serene/show.qml b/channels/share/airootfs/usr/share/calamares/branding/serene/show.qml
index ab5db7b..78f2777 100644 (file)
--- a/channels/share/airootfs/usr/share/calamares/branding/serene/show.qml
+++ b/channels/share/airootfs/usr/share/calamares/branding/serene/show.qml
@@ -20,7 +20,7 @@
  * Slides images dimensions are 800x440px.
  */
 
-import QtQuick 2.0;
+import QtQuick 2.12;
 import calamares.slideshow 1.0;
 
 Presentation
@@ -45,5 +45,126 @@ Presentation
             width: presentation.width
             horizontalAlignment: Text.Center
         }
+
+    SequentialAnimation{
+        SequentialAnimation{
+            ParallelAnimation {
+                YAnimator {
+                    target: imageleft
+                    from: imageleft.y
+                    to: imageleft.y * 4.8
+                    easing.type: Easing.OutExpo;
+                    duration: 300
+                }
+            }
+            ParallelAnimation {
+                YAnimator {
+                    target: imageleft;
+                    from: imageleft.y * 4.8
+                    to: imageleft.y
+                    easing.type: Easing.OutBounce;
+                    duration: 1000
+                }
+            }
+        }
+        PauseAnimation { duration: 1100 }
+        running: true
+        loops: Animation.Infinite
+    }
+    SequentialAnimation{
+        PauseAnimation { duration: 300 }
+        SequentialAnimation{
+            ParallelAnimation {
+                YAnimator {
+                    target: imagecenter
+                    from: imageleft.y
+                    to: imageleft.y * 4.8
+                    easing.type: Easing.OutExpo;
+                    duration: 300
+                }
+            }
+            ParallelAnimation {
+                YAnimator {
+                    target: imagecenter;
+                    from: imageleft.y * 4.8
+                    to: imageleft.y
+                    easing.type: Easing.OutBounce;
+                    duration: 1000
+                }
+            }
+        }
+        PauseAnimation { duration: 800 }
+        running: true
+        loops: Animation.Infinite
+    }
+    SequentialAnimation{
+        PauseAnimation { duration: 600 }
+        SequentialAnimation{
+            ParallelAnimation {
+                YAnimator {
+                    target: imageright
+                    from: imageleft.y
+                    to: imageleft.y * 4.8
+                    easing.type: Easing.OutExpo;
+                    duration: 300
+                }
+            }
+            ParallelAnimation {
+                YAnimator {
+                    target: imageright;
+                    from: imageleft.y * 4.8
+                    to: imageleft.y
+                    easing.type: Easing.OutBounce;
+                    duration: 1000
+                }
+            }
+        }
+        PauseAnimation { duration: 500 }
+        running: true
+        loops: Animation.Infinite
+    }
+    Rectangle {
+        id: rectangle
+
+        anchors.horizontalCenter: background.horizontalCenter
+        anchors.top: textkun.bottom
+        color: "#ffffff"
+        anchors.topMargin: 28
+        width: textkun.width
+        Image {
+            id: imageleft
+            anchors.right: imagecenter.left
+            height: textkun.height / 3
+            width:textkun.height / 3
+            source: "circle.svg"
+            anchors.topMargin: 28
+            anchors.rightMargin: 9
+            anchors.leftMargin: 16
+            y:imagecenter.y
+
+            fillMode: Image.PreserveAspectFit
+        }
+        Image {
+            id: imagecenter
+            height: textkun.height / 3
+            width:textkun.height / 3
+            source: "circle.svg"
+            anchors.topMargin: 28
+            anchors.leftMargin: 9
+            anchors.centerIn: rectangle
+            fillMode: Image.PreserveAspectFit
+        }
+        Image {
+            id: imageright
+            anchors.left: imagecenter.right
+            height: imagecenter.height
+            source: "circle.svg"
+            y:imagecenter.y
+            anchors.topMargin: 28
+
+            anchors.leftMargin: 9
+            fillMode: Image.PreserveAspectFit
+        }
+    }
     }
 }

diff --git a/lfbs b/lfbs
index e8cc720..419e558 100755 (executable)
--- a/lfbs
+++ b/lfbs
@@ -19,10 +19,10 @@ work_dir="${script_path}/work"
 channels_dir="${script_path}/channels"
 nfb_dir="${script_path}/nfb"
 codename="32"
-os_name="Fedora"
+os_name="SereneLinux"
 iso_name="Fedora"
 language="ja_JP.UTF-8"
-channel_name="lxde"
+channel_name="serene"
 cache_dir="${script_path}/cache"
 
 arch="x86_64"