Hello community,
here is the log from the commit of package yast2-country
checked in at Wed Jul 16 00:50:44 CEST 2008.
--------
--- yast2-country/yast2-country.changes 2008-05-22 14:37:28.000000000 +0200
+++ yast2-country/yast2-country.changes 2008-07-15 08:02:37.317284000 +0200
@@ -1,0 +2,23 @@
+Tue Jul 15 07:52:04 CEST 2008 - jsuchome@suse.cz
+
+- optimize sorting of time zone entries (bnc#395816)
+- adapted list of languages not showing correctly in ncurses
+- DPMS don't need to be disabled in timezone, it is disabled during
+ entire installation (fate#304395)
+- 2.17.2
+
+-------------------------------------------------------------------
+Tue Jun 10 13:09:03 CEST 2008 - jsuchome@suse.cz
+
+- open slide show dialog when installing packages (bnc#395838)
+- adapt list of secondary languages according to ones coming
+ from package selector (bnc#393007)
+- 2.17.1
+
+-------------------------------------------------------------------
+Mon Jun 9 14:58:01 CEST 2008 - jsuchome@suse.cz
+
+- use InputField instead of TextEntry
+- 2.17.0
+
+-------------------------------------------------------------------
Old:
----
yast2-country-2.16.26.tar.bz2
New:
----
yast2-country-2.17.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-country.spec ++++++
--- /var/tmp/diff_new_pack.r32278/_old 2008-07-16 00:37:57.000000000 +0200
+++ /var/tmp/diff_new_pack.r32278/_new 2008-07-16 00:37:57.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-country (Version 2.16.26)
+# spec file for package yast2-country (Version 2.17.2)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,12 +12,12 @@
Name: yast2-country
-Version: 2.16.26
+Version: 2.17.2
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-country-2.16.26.tar.bz2
+Source0: yast2-country-2.17.2.tar.bz2
Prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-perl-bindings yast2-testsuite
Requires: yast2-trans-stats yast2-perl-bindings timezone
@@ -68,7 +68,7 @@
Jiri Suchomel
%prep
-%setup -n yast2-country-2.16.26
+%setup -n yast2-country-2.17.2
%build
%{prefix}/bin/y2tool y2autoconf
@@ -136,6 +136,20 @@
/usr/share/YaST2/data/languages/*.ycp
/usr/share/YaST2/modules/Language.y*
%changelog
+* Tue Jul 15 2008 jsuchome@suse.cz
+- optimize sorting of time zone entries (bnc#395816)
+- adapted list of languages not showing correctly in ncurses
+- DPMS don't need to be disabled in timezone, it is disabled during
+ entire installation (fate#304395)
+- 2.17.2
+* Tue Jun 10 2008 jsuchome@suse.cz
+- open slide show dialog when installing packages (bnc#395838)
+- adapt list of secondary languages according to ones coming
+ from package selector (bnc#393007)
+- 2.17.1
+* Mon Jun 09 2008 jsuchome@suse.cz
+- use InputField instead of TextEntry
+- 2.17.0
* Thu May 22 2008 jsuchome@suse.cz
- do not sort timezones with ko_KR locale: workaround preventing
the crash in installation (bnc#385172)
++++++ yast2-country-2.16.26.tar.bz2 -> yast2-country-2.17.2.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-country-2.16.26/keyboard/data/xkblayout2keyboard.ycp new/yast2-country-2.17.2/keyboard/data/xkblayout2keyboard.ycp
--- old/yast2-country-2.16.26/keyboard/data/xkblayout2keyboard.ycp 2006-06-13 10:55:04.000000000 +0200
+++ new/yast2-country-2.17.2/keyboard/data/xkblayout2keyboard.ycp 2008-06-10 13:11:39.000000000 +0200
@@ -14,7 +14,7 @@
* The xkblayout-codes may or may not resemble a locale code, therefore
* an extra conversion map is necessary (see also lang2keyboard.ycp).
*
- * $Id: xkblayout2keyboard.ycp 31465 2006-06-13 08:54:53Z jsuchome $
+ * $Id: xkblayout2keyboard.ycp 48190 2008-06-10 11:12:04Z jsuchome $
*
* *****************************************************************
* In case of changes please keep the following three files in sync:
@@ -78,4 +78,5 @@
"hr" : "croatian",
"ua" : "ukrainian",
+ "kr" : "korean",
]
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-country-2.16.26/keyboard/src/dialogs.ycp new/yast2-country-2.17.2/keyboard/src/dialogs.ycp
--- old/yast2-country-2.16.26/keyboard/src/dialogs.ycp 2008-05-15 10:39:26.000000000 +0200
+++ new/yast2-country-2.17.2/keyboard/src/dialogs.ycp 2008-06-09 14:58:36.000000000 +0200
@@ -10,7 +10,7 @@
* Summary:
* Dialogs for keyboard configuration
*
- * $Id: dialogs.ycp 47548 2008-05-15 08:39:26Z jsuchome $
+ * $Id: dialogs.ycp 48167 2008-06-09 12:59:00Z jsuchome $
*/
{
textdomain "country";
@@ -57,12 +57,12 @@
// heading text
`Heading (_("Expert Keyboard Settings")),
`VSpacing(`opt(`vstretch), 1),
- `Left (
+ `Left (`InputField (`id(`rate), `opt (`hstretch),
// label text
- `TextEntry( `id(`rate), _("Repeat &Rate"))
+ _("Repeat &Rate"))
),
`Left (
- `TextEntry(`id(`delay),
+ `InputField (`id(`delay), `opt (`hstretch),
// label text
_("De&lay before Repetition Starts"))
),
@@ -98,8 +98,10 @@
),
`VSpacing(`opt(`vstretch), 1),
`Left (
- // textentry label
- `TextEntry (`id(`tty), _("&Devices for Lock"))
+ `InputField (`id(`tty), `opt (`hstretch),
+ // textentry label
+ _("&Devices for Lock")
+ )
),
`VSpacing(`opt(`vstretch), 1),
`Left (
@@ -176,7 +178,7 @@
// title for input field to test the keyboard setting
// (no more than about 25 characters!)
- term test = `TextEntry( _("&Test") );
+ term test = `InputField (`opt (`hstretch), _("&Test"));
if (Mode::config ())
test = `Empty();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-country-2.16.26/language/src/language.ycp new/yast2-country-2.17.2/language/src/language.ycp
--- old/yast2-country-2.16.26/language/src/language.ycp 2007-12-03 15:34:03.000000000 +0100
+++ new/yast2-country-2.17.2/language/src/language.ycp 2008-06-10 13:14:20.000000000 +0200
@@ -7,7 +7,7 @@
*
* Purpose: client for language configuration in running system
*
- * $Id: language.ycp 42608 2007-12-03 14:34:03Z jsuchome $
+ * $Id: language.ycp 48191 2008-06-10 11:14:46Z jsuchome $
*/
{
@@ -21,9 +21,22 @@
import "Mode";
import "Popup";
import "Progress";
+import "SlideShow";
import "Wizard";
/**
+ * Install and uninstall packages selected by Pkg::SetAdditionalLocales
+ */
+define boolean PackagesCommit () {
+
+ SlideShow::OpenSlideShowDialog ();
+ SlideShow::InitPkgData (false);
+ Pkg::PkgCommit (0);
+ SlideShow::CloseSlideShowDialog();
+ return true;
+}
+
+/**
* read language settings
*/
define boolean LanguageRead () {
@@ -79,7 +92,7 @@
}
if (enough_space)
{
- Language::PackagesCommit ();
+ PackagesCommit ();
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-country-2.16.26/language/src/modules/Language.ycp new/yast2-country-2.17.2/language/src/modules/Language.ycp
--- old/yast2-country-2.16.26/language/src/modules/Language.ycp 2008-05-12 13:56:57.000000000 +0200
+++ new/yast2-country-2.17.2/language/src/modules/Language.ycp 2008-06-12 07:57:42.000000000 +0200
@@ -6,7 +6,7 @@
* Thomas Roelz
* Maintainer: Jiri Suchomel
*
- * $Id: Language.ycp 47452 2008-05-12 11:56:56Z jsuchome $
+ * $Id: Language.ycp 48191 2008-06-10 11:14:46Z jsuchome $
*/
{
@@ -113,7 +113,10 @@
string languages_directory = nil;
// languages that cannot be correctly shown in text mode
-list cjk_languages = [ "ja", "ko", "zh", "hi", "km", "pa", "bn" ];
+list cjk_languages = [
+ "ja", "ko", "zh", "hi", "km", "pa", "bn", "gu", "mr", "si", "ta", "vi"
+
+];
// FATE #302955: Split translations out of installation system
// [ "en_US", "en_GB", "de", "cs" ]
@@ -733,13 +736,49 @@
// summary label
sformat (_("Primary Language: %1"), name)
];
- if (languages != "" && languages != language)
+ if (size (languages_map) == 0 || language_changed)
{
- if (size (languages_map) == 0 || language_changed)
+ read_languages_map();
+ }
+ // maybe additional languages were selected in package selector (bnc#393007)
+ list<string> langs = splitstring (languages, ",");
+ list<string> missing = [];
+ foreach (string additional, Pkg::GetAdditionalLocales (), {
+ // add the language for both kind of values ("cs" vs. "pt_PT")
+ if (!contains (langs, additional))
{
- read_languages_map();
+ if (additional == "en")
+ additional = "en_US";
+ if (additional == "pt")
+ additional = "pt_PT";
+ if (haskey (languages_map, additional))
+ {
+ missing = add (missing, additional);
+ return;
+ }
+ if (contains (langs, additional)) //en_US or pt_PT already installed
+ return;
+ // now, let's hope there's only one full entry for the short one
+ // (e.g. cs_CZ for cs)
+ foreach (string k, list dummy, languages_map,
+ {
+ if (substring (k, 0, 2) == additional)
+ {
+ missing = add (missing, k);
+ break;
+ }
+ });
}
- list<string> langs = [];
+ });
+ if (size (missing) > 0)
+ {
+ langs = (list<string>) union (langs, missing);
+ languages = mergestring (langs,",");
+ }
+ // now, generate the summary strings
+ if (languages != "" && languages != language)
+ {
+ langs = [];
foreach (string lang, splitstring (languages, ","), {
if (lang != language)
{
@@ -876,13 +915,15 @@
/**
* Install and uninstall packages selected by Pkg::SetAdditionalLocales
- */
+ *
global define boolean PackagesCommit () {
- PackageCallbacks::InitPackageCallbacks ();
+ SlideShow::OpenSlideShowDialog ();
Pkg::PkgCommit (0);
+ SlideShow::CloseSlideShowDialog();
return true;
}
+*/
/**
* de_DE@UTF-8 -> "DE"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-country-2.16.26/language/src/select_language.ycp new/yast2-country-2.17.2/language/src/select_language.ycp
--- old/yast2-country-2.16.26/language/src/select_language.ycp 2008-02-18 15:35:17.000000000 +0100
+++ new/yast2-country-2.17.2/language/src/select_language.ycp 2008-06-10 13:14:20.000000000 +0200
@@ -15,7 +15,7 @@
* Summary:
* This client shows main dialog for choosing the language.
*
- * $Id: select_language.ycp 44583 2008-02-18 14:35:17Z jsuchome $
+ * $Id: select_language.ycp 48191 2008-06-10 11:14:46Z jsuchome $
*
*/
{
@@ -30,6 +30,7 @@
import "Popup";
import "ProductFeatures";
import "Report";
+ import "SlideShow";
import "Stage";
import "Timezone";
import "Wizard";
@@ -37,6 +38,17 @@
string language = Language::language;
/**
+ * Install and uninstall packages selected by Pkg::SetAdditionalLocales
+ */
+ define boolean PackagesCommit () {
+ SlideShow::OpenSlideShowDialog ();
+ SlideShow::InitPkgData (false);
+ Pkg::PkgCommit (0);
+ SlideShow::CloseSlideShowDialog();
+ return true;
+ }
+
+ /**
* Popup for setting expert language values
*/
define symbol LanguageExpertDialog() {
@@ -619,9 +631,9 @@
ret = `not_next;
continue;
}
- if (Stage::firstboot ()) // install language packages now
+ if (Stage::firstboot ())// install language packages now
{
- Language::PackagesCommit ();
+ PackagesCommit ();
}
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-country-2.16.26/timezone/src/dialogs.ycp new/yast2-country-2.17.2/timezone/src/dialogs.ycp
--- old/yast2-country-2.16.26/timezone/src/dialogs.ycp 2008-05-22 14:35:23.000000000 +0200
+++ new/yast2-country-2.17.2/timezone/src/dialogs.ycp 2008-06-20 13:17:20.000000000 +0200
@@ -11,7 +11,7 @@
* Summary:
* Dialogs for timeone and time configuration.
*
- * $Id: dialogs.ycp 47792 2008-05-22 12:35:37Z jsuchome $
+ * $Id: dialogs.ycp 48439 2008-06-20 11:18:11Z jsuchome $
*/
{
textdomain "country";
@@ -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() {
@@ -119,11 +122,11 @@
),
`HBox (
`HSpacing(10),
- `TextEntry( `id(`day), `opt(`shrinkable), ""),
+ `InputField( `id(`day), `opt(`shrinkable), ""),
`HSpacing (),
- `TextEntry( `id(`month), `opt(`shrinkable), ""),
+ `InputField( `id(`month), `opt(`shrinkable), ""),
`HSpacing (),
- `TextEntry( `id(`year), `opt(`shrinkable), ""),
+ `InputField( `id(`year), `opt(`shrinkable), ""),
`HSpacing(30)
)
);
@@ -135,11 +138,11 @@
),
`HBox (
`HSpacing(10),
- `TextEntry (`id(`hour), `opt(`shrinkable), ""),
+ `InputField (`id(`hour), `opt(`shrinkable), ""),
`HSpacing (),
- `TextEntry (`id(`minute), `opt(`shrinkable), ""),
+ `InputField (`id(`minute), `opt(`shrinkable), ""),
`HSpacing (),
- `TextEntry (`id(`second), `opt(`shrinkable), ""),
+ `InputField (`id(`second), `opt(`shrinkable), ""),
`HSpacing(30)
)
);
@@ -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);
});
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-country-2.16.26/timezone/src/Timezone.ycp new/yast2-country-2.17.2/timezone/src/Timezone.ycp
--- old/yast2-country-2.16.26/timezone/src/Timezone.ycp 2008-05-12 13:56:57.000000000 +0200
+++ new/yast2-country-2.17.2/timezone/src/Timezone.ycp 2008-07-15 07:53:27.000000000 +0200
@@ -240,8 +240,6 @@
{
boolean inst = Stage::initial () || Stage::cont() || Stage::firstboot();
boolean textmode = Language::GetTextMode ();
- if (inst && !textmode)
- SCR::Execute ( .target.bash, "/usr/bin/xset -dpms");
string cmd = "/usr/sbin/zic -l " + timezone;
y2milestone( "Set cmd %1", cmd );
y2milestone( "Set ret %1", SCR::Execute( .target.bash_output, cmd ));
@@ -251,8 +249,6 @@
y2milestone( "Set cmd %1", cmd );
y2milestone( "Set ret %1", SCR::Execute(.target.bash_output, cmd ));
}
- if (inst && !textmode)
- SCR::Execute ( .target.bash, "/usr/bin/xset +dpms");
}
// On first assignment store default timezone.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-country-2.16.26/VERSION new/yast2-country-2.17.2/VERSION
--- old/yast2-country-2.16.26/VERSION 2008-05-22 14:30:27.000000000 +0200
+++ new/yast2-country-2.17.2/VERSION 2008-07-15 07:53:44.000000000 +0200
@@ -1 +1 @@
-2.16.26
+2.17.2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org