Author: visnov Date: Fri Feb 15 12:48:15 2008 New Revision: 44504 URL: http://svn.opensuse.org/viewcvs/yast?rev=44504&view=rev Log: show icons in the lists Modified: trunk/country/language/src/select_language.ycp trunk/country/package/yast2-country.changes trunk/country/yast2-country.spec.in Modified: trunk/country/language/src/select_language.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/language/src/select_language.ycp?rev=44504&r1=44503&r2=44504&view=diff ============================================================================== --- trunk/country/language/src/select_language.ycp (original) +++ trunk/country/language/src/select_language.ycp Fri Feb 15 12:48:15 2008 @@ -322,24 +322,26 @@ // if checkboxes for adapting keyboard and timezone should be shown boolean adapt_term = more_languages && !Mode::config (); - list<term> primary_items = []; - if (more_languages) - { - boolean primary_included= false; + boolean primary_included= false; - term languages_term = `MultiSelectionBox (`id(`languages), - // multiselection box label - _("&Secondary Languages"), - maplist (string trans_lang, lsort (lang_list), { + list<term> primary_items = []; + list<term> secondary_items = maplist (string trans_lang, lsort (lang_list), { string code = lang2code [trans_lang]:""; primary_items = add (primary_items, - `item (`id (code), trans_lang, language == code)); + `item (`id (code), `icon(tolower(Language::GetGivenLanguageCountry(code))+"/flag.png"), trans_lang, language == code)); if (language == code) primary_included = true; return - `item (`id (code), trans_lang, contains (languages, code)); - }) + `item (`id (code), `icon(tolower(Language::GetGivenLanguageCountry(code))+"/flag.png"), trans_lang, contains (languages, code)); + }); + + if (more_languages) + { + term languages_term = `MultiSelectionBox (`id(`languages), + // multiselection box label + _("&Secondary Languages") ); + if (!primary_included) primary_items = add (primary_items, `item (`id (language), language, true)); @@ -461,6 +463,13 @@ argmap["enable_back"]:true , argmap["enable_next"]:true); Wizard::SetDesktopIcon("yast-language"); + + UI::ChangeWidget( `languages, `IconPath, "/usr/share/locale/l10n/" ); + UI::ChangeWidget( `language, `IconPath, "/usr/share/locale/l10n/" ); + + UI::ChangeWidget( `languages, `Items, secondary_items ); + UI::ChangeWidget( `language, `Items, primary_items ); + // No .desktop files in inst-sys - use icon explicitly if (Stage::initial () || Stage::firstboot ()) Modified: trunk/country/package/yast2-country.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/package/yast2-country.changes?rev=44504&r1=44503&r2=44504&view=diff ============================================================================== --- trunk/country/package/yast2-country.changes (original) +++ trunk/country/package/yast2-country.changes Fri Feb 15 12:48:15 2008 @@ -1,4 +1,9 @@ -------------------------------------------------------------------- +-------------------------------------------------------------------- +Fri Feb 15 12:44:54 CET 2008 - visnov@suse.cz + +- show icons for languages + +------------------------------------------------------------------ Thu Feb 7 10:56:54 CET 2008 - jsuchome@suse.cz - the agent for adapting fvwm2 font not needed anymore (bnc#359183) Modified: trunk/country/yast2-country.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/yast2-country.spec.in?rev=44504&r1=44503&r2=44504&view=diff ============================================================================== --- trunk/country/yast2-country.spec.in (original) +++ trunk/country/yast2-country.spec.in Fri Feb 15 12:48:15 2008 @@ -7,6 +7,8 @@ Requires: yast2 >= 2.13.70 # Pkg::SetPackageLocale, Pkg::GetTextLocale Requires: yast2-pkg-bindings >= 2.15.3 +# IconPath support for MultiSelectionBox +Requires: yast2-core >= 2.16.28 Requires: yast2-country-data -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org