Author: locilka Date: Thu Nov 27 18:31:12 2008 New Revision: 53672 URL: http://svn.opensuse.org/viewcvs/yast?rev=53672&view=rev Log: - Downloading slides only once (bnc #444612). - Do not reset/open the slide show in inst_rpmcopy when slide show dialog is already available/in use (bnc #443755). - 2.17.49 Modified: trunk/packager/VERSION trunk/packager/package/yast2-packager.changes trunk/packager/src/clients/inst_rpmcopy.ycp trunk/packager/src/modules/Packages.ycp Modified: trunk/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=53672&r1=53671&r2=53672&view=diff ============================================================================== --- trunk/packager/VERSION (original) +++ trunk/packager/VERSION Thu Nov 27 18:31:12 2008 @@ -1 +1 @@ -2.17.48 +2.17.49 Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.changes?rev=53672&r1=53671&r2=53672&view=diff ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Thu Nov 27 18:31:12 2008 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Thu Nov 27 18:19:26 CET 2008 - locilka@suse.cz + +- Downloading slides only once (bnc #444612). +- Do not reset/open the slide show in inst_rpmcopy when slide show + dialog is already available/in use (bnc #443755). +- 2.17.49 + +------------------------------------------------------------------- Wed Nov 26 13:54:46 CET 2008 - locilka@suse.cz - Using <pre> in ProductLicense (bnc #449188). Modified: trunk/packager/src/clients/inst_rpmcopy.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/inst_rpmcopy.ycp?rev=53672&r1=53671&r2=53672&view=diff ============================================================================== --- trunk/packager/src/clients/inst_rpmcopy.ycp (original) +++ trunk/packager/src/clients/inst_rpmcopy.ycp Thu Nov 27 18:31:12 2008 @@ -419,7 +419,14 @@ // we want the table SlideShow::ShowTable(); - SlideShow::OpenDialog(); + // Do not open a new SlideShow widget, reuse the old one instead + boolean required_to_open_sl_dialog = (! SlideShow::HaveSlideWidget()); + + // BNC #443755 + if (required_to_open_sl_dialog) { + y2milestone ("SlideShow dialog not yet created"); + SlideShow::OpenDialog(); + } // move the progress to the packages stage SlideShow::MoveToStage("packages"); @@ -434,7 +441,11 @@ Pkg::PkgCommit (9999); } - SlideShow::CloseDialog(); + // BNC #443755 + if (required_to_open_sl_dialog) { + y2milestone ("Closing previously opened SlideShow dialog"); + SlideShow::CloseDialog(); + } if (result != `abort) { Modified: trunk/packager/src/modules/Packages.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/Packages.ycp?rev=53672&r1=53671&r2=53672&view=diff ============================================================================== --- trunk/packager/src/modules/Packages.ycp (original) +++ trunk/packager/src/modules/Packages.ycp Thu Nov 27 18:31:12 2008 @@ -1163,6 +1163,13 @@ Init (true); } + // Do not reinitialize the SlideShow if not needed + // bnc #444612 + if (size (SlideShow::GetSetup()) > 0) { + y2milestone ("SlideShow has been already set, skipping..."); + return; + } + integer source = base_source_id; string lang_long = ""; @@ -1207,6 +1214,9 @@ // no images are cached string search_for_dir = sformat ("/%1/setup/slide/", datadir); FindAndCopySlideDirWithoutCallbacks(our_slidedir, source, search_for_dir, lang_long, lang_short, Slides::fallback_lang); + // Language has to be set otherwise it uses a fallback language + // BNC #444612 comment #2 + SlideShow::SetLanguage (Language::language); // fallback solution disabled /* -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org