Hello community, here is the log from the commit of package yast2-installation for openSUSE:Factory checked in at 2020-07-27 17:36:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-installation (Old) and /work/SRC/openSUSE:Factory/.yast2-installation.new.3592 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-installation" Mon Jul 27 17:36:20 2020 rev:450 rq:822608 version:4.3.10 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-installation/yast2-installation.changes 2020-07-21 15:49:01.712194645 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-installation.new.3592/yast2-installation.changes 2020-07-27 17:36:27.890772547 +0200 @@ -1,0 +2,7 @@ +Fri Jul 24 06:48:57 UTC 2020 - José Iván López González <[email protected]> + +- Configure the wizard layout according to the product features. +- Related to jsc#PM-1998. +- 4.3.10 + +------------------------------------------------------------------- Old: ---- yast2-installation-4.3.9.tar.bz2 New: ---- yast2-installation-4.3.10.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.FTygBB/_old 2020-07-27 17:36:29.234773855 +0200 +++ /var/tmp/diff_new_pack.FTygBB/_new 2020-07-27 17:36:29.238773859 +0200 @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 4.3.9 +Version: 4.3.10 Release: 0 Summary: YaST2 - Installation Parts License: GPL-2.0-only @@ -74,8 +74,8 @@ # Systemd default target and services. This version supports # writing settings in the first installation stage. Requires: yast2-services-manager >= 3.2.1 -# Yast::OSRelease.ReleaseVersionHumanReadable -Requires: yast2 >= 4.2.56 +# UI::Wizards::Layout +Requires: yast2 >= 4.3.16 # Y2Network::NtpServer Requires: yast2-network >= 4.2.55 # for AbortException and handle direct abort ++++++ yast2-installation-4.3.9.tar.bz2 -> yast2-installation-4.3.10.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.3.9/doc/control-file.md new/yast2-installation-4.3.10/doc/control-file.md --- old/yast2-installation-4.3.9/doc/control-file.md 2020-07-20 09:55:37.000000000 +0200 +++ new/yast2-installation-4.3.10/doc/control-file.md 2020-07-24 12:29:09.000000000 +0200 @@ -4,10 +4,9 @@ Functionality ------------- -The product control enables customization of the installation makes it -possible to enable and disable features during installation in the final -installed product. It controls the workflow and what is really shown to -the user during installation. +The product control file is used to customize the installation process. +It allows to enable and disable features and it defines the workflow, +that is, what is really shown to the user during the installation. Besides workflow configuration, other system variables are configurable and can be predefined by the system administrator. To name a few: the @@ -476,6 +475,56 @@ workflow. The default is *false*. This feature should be off in the production phase. +### Look & Feel + +The *globals* section also offers some settings to configure the layout of the +installer. There are three possible layouts: + +* With a left sidebar including the list of installation steps. +* Without a sidebar and placing the title of the dialogs on the left side. +* Without a sidebar and placing the title of the dialogs on top. + +These settings can be used for configuring the layout: + +- (string) *installation_ui* - only accepts *sidebar* value. When used, the + layout is configured to include a left sidebar with the installation steps. + This setting is deprecated in favor of *installation_layout*. + +- *installation_layout*: this section includes a set of individual settings + to configure the layout. + +In the *installation_layout* section, these settings are available: + +- (string) *mode* - configures the layout mode and accepts these values: + *steps*, *title-on-left* and *title-on-top*. +- (boolean) *banner* - indicates whether a top banner should be included. + The banner is typically used for placing a logo. + +Note that *installation_layout* takes precedence over *installation_ui*. When +nothing is configured, the default layout is rendered with title on the left and +with the top banner (SLE flavor). + +Some examples of layout configuration: + +```xml +<globals> + <!-- installation_ui is ignored because installation_layout is used --> + <installation_ui>sidebar</installation_ui> + <installation_layout> + <mode>title-on-top</mode> + <banner config:type="boolean">true</banner> + </installation_layout> +</globals> +``` + +```xml +<globals> + <!-- installation_ui is used because nothing is defined by installation_layout --> + <installation_ui>sidebar</installation_ui> + <installation_layout></installation_layout> +</globals> +``` + ### Software The *software* section defines the selection of software during installation or diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.3.9/package/yast2-installation.changes new/yast2-installation-4.3.10/package/yast2-installation.changes --- old/yast2-installation-4.3.9/package/yast2-installation.changes 2020-07-20 09:55:37.000000000 +0200 +++ new/yast2-installation-4.3.10/package/yast2-installation.changes 2020-07-24 12:29:09.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Jul 24 06:48:57 UTC 2020 - José Iván López González <[email protected]> + +- Configure the wizard layout according to the product features. +- Related to jsc#PM-1998. +- 4.3.10 + +------------------------------------------------------------------- Thu Jul 16 11:01:42 CEST 2020 - [email protected] - Moving <files> section handling from second installation stage diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.3.9/package/yast2-installation.spec new/yast2-installation-4.3.10/package/yast2-installation.spec --- old/yast2-installation-4.3.9/package/yast2-installation.spec 2020-07-20 09:55:37.000000000 +0200 +++ new/yast2-installation-4.3.10/package/yast2-installation.spec 2020-07-24 12:29:09.000000000 +0200 @@ -16,7 +16,7 @@ # Name: yast2-installation -Version: 4.3.9 +Version: 4.3.10 Release: 0 Group: System/YaST License: GPL-2.0-only @@ -73,8 +73,8 @@ # Systemd default target and services. This version supports # writing settings in the first installation stage. Requires: yast2-services-manager >= 3.2.1 -# Yast::OSRelease.ReleaseVersionHumanReadable -Requires: yast2 >= 4.2.56 +# UI::Wizards::Layout +Requires: yast2 >= 4.3.16 # Y2Network::NtpServer Requires: yast2-network >= 4.2.55 # for AbortException and handle direct abort diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.3.9/src/lib/installation/clients/installation.rb new/yast2-installation-4.3.10/src/lib/installation/clients/installation.rb --- old/yast2-installation-4.3.9/src/lib/installation/clients/installation.rb 2020-07-20 09:55:37.000000000 +0200 +++ new/yast2-installation-4.3.10/src/lib/installation/clients/installation.rb 2020-07-24 12:29:09.000000000 +0200 @@ -28,6 +28,9 @@ # and calls the real installation. # # $Id$ + +require "ui/wizards/layout" + module Yast class InstallationClient < Client include Yast::Logger @@ -50,68 +53,60 @@ Hooks.search_path.join!("installation") - # Initialize the UI - if ProductFeatures.GetStringFeature("globals", "installation_ui") == "sidebar" - UI.SetProductLogo(false) - Wizard.OpenNextBackStepsDialog - else - UI.SetProductLogo(true) - Wizard.OpenLeftTitleNextBackDialog - end - - Wizard.SetContents( - # title - "", - # contents - Empty(), - # help - "", - # has back - false, - # has next - false - ) - if Mode.update - Wizard.SetDesktopTitleAndIcon("upgrade") - else - Wizard.SetDesktopTitleAndIcon("installation") - end - Wizard.DisableAbortButton - - @ret = nil - - # Call the real installation - Builtins.y2milestone("=== installation ===") + layout = ::UI::Wizards::Layout.from_product_features - Hooks.run "installation_start" - - # First-stage (initial installation) - if Stage.initial - Builtins.y2milestone( - "Stage::initial -> running inst_worker_initial client" - ) - @ret = WFM.CallFunction("inst_worker_initial", WFM.Args) - - # Second-stage (initial installation) - elsif Stage.cont - Builtins.y2milestone( - "Stage::cont -> running inst_worker_continue client" + layout.open_wizard do + Wizard.SetContents( + # title + "", + # contents + Empty(), + # help + "", + # has back + false, + # has next + false ) - @ret = WFM.CallFunction("inst_worker_continue", WFM.Args) - else - # TRANSLATORS: error message - Report.Error(_("No workflow defined for this kind of installation.")) - end - - Hooks.run "installation_failure" if @ret == false + if Mode.update + Wizard.SetDesktopTitleAndIcon("upgrade") + else + Wizard.SetDesktopTitleAndIcon("installation") + end + Wizard.DisableAbortButton + + @ret = nil + + # Call the real installation + Builtins.y2milestone("=== installation ===") + + Hooks.run "installation_start" + + # First-stage (initial installation) + if Stage.initial + Builtins.y2milestone( + "Stage::initial -> running inst_worker_initial client" + ) + @ret = WFM.CallFunction("inst_worker_initial", WFM.Args) + + # Second-stage (initial installation) + elsif Stage.cont + Builtins.y2milestone( + "Stage::cont -> running inst_worker_continue client" + ) + @ret = WFM.CallFunction("inst_worker_continue", WFM.Args) + else + # TRANSLATORS: error message + Report.Error(_("No workflow defined for this kind of installation.")) + end - Builtins.y2milestone("Installation ret: %1", @ret) - Builtins.y2milestone("=== installation ===") + Hooks.run "installation_failure" if @ret == false - Hooks.run "installation_finish" + Builtins.y2milestone("Installation ret: %1", @ret) + Builtins.y2milestone("=== installation ===") - # Shutdown the UI - Wizard.CloseDialog + Hooks.run "installation_finish" + end WFM.CallFunction("disintegrate_all_extensions") if Stage.initial
