Author: locilka Date: Wed Jun 20 16:17:01 2007 New Revision: 38929 URL: http://svn.opensuse.org/viewcvs/yast?rev=38929&view=rev Log: Added help text Adjusted client to allow to go back Modified: trunk/installation/src/clients/inst_network_check.ycp Modified: trunk/installation/src/clients/inst_network_check.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_network_check.ycp?rev=38929&r1=38928&r2=38929&view=diff ============================================================================== --- trunk/installation/src/clients/inst_network_check.ycp (original) +++ trunk/installation/src/clients/inst_network_check.ycp Wed Jun 20 16:17:01 2007 @@ -18,6 +18,10 @@ import "NetworkService"; import "Wizard"; import "Popup"; + import "GetInstArgs"; + + boolean enable_next = true; + boolean enable_back = true; /* * We don't need to run this script to setup the network @@ -31,6 +35,7 @@ y2milestone ("No network configuration found, offering to set it up..."); Wizard::SetContents ( + // TRANSLATORS: dialog caption _("Network Setup"), `VBox ( `VStretch(), @@ -39,13 +44,21 @@ `HBox ( `HStretch (), `VBox ( + // TRANSLATORS: dialog label `Left(`Label (_("No network setup has been found. -Would you like to configure your network card now?"))), +It is vitally important for adding some remote installation sources +otherwise you can safely skip it."))), + `VSpacing (2), + // TRANSLATORS: dialog label + `Left(`Label (_("Would you like to configure your network card now?"))), `VSpacing (1), `Frame ( + // TRANSLATORS: frame label _("Select"), `MarginBox ( 1.5, 1, `VBox ( + // TRANSLATORS: radio button `Left(`RadioButton (`id ("yes_do_run_setup"), _("&Yes, Run the Network Setup"), true)), + // TRANSLATORS: radio button `Left(`RadioButton (`id ("no_do_not_run_setup"), _("No, &Skip the Network Setup"))) )) ) @@ -55,9 +68,15 @@ ), `VStretch() ), - _("FIXME: help"), - false, - true + // TRANSLATORS: help text, part 1/2 + _("<p>The current installation system does not seem +to have configured network.</p>") + + // TRANSLATORS: help text, part 2/2 + _("<p>A configured network is needed for adding remote installation sources +or Add-On products. You do not need to set it up in case you do not want +to use any remote instalation source and you can skip the configuration now.</p>"), + enable_next, + enable_back ); Wizard::SetTitleIcon ("yast-network"); @@ -78,6 +97,10 @@ run_setup = (option_selected == "yes_do_run_setup"); return_this = `next; break; + } else if (ret == `back) { + y2milestone ("Going back"); + return_this = `back; + break; } else if (ret == `abort) { if (Popup::ConfirmAbort (`painless)) { @@ -91,10 +114,11 @@ if (run_setup) { y2milestone ("Running inst_network_setup"); - WFM::CallFunction ("inst_network_setup", []); + any ret = WFM::CallFunction ("inst_network_setup", []); + y2milestone ("inst_network_setup ret: %1", ret); } - return `next; + return return_this; /* EOF */ } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org