Author: jsuchome Date: Wed Oct 15 10:43:57 2008 New Revision: 52213 URL: http://svn.opensuse.org/viewcvs/yast?rev=52213&view=rev Log: - Image Creator: added widgets for locale, timezone and keytable (bnc#435208) - 2.17.10 Modified: trunk/product-creator/VERSION trunk/product-creator/package/yast2-product-creator.changes trunk/product-creator/src/kiwi_dialogs.ycp Modified: trunk/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/VERSION?rev=52213&r1=52212&r2=52213&view=diff ============================================================================== --- trunk/product-creator/VERSION (original) +++ trunk/product-creator/VERSION Wed Oct 15 10:43:57 2008 @@ -1 +1 @@ -2.17.9 +2.17.10 Modified: trunk/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/package/yast2-product-creator.changes?rev=52213&r1=52212&r2=52213&view=diff ============================================================================== --- trunk/product-creator/package/yast2-product-creator.changes (original) +++ trunk/product-creator/package/yast2-product-creator.changes Wed Oct 15 10:43:57 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Oct 15 10:33:44 CEST 2008 - jsuchome@suse.cz + +- Image Creator: added widgets for locale, timezone and keytable + (bnc#435208) +- 2.17.10 + +------------------------------------------------------------------- Tue Oct 14 14:18:06 CEST 2008 - lslezak@suse.cz - use Pkg::ResolvableProperties() instead of Modified: trunk/product-creator/src/kiwi_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/kiwi_dialogs.ycp?rev=52213&r1=52212&r2=52213&view=diff ============================================================================== --- trunk/product-creator/src/kiwi_dialogs.ycp (original) +++ trunk/product-creator/src/kiwi_dialogs.ycp Wed Oct 15 10:43:57 2008 @@ -482,6 +482,42 @@ } /** + * initialize the string value of "preferences" related widget + */ + define void InitPreferences (string id) { + UI::ChangeWidget (`id (id), `Value, + KiwiConfig["preferences",0,id,0,content_key]:"" + ); + } + + /** + * store the string value of "preferences" related given widget + */ + define void StorePreferences (string key, map event) { + string val = (string) UI::QueryWidget (`id(key), `Value); + if (val == "" && haskey (KiwiConfig["preferences",0]:$[], key)) + { + KiwiConfig["preferences",0] = + remove (KiwiConfig["preferences",0]:$[], key); + } + else if (val != "") + { + KiwiConfig["preferences",0,key] = [ $[ + content_key : UI::QueryWidget (`id(key), `Value) + ]]; + } + } + + /** + * handler for string-value "preferences" related widgets: store on exit/save + */ + define symbol HandlePreferences (string key, map event) { + // store the value on exiting + if (event["ID"]:nil == `next) StorePreferences (key, event); + return nil; + } + + /** * initialize the table with users */ define void InitUsersTable (string id) { @@ -1316,9 +1352,19 @@ "contact", `VSpacing (0.2), "specification", + `VSpacing (0.6), + // frame label + `Frame (_("Locale settings"), `HBox ( + "locale", + "keytable", + "timezone" + )), `VStretch () ), `HSpacing (1)), - "widget_names" : [ "author", "contact", "specification" ], + "widget_names" : [ + "author", "contact", "specification", "locale", "keytable", + "timezone" + ], ], "users" : $[ // tab header @@ -1656,6 +1702,33 @@ "handle" : HandleDescription, "no_help" : true, ], + "locale" : $[ + "widget" : `textentry, + // textentry label + "label" : _("&Locale"), + "init" : InitPreferences, + "store" : StorePreferences, + "handle" : HandlePreferences, + "no_help" : true, + ], + "keytable" : $[ + "widget" : `textentry, + // textentry label + "label" : _("&Keyboard layout"), + "init" : InitPreferences, + "store" : StorePreferences, + "handle" : HandlePreferences, + "no_help" : true, + ], + "timezone" : $[ + "widget" : `textentry, + // textentry label + "label" : _("&Time zone"), + "init" : InitPreferences, + "store" : StorePreferences, + "handle" : HandlePreferences, + "no_help" : true, + ], // ---------------- widgtes for users tab "general_users" : $[ "widget" : `empty, -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org