Author: jsrain Date: Wed Aug 1 14:00:13 2007 New Revision: 39868 URL: http://svn.opensuse.org/viewcvs/yast?rev=39868&view=rev Log: even more simplified installation overview Modified: trunk/live-installer/package/yast2-live-installer.changes trunk/live-installer/src/inst_live_simple_proposal.ycp trunk/live-installer/src/inst_live_welcome.ycp Modified: trunk/live-installer/package/yast2-live-installer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/package/yast2-live-installer.changes?rev=39868&r1=39867&r2=39868&view=diff ============================================================================== --- trunk/live-installer/package/yast2-live-installer.changes (original) +++ trunk/live-installer/package/yast2-live-installer.changes Wed Aug 1 14:00:13 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Aug 1 13:58:19 CEST 2007 - jsrain@suse.cz + +- even more simplified installation overview + +------------------------------------------------------------------- Mon Jul 30 17:27:29 CEST 2007 - jsrain@suse.cz - added simplified installation overview Modified: trunk/live-installer/src/inst_live_simple_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/src/inst_live_simple_proposal.ycp?rev=39868&r1=39867&r2=39868&view=diff ============================================================================== --- trunk/live-installer/src/inst_live_simple_proposal.ycp (original) +++ trunk/live-installer/src/inst_live_simple_proposal.ycp Wed Aug 1 14:00:13 2007 @@ -15,8 +15,10 @@ textdomain "live-installer"; Wizard::SetContents ( + // dialog caption _("Installation settings"), - `Label (_("Analyzing the system")), + // label + `Label (_("Analyzing the system...")), "", false, false @@ -36,6 +38,8 @@ ] ); +term contents = `VBox (); + // partitioning summary map tm = Storage::GetTargetMap (); @@ -60,54 +64,46 @@ { used = (100*used)/(used+free); disks = add (disks, sformat ( - _("<li>Use %1%% of %2 for Linux</li>"), used, data["name"]:"disk")); + _("Use %1%% of disk %2 for Linux"), used, data["name"]:"")); } else { - disks = add (disks, sformat (_("<li>Do not use %1</li>"), data["name"]:"disk")); + disks = add (disks, sformat (_("Do not use disk %1"), data["name"]:"")); } }); -string partitioning = HTML::List (disks); +contents = add (contents, `Left (`Heading (_("Partitioning")))); +foreach (string disk, disks, { + contents = add (contents, `Left (`Label (disk))); +}); // end of partitioning summary - // bootloader summary -string booting = "booting"; -string lt = BootCommon::getLoaderType (false); -string ln = BootCommon::getLoaderName (lt, `summary); +string timeout = BootCommon::globals["timeout"]:""; -list<string> locations = []; - -if (BootCommon::globals["boot_boot"]:"" == "true") - locations = add(locations, BootCommon::BootPartitionDevice); -if (BootCommon::globals["boot_root"]:"" == "true") - locations = add(locations, BootCommon::RootPartitionDevice); -if (BootCommon::globals["boot_mbr"]:"" == "true") - locations = add(locations, BootCommon::mbrDisk); -if (haskey (BootCommon::globals, "boot_custom")) - locations = add(locations, BootCommon::globals["boot_custom"]:""); - -if (size (locations) == 0 || lt == "none") - booting = _("Do not install bootloader"); -else -{ - booting = sformat (_("Install %1 to %2"), ln, mergestring (locations, ", ")); -} +boolean other = false; +foreach (map s, BootCommon::sections, { + if (s["type"]:"" == "other") + other = true; +}); -booting = HTML::List ([booting]); +contents = add (contents, `VSpacing (2)); +contents = add (contents, `Left (`Heading (_("System start-up")))); +contents = add (contents, `Left (`Label (other + ? _("Ask whether to boot Linux or existing system") + : _("Boot only Linux" )))); +contents = add (contents, `Left (`Label (sformat (_("System start time-out: %1 seconds"), timeout)))); -// FIXME was copy-pasted from GRUB, adaptability on anything but GRUB or LILO may be problematic // end of bootloader summary -string summary = sformat (_("<h1>Partitioning</h1>%1<h1>Booting</h1>%2"), - partitioning, booting); - -term contents = `VBox ( - // TRANSLATORS: progress message - `RichText (summary), - `PushButton (`id (`change), _("Change Installation Settings")) +contents = `HBox (`HSpacing (2), contents, `HSpacing (2)); +contents = `VBox ( + `VSpacing (1), + contents, + `VStretch (), + `PushButton (`id (`change), _("Change Installation Settings")), + `VSpacing (1) ); Wizard::SetContents ( Modified: trunk/live-installer/src/inst_live_welcome.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/src/inst_live_welcome.ycp?rev=39868&r1=39867&r2=39868&view=diff ============================================================================== --- trunk/live-installer/src/inst_live_welcome.ycp (original) +++ trunk/live-installer/src/inst_live_welcome.ycp Wed Aug 1 14:00:13 2007 @@ -11,12 +11,12 @@ textdomain "live-installer"; Wizard::SetContents ( + // dialog caption, %1 is product name (typically openSUSE) sformat (_("Welcome to %1 installation"), Product::name), - // TRANSLATORS: progress message - `Label (sformat (_("YaST will install %1 -on your computer. You will be asked several -questions before the installation will -start."), Product::name)), + // wellcome label, %1 is product name + `Label (sformat (_("Your %1 will be installed quickly +and easily in a few steps. +You will only have to answer some questions."), Product::name)), "", GetInstArgs::enable_back(), GetInstArgs::enable_next() -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org