Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #507 from yast/aio-master
Implement all-in-one overview for CASP/CaaSP (FATE#322328) (CASP->master)
- Loading branch information
Showing
10 changed files
with
565 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| require "installation/clients/inst_casp_overview" | ||
| ::Installation::InstCaspOverview.new.run |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,156 @@ | ||
| # encoding: utf-8 | ||
|
|
||
| # ------------------------------------------------------------------------------ | ||
| # Copyright (c) 2017 SUSE LLC | ||
| # | ||
| # | ||
| # This program is free software; you can redistribute it and/or modify it under | ||
| # the terms of version 2 of the GNU General Public License as published by the | ||
| # Free Software Foundation. | ||
| # | ||
| # This program is distributed in the hope that it will be useful, but WITHOUT | ||
| # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS | ||
| # FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. | ||
| # | ||
| # You should have received a copy of the GNU General Public License along with | ||
| # this program; if not, contact SUSE. | ||
| # | ||
| # To contact SUSE about this file by physical or electronic mail, you may find | ||
| # current contact information at www.suse.com. | ||
| # ------------------------------------------------------------------------------ | ||
|
|
||
| require "users/widgets" | ||
| require "y2country/widgets" | ||
| require "ui/widgets" | ||
| require "tune/widgets" | ||
| require "registration/widgets/registration_code" | ||
|
|
||
| require "installation/widgets/overview" | ||
| require "installation/widgets/system_role" | ||
|
|
||
| module Installation | ||
| # This library provides a simple dialog for setting | ||
| # - the password for the system administrator (root) | ||
| # - the keyboard layout | ||
| # This dialog does not write the password to the system, | ||
| # only stores it in UsersSimple module, | ||
| # to be written during inst_finish. | ||
| class InstCaspOverview | ||
| include Yast::Logger | ||
| include Yast::I18n | ||
| include Yast::UIShortcuts | ||
|
|
||
| def run | ||
| Yast.import "UI" | ||
| Yast.import "Language" | ||
| Yast.import "Mode" | ||
| Yast.import "CWM" | ||
| Yast.import "Popup" | ||
| Yast.import "Pkg" | ||
|
|
||
| textdomain "installation" | ||
|
|
||
| # Simplified work-flow do not contain language proposal, but have software one. | ||
| # So avoid false positive detection of language change | ||
| Yast::Pkg.SetPackageLocale(Yast::Language.language) | ||
|
|
||
| # We do not need to create a wizard dialog in installation, but it's | ||
| # helpful when testing all manually on a running system | ||
| Yast::Wizard.CreateDialog if separate_wizard_needed? | ||
|
|
||
| ret = nil | ||
| loop do | ||
| ret = Yast::CWM.show( | ||
| content, | ||
| # Title for installation overview dialog | ||
| caption: _("Installation Overview"), | ||
| # Button label: start the installation | ||
| next_button: _("Install"), | ||
| # do not show abort and back button | ||
| abort_button: "", | ||
| back_button: "", | ||
| # do not store stuff when just redrawing | ||
| skip_store_for: [:redraw] | ||
| ) | ||
| next if ret == :redraw | ||
|
|
||
| # do software proposal | ||
| d = Yast::WFM.CallFunction("software_proposal", | ||
| [ | ||
| "MakeProposal", | ||
| { "simple_mode" => true } | ||
| ]) | ||
| # report problems with sofware proposal | ||
| if [:blocker, :fatal].include?(d["warning_level"]) | ||
| # %s is a problem description | ||
| Yast::Popup.Error( | ||
| _("Software proposal failed. Cannot proceed with installation.\n%s") % d["warning"] | ||
| ) | ||
| # continue only if confirmed | ||
| elsif Yast::WFM.CallFunction("inst_doit", []) == :next | ||
| break | ||
| end | ||
| end | ||
|
|
||
| Yast::Wizard.CloseDialog if separate_wizard_needed? | ||
|
|
||
| ret | ||
| end | ||
|
|
||
| private | ||
|
|
||
| def quadrant_layout(upper_left:, lower_left:, upper_right:, lower_right:) | ||
| HBox( | ||
| HWeight( | ||
| 6, | ||
| VBox( | ||
| VWeight(5, upper_left), | ||
| VStretch(), | ||
| VWeight(5, lower_left) | ||
| ) | ||
| ), | ||
| HSpacing(3), | ||
| HWeight( | ||
| 4, | ||
| VBox( | ||
| VWeight(5, upper_right), | ||
| VStretch(), | ||
| VWeight(5, lower_right) | ||
| ) | ||
| ) | ||
| ) | ||
| end | ||
|
|
||
| # Returns a pair with UI widget-set for the dialog and widgets that can | ||
| # block installation | ||
| def content | ||
| dashboard = Installation::Widgets::DashboardPlace.new | ||
| quadrant_layout( | ||
| upper_left: VBox( | ||
| ::Registration::Widgets::RegistrationCode.new, | ||
| ::Users::PasswordWidget.new(little_space: true), | ||
| # use english us as default keyboard layout | ||
| ::Y2Country::Widgets::KeyboardSelectionCombo.new("english-us") | ||
| ), | ||
| lower_left: VBox( | ||
| Installation::Widgets::SystemRole.new(dashboard), | ||
| dashboard, | ||
| Tune::Widgets::SystemInformation.new | ||
| ), | ||
| upper_right: VBox( | ||
| Installation::Widgets::Overview.new(client: "partitions_proposal"), | ||
| Installation::Widgets::Overview.new(client: "bootloader_proposal") | ||
| ), | ||
| lower_right: VBox( | ||
| Installation::Widgets::Overview.new(client: "network_proposal"), | ||
| Installation::Widgets::Overview.new(client: "kdump_proposal") | ||
| ) | ||
| ) | ||
| end | ||
|
|
||
| # Returns whether we need/ed to create new UI Wizard | ||
| def separate_wizard_needed? | ||
| Yast::Mode.normal | ||
| end | ||
| end | ||
| end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,112 @@ | ||
| # encoding: utf-8 | ||
|
|
||
| # ------------------------------------------------------------------------------ | ||
| # Copyright (c) 2017 SUSE LLC | ||
| # | ||
| # | ||
| # This program is free software; you can redistribute it and/or modify it under | ||
| # the terms of version 2 of the GNU General Public License as published by the | ||
| # Free Software Foundation. | ||
| # | ||
| # This program is distributed in the hope that it will be useful, but WITHOUT | ||
| # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS | ||
| # FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. | ||
| # | ||
| # You should have received a copy of the GNU General Public License along with | ||
| # this program; if not, contact SUSE. | ||
| # | ||
| # To contact SUSE about this file by physical or electronic mail, you may find | ||
| # current contact information at www.suse.com. | ||
| # ------------------------------------------------------------------------------ | ||
|
|
||
| require "yast" | ||
| require "cwm/widget" | ||
|
|
||
| Yast.import "Popup" | ||
|
|
||
| module Installation | ||
| module Widgets | ||
| # A widget for an all-in-one installation dialog. | ||
| # It uses the `simple_mode` of {Installation::ProposalClient#make_proposal} | ||
| # It is immutable, so for showing new values reinitialize widget | ||
| class Overview < CWM::CustomWidget | ||
| attr_reader :proposal_client | ||
|
|
||
| # @param client [String] A proposal client implementing simple_mode, | ||
| # eg. "bootloader_proposal" | ||
| def initialize(client:) | ||
| textdomain "installation" | ||
| @proposal_client = client | ||
| # by default widget_id is the class name; must differentiate instances | ||
| self.widget_id = "overview_" + client | ||
| @blocking = false | ||
| end | ||
|
|
||
| def contents | ||
| VBox( | ||
| Left(PushButton(Id(button_id), label)), | ||
| * items.map { |i| Left(Label(" * #{i}")) } | ||
| ) | ||
| end | ||
|
|
||
| def label | ||
| return @label if @label | ||
|
|
||
| d = Yast::WFM.CallFunction(proposal_client, ["Description", {}]) | ||
| @label = d["menu_title"] | ||
| end | ||
|
|
||
| def items | ||
| return @items if @items | ||
|
|
||
| d = Yast::WFM.CallFunction(proposal_client, | ||
| [ | ||
| "MakeProposal", | ||
| { "simple_mode" => true } | ||
| ]) | ||
| if d["warning"] && !d["warning"].empty? && d["warning_level"] != :notice | ||
| Yast::Popup.LongError( | ||
| format( | ||
| _("Problem found when proposing %{client}:<br>" \ | ||
| "Severity: %{severity}<br>" \ | ||
| "Message: %{message}"), | ||
| client: label.delete("&"), | ||
| severity: (d["warning_level"] || :warning).to_s, | ||
| message: d["warning"] | ||
| ) | ||
| ) | ||
| @blocking = [:blocker, :fatal].include?(d["warning_level"]) | ||
| end | ||
| @items = d["label_proposal"] | ||
| end | ||
|
|
||
| def handle(_event) | ||
| Yast::WFM.CallFunction(proposal_client, ["AskUser", {}]) | ||
| :redraw | ||
| end | ||
|
|
||
| def validate | ||
| return true unless @blocking | ||
|
|
||
| # %s is a heading of a problematic section, like "Partitioning" or "Network" | ||
| Yast::Popup.Error( | ||
| _("%s blocks the installation. Please solve the problem there before proceeding.") % | ||
| label.delete("&") | ||
| ) | ||
|
|
||
| false | ||
| end | ||
|
|
||
| def blocking? | ||
| @blocking | ||
| end | ||
|
|
||
| private | ||
|
|
||
| def button_id | ||
| # an arbitrary unique id | ||
| "ask_" + proposal_client | ||
| end | ||
| end | ||
| end | ||
| end |
Oops, something went wrong.