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 #487 from yast/all-in-one-overview
CASP/CaaSP new all-in-one overview dialog
- Loading branch information
Showing
9 changed files
with
401 additions
and
2 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
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,133 @@ | ||
| # 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 "installation/widgets/overview" | ||
| require "installation/widgets/system_role" | ||
| # FIXME: prototype only | ||
| require "installation/widgets/mocked" | ||
|
|
||
| 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 "Mode" | ||
| Yast.import "CWM" | ||
|
|
||
| textdomain "installation" | ||
|
|
||
| # 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] | ||
| ) | ||
| break if ret != :redraw | ||
| 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 UI widget-set for the dialog | ||
| def content | ||
| dashboard = Installation::Widgets::DashboardPlace.new | ||
| quadrant_layout( | ||
| upper_left: VBox( | ||
| ::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"), | ||
| Installation::Widgets::InvisibleSoftwareOverview.new | ||
| ) | ||
| ) | ||
| 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,17 @@ | ||
| require "yast" | ||
| require "cwm/widget" | ||
|
|
||
| # FIXME: these are mock only | ||
|
|
||
| # move this to: yast2-registration | ||
| module Widgets | ||
| class RegistrationCode < CWM::InputField | ||
| def initialize | ||
| textdomain "FIXME" | ||
| end | ||
|
|
||
| def label | ||
| _("Registration Code or SMT Server URL") | ||
| 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,85 @@ | ||
| # 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" | ||
|
|
||
| module Installation | ||
| module Widgets | ||
| # A widget for an all-in-one installation dialog. | ||
| # It uses the `simple_mode` of {Installation::ProposalClient#make_proposal} | ||
| class Overview < CWM::CustomWidget | ||
| attr_reader :proposal_client | ||
|
|
||
| # @param client [String] A proposal client implementing simple_mode, | ||
| # eg. "bootloader_proposal" | ||
| def initialize(client:) | ||
| @proposal_client = client | ||
| # by default widget_id is the class name; must differentiate instances | ||
| self.widget_id = "overview_" + client | ||
| end | ||
|
|
||
| def contents | ||
| VBox( | ||
| Left(PushButton(Id(button_id), label)), | ||
| * items.map { |i| Left(Label(" * #{i}")) } | ||
| ) | ||
| end | ||
|
|
||
| def label | ||
| d = Yast::WFM.CallFunction(proposal_client, ["Description", {}]) | ||
| d["menu_title"] | ||
| end | ||
|
|
||
| def items | ||
| d = Yast::WFM.CallFunction(proposal_client, | ||
| [ | ||
| "MakeProposal", | ||
| { "simple_mode" => true } | ||
| ]) | ||
| d["label_proposal"] | ||
| end | ||
|
|
||
| def handle(_event) | ||
| Yast::WFM.CallFunction(proposal_client, ["AskUser", {}]) | ||
| :redraw | ||
| end | ||
|
|
||
| private | ||
|
|
||
| def button_id | ||
| # an arbitrary unique id | ||
| "ask_" + proposal_client | ||
| end | ||
| end | ||
|
|
||
| class InvisibleSoftwareOverview < Overview | ||
| def initialize | ||
| super(client: "software_proposal") | ||
| end | ||
|
|
||
| def contents | ||
| _ = items | ||
| Empty() | ||
| end | ||
| end | ||
| end | ||
| end |
Oops, something went wrong.