[yast-commit] r57530 - in /trunk/live-installer: VERSION package/yast2-live-installer.changes src/Makefile.am src/inst_live_doit.ycp yast2-live-installer.spec.in

Author: jsrain Date: Thu Jun 11 13:54:43 2009 New Revision: 57530 URL: http://svn.opensuse.org/viewcvs/yast?rev=57530&view=rev Log: adapted for unified progress during live installation (bnc#435680) Modified: trunk/live-installer/VERSION trunk/live-installer/package/yast2-live-installer.changes trunk/live-installer/src/Makefile.am trunk/live-installer/src/inst_live_doit.ycp trunk/live-installer/yast2-live-installer.spec.in Modified: trunk/live-installer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/VERSION?rev=57530&r1=57529&r2=57530&view=diff ============================================================================== --- trunk/live-installer/VERSION (original) +++ trunk/live-installer/VERSION Thu Jun 11 13:54:43 2009 @@ -1 +1 @@ -2.18.1 +2.18.2 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=57530&r1=57529&r2=57530&view=diff ============================================================================== --- trunk/live-installer/package/yast2-live-installer.changes (original) +++ trunk/live-installer/package/yast2-live-installer.changes Thu Jun 11 13:54:43 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Jun 11 13:40:23 CEST 2009 - jsrain@suse.cz + +- adapted for unified progress during live installation + (bnc#435680) +- 2.18.2 + +------------------------------------------------------------------- Thu May 7 15:41:32 CEST 2009 - jsrain@suse.cz - adapted to changes in yast2-bootloader Modified: trunk/live-installer/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/src/Makefile.am?rev=57530&r1=57529&r2=57530&view=diff ============================================================================== --- trunk/live-installer/src/Makefile.am (original) +++ trunk/live-installer/src/Makefile.am Thu Jun 11 13:54:43 2009 @@ -14,6 +14,7 @@ inst_live_simple_proposal.ycp \ inst_live_cleanup.ycp \ inst_live_prepare_net_test.ycp \ + inst_live_prepareprogress.ycp \ live_save_config_finish.ycp \ inst_live_pre-proposal.ycp Modified: trunk/live-installer/src/inst_live_doit.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/src/inst_live_doit.ycp?rev=57530&r1=57529&r2=57530&view=diff ============================================================================== --- trunk/live-installer/src/inst_live_doit.ycp (original) +++ trunk/live-installer/src/inst_live_doit.ycp Thu Jun 11 13:54:43 2009 @@ -11,6 +11,7 @@ import "Wizard"; import "ImageInstallation"; import "LiveInstaller"; +import "SlideShow"; Installation::destdir = "/mnt"; @@ -72,7 +73,10 @@ integer progress_step = (100-progress_start) * index / size (symlinks); foreach (string link, string target, symlinks, { index = index + 1; - Progress::Title (sformat (_("Copying %1..."), link)); + SlideShow::StageProgress( progress_start, nil); + SlideShow::SubProgress( 0, sformat (_("Copying %1..."), link)); + SlideShow::AppendMessageToInstLog (sformat (_("Copying %1..."), link)); +// Progress::Title (sformat (_("Copying %1..."), link)); SCR::Execute (.target.remove, sformat ("%1/%2", Installation::destdir, link)); /* list<string> components = splitstring (link, "/"); @@ -88,7 +92,9 @@ integer progress_done = progress_start + progress_step; ImageInstallation::FileSystemCopy ("/" + target, sformat ("%1/%2", Installation::destdir, link), progress_start, progress_done); progress_start = progress_done; - Progress::Step (progress_start); +// Progress::Step (progress_start); + SlideShow::StageProgress( progress_done, nil); + SlideShow::SubProgress( 100, nil); }); return true; } @@ -104,7 +110,7 @@ SCR::Execute (.target.bash, sformat ("/bin/cp -a %1/etc %2", tmpdir, Installation::destdir)); return true; } - +/* Progress::New( // Headline for last dialog of base installation: Install LILO etc. _("Copying the Live Image to Hard Disk"), @@ -119,18 +125,27 @@ Progress::NextStage (); Progress::Title (_("Evaluating filesystems to copy...")); +*/ +SlideShow::MoveToStage( "images" ); +SlideShow::StageProgress( 0, _("Evaluating filesystems to copy...") ); +SlideShow::AppendMessageToInstLog (_("Evaluating filesystems to copy...")); map copy_map = LinksMap (LinksToCopyList ()); +SlideShow::SubProgress( 0, _("Copying root filesystem...")); +SlideShow::AppendMessageToInstLog (_("Copying root filesystem...")); +SlideShow::StageProgress( 5, _("Copying live image...")); +/* Progress::NextStageStep (5); Progress::Title (_("Copying root filesystem...")); +*/ integer steps = size (copy_map) + 1; integer step_size = 95 / steps; CopyRootImage (5, 5 + step_size); -Progress::NextStageStep (10); +//Progress::NextStageStep (10); CopySymlinkedImage (copy_map, 5 + step_size); -Progress::Finish(); -Progress::Title (_("Finished.")); +//Progress::Finish(); +//Progress::Title (_("Finished.")); // reenable sources/services before their status gets stored in the target system Pkg::SourceEditSet (LiveInstaller::source_states); Modified: trunk/live-installer/yast2-live-installer.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/yast2-live-installer.spec.in?rev=57530&r1=57529&r2=57530&view=diff ============================================================================== --- trunk/live-installer/yast2-live-installer.spec.in (original) +++ trunk/live-installer/yast2-live-installer.spec.in Thu Jun 11 13:54:43 2009 @@ -6,8 +6,10 @@ Requires: yast2 >= 2.16.6 Requires: yast2-network >= 2.16.6 Requires: yast2-bootloader >= 2.18.7 +#unified progress +Requires: yast2-installation >= 2.18.17 -Requires: yast2-bootloader yast2-country yast2-installation yast2-storage +Requires: yast2-bootloader yast2-country yast2-storage BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite BuildArchitectures: noarch -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org