Hello community,
here is the log from the commit of package yast2-product-creator for
openSUSE:Factory
checked in at Tue May 17 12:33:05 CEST 2011.
--------
--- yast2-product-creator/yast2-product-creator.changes 2011-03-11
15:11:46.000000000 +0100
+++
/mounts/work_src_done/STABLE/yast2-product-creator/yast2-product-creator.changes
2011-05-13 10:01:45.000000000 +0200
@@ -1,0 +2,6 @@
+Fri May 13 09:59:46 CEST 2011 - [email protected]
+
+- better UI for locale related settings (fate#311734)
+- 2.21.2
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-product-creator-2.21.1.tar.bz2
New:
----
yast2-product-creator-2.21.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-product-creator.spec ++++++
--- /var/tmp/diff_new_pack.YnimtS/_old 2011-05-17 12:28:25.000000000 +0200
+++ /var/tmp/diff_new_pack.YnimtS/_new 2011-05-17 12:28:25.000000000 +0200
@@ -19,21 +19,21 @@
Name: yast2-product-creator
-Version: 2.21.1
+Version: 2.21.2
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-product-creator-2.21.1.tar.bz2
+Source0: yast2-product-creator-2.21.2.tar.bz2
Prefix: /usr
Group: System/YaST
-License: GPLv2+
+License: GPL v2 or later
BuildRequires: autoyast2-installation perl-XML-Writer update-desktop-files
yast2 yast2-add-on-creator yast2-devtools yast2-packager yast2-security
yast2-slp yast2-testsuite
PreReq: %fillup_prereq
-Requires: autoyast2-installation yast2-security
+Requires: autoyast2-installation yast2-security yast2-country
# ag_pattern handling gzipped files
Requires: yast2-add-on-creator >= 2.17.1
@@ -62,7 +62,7 @@
XEN images etc.), based on existing installation sources.
%prep
-%setup -n yast2-product-creator-2.21.1
+%setup -n yast2-product-creator-2.21.2
%build
%{prefix}/bin/y2tool y2autoconf
++++++ yast2-product-creator-2.21.1.tar.bz2 ->
yast2-product-creator-2.21.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-product-creator-2.21.1/VERSION
new/yast2-product-creator-2.21.2/VERSION
--- old/yast2-product-creator-2.21.1/VERSION 2011-03-11 15:10:45.000000000
+0100
+++ new/yast2-product-creator-2.21.2/VERSION 2011-05-13 10:00:04.000000000
+0200
@@ -1 +1 @@
-2.21.1
+2.21.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-product-creator-2.21.1/src/Kiwi.ycp
new/yast2-product-creator-2.21.2/src/Kiwi.ycp
--- old/yast2-product-creator-2.21.1/src/Kiwi.ycp 2011-03-04
14:27:25.000000000 +0100
+++ new/yast2-product-creator-2.21.2/src/Kiwi.ycp 2011-05-13
09:59:36.000000000 +0200
@@ -79,6 +79,12 @@
string stderr_file = "image_creator.stderr";
string logs_directory = "/tmp";
+ // all available locales
+ global list<string> all_locales = [];
+
+ // all available time zones
+ global list<string> all_timezones = [];
+
/**
* crypt given user password with current encryption algorithm
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-product-creator-2.21.1/src/complex.ycp
new/yast2-product-creator-2.21.2/src/complex.ycp
--- old/yast2-product-creator-2.21.1/src/complex.ycp 2011-03-11
15:06:50.000000000 +0100
+++ new/yast2-product-creator-2.21.2/src/complex.ycp 2011-03-11
15:11:21.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Dialogs definitions
* Authors: Anas Nashif <[email protected]>
*
- * $Id: complex.ycp 61923 2010-04-29 16:03:38Z jsuchome $
+ * $Id: complex.ycp 63568 2011-03-11 14:11:21Z jsuchome $
*/
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-product-creator-2.21.1/src/kiwi_dialogs.ycp
new/yast2-product-creator-2.21.2/src/kiwi_dialogs.ycp
--- old/yast2-product-creator-2.21.1/src/kiwi_dialogs.ycp 2011-03-04
14:29:50.000000000 +0100
+++ new/yast2-product-creator-2.21.2/src/kiwi_dialogs.ycp 2011-05-13
09:59:37.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Dialogs for kiwi configuration
* Authors: Jiri Suchomel <[email protected]>
*
- * $Id: kiwi_dialogs.ycp 63513 2011-03-04 13:27:24Z jsuchome $
+ * $Id: kiwi_dialogs.ycp 63568 2011-03-11 14:11:21Z jsuchome $
*/
{
textdomain "product-creator";
@@ -14,6 +14,7 @@
import "CWMTab";
import "Directory";
import "FileUtils";
+ import "Keyboard";
import "Kiwi";
import "Label";
import "Message";
@@ -516,6 +517,73 @@
}
/**
+ * initialize the list value of "locale" combo box
+ */
+ define void InitLocaleCombo (string id) {
+
+ string lang = KiwiConfig["preferences",0,id,0,content_key]:"";
+ list items = [];
+
+ if (Kiwi::all_locales == [])
+ {
+ map out = (map) SCR::Execute (.target.bash_output, "/usr/bin/locale
-a");
+ Kiwi::all_locales = filter (string s, splitstring
(out["stdout"]:"", "\n"), {
+ return s != "";
+ });
+ }
+ foreach (string line, Kiwi::all_locales, {
+ string code = splitstring (line, ".@")[0]:line;
+ items = add (items, `item (`id (code), code, lang == code));
+ });
+
+ UI::ChangeWidget (`id (id), `Items, items);
+ }
+
+ /**
+ * initialize the list value of "keytable" combo box
+ */
+ define void InitKeytableCombo (string id) {
+
+ string kb = KiwiConfig["preferences",0,id,0,content_key]:"";
+
+ list items = [];
+ boolean kb_present = false;
+
+ foreach (string name, string yast, Keyboard::keymap2yast (), {
+ items = add (items, `item (`id (name), name, kb == name));
+ if (kb == name) kb_present = true;
+ });
+ if (!kb_present)
+ {
+ items = add (items, `item (`id (kb), kb, true));
+ }
+ UI::ChangeWidget (`id (id), `Items, items);
+ }
+
+ /**
+ * initialize the list value of "timezone" combo box
+ */
+ define void InitTimezoneCombo (string id) {
+
+ string tz = KiwiConfig["preferences",0,id,0,content_key]:"";
+
+ if (Kiwi::all_timezones == [])
+ {
+ map out = (map) SCR::Execute (.target.bash_output,
+ "grep -v '#' /usr/share/zoneinfo/zone.tab | cut -f 3 | sort",
$["LANG":"C"]);
+ Kiwi::all_timezones = filter (string t, splitstring
(out["stdout"]:"", "\n"), {
+ return t != "";
+ });
+ }
+
+ list items = maplist (string zone, Kiwi::all_timezones, {
+ return `item (`id (zone), zone, tz == zone);
+ });
+
+ UI::ChangeWidget (`id (id), `Items, items);
+ }
+
+ /**
* initialize the string value of "preferences" related widget
*/
define void InitPreferences (string id) {
@@ -1942,10 +2010,12 @@
"no_help" : true,
],
"locale" : $[
- "widget" : `textentry,
+ "widget" : `combobox,
+ "opt" : [ `hstretch, `notify ],
+ "items" : [],
// textentry label
"label" : _("&Locale"),
- "init" : InitPreferences,
+ "init" : InitLocaleCombo,
"store" : StorePreferences,
"handle" : HandlePreferences,
// help text for locale (heading)
@@ -1954,20 +2024,23 @@
_("<p>The value of <b>Locale</b> (e.g. <tt>en_US</tt>) defines the
contents of the RC_LANG variable in <t>/etc/sysconfig/language</tt>.</p>"),
],
"keytable" : $[
- "widget" : `textentry,
+ "widget" : `combobox,
+ "opt" : [ `hstretch, `notify, `editable ],
// textentry label
"label" : _("&Keyboard layout"),
- "init" : InitPreferences,
+ "init" : InitKeytableCombo,
"store" : StorePreferences,
"handle" : HandlePreferences,
// help text for keytable
"help" : _("<p><b>Keyboard layout</b> specifies the name of
the console keymap to use. The value corresponds to a map file in
<tt>/usr/share/kbd/keymaps</tt>.</p>"),
],
"timezone" : $[
- "widget" : `textentry,
+ "widget" : `combobox,
+ "opt" : [ `hstretch, `notify ],
+ "items" : [],
// textentry label
"label" : _("&Time zone"),
- "init" : InitPreferences,
+ "init" : InitTimezoneCombo,
"store" : StorePreferences,
"handle" : HandlePreferences,
// help text for timezone
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
