Author: locilka Date: Thu Apr 10 16:46:01 2008 New Revision: 46362 URL: http://svn.opensuse.org/viewcvs/yast?rev=46362&view=rev Log: - Preparing image installation dialog for two progress-bars. Modified: trunk/installation/VERSION trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/inst_deploy_image.ycp trunk/installation/src/modules/ImageInstallation.ycp Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=46362&r1=46361&r2=46362&view=diff ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Thu Apr 10 16:46:01 2008 @@ -1 +1 @@ -2.16.31 +2.16.32 Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=46362&r1=46361&r2=46362&view=diff ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Thu Apr 10 16:46:01 2008 @@ -4,6 +4,8 @@ - Filtering installation imagesets using the default architecture. - Installation from images sets the download area (SourceManager). - Removing image after it is deployed. +- Preparing image installation dialog for two progress-bars. +- 2.16.32 ------------------------------------------------------------------- Wed Apr 9 16:39:36 CEST 2008 - jsrain@suse.cz Modified: trunk/installation/src/clients/inst_deploy_image.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_deploy_image.ycp?rev=46362&r1=46361&r2=46362&view=diff ============================================================================== --- trunk/installation/src/clients/inst_deploy_image.ycp (original) +++ trunk/installation/src/clients/inst_deploy_image.ycp Thu Apr 10 16:46:01 2008 @@ -27,45 +27,47 @@ void SetProgress (integer image, integer percent) { if (percent >= 100) image = image + 1; - if (image != last_image) - { + + if (image != last_image) { last_image = image; - if (image < size (images)) - Progress::Title (sformat (_("Deploying Image (%1/%2)..."), (image + 1), size (images))); + if (image < size (images)) { + UI::ChangeWidget ( + `id ("deploying_progress"), + `Label, + sformat (_("Deploying Image (%1/%2)..."), (image + 1), size (images)) + ); + } } - Progress::Step (image); -} -Wizard::SetContents (_("Deploying Installation Images"), `Empty (), "", false, false); -Wizard::SetTitleIcon ("yast-inst-mode"); + UI::ChangeWidget ( + `id ("deploying_progress"), + `Value, + image + ); +} ImageInstallation::StoreAllChanges(); Pkg::TargetFinish (); -// TODO: help (if needed) -Progress::Simple (_("Deploying Installation Images"), _("Deploying Installation Images"), size (images), "help"); - -// Images usually do not fit into RAMDISK -// move download area to hard disk (for HTTP/FTP media) -// TODO select according to partitioning -/* -string download_dir = Installation::destdir + "/img_tmp"; -SCR::Execute (.target.bash, sformat ("test -d %1 || mkdir -p %1", download_dir)); -Pkg::SourceMoveDownloadArea (download_dir); -*/ +Wizard::SetContents ( + _("Deploying Installation Images"), + `ProgressBar ( + `id ("deploying_progress"), + _("Deploying Images..."), + size(images), + 0 + ), + "", + false, false +); +Wizard::SetTitleIcon ("yast-inst-mode"); SourceManager::InstInitSourceMoveDownloadArea(); ImageInstallation::DeployImages (images, Installation::destdir, SetProgress); -/* -SCR::Execute (.target.bash, sformat ("rmdir '%1'", download_dir)); -*/ - y2milestone ("Target image for package selector prepared"); -Progress::Finish(); - Pkg::TargetInitialize (Installation::destdir); Pkg::TargetLoad (); Modified: trunk/installation/src/modules/ImageInstallation.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/modules/ImageInstallation.ycp?rev=46362&r1=46361&r2=46362&view=diff ============================================================================== --- trunk/installation/src/modules/ImageInstallation.ycp (original) +++ trunk/installation/src/modules/ImageInstallation.ycp Thu Apr 10 16:46:01 2008 @@ -129,6 +129,13 @@ } } +void (integer) tar_image_progress = nil; + +global void SetDeployTarImageProgress (void (integer) tip) { + tar_image_progress = tip; + y2milestone ("New tar_image_progress: %1", tar_image_progress); +} + /** * Deploy an image of the filesystem type * @param id string the id of the image -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org