Author: locilka Date: Wed Feb 6 17:50:47 2008 New Revision: 44209 URL: http://svn.opensuse.org/viewcvs/yast?rev=44209&view=rev Log: - Speed-up inst_complex_welcome optimalizations (e.g., skipping downloading extension already by Linuxrc) Modified: trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/inst_complex_welcome.ycp trunk/installation/src/modules/InstData.ycp Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=44209&r1=44208&r2=44209&view=diff ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Wed Feb 6 17:50:47 2008 @@ -2,6 +2,8 @@ Wed Feb 6 13:23:35 CET 2008 - locilka@suse.cz - Better /lbin/wget handling in InstExtensionImage. +- Speed-up inst_complex_welcome optimalizations (e.g., skipping + downloading extension already by Linuxrc) ------------------------------------------------------------------- Tue Feb 5 16:04:15 CET 2008 - locilka@suse.cz Modified: trunk/installation/src/clients/inst_complex_welcome.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_complex_welcome.ycp?rev=44209&r1=44208&r2=44209&view=diff ============================================================================== --- trunk/installation/src/clients/inst_complex_welcome.ycp (original) +++ trunk/installation/src/clients/inst_complex_welcome.ycp Wed Feb 6 17:50:47 2008 @@ -271,15 +271,15 @@ `Left (`ReplacePoint (`id (`base_license_rp), `Empty())) )), `VSpacing (text_mode ? 0.1 : 0.5), - `HBox ( + `MinHeight (1, `HBox ( `Left (`CheckBox ( // TRANSLATORS: check-box `id (`license_agreement), `opt (`notify), _("I Do &Agree to the License Terms."), InstData::product_license_accepted )), `VStretch (), // TRANSLATORS: button label - `Right (`PushButton (`id (`show_fulscreen_license), _("Show In Full-Screen..."))) - ) + `Right (`PushButton (`id (`show_fulscreen_license), _("&Show In Full-Screen..."))) + )) ) ), `VWeight (3, `VStretch()) @@ -408,12 +408,18 @@ // Returns true if the dialog needs redrawing boolean SetLanguageIfChanged (any ret) { - if (Stage::initial()) { - // TRANSLATORS: busy message - UI::OpenDialog (`Label (_("Downloading installation system language extension..."))); - // FATE #302955: Split translations out of installation system - InstExtensionImage::DownloadAndIntegrateExtension (GetLanguageExtensionFilename (language)); - UI::CloseDialog(); + // Only inst-sys and only if a language has been changed right now + // and the new language is not the initial one (that one is already downloaded by Linuxrc) + if (Stage::initial() && ret == `language) { + if (InstData::initial_installation_language != language) { + // TRANSLATORS: busy message + UI::OpenDialog (`Label (_("Downloading installation system language extension..."))); + // FATE #302955: Split translations out of installation system + InstExtensionImage::DownloadAndIntegrateExtension (GetLanguageExtensionFilename (language)); + UI::CloseDialog(); + } else { + y2milestone ("Skipping downloading %1 extension again (initial language)", InstData::initial_installation_language); + } } if (language != Language::language) { @@ -496,8 +502,15 @@ // FATE #302955: Split translations out of installation system // [ "en_US", "en_GB", "de", "cs" ] // they are in content.SUPPLANGS or as files in /usr/lib/YaST2/trans - available_lang_filenames = GetListOfSupportedLangExtensions(); - y2milestone ("Supported languages are: %1", available_lang_filenames); + if (available_lang_filenames == nil || available_lang_filenames == []) { + available_lang_filenames = GetListOfSupportedLangExtensions(); + y2milestone ("Supported languages are: %1", available_lang_filenames); + } + + // Store the initial language + if (InstData::initial_installation_language == nil) { + InstData::initial_installation_language = Language::language; + } while (true) { ret = UI::UserInput(); Modified: trunk/installation/src/modules/InstData.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/modules/InstData.ycp?rev=44209&r1=44208&r2=44209&view=diff ============================================================================== --- trunk/installation/src/modules/InstData.ycp (original) +++ trunk/installation/src/modules/InstData.ycp Wed Feb 6 17:50:47 2008 @@ -37,6 +37,10 @@ global boolean product_license_accepted = false; + // when Linuxrc starts the installation, the first language is already selected + // and language extension already merged + global string initial_installation_language = nil; + // <-- other /* EOF */ -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org