Author: dfiser Date: Tue Aug 28 14:22:43 2007 New Revision: 40534 URL: http://svn.opensuse.org/viewcvs/yast?rev=40534&view=rev Log: Changed Read dialog to show more than one stage. Removed Back button in MainDialog. Modified: trunk/squid/src/Squid.ycp trunk/squid/src/complex.ycp Modified: trunk/squid/src/Squid.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/Squid.ycp?rev=40534&r1=40533&r2=40534&view=diff ============================================================================== --- trunk/squid/src/Squid.ycp (original) +++ trunk/squid/src/Squid.ycp Tue Aug 28 14:22:43 2007 @@ -982,22 +982,22 @@ boolean ok = true; if (!readHttpPorts()) ok = false; - Progress::NextStep(); + Progress::NextStage(); if (!readRefreshPatterns()) ok = false; - Progress::NextStep(); + Progress::NextStage(); if (!readACLs()) ok = false; - Progress::NextStep(); + Progress::NextStage(); if (!readHttpAccesses()) ok = false; - Progress::NextStep(); + Progress::NextStage(); if (!readRestSetting()) ok = false; - Progress::NextStep(); + Progress::NextStage(); if (!readServiceStatus()) ok = false; - Progress::NextStep(); + Progress::NextStage(); return ok; } @@ -1012,8 +1012,18 @@ Progress::New(_("Initializing squid Configuration"), " ", 6, - [_("Read the settings.")], - [_("Reading the setting ...")], + [_("Read HTTP Ports from config file."), + _("Read Refresh Patterns from config file."), + _("Read ACL Groups from config file."), + _("Read Access Control table from config file."), + _("Read the rest settings."), + _("Read service status.")], + [_("Reading HTTP Ports ..."), + _("Reading Refresh Patterns ..."), + _("Reading ACL Groups ..."), + _("Reading Access Control table ..."), + _("Reading the rest settings ..."), + _("Reading service status ...")], ""); if(Abort()) return false; Modified: trunk/squid/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/complex.ycp?rev=40534&r1=40533&r2=40534&view=diff ============================================================================== --- trunk/squid/src/complex.ycp (original) +++ trunk/squid/src/complex.ycp Tue Aug 28 14:22:43 2007 @@ -267,8 +267,8 @@ "widget_descr" : widget_descr, "screens" : screens, "functions" : $[`abort : ReallyAbort], - "back_button" : Label::BackButton(), - "next_button" : Label::FinishButton(), + "back_button" : "", + "next_button" : Label::AcceptButton(), "abort_button" : Label::AbortButton() ]); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org