fixed calamares theme

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

diff --git a/channels/serene/airootfs/root/customize_airootfs_serene.sh b/channels/serene/airootfs/root/customize_airootfs_serene.sh
index 93d5013..e6bbaa5 100755 (executable)
--- a/channels/serene/airootfs/root/customize_airootfs_serene.sh
+++ b/channels/serene/airootfs/root/customize_airootfs_serene.sh
@@ -24,7 +24,7 @@ sed -i s/%USERNAME%/${username}/g /etc/lightdm/lightdm.conf
 dconf update
 # Set os name
 sed -i s/%OS_NAME%/"${os_name}"/g /etc/skel/Desktop/calamares.desktop
-sed -i s/%OS_NAME%/"${os_name}"/g /home/${username}/Desktop/calamares.desktop
+cp -f /etc/skel/Desktop/calamares.desktop /home/${username}/Desktop/calamares.desktop
 
 # Create Calamares Entry
 cp -f /etc/skel/Desktop/calamares.desktop /usr/share/applications/calamares.desktop
@@ -37,3 +37,4 @@ sed -i "s/- grubcfg/# - grubcfg/g" /usr/share/calamares/settings.conf
 sed -i "s/- packages/- shellprocess\n  - packages/g" /usr/share/calamares/settings.conf
 sed -i "s/sb-shim/grub/g" /usr/share/calamares/modules/bootloader.conf
 sed -i "s/fedora/Serene Linux on Fedora/g" /usr/share/calamares/modules/bootloader.conf
+sed -i "s/auto/serene/g" /usr/share/calamares/settings.conf

diff --git a/channels/share/airootfs/usr/share/calamares/branding/serene/banner.png b/channels/share/airootfs/usr/share/calamares/branding/serene/banner.png
new file mode 100644 (file)
index 0000000..d1baeee
Binary files /dev/null and b/channels/share/airootfs/usr/share/calamares/branding/serene/banner.png differ

diff --git a/channels/share/airootfs/usr/share/calamares/branding/serene/banner.png.license b/channels/share/airootfs/usr/share/calamares/branding/serene/banner.png.license
new file mode 100644 (file)
index 0000000..38aa361
--- /dev/null
+++ b/channels/share/airootfs/usr/share/calamares/branding/serene/banner.png.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: 2020 Adriaan de Groot <groot@kde.org>
+SPDX-License-Identifier: GPL-3.0-or-later

