Author: locilka Date: Tue Feb 9 14:58:04 2010 New Revision: 60766 URL: http://svn.opensuse.org/viewcvs/yast?rev=60766&view=rev Log: - Fixed license agreement check box visibility (BNC #571846). - 2.19.3 Modified: trunk/installation/VERSION trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/inst_complex_welcome.ycp Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=60766&r1=60765&r2=60766&view=diff ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Tue Feb 9 14:58:04 2010 @@ -1 +1 @@ -2.19.2 +2.19.3 Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=60766&r1=60765&r2=60766&view=diff ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Tue Feb 9 14:58:04 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Feb 9 14:49:33 CET 2010 - locilka@ssue.cz + +- Fixed license agreement check box visibility (BNC #571846). +- 2.19.3 + +------------------------------------------------------------------- Tue Feb 2 11:03:04 CET 2010 - locilka@suse.cz - Added LXDE to openSUSE control file (FATE #307729). 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=60766&r1=60765&r2=60766&view=diff ============================================================================== --- trunk/installation/src/clients/inst_complex_welcome.ycp (original) +++ trunk/installation/src/clients/inst_complex_welcome.ycp Tue Feb 9 14:58:04 2010 @@ -53,7 +53,8 @@ boolean text_mode = Language::GetTextMode (); - string license_ui_id = "base_license"; + integer license_id = Pkg::SourceGetCurrent(true)[0]:0; + string license_ui_id = tostring (license_id); /* ---------------------------------------------------------------------- * Build dialog @@ -293,7 +294,7 @@ return false; } - ProductLicense::ShowLicenseInInstallation (`base_license_rp, Pkg::SourceGetCurrent(true)[0]:0); + ProductLicense::ShowLicenseInInstallation (`base_license_rp, license_id); // bugzilla #206706 if (Mode::autoinst()) { @@ -301,6 +302,7 @@ } // If accepting the license is required, show the check-box + y2milestone ("Acceptance needed: %1 => %2", license_ui_id, ProductLicense::AcceptanceNeeded (license_ui_id)); if (ProductLicense::AcceptanceNeeded (license_ui_id)) { UI::ReplaceWidget (`license_checkbox_rp, license_agreement_checkbox); } @@ -347,7 +349,7 @@ if (ret == `next) break; } else if (ret == `show_fulscreen_license) { UI::OpenDialog (AllLicensesDialog()); - ProductLicense::ShowFullScreenLicenseInInstallation (`full_screen_license_rp, Pkg::SourceGetCurrent(true)[0]:0); + ProductLicense::ShowFullScreenLicenseInInstallation (`full_screen_license_rp, license_id); UI::CloseDialog(); } } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org