Author: gs Date: Tue Apr 19 14:53:05 2011 New Revision: 63830 URL: http://svn.opensuse.org/viewcvs/yast?rev=63830&view=rev Log: adjust progress Modified: trunk/fcoe-client/src/FcoeClient.ycp trunk/fcoe-client/src/complex.ycp trunk/fcoe-client/src/dialogs.ycp Modified: trunk/fcoe-client/src/FcoeClient.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/src/FcoeClient.ycp?rev=63830&r1=63829&r2=63830&view=diff ============================================================================== --- trunk/fcoe-client/src/FcoeClient.ycp (original) +++ trunk/fcoe-client/src/FcoeClient.ycp Tue Apr 19 14:53:05 2011 @@ -145,13 +145,12 @@ /* FcoeClient read dialog caption */ string caption = _("Initializing fcoe-client Configuration"); - // TODO FIXME Set the right number of stages - integer steps = 4; + // Set the right number of stages + integer steps = 3; integer sl = 500; sleep(sl); - // TODO FIXME Names of real stages // We do not set help text here, because it was set outside Progress::New( caption, " ", steps, [ /* Progress stage 1/3 */ @@ -177,14 +176,7 @@ if(Abort()) return false; Progress::NextStage(); /* Error message */ - if(false) Report::Error(_("Cannot read database1.")); - sleep(sl); - - // read another database - if(Abort()) return false; - Progress::NextStep(); - /* Error message */ - if(false) Report::Error(_("Cannot read database2.")); + if(false) Report::Error(_("Cannot read database.")); sleep(sl); // read current settings @@ -201,13 +193,11 @@ if(false) Report::Warning(_("Cannot detect devices.")); sleep(sl); - if(Abort()) return false; - /* Progress finished */ - Progress::NextStage(); - sleep(sl); - + Progress::Finish(); + if(Abort()) return false; modified = false; + return true; } @@ -219,14 +209,13 @@ /* FcoeClient read dialog caption */ string caption = _("Saving fcoe-client Configuration"); - - // TODO FIXME And set the right number of stages + y2milestone( "Saving fcoe-client Configuration" ); + + // Set the number of stages integer steps = 2; integer sl = 500; - sleep(sl); - - // TODO FIXME Names of real stages + // We do not set help text here, because it was set outside Progress::New(caption, " ", steps, [ /* Progress stage 1/2 */ @@ -243,10 +232,13 @@ ], "" ); + boolean is_running = Progress::IsRunning(); + y2milestone( "**** Progress still running: %1", is_running ); // write settings if(Abort()) return false; Progress::NextStage(); + /* Error message */ if(false) Report::Error (_("Cannot write settings.")); sleep(sl); @@ -254,16 +246,13 @@ // run SuSEconfig if(Abort()) return false; Progress::NextStage (); + /* Error message */ if(false) Report::Error (Message::SuSEConfigFailed()); sleep(sl); if(Abort()) return false; - /* Progress finished */ - Progress::NextStage(); - sleep(sl); - if(Abort()) return false; return true; } Modified: trunk/fcoe-client/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/src/complex.ycp?rev=63830&r1=63829&r2=63830&view=diff ============================================================================== --- trunk/fcoe-client/src/complex.ycp (original) +++ trunk/fcoe-client/src/complex.ycp Tue Apr 19 14:53:05 2011 @@ -74,6 +74,7 @@ */ symbol WriteDialog() { Wizard::RestoreHelp(HELPS["write"]:""); + y2milestone( "Writing configuration" ); // FcoeClient::SetAbortFunction(PollAbort); boolean ret = FcoeClient::Write(); return ret ? `next : `abort; @@ -106,9 +107,13 @@ symbol HandleInterfacesDialog( string id, map event ) { any action = event["ID"]:nil; - y2milestone( "Action: %1, returning `edit", action); + if ( action == `edit ) + { + y2milestone( "Action: %1, returning `edit", action); return `edit; + } + return nil; } Modified: trunk/fcoe-client/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/src/dialogs.ycp?rev=63830&r1=63829&r2=63830&view=diff ============================================================================== --- trunk/fcoe-client/src/dialogs.ycp (original) +++ trunk/fcoe-client/src/dialogs.ycp Tue Apr 19 14:53:05 2011 @@ -82,7 +82,7 @@ return `MarginBox( mbox_x, mbox_y, `VBox( `Table(`id(`interfaces), `opt(`notify, `immediate ), - `header(_("Portal Address"), _("Target Name"), _("Start-Up")), + `header(_("Device Name"), _("Model"), _("FCoE Satus"), _("DCB Status")), [] ), `Left(`HBox( -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org