Merge pull request #14 from Hayao0819/master

いくつかの追加を修正

src/branding/alter/branding.desc

@@ -1,3 +1,9 @@
+# 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:  alter
 
@@ -17,8 +23,8 @@ welcomeExpandingLogo:   true
 # Size and expansion policy for Calamares.
 #  - "normal" or unset, expand as needed, use *windowSize*
 #  - "fullscreen", start as large as possible, ignore *windowSize*
-#  - "noexpand", never expand, use *windowSize*
-windowExpanding:    noexpand
+#  - "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).
@@ -29,6 +35,12 @@ windowExpanding:    noexpand
 # 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
+
 # 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.
@@ -40,14 +52,32 @@ windowSize: 800px,520px
 #
 # 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:         Alter Linux
     shortProductName:    Alter Linux
-    version:             
-    shortVersion:        
+    version:
+    shortVersion:
     versionedName:       Alter Linux
     shortVersionedName:  Alter Linux
     bootloaderEntryName: Alter Linux
+    productUrl:          https://alterlinux.com
+    supportUrl:          https://github.com/SereneTeam/alterlinux/issues
+    knownIssuesUrl:      https://alterlinux.com
+    releaseNotesUrl:     https://github.com/SereneTeam/alterlinux/releases
 
 # These images are loaded from the branding module directory.
 #
@@ -63,6 +93,8 @@ strings:
 #       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:
     productIcon:         "logo-16.png"
     productLogo:         "logo-128.png"
@@ -71,6 +103,17 @@ images:
 # The slideshow is displayed during execution steps (e.g. when the
 # installer is actually writing to disk and doing other slow things).
 slideshow:               "show.qml"
+# There are two available APIs for the 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).
+slideshowAPI: 2
+
 
 # Colors for text and background components.
 #
@@ -80,15 +123,12 @@ slideshow:               "show.qml"
 #    Optional, and defaults to the application palette.
 #  - sidebarSelect is the text color of the selected step.
 #
-# Manjaro defaults 
-#
-#style:
-#   sidebarBackground:    "#454948"
-#   sidebarTextSelect:    "#4d915e"
-#   sidebarTextHighlight: "#1a1c1b"
-
+# 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:    "#EFEFEF"
+#   sidebarBackground:    "#EFEFEF"
+   sidebarBackground:    "#FFFFFF"
    sidebarText:          "#000000"
    sidebarTextSelect:    "#1565C0"
-   sidebarTextHighlight: "#EFEFEF"
+   sidebarTextHighlight: "#EFEFEF"