diff --git a/channels/share/airootfs/usr/share/calamares/branding/serene/branding.desc b/channels/share/airootfs/usr/share/calamares/branding/serene/branding.desc
new file mode 100644 (file)
index 0000000..2085169
--- /dev/null
+++ b/channels/share/airootfs/usr/share/calamares/branding/serene/branding.desc
@@ -0,0 +1,221 @@
+# SPDX-FileCopyrightText: no
+# SPDX-License-Identifier: CC0-1.0
+#
+# Product branding information. This influences some global
+# user-visible aspects of Calamares, such as the product
+# name, window behavior, and the slideshow during installation.
+#
+# Additional styling can be done using the stylesheet.qss
+# file, also in the branding directory.
+---
+componentName:  serene
+
+
+### WELCOME / OVERALL WORDING
+#
+# These settings affect some overall phrasing and looks,
+# which are most visible in the welcome page.
+
+# This selects between different welcome texts. When false, uses
+# the traditional "Welcome to the %1 installer.", and when true,
+# uses "Welcome to the Calamares installer for %1." This allows
+# to distinguish this installer from other installers for the
+# same distribution.
+welcomeStyleCalamares:   false
+
+# Should the welcome image (productWelcome, below) be scaled
+# up beyond its natural size? If false, the image does not grow
+# with the window but remains the same size throughout (this
+# may have surprising effects on HiDPI monitors).
+welcomeExpandingLogo:   true
+
+### WINDOW CONFIGURATION
+#
+# The settings here affect the placement of the Calamares
+# window through hints to the window manager and initial
+# sizing of the Calamares window.
+
+# Size and expansion policy for Calamares.
+#  - "normal" or unset, expand as needed, use *windowSize*
+#  - "fullscreen", start as large as possible, ignore *windowSize*
+#  - "noexpand", don't expand automatically, use *windowSize*
+windowExpanding:    normal
+
+# Size of Calamares window, expressed as w,h. Both w and h
+# may be either pixels (suffix px) or font-units (suffix em).
+#   e.g.    "800px,600px"
+#           "60em,480px"
+# This setting is ignored if "fullscreen" is selected for
+# *windowExpanding*, above. If not set, use constants defined
+# in CalamaresUtilsGui, 800x520.
+windowSize: 800px,520px
+
+# Placement of Calamares window. Either "center" or "free".
+# Whether "center" actually works does depend on the window
+# manager in use (and only makes sense if you're not using
+# *windowExpanding* set to "fullscreen").
+windowPlacement: center
+
+### PANELS CONFIGURATION
+#
+# Calamares has a main content area, and two panels (navigation
+# and progress / sidebar). The panels can be controlled individually,
+# or switched off. If both panels are switched off, the layout of
+# the main content area loses its margins, on the assumption that
+# you're doing something special.
+
+# Kind of sidebar (panel on the left, showing progress).
+#  - "widget" or unset, use traditional sidebar (logo, items)
+#  - "none", hide it entirely
+#  - "qml", use calamares-sidebar.qml from branding folder
+# In addition, you **may** specify a side, separated by a comma,
+# from the kind. Valid sides are:
+#  - "left" (if not specified, uses this)
+#  - "right"
+#  - "top"
+#  - "bottom"
+# For instance, "widget,right" is valid; so is "qml", which defaults
+# to putting the sidebar on the left. Also valid is "qml,top".
+# While "widget,top" is valid, the widgets code is **not** flexible
+# and results will be terrible.
+sidebar: widget
+
+# Kind of navigation (button panel on the bottom).
+#  - "widget" or unset, use traditional navigation
+#  - "none", hide it entirely
+#  - "qml", use calamares-navigation.qml from branding folder
+# In addition, you **may** specify a side, separated by a comma,
+# from the kind. The same sides are valid as for *sidebar*,
+# except the default is *bottom*.
+navigation: widget
+
+
+### STRINGS, IMAGES AND COLORS
+#
+# This section contains the "branding proper" of names
+# and images, rather than global-look settings.
+
+# These are strings shown to the user in the user interface.
+# There is no provision for translating them -- since they
+# are names, the string is included as-is.
+#
+# The four Url strings are the Urls used by the buttons in
+# the welcome screen, and are not shown to the user. Clicking
+# on the "Support" button, for instance, opens the link supportUrl.
+# If a Url is empty, the corresponding button is not shown.
+#
+# bootloaderEntryName is how this installation / distro is named
+# in the boot loader (e.g. in the GRUB menu).
+#
+# These strings support substitution from /etc/os-release
+# if KDE Frameworks 5.58 are available at build-time. When
+# enabled, @{var-name} is replaced by the equivalent value
+# from os-release. All the supported var-names are in all-caps,
+# and are listed on the FreeDesktop.org site,
+#       https://www.freedesktop.org/software/systemd/man/os-release.html
+# Note that ANSI_COLOR and CPE_NAME don't make sense here, and
+# are not supported (the rest are). Remember to quote the string
+# if it contains substitutions, or you'll get YAML exceptions.
+#
+# The *Url* entries are used on the welcome page, and they
+# are visible as buttons there if the corresponding *show* keys
+# are set to "true" (they can also be overridden).
+strings:
+    productName:         "Serene Linux"
+    shortProductName:    Generic
+    version:             2020.2 LTS
+    shortVersion:        2020.2
+    versionedName:       Serene Linux 
+    shortVersionedName:  Serene Linux 2020.09
+    bootloaderEntryName: Serene Linux
+    productUrl:          https://calamares.io/
+    supportUrl:          https://github.com/calamares/calamares/issues
+    knownIssuesUrl:      https://calamares.io/about/
+    releaseNotesUrl:     https://calamares.io/about/
+    donateUrl:           https://kde.org/community/donations/index.php
+
+# These images are loaded from the branding module directory.
+#
+# productBanner is an optional image, which if present, will be shown
+#       on the welcome page of the application, above the welcome text.
+#       It is intended to have a width much greater than height.
+#       It is displayed at 64px height (also on HiDPI).
+#       Recommended size is 64px tall, and up to 460px wide.
+# productIcon is used as the window icon, and will (usually) be used
+#       by the window manager to represent the application. This image
+#       should be square, and may be displayed by the window manager
+#       as small as 16x16 (but possibly larger).
+# productLogo is used as the logo at the top of the left-hand column
+#       which shows the steps to be taken. The image should be square,
+#       and is displayed at 80x80 pixels (also on HiDPI).
+# productWallpaper is an optional image, which if present, will replace
+#       the normal solid background on every page of the application.
+#       It can be any size and proportion,
+#       and will be tiled to fit the entire window.
+#       For a non-tiled wallpaper, the size should be the same as
+#       the overall window, see *windowSize* above (800x520).
+# productWelcome is shown on the welcome page of the application in
+#       the middle of the window, below the welcome text. It can be
+#       any size and proportion, and will be scaled to fit inside
+#       the window. Use `welcomeExpandingLogo` to make it non-scaled.
+#       Recommended size is 320x150.
+#
+# These filenames can also use substitutions from os-release (see above).
+images:
+    # productBanner:       "banner.png"
+    productIcon:         "logo-512.png"
+    productLogo:         "logo-128.png"
+    # productWallpaper:    "wallpaper.png"
+    productWelcome:      "languages.png"
+
+# Colors for text and background components.
+#
+#  - sidebarBackground is the background of the sidebar
+#  - sidebarText is the (foreground) text color
+#  - sidebarTextHighlight sets the background of the selected (current) step.
+#    Optional, and defaults to the application palette.
+#  - sidebarSelect is the text color of the selected step.
+#
+# These colors can **also** be set through the stylesheet, if the
+# branding component also ships a stylesheet.qss. Then they are
+# the corresponding CSS attributes of #sidebarApp.
+style:
+   sidebarBackground:    "#292F34"
+   sidebarText:          "#FFFFFF"
+   sidebarTextSelect:    "#292F34"
+   sidebarTextHighlight: "#00AAD1"
+
+### SLIDESHOW
+#
+# The slideshow is displayed during execution steps (e.g. when the
+# installer is actually writing to disk and doing other slow things).
+
+# The slideshow can be a QML file (recommended) which can display
+# arbitrary things -- text, images, animations, or even play a game --
+# during the execution step. The QML **is** abruptly stopped when the
+# execution step is done, though, so maybe a game isn't a great idea.
+#
+# The slideshow can also be a sequence of images (not recommended unless
+# you don't want QML at all in your Calamares). The images are displayed
+# at a rate of 1 every 2 seconds during the execution step.
+#
+# To configure a QML file, list a single filename:
+#   slideshow:               "show.qml"
+# To configure images, like the filenames (here, as an inline list):
+#   slideshow: [ "/etc/calamares/slideshow/0.png", "/etc/logo.png" ]
+slideshow:               "show.qml"
+
+# There are two available APIs for a QML slideshow:
+#  - 1 (the default) loads the entire slideshow when the installation-
+#      slideshow page is shown and starts the QML then. The QML
+#      is never stopped (after installation is done, times etc.
+#      continue to fire).
+#  - 2 loads the slideshow on startup and calls onActivate() and
+#      onLeave() in the root object. After the installation is done,
+#      the show is stopped (first by calling onLeave(), then destroying
+#      the QML components).
+#
+# An image slideshow does not need to have the API defined.
+slideshowAPI: 2
+
+

