[yast-commit] r60511 - in /branches/SuSE-Code-11-SP1-Branch/support: package/yast2-support.changes src/Support.ycp

Author: mzugec Date: Mon Jan 25 15:39:42 2010 New Revision: 60511 URL: http://svn.opensuse.org/viewcvs/yast?rev=60511&view=rev Log: bnc#447588 - remove progress dialog on start of support module Modified: branches/SuSE-Code-11-SP1-Branch/support/package/yast2-support.changes branches/SuSE-Code-11-SP1-Branch/support/src/Support.ycp Modified: branches/SuSE-Code-11-SP1-Branch/support/package/yast2-support.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/support/package/yast2-support.changes?rev=60511&r1=60510&r2=60511&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/support/package/yast2-support.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/support/package/yast2-support.changes Mon Jan 25 15:39:42 2010 @@ -2,6 +2,7 @@ Mon Jan 18 09:51:55 CET 2010 - mzugec@suse.cz - fixed desktop file (Categories) +- bnc#447588 - remove progress dialog on start of support module - 2.17.19 ------------------------------------------------------------------- Modified: branches/SuSE-Code-11-SP1-Branch/support/src/Support.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/support/src/Support.ycp?rev=60511&r1=60510&r2=60511&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/support/src/Support.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/support/src/Support.ycp Mon Jan 25 15:39:42 2010 @@ -244,52 +244,20 @@ /* Support read dialog caption */ string caption = _("Initializing support Configuration"); - // TODO FIXME Set the right 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/3 */ - _("Read the configuration") - ], [ - /* Progress step 1/3 */ - _("Reading the database..."), - /* Progress step 2/3 */ - _("Reading the previous settings..."), - /* Progress step 3/3 */ - _("Detecting the devices..."), - /* Progress finished */ - _("Finished") - ], - "" - ); - - // read database - if(Abort()) return false; - Progress::NextStage(); configuration = (map)SCR::Read(.etc.supportconfig.all); foreach(map row, configuration["value"]:[], { options[row["name"]:""]=row["value"]:""; }); /* Error message */ if(false) Report::Error(Message::CannotReadCurrentSettings()); - sleep(sl); - // read current settings - if(Abort()) return false; - Progress::NextStage(); if (PackageSystem::Installed("MozillaFirefox")) browser="firefox"; else if (PackageSystem::Installed("kde4-konqueror")||PackageSystem::Installed("kdebase3")) browser="konqueror"; else if (PackageSystem::Installed("opera")) browser="opera"; else y2error("Couldn't find any supported browser installed."); /* Error message */ if(false) Report::Error(Message::CannotReadCurrentSettings()); - sleep(sl); if(Abort()) return false; log_files=$[ "tmp_dir":(string)SCR::Read(.target.tmpdir) ]; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org