Author: jsuchome Date: Tue Jul 7 09:48:34 2009 New Revision: 57874 URL: http://svn.opensuse.org/viewcvs/yast?rev=57874&view=rev Log: merged from SP1 branch Modified: branches/SuSE-Code-11-Branch/firstboot/VERSION branches/SuSE-Code-11-Branch/firstboot/configure.in.in branches/SuSE-Code-11-Branch/firstboot/package/yast2-firstboot.changes branches/SuSE-Code-11-Branch/firstboot/src/firstboot_keyboard.ycp branches/SuSE-Code-11-Branch/firstboot/src/firstboot_language.ycp branches/SuSE-Code-11-Branch/firstboot/src/firstboot_write.ycp Modified: branches/SuSE-Code-11-Branch/firstboot/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/firstboot/VERSION?rev=57874&r1=57873&r2=57874&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/firstboot/VERSION (original) +++ branches/SuSE-Code-11-Branch/firstboot/VERSION Tue Jul 7 09:48:34 2009 @@ -1 +1 @@ -2.17.7 +2.17.8 Modified: branches/SuSE-Code-11-Branch/firstboot/configure.in.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/firstboot/configure.in.in?rev=57874&r1=57873&r2=57874&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/firstboot/configure.in.in (original) +++ branches/SuSE-Code-11-Branch/firstboot/configure.in.in Tue Jul 7 09:48:34 2009 @@ -13,5 +13,7 @@ ## Nasty hack: xgettext doesn't work for XML files, so let's symlink it ( cd src/control; ln -sf firstboot.xml firstboot.glade ) +find src/control -name \*.glade | LC_ALL=C sort > POTFILES + ## and generate the output... @YAST2-OUTPUT@ Modified: branches/SuSE-Code-11-Branch/firstboot/package/yast2-firstboot.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/firstboot/package/yast2-firstboot.changes?rev=57874&r1=57873&r2=57874&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/firstboot/package/yast2-firstboot.changes (original) +++ branches/SuSE-Code-11-Branch/firstboot/package/yast2-firstboot.changes Tue Jul 7 09:48:34 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Jun 1 13:02:52 CEST 2009 - jsuchome@suse.cz + +- grab texts from firstboot.xml when creating pot file (bnc#479571) +- call the X11 config to save kbd layout (bnc#497819) +- 2.17.8 + +------------------------------------------------------------------- Wed Feb 25 18:32:41 CET 2009 - jsuchome@suse.cz - retranslate wizard steps after language change (bnc#479571) Modified: branches/SuSE-Code-11-Branch/firstboot/src/firstboot_keyboard.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/firstboot/src/firstboot_keyboard.ycp?rev=57874&r1=57873&r2=57874&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/firstboot/src/firstboot_keyboard.ycp (original) +++ branches/SuSE-Code-11-Branch/firstboot/src/firstboot_keyboard.ycp Tue Jul 7 09:48:34 2009 @@ -28,6 +28,8 @@ Keyboard::Save (false); // kbd must be restarted after YaST finishes (#303808) SCR::Execute (.target.bash, sformat ("touch %1/firstboot_kbd_restart", Directory::vardir)); + // save X11 keyboard layout at the end + SCR::Execute (.target.bash, sformat ("touch %1/firstboot_x11_save", Directory::vardir)); } return ret; Modified: branches/SuSE-Code-11-Branch/firstboot/src/firstboot_language.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/firstboot/src/firstboot_language.ycp?rev=57874&r1=57873&r2=57874&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/firstboot/src/firstboot_language.ycp (original) +++ branches/SuSE-Code-11-Branch/firstboot/src/firstboot_language.ycp Tue Jul 7 09:48:34 2009 @@ -19,6 +19,7 @@ textdomain "firstboot"; import "Console"; + import "Directory"; import "Language"; import "Wizard"; import "Firstboot"; @@ -34,7 +35,6 @@ string language_on_entry = Language::language; y2milestone("language_on_entry: <%1>", language_on_entry ); - any result = `again; // create the wizard dialog while (result == `again) @@ -97,12 +97,17 @@ } }); if (!firstboot_keyboard) + { // popup text Popup::Message( _("Your language setting has been changed. If necessary, you may want to adapt your keyboard settings to the new language. This is possible either in the YaST2 Control Center or by starting \"yast2 keyboard\" directly.")); + // save X11 keyboard layout at the end: + // (default change of layout was done based on language) + SCR::Execute (.target.bash, sformat ("touch %1/firstboot_x11_save", Directory::vardir)); + } } else { Modified: branches/SuSE-Code-11-Branch/firstboot/src/firstboot_write.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/firstboot/src/firstboot_write.ycp?rev=57874&r1=57873&r2=57874&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/firstboot/src/firstboot_write.ycp (original) +++ branches/SuSE-Code-11-Branch/firstboot/src/firstboot_write.ycp Tue Jul 7 09:48:34 2009 @@ -8,9 +8,12 @@ */ { textdomain "firstboot"; - import "Progress"; - import "Popup"; + import "Directory"; + import "FileUtils"; import "Firstboot"; + import "Keyboard"; + import "Popup"; + import "Progress"; import "Wizard"; @@ -73,6 +76,15 @@ sleep(100); Progress::NextStage (); + // call the X11 config before executing the scripts... (bnc#497819,c23) + string file = sformat ("%1/firstboot_x11_save", Directory::vardir); + if (FileUtils::Exists (file)) + { + // current X11 keyboard layout needs to be saved + Keyboard::xf86_update (); + SCR::Execute (.target.remove, file); + } + Firstboot::ExecuteScripts(); sleep(100); Progress::Finish (); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org