diff --git a/channels/share/airootfs/usr/share/calamares/branding/serene/icon.svg b/channels/share/airootfs/usr/share/calamares/branding/serene/icon.svg
new file mode 100644 (file)
index 0000000..ff66e8e
--- /dev/null
+++ b/channels/share/airootfs/usr/share/calamares/branding/serene/icon.svg
@@ -0,0 +1,342 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+<!-- Created with Inkscape (http://www.inkscape.org/) -->\r
+\r
+<svg\r
+   xmlns:dc="http://purl.org/dc/elements/1.1/"\r
+   xmlns:cc="http://creativecommons.org/ns#"\r
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"\r
+   xmlns:svg="http://www.w3.org/2000/svg"\r
+   xmlns="http://www.w3.org/2000/svg"\r
+   xmlns:xlink="http://www.w3.org/1999/xlink"\r
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"\r
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"\r
+   width="150.58789mm"\r
+   height="150.58789mm"\r
+   viewBox="0 0 150.58789 150.58789"\r
+   version="1.1"\r
+   id="svg2630"\r
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"\r
+   sodipodi:docname="Serene-icon.svg">\r
+  <defs\r
+     id="defs2624">\r
+    <linearGradient\r
+       inkscape:collect="always"\r
+       id="linearGradient1573">\r
+      <stop\r
+         style="stop-color:#000000;stop-opacity:1;"\r
+         offset="0"\r
+         id="stop1569" />\r
+      <stop\r
+         style="stop-color:#000000;stop-opacity:0;"\r
+         offset="1"\r
+         id="stop1571" />\r
+    </linearGradient>\r
+    <clipPath\r
+       id="clipPath4014"\r
+       clipPathUnits="userSpaceOnUse">\r
+      <circle\r
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.29999995;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.87234042"\r
+         id="circle4016"\r
+         cx="94.063423"\r
+         cy="187.42929"\r
+         r="65.293945" />\r
+    </clipPath>\r
+    <clipPath\r
+       clipPathUnits="userSpaceOnUse"\r
+       id="clipPath4180">\r
+      <circle\r
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.29999995;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.87234042"\r
+         id="circle4182"\r
+         cx="94.063423"\r
+         cy="187.42929"\r
+         r="65.293945" />\r
+    </clipPath>\r
+    <clipPath\r
+       id="clipPath2582"\r
+       clipPathUnits="userSpaceOnUse">\r
+      <circle\r
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.29999995;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.87234042"\r
+         id="circle2580"\r
+         cx="94.063423"\r
+         cy="187.42929"\r
+         r="65.293945" />\r
+    </clipPath>\r
+    <clipPath\r
+       clipPathUnits="userSpaceOnUse"\r
+       id="clipPath4176">\r
+      <circle\r
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.29999995;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.87234042"\r
+         id="circle4178"\r
+         cx="94.063423"\r
+         cy="187.42929"\r
+         r="65.293945" />\r
+    </clipPath>\r
+    <radialGradient\r
+       inkscape:collect="always"\r
+       xlink:href="#linearGradient1573"\r
+       id="radialGradient1575"\r
+       cx="74.513741"\r
+       cy="234.20605"\r
+       fx="74.513741"\r
+       fy="234.20605"\r
+       r="72.793999"\r
+       gradientTransform="translate(0,1.718267e-4)"\r
+       gradientUnits="userSpaceOnUse" />\r
+  </defs>\r
+  <sodipodi:namedview\r
+     id="base"\r
+     pagecolor="#ffffff"\r
+     bordercolor="#666666"\r
+     borderopacity="1.0"\r
+     inkscape:pageopacity="0.0"\r
+     inkscape:pageshadow="2"\r
+     inkscape:zoom="0.86097527"\r
+     inkscape:cx="82.782985"\r
+     inkscape:cy="228.04997"\r
+     inkscape:document-units="mm"\r
+     inkscape:current-layer="layer1"\r
+     showgrid="false"\r
+     inkscape:showpageshadow="false"\r
+     inkscape:pagecheckerboard="true"\r
+     fit-margin-top="10"\r
+     fit-margin-left="10"\r
+     fit-margin-right="10"\r
+     fit-margin-bottom="10"\r
+     inkscape:window-width="1858"\r
+     inkscape:window-height="1057"\r
+     inkscape:window-x="54"\r
+     inkscape:window-y="-8"\r
+     inkscape:window-maximized="1"\r
+     inkscape:object-paths="true"\r
+     inkscape:snap-intersection-paths="true"\r
+     inkscape:snap-smooth-nodes="true"\r
+     inkscape:snap-midpoints="true"\r
+     inkscape:object-nodes="true"\r
+     showguides="true"\r
+     showborder="true"\r
+     units="px" />\r
+  <metadata\r
+     id="metadata2627">\r
+    <rdf:RDF>\r
+      <cc:Work\r
+         rdf:about="">\r
+        <dc:format>image/svg+xml</dc:format>\r
+        <dc:type\r
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />\r
+        <dc:title></dc:title>\r
+      </cc:Work>\r
+    </rdf:RDF>\r
+  </metadata>\r
+  <g\r
+     inkscape:label="レイヤー 1"\r
+     inkscape:groupmode="layer"\r
+     id="layer1"\r
+     transform="translate(3.2802582,-156.41211)">\r
+    <ellipse\r
+       style="display:inline;opacity:1;fill:url(#radialGradient1575);fill-opacity:1;stroke:none;stroke-width:1.44932461;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.87234042"\r
+       id="circle4000-3"\r
+       cx="74.513741"\r
+       cy="234.20605"\r
+       rx="72.793999"\r
+       ry="72.793945" />\r
+    <circle\r
+       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.29999995;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.87234042"\r
+       id="circle4000"\r
+       cx="72.013687"\r
+       cy="231.70605"\r
+       r="65.293945" />\r
+    <g\r
+       transform="translate(-22.04973,44.276758)"\r
+       id="g4110"\r
+       style="display:inline;fill:#aeaeae;fill-opacity:1"\r
+       clip-path="url(#clipPath4176)">\r
+      <g\r
+         id="g4107"\r
+         style="display:inline;fill:#aeaeae;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1">\r
+        <path\r
+           id="path4087"\r
+           d="m 22.049736,171.78422 c 20.96714,4.45284 28.255596,8.91127 35.674631,16.3303 l 70.710673,70.71068 c -7.41903,-7.41903 -14.70749,-11.87746 -35.674626,-16.3303 z"\r
+           style="fill:#aeaeae;fill-opacity:1"\r
+           inkscape:connector-curvature="0" />\r
+        <path\r
+           id="path4089"\r
+           d="m 57.724367,188.11452 c 1.878796,1.8788 3.765967,3.94746 5.88578,6.25398 l 70.710683,70.71068 c -2.11982,-2.30652 -4.00699,-4.37518 -5.88579,-6.25398 z"\r
+           style="fill:#aeaeae;fill-opacity:1"\r
+           inkscape:connector-curvature="0" />\r
+        <path\r
+           id="path4091"\r
+           d="M 63.610147,194.3685 C 79.715848,177.94611 88.66183,177.74344 103.29236,171.50364 l 70.71068,70.71068 c -14.63053,6.2398 -23.57651,6.44247 -39.68221,22.86486 z"\r
+           style="fill:#aeaeae;fill-opacity:1"\r
+           inkscape:connector-curvature="0" />\r
+        <path\r
+           id="path4093"\r
+           d="m 103.29236,171.50364 c 12.04675,-5.13784 28.03881,-15.55547 54.26303,-32.19266 l 70.71068,70.71068 c -26.22422,16.63719 -42.21628,27.05482 -54.26303,32.19266 z"\r
+           style="fill:#aeaeae;fill-opacity:1"\r
+           inkscape:connector-curvature="0" />\r
+        <path\r
+           id="path4095"\r
+           d="m 157.55539,139.31098 c -29.71902,10.69799 -41.05954,10.18356 -53.71905,10.70223 l 70.71068,70.71068 c 12.65951,-0.51867 24.00003,-0.004 53.71905,-10.70223 z"\r
+           style="fill:#aeaeae;fill-opacity:1"\r
+           inkscape:connector-curvature="0" />\r
+        <path\r
+           id="path4097"\r
+           d="m 103.83634,150.01321 c -7.554444,0.30951 -12.962374,1.81357 -18.937894,6.97752 l 70.710674,70.71068 c 5.97552,-5.16395 11.38345,-6.66801 18.9379,-6.97752 z"\r
+           style="fill:#aeaeae;fill-opacity:1"\r
+           inkscape:connector-curvature="0" />\r
+        <path\r
+           id="path4099"\r
+           d="m 84.898446,156.99073 c -4.974201,4.29864 -12.662888,16.11013 -15.892479,23.12517 l 70.710683,70.71068 c 3.22959,-7.01504 10.91827,-18.82653 15.89247,-23.12517 z"\r
+           style="fill:#aeaeae;fill-opacity:1"\r
+           inkscape:connector-curvature="0" />\r
+        <path\r
+           id="path4101"\r
+           d="m 69.005967,180.1159 c -2.835371,6.15875 -4.014887,2.70927 -7.351705,4.6543 l 70.710678,70.71068 c 3.33682,-1.94503 4.51633,1.50445 7.35171,-4.6543 z"\r
+           style="fill:#aeaeae;fill-opacity:1"\r
+           inkscape:connector-curvature="0" />\r
+        <path\r
+           id="path4103"\r
+           d="m 61.654262,184.7702 c -4.239643,-1.52337 -12.325592,-8.60825 -17.821049,-9.75258 l 70.710677,70.71068 c 5.49546,1.14433 13.58141,8.22921 17.82105,9.75258 z"\r
+           style="fill:#aeaeae;fill-opacity:1"\r
+           inkscape:connector-curvature="0" />\r
+        <path\r
+           id="path4105"\r
+           d="m 43.833213,175.01762 c -12.093132,-2.51817 -8.675813,-1.68746 -21.783477,-3.2334 l 70.710678,70.71068 c 13.107666,1.54594 9.690346,0.71523 21.783476,3.2334 z"\r
+           style="fill:#aeaeae;fill-opacity:1"\r
+           inkscape:connector-curvature="0" />\r
+      </g>\r
+      <path\r
+         style="display:inline;fill:#aeaeae;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"\r
+         d="m 22.049736,171.78422 c 26.276859,5.58048 31.069832,11.16973 41.560411,22.58428 16.105701,-16.42239 25.051683,-16.62506 39.682213,-22.86486 12.04675,-5.13784 28.03881,-15.55547 54.26303,-32.19266 -29.71902,10.69799 -41.05954,10.18356 -53.71905,10.70223 -7.554444,0.30951 -12.962374,1.81357 -18.937894,6.97752 -4.974201,4.29864 -12.662888,16.11013 -15.892479,23.12517 -2.835371,6.15875 -4.014887,2.70927 -7.351705,4.6543 -4.239643,-1.52337 -12.325592,-8.60825 -17.821049,-9.75258 -12.093132,-2.51817 -8.675813,-1.68746 -21.783477,-3.2334 z"\r
+         id="path4018"\r
+         inkscape:connector-curvature="0"\r
+         sodipodi:nodetypes="ccscssscsc" />\r
+    </g>\r
+    <g\r
+       transform="translate(-22.04973,44.276758)"\r
+       id="g4084"\r
+       style="display:inline;fill:#aeaeae;fill-opacity:1"\r
+       clip-path="url(#clipPath4180)">\r
+      <g\r
+         id="g4081"\r
+         style="fill:#aeaeae;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1">\r
+        <path\r
+           id="path4045"\r
+           d="m 43.402302,190.92558 c -3.740617,1.1614 -4.893569,5.19672 -2.298466,7.79182 l 70.710674,70.71068 c -2.5951,-2.5951 -1.44215,-6.63042 2.29847,-7.79182 z"\r
+           style="fill:#aeaeae;fill-opacity:1"\r
+           inkscape:connector-curvature="0" />\r
+        <path\r
+           id="path4047"\r
+           d="m 41.103836,198.7174 c 0.671599,0.6716 1.594222,1.24674 2.787982,1.65065 l 70.710682,70.71068 c -1.19376,-0.40391 -2.11639,-0.97905 -2.78799,-1.65065 z"\r
+           style="fill:#aeaeae;fill-opacity:1"\r
+           inkscape:connector-curvature="0" />\r
+        <path\r
+           id="path4049"\r
+           d="m 43.891818,200.36805 c 9.983163,3.00137 0,0 35.614145,10.07133 l 70.710677,70.71068 C 114.6025,271.07873 124.58566,274.0801 114.6025,271.07873 Z"\r
+           style="fill:#aeaeae;fill-opacity:1"\r
+           inkscape:connector-curvature="0" />\r
+        <path\r
+           id="path4051"\r
+           d="m 79.505963,210.43938 c 13.140867,3.73114 24.901227,6.26991 27.353057,8.72174 l 70.71068,70.71068 c -2.45183,-2.45183 -14.21219,-4.9906 -27.35306,-8.72174 z"\r
+           style="fill:#aeaeae;fill-opacity:1"\r
+           inkscape:connector-curvature="0" />\r
+        <path\r
+           id="path4053"\r
+           d="m 106.85902,219.16112 c 2.01379,2.01379 -2.25199,3.96893 -17.190094,6.47791 l 70.710674,70.71068 c 14.93811,-2.50899 19.20389,-4.46412 17.1901,-6.47791 z"\r
+           style="fill:#aeaeae;fill-opacity:1"\r
+           inkscape:connector-curvature="0" />\r
+        <path\r
+           id="path4055"\r
+           d="m 89.668926,225.63903 c -51.716654,8.68626 -59.734738,10.02261 -59.734738,10.02261 l 70.710682,70.71068 c 0,0 8.01808,-1.33635 59.73473,-10.02261 z"\r
+           style="fill:#aeaeae;fill-opacity:1"\r
+           inkscape:connector-curvature="0" />\r
+        <path\r
+           id="path4057"\r
+           d="m 29.934188,235.66164 c 0,0 0,0 0,0 l 70.710682,70.71068 c 0,0 0,0 0,0 z"\r
+           style="fill:#aeaeae;fill-opacity:1"\r
+           inkscape:connector-curvature="0" />\r
+        <path\r
+           id="path4059"\r
+           d="m 29.934188,235.66164 -8.686261,14.16529 70.710678,70.71068 8.686265,-14.16529 z"\r
+           style="fill:#aeaeae;fill-opacity:1"\r
+           inkscape:connector-curvature="0" />\r
+        <path\r
+           id="path4061"\r
+           d="M 21.247927,249.82693 2.9399647,292.59005 73.650643,363.30073 91.958605,320.53761 Z"\r
+           style="fill:#aeaeae;fill-opacity:1"\r
+           inkscape:connector-curvature="0" />\r
+        <path\r
+           id="path4063"\r
+           d="M 2.9399647,292.59005 171.84272,288.38646 242.5534,359.09714 73.650643,363.30073 Z"\r
+           style="fill:#aeaeae;fill-opacity:1"\r
+           inkscape:connector-curvature="0" />\r
+        <path\r
+           id="path4065"\r
+           d="m 171.84272,288.38646 -43.15244,-40.56406 70.71068,70.71068 43.15244,40.56406 z"\r
+           style="fill:#aeaeae;fill-opacity:1"\r
+           inkscape:connector-curvature="0" />\r
+        <path\r
+           id="path4067"\r
+           d="m 128.69028,247.8224 10.82442,-11.89349 70.71068,70.71068 -10.82442,11.89349 z"\r
+           style="fill:#aeaeae;fill-opacity:1"\r
+           inkscape:connector-curvature="0" />\r
+        <path\r
+           id="path4069"\r
+           d="m 139.5147,235.92891 c 0,0 11.74315,-11.89473 2.12987,-21.50801 l 70.71068,70.71068 c 9.61328,9.61328 -2.12987,21.50801 -2.12987,21.50801 z"\r
+           style="fill:#aeaeae;fill-opacity:1"\r
+           inkscape:connector-curvature="0" />\r
+        <path\r
+           id="path4071"\r
+           d="m 141.64457,214.4209 c -5.53944,-5.53944 -18.17007,-10.32136 -44.224828,-11.63341 l 70.710678,70.71068 c 26.05476,1.31205 38.68538,6.09396 44.22483,11.63341 z"\r
+           style="fill:#aeaeae;fill-opacity:1"\r
+           inkscape:connector-curvature="0" />\r
+        <path\r
+           id="path4073"\r
+           d="m 97.419742,202.78749 c -14.740083,-0.74227 -31.182815,-2.70061 -34.329589,-5.84738 l 70.710677,70.71068 c 3.14677,3.14677 19.58951,5.10511 34.32959,5.84738 z"\r
+           style="fill:#aeaeae;fill-opacity:1"\r
+           inkscape:connector-curvature="0" />\r
+        <path\r
+           id="path4075"\r
+           d="m 63.090153,196.94011 c -0.845008,-0.84501 -0.731256,-1.77571 0.631682,-2.79158 l 70.710675,70.71068 c -1.36293,1.01586 -1.47669,1.94657 -0.63168,2.79158 z"\r
+           style="fill:#aeaeae;fill-opacity:1"\r
+           inkscape:connector-curvature="0" />\r
+        <path\r
+           id="path4077"\r
+           d="m 63.721835,194.14853 2.451651,-9.92352 70.710674,70.71068 -2.45165,9.92352 z"\r
+           style="fill:#aeaeae;fill-opacity:1"\r
+           inkscape:connector-curvature="0" />\r
+        <path\r
+           id="path4079"\r
+           d="m 66.173486,184.22501 -3.771138,0.80134 70.710682,70.71068 3.77113,-0.80134 z"\r
+           style="fill:#aeaeae;fill-opacity:1"\r
+           inkscape:connector-curvature="0" />\r
+      </g>\r
+      <path\r
+         style="fill:#aeaeae;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"\r
+         d="m 43.402302,190.92558 c -4.708668,1.46197 -5.317017,7.47783 0.489516,9.44247 9.983163,3.00137 0,0 35.614145,10.07133 23.934017,6.79569 43.288497,9.63593 10.162963,15.19965 -51.716654,8.68626 -59.734738,10.02261 -59.734738,10.02261 L 21.247927,249.82693 2.9399647,292.59005 171.84272,288.38646 128.69028,247.8224 139.5147,235.92891 c 0,0 29.17582,-29.55241 -42.094958,-33.14142 -18.698257,-0.94159 -40.13637,-3.84005 -33.697907,-8.63896 l 2.451651,-9.92352 -3.771138,0.80134 z"\r
+         id="path4022"\r
+         inkscape:connector-curvature="0"\r
+         sodipodi:nodetypes="sccsccccccssccs"\r
+         inkscape:export-xdpi="356.79999"\r
+         inkscape:export-ydpi="356.79999"\r
+         inkscape:export-filename="C:\Users\sotaro\Desktop\Apps\Downloads\InkscapePortable\Data\settings\path3852.png"\r
+         clip-path="url(#clipPath4014)" />\r
+    </g>\r
+    <path\r
+       transform="translate(-22.04973,44.276758)"\r
+       clip-path="url(#clipPath4014)"\r
+       inkscape:export-filename="C:\Users\sotaro\Desktop\Apps\Downloads\InkscapePortable\Data\settings\path3852.png"\r
+       inkscape:export-ydpi="356.79999"\r
+       inkscape:export-xdpi="356.79999"\r
+       sodipodi:nodetypes="sccsccccccssccs"\r
+       inkscape:connector-curvature="0"\r
+       id="path3852"\r
+       d="m 43.402302,190.92558 c -4.708668,1.46197 -5.317017,7.47783 0.489516,9.44247 9.983163,3.00137 0,0 35.614145,10.07133 23.934017,6.79569 43.288497,9.63593 10.162963,15.19965 -51.716654,8.68626 -59.734738,10.02261 -59.734738,10.02261 L 21.247927,249.82693 2.9399647,292.59005 171.84272,288.38646 128.69028,247.8224 139.5147,235.92891 c 0,0 29.17582,-29.55241 -42.094958,-33.14142 -18.698257,-0.94159 -40.13637,-3.84005 -33.697907,-8.63896 l 2.451651,-9.92352 -3.771138,0.80134 z"\r
+       style="display:inline;fill:#1565c0;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />\r
+    <path\r
+       sodipodi:nodetypes="ccscssscsc"\r
+       inkscape:connector-curvature="0"\r
+       id="path3850"\r
+       d="m 0,216.06098 c 26.27686,5.58048 31.18153,10.94976 41.672104,22.36431 16.105701,-16.42239 24.939995,-16.40509 39.570525,-22.64489 12.046749,-5.13784 28.038811,-15.55547 54.263031,-32.19266 -29.71903,10.69799 -41.059542,10.18356 -53.71905,10.70223 -7.554445,0.30951 -12.962374,1.81357 -18.937896,6.97752 -4.974201,4.29864 -12.662887,16.11013 -15.892479,23.12517 -2.83537,6.15875 -4.014888,2.70927 -7.351704,4.6543 C 35.364887,227.52359 27.27894,220.43871 21.78348,219.29438 9.69035,216.77621 13.10767,217.60692 0,216.06098 Z"\r
+       style="display:inline;fill:#26c6da;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />\r
+  </g>\r
+</svg>\r

diff --git a/channels/share/airootfs/usr/share/calamares/branding/serene/lang/calamares-default_ar.ts b/channels/share/airootfs/usr/share/calamares/branding/serene/lang/calamares-default_ar.ts
new file mode 100644 (file)
index 0000000..3c4fe09
--- /dev/null
+++ b/channels/share/airootfs/usr/share/calamares/branding/serene/lang/calamares-default_ar.ts
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="ar">
+<context>
+    <name>show</name>
+    <message>
+        <location filename="../show.qml" line="64"/>
+        <source>This is a second Slide element.</source>
+        <translation>عرض الثاني</translation>
+    </message>
+    <message>
+        <location filename="../show.qml" line="68"/>
+        <source>This is a third Slide element.</source>
+        <translation>عرض الثالث</translation>
+    </message>
+</context>
+</TS>

diff --git a/channels/share/airootfs/usr/share/calamares/branding/serene/lang/calamares-default_en.ts b/channels/share/airootfs/usr/share/calamares/branding/serene/lang/calamares-default_en.ts
new file mode 100644 (file)
index 0000000..b02dbd5
--- /dev/null
+++ b/channels/share/airootfs/usr/share/calamares/branding/serene/lang/calamares-default_en.ts
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="en">
+<context>
+    <name>show</name>
+    <message>
+        <location filename="../show.qml" line="64"/>
+        <source>This is a second Slide element.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../show.qml" line="68"/>
+        <source>This is a third Slide element.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>

diff --git a/channels/share/airootfs/usr/share/calamares/branding/serene/lang/calamares-default_eo.ts b/channels/share/airootfs/usr/share/calamares/branding/serene/lang/calamares-default_eo.ts
new file mode 100644 (file)
index 0000000..7d1ef4e
--- /dev/null
+++ b/channels/share/airootfs/usr/share/calamares/branding/serene/lang/calamares-default_eo.ts
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="eo">
+<context>
+    <name>show</name>
+    <message>
+        <location filename="../show.qml" line="64"/>
+        <source>This is a second Slide element.</source>
+        <translation>Ĉi tio estas la dua gliteja.</translation>
+    </message>
+    <message>
+        <location filename="../show.qml" line="68"/>
+        <source>This is a third Slide element.</source>
+        <translation>Ĉi tio estas la tria gliteja.</translation>
+    </message>
+</context>
+</TS>

diff --git a/channels/share/airootfs/usr/share/calamares/branding/serene/lang/calamares-default_fr.ts b/channels/share/airootfs/usr/share/calamares/branding/serene/lang/calamares-default_fr.ts
new file mode 100644 (file)
index 0000000..ec5e041
--- /dev/null
+++ b/channels/share/airootfs/usr/share/calamares/branding/serene/lang/calamares-default_fr.ts
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="fr">
+<context>
+    <name>show</name>
+    <message>
+        <location filename="../show.qml" line="64"/>
+        <source>This is a second Slide element.</source>
+        <translation>Ceci est la deuxieme affiche.</translation>
+    </message>
+    <message>
+        <location filename="../show.qml" line="68"/>
+        <source>This is a third Slide element.</source>
+        <translation>La troisième affice ce trouve ici.</translation>
+    </message>
+</context>
+</TS>

diff --git a/channels/share/airootfs/usr/share/calamares/branding/serene/lang/calamares-default_nl.ts b/channels/share/airootfs/usr/share/calamares/branding/serene/lang/calamares-default_nl.ts
new file mode 100644 (file)
index 0000000..19fd583
--- /dev/null
+++ b/channels/share/airootfs/usr/share/calamares/branding/serene/lang/calamares-default_nl.ts
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="nl">
+<context>
+    <name>show</name>
+    <message>
+        <location filename="../show.qml" line="64"/>
+        <source>This is a second Slide element.</source>
+        <translation>Dit is het tweede Dia element.</translation>
+    </message>
+    <message>
+        <location filename="../show.qml" line="68"/>
+        <source>This is a third Slide element.</source>
+        <translation>Dit is het derde Dia element.</translation>
+    </message>
+</context>
+</TS>

diff --git a/channels/share/airootfs/usr/share/calamares/branding/serene/languages.png b/channels/share/airootfs/usr/share/calamares/branding/serene/languages.png
new file mode 100644 (file)
index 0000000..5331652
Binary files /dev/null and b/channels/share/airootfs/usr/share/calamares/branding/serene/languages.png differ

diff --git a/channels/share/airootfs/usr/share/calamares/branding/serene/languages.png.license b/channels/share/airootfs/usr/share/calamares/branding/serene/languages.png.license
new file mode 100644 (file)
index 0000000..ea82645
--- /dev/null
+++ b/channels/share/airootfs/usr/share/calamares/branding/serene/languages.png.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: 2015 Teo Mrnjavac <teo@kde.org>
+SPDX-License-Identifier: GPL-3.0-or-later

diff --git a/channels/share/airootfs/usr/share/calamares/branding/serene/logo-128.png b/channels/share/airootfs/usr/share/calamares/branding/serene/logo-128.png
new file mode 100644 (file)
index 0000000..bfb5bb2
Binary files /dev/null and b/channels/share/airootfs/usr/share/calamares/branding/serene/logo-128.png differ

diff --git a/channels/share/airootfs/usr/share/calamares/branding/serene/logo-16.png b/channels/share/airootfs/usr/share/calamares/branding/serene/logo-16.png
new file mode 100644 (file)
index 0000000..f65172a
Binary files /dev/null and b/channels/share/airootfs/usr/share/calamares/branding/serene/logo-16.png differ

diff --git a/channels/share/airootfs/usr/share/calamares/branding/serene/logo-512.png b/channels/share/airootfs/usr/share/calamares/branding/serene/logo-512.png
new file mode 100644 (file)
index 0000000..7bea7aa
Binary files /dev/null and b/channels/share/airootfs/usr/share/calamares/branding/serene/logo-512.png differ

diff --git a/channels/share/airootfs/usr/share/calamares/branding/serene/show.qml b/channels/share/airootfs/usr/share/calamares/branding/serene/show.qml
new file mode 100644 (file)
index 0000000..f4c50e6
--- /dev/null
+++ b/channels/share/airootfs/usr/share/calamares/branding/serene/show.qml
@@ -0,0 +1,77 @@
+/* === This file is part of Calamares - <https://calamares.io> ===
+ *
+ *   SPDX-FileCopyrightText: 2015 Teo Mrnjavac <teo@kde.org>
+ *   SPDX-FileCopyrightText: 2018 Adriaan de Groot <groot@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
+ *
+ *   Calamares is Free Software: see the License-Identifier above.
+ *
+ */
+
+import QtQuick 2.0;
+import calamares.slideshow 1.0;
+
+Presentation
+{
+    id: presentation
+
+    function nextSlide() {
+        console.log("QML Component (default slideshow) Next slide");
+        presentation.goToNextSlide();
+    }
+
+    Timer {
+        id: advanceTimer
+        interval: 1000
+        running: presentation.activatedInCalamares
+        repeat: true
+        onTriggered: nextSlide()
+    }
+
+    Slide {
+
+        Image {
+            id: background
+            source: "squid.png"
+            width: 200; height: 200
+            fillMode: Image.PreserveAspectFit
+            anchors.centerIn: parent
+        }
+        Text {
+            anchors.horizontalCenter: background.horizontalCenter
+            anchors.top: background.bottom
+            text: "This is a customizable QML slideshow.<br/>"+
+                  "Distributions should provide their own slideshow and list it in <br/>"+
+                  "their custom branding.desc file.<br/>"+
+                  "To create a Calamares presentation in QML, import calamares.slideshow,<br/>"+
+                  "define a Presentation element with as many Slide elements as needed."
+            wrapMode: Text.WordWrap
+            width: presentation.width
+            horizontalAlignment: Text.Center
+        }
+    }
+
+    Slide {
+        centeredText: qsTr("This is a second Slide element.")
+    }
+
+    Slide {
+        centeredText: qsTr("This is a third Slide element.")
+    }
+
+    // When this slideshow is loaded as a V1 slideshow, only
+    // activatedInCalamares is set, which starts the timer (see above).
+    //
+    // In V2, also the onActivate() and onLeave() methods are called.
+    // These example functions log a message (and re-start the slides
+    // from the first).
+    function onActivate() {
+        console.log("QML Component (default slideshow) activated");
+        presentation.currentSlide = 0;
+    }
+
+    function onLeave() {
+        console.log("QML Component (default slideshow) deactivated");
+    }
+
+}

diff --git a/channels/share/airootfs/usr/share/calamares/branding/serene/squid.png b/channels/share/airootfs/usr/share/calamares/branding/serene/squid.png
new file mode 100644 (file)
index 0000000..452e445
Binary files /dev/null and b/channels/share/airootfs/usr/share/calamares/branding/serene/squid.png differ

diff --git a/channels/share/airootfs/usr/share/calamares/branding/serene/squid.png.license b/channels/share/airootfs/usr/share/calamares/branding/serene/squid.png.license
new file mode 100644 (file)
index 0000000..cc08e1f
--- /dev/null
+++ b/channels/share/airootfs/usr/share/calamares/branding/serene/squid.png.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: 2014 Teo Mrnjavac <teo@kde.org>
+SPDX-License-Identifier: GPL-3.0-or-later

diff --git a/channels/share/airootfs/usr/share/calamares/branding/serene/stylesheet.qss b/channels/share/airootfs/usr/share/calamares/branding/serene/stylesheet.qss
new file mode 100644 (file)
index 0000000..5c36738
--- /dev/null
+++ b/channels/share/airootfs/usr/share/calamares/branding/serene/stylesheet.qss
@@ -0,0 +1,96 @@
+/*
+ * SPDX-FileCopyrightText: no
+ * SPDX-License-Identifier: CC0-1.0
+ */
+
+/*
+A branding component can ship a stylesheet (like this one)
+which is applied to parts of the Calamares user-interface.
+In principle, all parts can be styled through CSS.
+Missing parts should be filed as issues.
+
+The IDs are based on the object names in the C++ code.
+You can use the Debug Dialog to find out object names:
+  - Open the debug dialog
+  - Choose tab *Tools*
+  - Click *Widget Tree* button
+The list of object names is printed in the log.
+
+Documentation for styling Qt Widgets through a stylesheet
+can be found at
+    https://doc.qt.io/qt-5/stylesheet-examples.html
+    https://doc.qt.io/qt-5/stylesheet-reference.html
+In Calamares, styling widget classes is supported (e.g.
+using `QComboBox` as a selector).
+
+This example stylesheet has all the actual styling commented out.
+The examples are not exhaustive.
+
+*/
+
+/*** Generic Widgets.
+ *
+ * You can style **all** widgets of a given class by selecting
+ * the class name. Some widgets have specialized sub-selectors.
+ */
+
+/*
+QPushButton { background-color: green; }
+*/
+
+/*** Main application window.
+ *
+ * The main application window has the sidebar, which in turn
+ * contains a logo and a list of items -- note that the list
+ * can **not** be styled, since it has its own custom C++
+ * delegate code.
+ */
+
+/*
+#mainApp { }
+#sidebarApp { }
+#logoApp { }
+*/
+
+/*** Welcome module.
+ *
+ * There are plenty of parts, but the buttons are the most interesting
+ * ones (donate, release notes, ...). The little icon image can be
+ * styled through *qproperty-icon*, which is a little obscure.
+ * URLs can reference the QRC paths of the Calamares application
+ * or loaded via plugins or within the filesystem. There is no
+ * comprehensive list of available icons, though.
+ */
+
+/*
+QPushButton#aboutButton { qproperty-icon: url(:/data/images/release.svg); }
+#donateButton,
+#supportButton,
+#releaseNotesButton,
+#knownIssuesButton { qproperty-icon: url(:/data/images/help.svg); }
+*/
+
+/*** Partitioning module.
+ *
+ * Many moving parts, which you will need to experiment with.
+ */
+
+/*
+#bootInfoIcon { }
+#bootInfoLable { }
+#deviceInfoIcon { }
+#defineInfoLabel { }
+#scrollAreaWidgetContents { }
+#partitionBarView { }
+*/
+
+/*** Licensing module.
+ *
+ * The licensing module paints individual widgets for each of
+ * the licenses. The item can be collapsed or expanded.
+ */
+
+/*
+#licenseItem {  }
+#licenseItemFullText {  }
+*/