Author: locilka Date: Wed Jan 30 12:22:48 2008 New Revision: 44001 URL: http://svn.opensuse.org/viewcvs/yast?rev=44001&view=rev Log: - Fixed visibility of ZMD Turnoff checkbox (#356655). - 2.13.203 Modified: branches/SuSE-SLE-10-SP2-Branch/installation/VERSION branches/SuSE-SLE-10-SP2-Branch/installation/package/yast2-installation.changes branches/SuSE-SLE-10-SP2-Branch/installation/src/clients/inst_congratulate.ycp Modified: branches/SuSE-SLE-10-SP2-Branch/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/installation/VERSION?rev=44001&r1=44000&r2=44001&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/installation/VERSION (original) +++ branches/SuSE-SLE-10-SP2-Branch/installation/VERSION Wed Jan 30 12:22:48 2008 @@ -1 +1 @@ -2.13.202 +2.13.203 Modified: branches/SuSE-SLE-10-SP2-Branch/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/installation/package/yast2-installation.changes?rev=44001&r1=44000&r2=44001&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/installation/package/yast2-installation.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/installation/package/yast2-installation.changes Wed Jan 30 12:22:48 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Jan 30 12:19:35 CET 2008 - locilka@suse.cz + +- Fixed visibility of ZMD Turnoff checkbox (#356655). +- 2.13.203 + +------------------------------------------------------------------- Thu Jan 17 12:56:30 CET 2008 - jsrain@suse.cz - merged texts from proofread Modified: branches/SuSE-SLE-10-SP2-Branch/installation/src/clients/inst_congratulate.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/installation/src/clients/inst_congratulate.ycp?rev=44001&r1=44000&r2=44001&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/installation/src/clients/inst_congratulate.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/installation/src/clients/inst_congratulate.ycp Wed Jan 30 12:22:48 2008 @@ -64,38 +64,38 @@ // See FATE #302495 // Param 'show_zmd_turnoff_checkbox' says whether the checkbox for stopping and // disabling ZMD should be shown - boolean show_zmd_turnoff_checkbox = (boolean) argmap["show_zmd_turnoff_checkbox"]:false; + boolean show_zmd_turnoff_checkbox = (argmap["show_zmd_turnoff_checkbox"]:"no" == "yes"); + // Param 'zmd_turnoff_default_state' says whether the checkbox is selected or // not by default - boolean turnoff_zmd_default_state = (boolean) argmap["zmd_turnoff_default_state"]:false; + boolean turnoff_zmd_default_state = (argmap["zmd_turnoff_default_state"]:"no" == "yes"); + + boolean zmd_installed = Package::Installed (zmd_package_name); + // don't check for state a service that is not installed + boolean zmd_enabled_or_running = (zmd_installed && (Service::Enabled (zmd_service_name) || Service::Status (zmd_service_name) == 0)); + y2milestone ("ZMD Installed: %1, Enabled/Running: %2", zmd_installed, zmd_enabled_or_running); + y2milestone ("Show TurnOffZMD checkbox: %1, default state: %2", show_zmd_turnoff_checkbox, turnoff_zmd_default_state); // + 'show_zmd_turnoff_checkbox' // + ZMD package needs to be installed // + ZMD service needs to be enabled - if ( - show_zmd_turnoff_checkbox == true && - Package::Installed (zmd_package_name) && - (Service::Enabled (zmd_service_name) || Service::Status (zmd_service_name) == 0) - ) { - show_zmd_turnoff_checkbox = true; - turnoff_zmd_default_state = (ProductFeatures::GetBooleanFeature ("software", "zmd_turnoff_default_state") == true); - + if (show_zmd_turnoff_checkbox && zmd_installed && zmd_enabled_or_running) { check_box_turnoff_zmd = `CheckBox ( `id (`turnoff_zmd), // TRANSLATORS: check box, see #ZMD _("&Disable ZMD Service"), - // (boolean) control_file->software->zmd_turnoff_default_state - // says whether the checkbox is selected or not by default + // control_file->software->zmd_turnoff_default_state + // says whether the checkbox is selected or not by default turnoff_zmd_default_state ); // TRANSLATORS: help text, see #ZMD turnoff_zmd_help = _("<p>Select <b>Disable ZMD Service</b> to stop and disable the ZMD service during the system start.</p>"); + } else { + y2milestone ("ZMD Turnoff check-box will be invisible"); } - y2milestone ("Show TurnOffZMD checkbox: %1, default state: %2", show_zmd_turnoff_checkbox, turnoff_zmd_default_state); - map display = UI::GetDisplayInfo(); integer space = display["TextMode"]:true ? 1 : 3; string vendor_url_tmp = ProductFeatures::GetStringFeature("globals", "vendor_url"); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org