Author: jsuchome Date: Thu Jul 16 13:50:56 2009 New Revision: 58080 URL: http://svn.opensuse.org/viewcvs/yast?rev=58080&view=rev Log: - correct path to xset binary (bnc#522615) - make PackagesCommit available for outside - load english names for languages in firstboot stage - 2.18.11 Modified: trunk/country/VERSION trunk/country/language/src/language.ycp trunk/country/language/src/modules/Language.ycp trunk/country/language/src/select_language.ycp trunk/country/package/yast2-country.changes trunk/country/timezone/src/Timezone.ycp Modified: trunk/country/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/VERSION?rev=58080&r1=58079&r2=58080&view=diff ============================================================================== --- trunk/country/VERSION (original) +++ trunk/country/VERSION Thu Jul 16 13:50:56 2009 @@ -1 +1 @@ -2.18.10 +2.18.11 Modified: trunk/country/language/src/language.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/language/src/language.ycp?rev=58080&r1=58079&r2=58080&view=diff ============================================================================== --- trunk/country/language/src/language.ycp (original) +++ trunk/country/language/src/language.ycp Thu Jul 16 13:50:56 2009 @@ -20,43 +20,14 @@ import "Keyboard"; import "Language"; import "Mode"; -import "PackageSlideShow"; import "Popup"; import "Progress"; import "Service"; -import "SlideShow"; import "Wizard"; // if packages should be installed after language change boolean no_packages = false; -/** - * Install and uninstall packages selected by Pkg::SetAdditionalLocales - */ -define boolean PackagesCommit () { - - if (!Mode::commandline ()) - { - PackageSlideShow::InitPkgData (false); - SlideShow::Setup([$[ - "name" : "packages", - "description" : _("Installing Packages..."), - "value" : PackageSlideShow::total_size_to_install / 1024 , // kilobytes - "units" : `kb, - ]]); - - SlideShow::ShowTable(); - - SlideShow::OpenDialog (); - SlideShow::MoveToStage( "packages" ); - } - Pkg::PkgCommit (0); - if (!Mode::commandline ()) - { - SlideShow::CloseDialog(); - } - return true; -} /** * read language settings @@ -114,7 +85,7 @@ } if (enough_space) { - PackagesCommit (); + Language::PackagesCommit (); } } Modified: trunk/country/language/src/modules/Language.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/language/src/modules/Language.ycp?rev=58080&r1=58079&r2=58080&view=diff ============================================================================== --- trunk/country/language/src/modules/Language.ycp (original) +++ trunk/country/language/src/modules/Language.ycp Thu Jul 16 13:50:56 2009 @@ -24,9 +24,11 @@ import "Misc"; import "Mode"; import "PackageCallbacks"; +import "PackageSlideShow"; import "PackageSystem"; import "Popup"; import "ProductFeatures"; +import "SlideShow"; import "Stage"; @@ -571,7 +573,7 @@ string local_lang = ReadSysconfigLanguage (); QuickSet (local_lang); SetDefault(); // also default - if (Mode::live_installation ()) + if (Mode::live_installation () || Stage::firstboot ()) { FillEnglishNames (local_lang); } @@ -915,15 +917,31 @@ /** * Install and uninstall packages selected by Pkg::SetAdditionalLocales - * -global define boolean PackagesCommit () { + */ +global boolean PackagesCommit () { + + if (!Mode::commandline ()) + { + PackageSlideShow::InitPkgData (false); + SlideShow::Setup([$[ + "name" : "packages", + "description" : _("Installing Packages..."), + "value" : PackageSlideShow::total_size_to_install / 1024 , // kilobytes + "units" : `kb, + ]]); - SlideShow::OpenSlideShowDialog (); + SlideShow::ShowTable(); + + SlideShow::OpenDialog (); + SlideShow::MoveToStage( "packages" ); + } Pkg::PkgCommit (0); - SlideShow::CloseSlideShowDialog(); + if (!Mode::commandline ()) + { + SlideShow::CloseDialog(); + } return true; } -*/ /** * de_DE@UTF-8 -> "DE" Modified: trunk/country/language/src/select_language.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/language/src/select_language.ycp?rev=58080&r1=58079&r2=58080&view=diff ============================================================================== --- trunk/country/language/src/select_language.ycp (original) +++ trunk/country/language/src/select_language.ycp Thu Jul 16 13:50:56 2009 @@ -39,27 +39,6 @@ string language = Language::language; /** - * Install and uninstall packages selected by Pkg::SetAdditionalLocales - */ - define boolean PackagesCommit () { - SlideShow::OpenDialog (); - PackageSlideShow::InitPkgData (false); - SlideShow::Setup([$[ - "name" : "packages", - "description" : _("Installing Packages..."), - "value" : PackageSlideShow::total_size_to_install / 1024 , // kilobytes - "units" : `kb, - ]]); - - SlideShow::ShowTable(); - - SlideShow::MoveToStage( "packages" ); - Pkg::PkgCommit (0); - SlideShow::CloseDialog (); - return true; - } - - /** * Popup for setting expert language values */ define symbol LanguageExpertDialog() { @@ -657,7 +636,7 @@ } if (Stage::firstboot ())// install language packages now { - PackagesCommit (); + Language::PackagesCommit (); } } } Modified: trunk/country/package/yast2-country.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/package/yast2-country.changes?rev=58080&r1=58079&r2=58080&view=diff ============================================================================== --- trunk/country/package/yast2-country.changes (original) +++ trunk/country/package/yast2-country.changes Thu Jul 16 13:50:56 2009 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Thu Jul 16 12:50:43 CEST 2009 - jsuchome@suse.cz + +- correct path to xset binary (bnc#522615) +- make PackagesCommit available for outside +- load english names for languages in firstboot stage +- 2.18.11 + +------------------------------------------------------------------- Thu Jul 9 10:12:41 CEST 2009 - jreidinger@suse.cz - fix spec file problem for 2.18.10 ( by coolo ) Modified: trunk/country/timezone/src/Timezone.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/timezone/src/Timezone.ycp?rev=58080&r1=58079&r2=58080&view=diff ============================================================================== --- trunk/country/timezone/src/Timezone.ycp (original) +++ trunk/country/timezone/src/Timezone.ycp Thu Jul 16 13:50:56 2009 @@ -249,9 +249,9 @@ // (in non-firstboot cases, installation process handles it) if (Stage::firstboot() && !textmode) { - SCR::Execute ( .target.bash, "/usr/X11R6/bin/xset -dpms"); - SCR::Execute ( .target.bash, "/usr/X11R6/bin/xset s reset"); - SCR::Execute ( .target.bash, "/usr/X11R6/bin/xset s off"); + SCR::Execute ( .target.bash, "/usr/bin/xset -dpms"); + SCR::Execute ( .target.bash, "/usr/bin/xset s reset"); + SCR::Execute ( .target.bash, "/usr/bin/xset s off"); } string cmd = "/usr/sbin/zic -l " + timezone; y2milestone( "Set cmd %1", cmd ); @@ -264,8 +264,8 @@ } if (Stage::firstboot() && !textmode) { - SCR::Execute (.target.bash, "/usr/X11R6/bin/xset s on"); - SCR::Execute ( .target.bash, "/usr/X11R6/bin/xset +dpms"); + SCR::Execute (.target.bash, "/usr/bin/xset s on"); + SCR::Execute ( .target.bash, "/usr/bin/xset +dpms"); } } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org