Author: jdsn Date: Fri Apr 25 16:00:25 2008 New Revision: 47077 URL: http://svn.opensuse.org/viewcvs/yast?rev=47077&view=rev Log: show error output behind details button on error 101 (bnc#308117) Modified: trunk/registration/package/yast2-registration.changes trunk/registration/src/clients/inst_suse_register.ycp Modified: trunk/registration/package/yast2-registration.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/package/yast2-registration.changes?rev=47077&r1=47076&r2=47077&view=diff ============================================================================== --- trunk/registration/package/yast2-registration.changes (original) +++ trunk/registration/package/yast2-registration.changes Fri Apr 25 16:00:25 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Apr 25 15:59:18 CEST 2008 - jdsn@suse.de + +- show error output behind details button on error 101 (bnc#308117) + +------------------------------------------------------------------- Fri Apr 25 14:21:22 CEST 2008 - jdsn@suse.de - adding alternative strings using repository instead of source Modified: trunk/registration/src/clients/inst_suse_register.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/clients/inst_suse_register.ycp?rev=47077&r1=47076&r2=47077&view=diff ============================================================================== --- trunk/registration/src/clients/inst_suse_register.ycp (original) +++ trunk/registration/src/clients/inst_suse_register.ycp Fri Apr 25 16:00:25 2008 @@ -381,12 +381,19 @@ /* ---------------------------------- LOCAL FUNCTIONS ------------------------------------------------------------ */ -boolean report_error() +boolean report_error(string errMsg, string errMsgDetail) { // function to display an error message // and offer a detailled view of the error message UI::OpenDialog(error_message); + if (errMsg != nil) + { + // use this function for custom error messages as well (bnc#308117) + UI::ChangeWidget(`id(`err_description), `Value, errMsg); + UI::RecalcLayout(); + UI::ChangeWidget(`id(`back), `Enabled, false ); + } UI::SetFocus (`id (`skip )); symbol retry = nil; @@ -399,6 +406,10 @@ { // switch to plaintext if error output is one or two lines (#239570) string error_msg_details = (string)information_data["stderr"]:"no error message available"; + if (errMsgDetail != nil) + { + error_msg_details = errMsgDetail; + } if ( contains( [0,1], size(splitstring(error_msg_details,"\n")) ) ) UI::OpenDialog(error_message_details); else @@ -633,7 +644,7 @@ if (! ( information_data["exit"]:"99" == "199" && information_data["stdout"]:"aborted" == "aborted" && information_data["stderr"]:"aborted" == "aborted" ) ) - report_error(); + report_error(nil, nil); } } @@ -803,7 +814,8 @@ // show a message when there are no products to register if (information_data["exit"]:"99" == "101") { - Popup::Message(no_product_msg); + //Popup::Message(no_product_msg); + report_error(no_product_msg, information_data["stderr"]:""); loopend = true; } @@ -835,7 +847,7 @@ ) { // display error message - report_error(); + report_error(nil, nil); } } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org