[yast-commit] r48439 - /trunk/country/timezone/src/dialogs.ycp

Author: jsuchome Date: Fri Jun 20 13:18:11 2008 New Revision: 48439 URL: http://svn.opensuse.org/viewcvs/yast?rev=48439&view=rev Log: optimize a bit sorting of time zone entries (bnc#395816) Modified: trunk/country/timezone/src/dialogs.ycp Modified: trunk/country/timezone/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/timezone/src/dialogs.ycp?rev=48439&r1=48438&r2=48439&view=diff ============================================================================== --- trunk/country/timezone/src/dialogs.ycp (original) +++ trunk/country/timezone/src/dialogs.ycp Fri Jun 20 13:18:11 2008 @@ -30,8 +30,10 @@ symbol hwclock_s_initial = `none; - // helper function for seting the time related stuff in module and possibly - // adapting current time according to it + /** + * helper function for seting the time related stuff in module and possibly + * adapting current time according to it + */ define void SetTimezone (symbol hwclock, string timezone, boolean really, boolean changed_time) { @@ -57,6 +59,7 @@ /** * Dialog for setinge system date and time + * @return true if user changed the time (dialog accepted) */ define boolean SetTimeDialog() { @@ -410,7 +413,6 @@ } // get current timezone and clock setting - // boolean changed_time = false; string timezone = Timezone::timezone; string timezone_old = timezone; @@ -428,23 +430,10 @@ Timezone::PushVal(); - /* ---------------------------------------------------------------------- - * Build dialog - * ----------------------------------------------------------------------*/ - // Assign system date and time. // string date = Timezone::GetDateTime(true, false); - // build up timezone selection box - // - term timezonesel = `ReplacePoint (`id(`tzsel), - // title for selection box 'timezone' - `SelectionBox (`id (`timezone), `opt(`notify), _("Time &Zone"))); - - term region = `SelectionBox ( - // label text - `id(`region),`opt(`notify,`immediate), _("&Region"),Timezone::Region()); term settime = `Empty(); @@ -456,11 +445,6 @@ boolean textmode = Language::GetTextMode (); - term timezoneterm = `HBox ( - region, - `HSpacing (), - timezonesel - ); boolean timezone_selector = false; list<map> zonemap = Timezone::get_zonemap (); @@ -469,32 +453,20 @@ map yast2zonetab = Timezone::yast2zonetab; // map of timezone -> translated label to be passed to TimezoneSelector - map zones = $[]; + map zones = $[]; // cache the zonemap with the order sorted according to current locale - list sorted_zonemap = maplist (map region, zonemap, { - list trl = maplist ( - string key, string name, (map)region["entries"]:$[], - { - // Vatican cannot be shown in the map, Rome would be missing... - if (key != "Europe/Vatican") - zones[yast2zonetab[key]:key] = name; - return [ name, key ]; + map sorted_zonemap = $[]; + + foreach (map region, zonemap, { + foreach (string key, string name, region["entries"]:$[], { + if (key != "Europe/Vatican") + zones[yast2zonetab[key]:key] = name; }); - // prevent the crash in installation (workaround for bnc#385172) - if (Language::language != "ko_KR") - { - trl = sort (list a, list b, (list<list>) trl, { - list lsorted = lsort ([a[0]:"", b[0]:""]); - return (lsorted[0]:"" == a[0]:"" && a[0]:"" != b[0]:""); - }); - } - return $[ - "name" : region["name"]:"", - "entries" : trl, - ]; }); + term timezoneterm = `HBox (); + if (UI::HasSpecialWidget (`TimezoneSelector) == true) { timezone_selector = true; @@ -516,6 +488,20 @@ ) ); } + else + { + timezoneterm = `HBox ( + `SelectionBox (`id(`region),`opt(`notify,`immediate), + // label text + _("&Region"), Timezone::Region() + ), + `HSpacing (), + `ReplacePoint (`id(`tzsel), + // title for selection box 'timezone' + `SelectionBox (`id (`timezone), `opt(`notify), _("Time &Zone")) + ) + ); + } term hwclock_term = `VBox ( `CheckBox (`id (`hwclock), `opt(`hstretch, `notify), // check box label @@ -556,7 +542,23 @@ map timezones_for_region = $[]; list get_timezones_for_region (integer region, string zone) { - return maplist (list entry, sorted_zonemap[region,"entries"]:[], + if (!haskey (sorted_zonemap, region)) + { + list reg_list = + maplist (string key, string name, zonemap[region,"entries"]:$[], + ``([ name, key ])); + + // prevent the crash in installation (workaround for bnc#385172) + if (Language::language != "ko_KR" && Language::language != "ja_JP") + { + reg_list = sort (list a, list b, (list<list>) reg_list, { + list lsorted = lsort ([a[0]:"", b[0]:""]); + return (lsorted[0]:"" == a[0]:"" && a[0]:"" != b[0]:""); + }); + } + sorted_zonemap[region] = reg_list; + } + return maplist (list entry, sorted_zonemap[region]:[], { return `item (`id(entry[1]:""), entry[0]:"", entry[1]:"" == zone); }); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org