Author: locilka Date: Wed Jan 30 12:22:27 2008 New Revision: 44000 URL: http://svn.opensuse.org/viewcvs/yast?rev=44000&view=rev Log: - Fixed visibility of ZMD Turnoff checkbox (bnc #356655). Modified: trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/inst_congratulate.ycp Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=44000&r1=43999&r2=44000&view=diff ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Wed Jan 30 12:22:27 2008 @@ -1,9 +1,10 @@ ------------------------------------------------------------------- Wed Jan 30 09:51:42 CET 2008 - locilka@suse.cz -- Added -noreset option to the VNC startup script (BNC #351338). +- Added -noreset option to the VNC startup script (bnc #351338). - Added inst_user_first.ycp call to the control file right before the installation proposal. +- Fixed visibility of ZMD Turnoff checkbox (bnc #356655). ------------------------------------------------------------------- Tue Jan 29 17:34:03 CET 2008 - locilka@suse.cz Modified: trunk/installation/src/clients/inst_congratulate.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_congratulate.ycp?rev=44000&r1=43999&r2=44000&view=diff ============================================================================== --- trunk/installation/src/clients/inst_congratulate.ycp (original) +++ trunk/installation/src/clients/inst_congratulate.ycp Wed Jan 30 12:22:27 2008 @@ -58,33 +58,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 or running - if ( - show_zmd_turnoff_checkbox == true && - Package::Installed (zmd_package_name) && - (Service::Enabled (zmd_service_name) || Service::Status (zmd_service_name) == 0) - ) { - check_box_turnoff_zmd = `CheckBox ( - `id (`turnoff_zmd), - // TRANSLATORS: check box, see #ZMD - _("&Disable ZMD Service"), - turnoff_zmd_default_state - ); + // + ZMD service needs to be enabled + 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"), + // 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 + // 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); - // Cloning client is installed and there is something to be cloned if (Package::Installed("autoyast2") && size(ProductControl::clone_modules) > 0) { clone_enabled = true; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org