Author: jsrain
Date: Mon Nov 30 17:24:18 2009
New Revision: 59864
URL: http://svn.opensuse.org/viewcvs/yast?rev=59864&view=rev
Log:
merged from trunk
Modified:
branches/SuSE-Code-11-SP1-Branch/live-installer/package/yast2-live-installer.changes
branches/SuSE-Code-11-SP1-Branch/live-installer/src/inst_live_doit.ycp
Modified: branches/SuSE-Code-11-SP1-Branch/live-installer/package/yast2-live-installer.changes
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/live-installer/package/yast2-live-installer.changes?rev=59864&r1=59863&r2=59864&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/live-installer/package/yast2-live-installer.changes (original)
+++ branches/SuSE-Code-11-SP1-Branch/live-installer/package/yast2-live-installer.changes Mon Nov 30 17:24:18 2009
@@ -1,8 +1,10 @@
-------------------------------------------------------------------
-Tue Jan 6 14:41:29 CET 2009 - jsrain@suse.cz
+Thu Jun 11 13:40:23 CEST 2009 - jsrain@suse.cz
- disable all repos before installation, reenable afterwards
(bnc #450228)
+- adapted for unified progress during live installation
+ (bnc#435680)
-------------------------------------------------------------------
Tue Aug 11 13:01:49 CEST 2009 - jsrain@suse.cz
Modified: branches/SuSE-Code-11-SP1-Branch/live-installer/src/inst_live_doit.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/live-installer/src/inst_live_doit.ycp?rev=59864&r1=59863&r2=59864&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/live-installer/src/inst_live_doit.ycp (original)
+++ branches/SuSE-Code-11-SP1-Branch/live-installer/src/inst_live_doit.ycp Mon Nov 30 17:24:18 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