Author: jsuchome Date: Mon Apr 14 13:10:01 2008 New Revision: 46564 URL: http://svn.opensuse.org/viewcvs/yast?rev=46564&view=rev Log: - fixed selecting time zone regions, "central zone" moved to DB - use CheckBox instead of ComboBox for HW clock term (bnc#359112) - 2.16.17 Modified: trunk/country/VERSION trunk/country/package/yast2-country.changes trunk/country/timezone/src/dialogs.ycp Modified: trunk/country/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/VERSION?rev=46564&r1=46563&r2=46564&view=diff ============================================================================== --- trunk/country/VERSION (original) +++ trunk/country/VERSION Mon Apr 14 13:10:01 2008 @@ -1 +1 @@ -2.16.16 +2.16.17 Modified: trunk/country/package/yast2-country.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/package/yast2-country.changes?rev=46564&r1=46563&r2=46564&view=diff ============================================================================== --- trunk/country/package/yast2-country.changes (original) +++ trunk/country/package/yast2-country.changes Mon Apr 14 13:10:01 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Apr 14 13:00:37 CEST 2008 - jsuchome@suse.cz + +- fixed selecting time zone regions, "central zone" moved to DB +- use CheckBox instead of ComboBox for HW clock term (bnc#359112) +- 2.16.17 + +------------------------------------------------------------------- Thu Apr 10 08:12:48 CEST 2008 - jsuchome@suse.cz - time zone names updated to correct country names (bnc#377513) Modified: trunk/country/timezone/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/timezone/src/dialogs.ycp?rev=46564&r1=46563&r2=46564&view=diff ============================================================================== --- trunk/country/timezone/src/dialogs.ycp (original) +++ trunk/country/timezone/src/dialogs.ycp Mon Apr 14 13:10:01 2008 @@ -461,25 +461,6 @@ list<map> zonemap = Timezone::get_zonemap (); - // map regions to the zone approximatelly in the center, for selector widget - list central_zone = [ - "Europe/Prague", - "America/Chicago", - "America/Winnipeg", - "America/Argentina/Buenos_Aires", - "America/Sao_Paulo", - "America/Mexico_City", - "America/La_Paz", - "Asia/Novosibirsk", - "Asia/Calcutta", - "Australia/Sydney", - "Africa/Kampala", - "Pacific/Tahiti", - "Atlantic/Madeira", - "Indian/Maldives", - "America/Godthab", - ]; - // map of zones conversions map yast2zonetab = Timezone::yast2zonetab; @@ -528,17 +509,13 @@ ); } term hwclock_term = `VBox ( - `ComboBox (`id (`hwclock), `opt(`hstretch, `notify), - // combo box label - _("&Hardware Clock Set To"), [ - // ComboBox entry: clock set to local time - `item (`id (`hwclock_localtime), _("Local Time"), - (hwclock == "--localtime")), - // ComboBox entry: clock set UTC - `item (`id(`hwclock_utc ), _("UTC"), (hwclock == "-u")), - ]), + `CheckBox (`id (`hwclock), `opt(`hstretch, `notify), + // check box label + _("&Hardware Clock Set To UTC"), hwclock == "-u" + ), textmode ? `Label ("") : `Empty () ); + term contents = `MarginBox ( `leftMargin (2), `rightMargin (2), `topMargin (0), `bottomMargin (0.2), `VBox ( @@ -552,7 +529,7 @@ // frame label `HWeight (1, `Frame (_("Time and Date"), `MarginBox ( `leftMargin (1.2), `rightMargin (1), - `topMargin (0.2), `bottomMargin (0.2), + `topMargin (0), `bottomMargin (0), textmode ? `VBox ( `Label (`id(`date), `opt(`outputField,`hstretch), date), @@ -696,8 +673,7 @@ if (ret == `region) { integer num = selected_region (); - /* FIXME zoom the map to the "central place" */ - string central = central_zone[num]:timezone; + string central = zonemap[num,"central"]:timezone; if (central != timezone) { timezone = central; @@ -728,7 +704,8 @@ hwclock_s = `hwclock_utc; if (!utc_only) { - hwclock_s = (symbol)UI::QueryWidget( `id(`hwclock), `Value ); + hwclock_s = ((boolean)UI::QueryWidget( `id(`hwclock), `Value))? + `hwclock_utc : `hwclock_localtime; } if (ret == `timezonemap) { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org