Hello community,
here is the log from the commit of package yast2
checked in at Thu Dec 6 01:47:16 CET 2007.
--------
--- yast2/yast2.changes 2007-11-29 13:21:04.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2/yast2.changes 2007-12-04 14:46:46.000000000 +0100
@@ -1,0 +2,23 @@
+Mon Dec 3 16:43:50 CET 2007 - locilka@suse.cz
+
+- Adjusted RPM dependencies: mod_UI in yast2-core.
+- Updated Progress with icons to rather use Image-Dimm support
+ if available.
+- Added new Icon YCP module to provide basic acces to icon files.
+- Popup::ConfirmAbort now uses Icons.
+- 2.16.16
+
+-------------------------------------------------------------------
+Mon Dec 3 14:24:02 CET 2007 - ug@suse.de
+
+- XMLToYCPString added to convert an XML string to
+ YCP data
+
+-------------------------------------------------------------------
+Thu Nov 29 15:35:40 CET 2007 - locilka@suse.cz
+
+- Progress module has been extended to show icons for stages.
+ Function NewProgressIcons() just extends the New() function
+ with list of images to be shown.
+
+-------------------------------------------------------------------
Old:
----
yast2-2.16.15.tar.bz2
New:
----
yast2-2.16.16.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2.spec ++++++
--- /var/tmp/diff_new_pack.T13174/_old 2007-12-06 01:46:50.000000000 +0100
+++ /var/tmp/diff_new_pack.T13174/_new 2007-12-06 01:46:50.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2 (Version 2.16.15)
+# spec file for package yast2 (Version 2.16.16)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,17 +11,17 @@
# norootforbuild
Name: yast2
-Version: 2.16.15
+Version: 2.16.16
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-2.16.15.tar.bz2
+Source0: yast2-2.16.16.tar.bz2
Prefix: /usr
Source1: yast2-rpmlintrc
BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-perl-bindings yast2-pkg-bindings yast2-testsuite
-# SCR::RegisterNewAgents()
-Requires: yast2-core >= 2.16.10
+# Mod_UI
+Requires: yast2-core >= 2.16.6
# Pkg::PkgAvailable() and Pkg::PkgInstalled()
Requires: yast2-pkg-bindings >= 2.15.47
Requires: yast2_ui yast2_theme
@@ -123,7 +123,7 @@
Steffen Winterfeldt
%prep
-%setup -n yast2-2.16.15
+%setup -n yast2-2.16.16
%build
%{prefix}/bin/y2tool y2autoconf
@@ -227,6 +227,20 @@
%doc %{prefix}/share/doc/packages/yast2/wizard
%changelog
+* Mon Dec 03 2007 - locilka@suse.cz
+- Adjusted RPM dependencies: mod_UI in yast2-core.
+- Updated Progress with icons to rather use Image-Dimm support
+ if available.
+- Added new Icon YCP module to provide basic acces to icon files.
+- Popup::ConfirmAbort now uses Icons.
+- 2.16.16
+* Mon Dec 03 2007 - ug@suse.de
+- XMLToYCPString added to convert an XML string to
+ YCP data
+* Thu Nov 29 2007 - locilka@suse.cz
+- Progress module has been extended to show icons for stages.
+ Function NewProgressIcons() just extends the New() function
+ with list of images to be shown.
* Thu Nov 29 2007 - mzugec@suse.cz
- for AY Confirm::Detection popup has timeout 10 seconds (#192181)
- 2.16.15
++++++ yast2-2.16.15.tar.bz2 -> yast2-2.16.16.tar.bz2 ++++++
++++ 4630 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.16.15/configure.in new/yast2-2.16.16/configure.in
--- old/yast2-2.16.15/configure.in 2007-11-29 13:15:05.000000000 +0100
+++ new/yast2-2.16.16/configure.in 2007-12-04 13:35:20.000000000 +0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2
dnl
-dnl -- This file is generated by y2autoconf 2.15.9 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.16.2 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2, 2.16.14, http://bugs.opensuse.org/, yast2)
+AC_INIT(yast2, 2.16.16, http://bugs.opensuse.org/, yast2)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -14,10 +14,11 @@
AC_PREFIX_DEFAULT(/usr)
-AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
+dnl long filenames; we use GNU Make extensions and that's ok
+AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.16.14"
+VERSION="2.16.16"
RPMNAME="yast2"
MAINTAINER="Jiri Srain "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.16.15/COPYRIGHT.english new/yast2-2.16.16/COPYRIGHT.english
--- old/yast2-2.16.15/COPYRIGHT.english 2007-11-29 13:20:22.000000000 +0100
+++ new/yast2-2.16.16/COPYRIGHT.english 1970-01-01 01:00:00.000000000 +0100
@@ -1,340 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-
- Copyright (C) <year> <name of author>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- <signature of Ty Coon>, 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.16.15/library/modules/Icon.ycp new/yast2-2.16.16/library/modules/Icon.ycp
--- old/yast2-2.16.15/library/modules/Icon.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-2.16.16/library/modules/Icon.ycp 2007-12-04 09:47:52.000000000 +0100
@@ -0,0 +1,156 @@
+/**
+ * File: modules/Icon.ycp
+ * Package: YaST2
+ * Authors: Lukas Ocilka
+ * Summary: Transparent access to Icons
+ * Flags: Stable
+ *
+ * $Id:$
+ */
+{
+ module "Icon";
+
+ textdomain "base";
+
+ import "Directory";
+
+ boolean has_image_support = nil;
+ map icons_map = $[];
+ string icon_32x32_path = nil;
+
+ void LazyInit () {
+ if (has_image_support != nil)
+ return;
+
+ map display_info = UI::GetDisplayInfo();
+ has_image_support = display_info["HasImageSupport"]:false;
+
+ icon_32x32_path = Directory::themedir + "/current/icons/32x32/apps/";
+
+ icons_map = $[
+ "warning" : "msg_warning.png",
+ "info" : "msg_info.png",
+ "error" : "msg_error.png",
+ ];
+ }
+
+ /**
+ * Returns path to an image
+ *
+ * @param string icon_type
+ *
+ * @see Icon::Image() for details
+ */
+ global string IconPath (string icon_type) {
+ string icon_path = nil;
+
+ if (icons_map[icon_type]:nil != nil) {
+ icon_path = icon_32x32_path + icons_map[icon_type]:"";
+ } else {
+ icon_path = icon_32x32_path + icon_type + ".png";
+ y2milestone ("Image '%1' is not defined, using '%2'", icon_type, icon_path);
+ }
+
+ return icon_path;
+ }
+
+ /**
+ * Returns `Image() term defined by parameters. Returns `Empty() if the current
+ * UI doesn't support images.
+ *
+ * @param string icon_type (one of known types or just an image name without a 'png' suffix)
+ * Known icon types are "warning", "info", and "error"
+ *
+ * @param map options
+ *
+ * @struct options = $[
+ * "id" : any_icon_id,
+ * "label" : (string) icon_label, // (used if icon is missing)
+ * "margin_left" : 0, // HSpacing on the left
+ * "margin_right" : 5, // HSpacing on the right
+ * ]
+ *
+ * @example
+ * Icon::Image ("warning", $["id":`my_warning, "label":_("My Warning")])
+ * -> `Image (`id (`my_warning), "/usr/share/YaST2/theme/current/icons/32x32/apps/msg_warning.png", "My Warning")
+ * Icon::Image ("info", $["margin_left":1, "margin_right":2])
+ * -> `HBox (
+ * `HSpacing (1),
+ * `Image (`id ("icon_id_info"), "/usr/share/YaST2/theme/current/icons/32x32/apps/msg_info.png", "info"),
+ * `HSpacing (2)
+ * )
+ */
+ global term Image (string icon_type, map options) {
+ LazyInit();
+
+ if (! has_image_support)
+ return `Empty();
+
+ any icon_id = options["id"]:nil;
+ if (icon_id == nil) icon_id = sformat ("icon_id_%1", icon_type);
+
+ string icon_label = options["label"]:icon_type;
+
+ term ret = nil;
+
+ term this_image = `Image (
+ `id (icon_id),
+ IconPath (icon_type),
+ icon_label
+ );
+
+ // left and/or right margin defined
+ if (options["margin_left"]:0 != 0 || options["margin_right"]:0 != 0) {
+ ret = `HBox (
+ `HSpacing (options["margin_left"]:0),
+ this_image,
+ `HSpacing (options["margin_right"]:0)
+ );
+
+ return ret;
+ // no margin defined
+ } else {
+ return this_image;
+ }
+ }
+
+ /**
+ * Function calls Icon::Image with default options
+ *
+ * @param string icon_type
+ *
+ * @see Icon for more information
+ */
+ global term Simple (string icon_type) {
+ return Image (icon_type, $[]);
+ }
+
+ /**
+ * Returns UI term `Image() widget with a warning-icon.
+ *
+ * @return term warning icon
+ */
+ global term Warning () {
+ return Image ("warning", $[]);
+ }
+
+ /**
+ * Returns UI term `Image() widget with an error-icon.
+ *
+ * @return term error-icon
+ */
+ global term Error () {
+ return Image ("error", $[]);
+ }
+
+ /**
+ * Returns UI term `Image() widget with an info-icon.
+ *
+ * @return term info icon
+ */
+ global term Info () {
+ return Image ("info", $[]);
+ }
+
+/* EOF */
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.16.15/library/modules/Popup.ycp new/yast2-2.16.16/library/modules/Popup.ycp
--- old/yast2-2.16.15/library/modules/Popup.ycp 2007-10-29 10:01:12.000000000 +0100
+++ new/yast2-2.16.16/library/modules/Popup.ycp 2007-12-03 16:46:31.000000000 +0100
@@ -7,7 +7,7 @@
* Arvin Schnell
* Flags: Stable
*
- * $Id: Popup.ycp 37321 2007-04-05 08:01:51Z jsuchome $
+ * $Id: Popup.ycp 42613 2007-12-03 15:46:30Z locilka $
*
* Contains commonly used popup dialogs
* for general usage, e.g. Popup::YesNo(), Popup::ContinueCancel().
@@ -25,6 +25,7 @@
import "Mode";
import "Directory";
import "String";
+import "Icon";
boolean feedback_open = false;
@@ -656,6 +657,8 @@
string abort_button = _("&Abort Installation");
// Button that will continue with the installation
string continue_button = _("&Continue Installation");
+ // Dialog icon
+ string icon_name = "warning";
if ( severity == `painless )
{
@@ -675,6 +678,7 @@
Linux will not be installed.
Your hard disk will remain untouched.");
}
+ // icon_name = "info";
}
else if ( severity == `incomplete )
{
@@ -702,8 +706,16 @@
string message = abort_label + "\n\n" + what_will_happen;
- boolean ret = AnyQuestion (NoHeadline (), message, abort_button,
- continue_button, `focus_no);
+ term button_box = AnyQuestionButtonBox (abort_button, continue_button, `focus_no);
+ UI::OpenDialog (
+ `opt (`decorated),
+ popupLayoutInternal (NoHeadline(), message, Icon::IconPath (icon_name), button_box)
+ );
+
+ any user_ret = UI::UserInput();
+ UI::CloseDialog();
+
+ boolean ret = (user_ret == `yes);
y2debug("ConfirmAbort returned: %1", ret);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.16.15/library/modules/Version.ycp new/yast2-2.16.16/library/modules/Version.ycp
--- old/yast2-2.16.15/library/modules/Version.ycp 2007-11-29 13:19:49.000000000 +0100
+++ new/yast2-2.16.16/library/modules/Version.ycp 2007-12-04 13:35:35.000000000 +0100
@@ -20,7 +20,7 @@
/**
* Version of the yast2 package
*/
-global string yast2 = "2.16.15";
+global string yast2 = "2.16.16";
/* EOF */
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.16.15/library/network/src/yast2-services-translations.ycp new/yast2-2.16.16/library/network/src/yast2-services-translations.ycp
--- old/yast2-2.16.15/library/network/src/yast2-services-translations.ycp 2007-11-07 10:53:43.000000000 +0100
+++ new/yast2-2.16.16/library/network/src/yast2-services-translations.ycp 1970-01-01 01:00:00.000000000 +0100
@@ -1,226 +0,0 @@
-{
- /**
- * This file contains only translations for
- * FATE #300687: Ports for SuSEfirewall added via packages
- *
- * Translations are grabbed when 'make pot' is called.
- */
-
- textdomain "firewall-services";
-
- string tmpstring = nil;
-
- // TRANSLATORS: Name of Service (rpm: apache2), can be used as check box, item in multiple selection box...
- tmpstring = _("Apache 2");
-
- // TRANSLATORS: Description of a Service (rpm: apache2), used as a common label or an item in table
- tmpstring = _("Opens ports for Apache Web Server.");
-
- // TRANSLATORS: Name of Service (rpm: apache2-ssl), can be used as check box, item in multiple selection box...
- tmpstring = _("Apache 2");
-
- // TRANSLATORS: Description of a Service (rpm: apache2-ssl), used as a common label or an item in table
- tmpstring = _("Opens ports for Apache Web Server.");
-
- // TRANSLATORS: Name of Service (rpm: avahi), can be used as check box, item in multiple selection box...
- tmpstring = _("Zeroconf/Bonjour Multicast DNS");
-
- // TRANSLATORS: Description of a Service (rpm: avahi), used as a common label or an item in table
- tmpstring = _("Zeroconf/Bonjour Multicast DNS (mDNS) ports for Service Discovery (DNS-SD)");
-
- // TRANSLATORS: Description of a Service (rpm: bacula-dir), used as a common label or an item in table
- tmpstring = _("Bacula Director ");
-
- // TRANSLATORS: Description of a Service (rpm: bacula-fd), used as a common label or an item in table
- tmpstring = _("Bacula File Daemon ");
-
- // TRANSLATORS: Description of a Service (rpm: bacula-sd), used as a common label or an item in table
- tmpstring = _("Bacula Storage Daemon ");
-
- // TRANSLATORS: Name of Service (rpm: bind), can be used as check box, item in multiple selection box...
- tmpstring = _("bind DNS server");
-
- // TRANSLATORS: Description of a Service (rpm: bind), used as a common label or an item in table
- tmpstring = _("Open ports for the bind DNS server");
-
- // TRANSLATORS: Name of Service (rpm: courier-imap), can be used as check box, item in multiple selection box...
- tmpstring = _("courier-imapd");
-
- // TRANSLATORS: Description of a Service (rpm: courier-imap), used as a common label or an item in table
- tmpstring = _("Opens ports for courier-imapd.");
-
- // TRANSLATORS: Name of Service (rpm: courier-imap-ssl), can be used as check box, item in multiple selection box...
- tmpstring = _("courier-imapd");
-
- // TRANSLATORS: Description of a Service (rpm: courier-imap-ssl), used as a common label or an item in table
- tmpstring = _("Opens ports for courier-imapd.");
-
- // TRANSLATORS: Name of Service (rpm: cups), can be used as check box, item in multiple selection box...
- tmpstring = _("cups");
-
- // TRANSLATORS: Description of a Service (rpm: cups), used as a common label or an item in table
- tmpstring = _("Firewall Configuration file for printing service CUPS");
-
- // TRANSLATORS: Name of Service (rpm: cyrus-imapd), can be used as check box, item in multiple selection box...
- tmpstring = _("cyrus-imapd Server");
-
- // TRANSLATORS: Description of a Service (rpm: cyrus-imapd), used as a common label or an item in table
- tmpstring = _("Opens ports for the cyrus-imapd Server.");
-
- // TRANSLATORS: Name of Service (rpm: dhcp-server), can be used as check box, item in multiple selection box...
- tmpstring = _("DHCP Server");
-
- // TRANSLATORS: Description of a Service (rpm: dhcp-server), used as a common label or an item in table
- tmpstring = _("Opens ports for ISC DHCP Server.");
-
- // TRANSLATORS: Name of Service (rpm: dnsmasq-dhcp), can be used as check box, item in multiple selection box...
- tmpstring = _("dnsmasq");
-
- // TRANSLATORS: Description of a Service (rpm: dnsmasq-dhcp), used as a common label or an item in table
- tmpstring = _("Open ports for the dnsmasq DNS/DHCP server");
-
- // TRANSLATORS: Name of Service (rpm: dnsmasq-dns), can be used as check box, item in multiple selection box...
- tmpstring = _("dnsmasq");
-
- // TRANSLATORS: Description of a Service (rpm: dnsmasq-dns), used as a common label or an item in table
- tmpstring = _("Open ports for the dnsmasq DNS/DHCP server");
-
- // TRANSLATORS: Name of Service (rpm: iscsitarget), can be used as check box, item in multiple selection box...
- tmpstring = _("iSCSI Target Daemon");
-
- // TRANSLATORS: Description of a Service (rpm: iscsitarget), used as a common label or an item in table
- tmpstring = _("Opens ports for iSCSI Target Daemon with broadcast allowed.");
-
- // TRANSLATORS: Name of Service (rpm: isns), can be used as check box, item in multiple selection box...
- tmpstring = _("iSNS Daemon");
-
- // TRANSLATORS: Description of a Service (rpm: isns), used as a common label or an item in table
- tmpstring = _("Opens ports for iSNS daemon with broadcast allowed.");
-
- // TRANSLATORS: Name of Service (rpm: kadmind), can be used as check box, item in multiple selection box...
- tmpstring = _("Kerberos Admin Server");
-
- // TRANSLATORS: Description of a Service (rpm: kadmind), used as a common label or an item in table
- tmpstring = _("Open ports for kadmind Server");
-
- // TRANSLATORS: Name of Service (rpm: kdc), can be used as check box, item in multiple selection box...
- tmpstring = _("Key Distribution Center");
-
- // TRANSLATORS: Description of a Service (rpm: kdc), used as a common label or an item in table
- tmpstring = _("Open ports for the Key Distribution Center");
-
- // TRANSLATORS: Name of Service (rpm: lighttpd), can be used as check box, item in multiple selection box...
- tmpstring = _("lighttpd");
-
- // TRANSLATORS: Description of a Service (rpm: lighttpd), used as a common label or an item in table
- tmpstring = _("Open the http port for lighttpd.");
-
- // TRANSLATORS: Name of Service (rpm: lighttpd-ssl), can be used as check box, item in multiple selection box...
- tmpstring = _("lighttpd");
-
- // TRANSLATORS: Description of a Service (rpm: lighttpd-ssl), used as a common label or an item in table
- tmpstring = _("Open the https port for lighttpd.");
-
- // TRANSLATORS: Name of Service (rpm: mysql), can be used as check box, item in multiple selection box...
- tmpstring = _("MySQL server");
-
- // TRANSLATORS: Description of a Service (rpm: mysql), used as a common label or an item in table
- tmpstring = _("opens ports for MySQL in order to allow other hosts connect to it");
-
- // TRANSLATORS: Name of Service (rpm: nut), can be used as check box, item in multiple selection box...
- tmpstring = _("Network UPS Tools");
-
- // TRANSLATORS: Description of a Service (rpm: nut), used as a common label or an item in table
- tmpstring = _("Opens ports for remote UPS signalling for Network UPS Tools.");
-
- // TRANSLATORS: Name of Service (rpm: openldap), can be used as check box, item in multiple selection box...
- tmpstring = _("OpenLDAP Server");
-
- // TRANSLATORS: Description of a Service (rpm: openldap), used as a common label or an item in table
- tmpstring = _("Opens ports for the OpenLDAP Server (slapd).");
-
- // TRANSLATORS: Description of a Service (rpm: postfix), used as a common label or an item in table
- tmpstring = _("Firewall Configuration file for postfix");
-
- // TRANSLATORS: Name of Service (rpm: postgresql), can be used as check box, item in multiple selection box...
- tmpstring = _("PostgreSQL Server");
-
- // TRANSLATORS: Description of a Service (rpm: postgresql), used as a common label or an item in table
- tmpstring = _("Opens TCP port 5432 to allow remote connections to the PostgreSQL server.");
-
- // TRANSLATORS: Name of Service (rpm: pure-ftpd), can be used as check box, item in multiple selection box...
- tmpstring = _("pureftpd");
-
- // TRANSLATORS: Description of a Service (rpm: pure-ftpd), used as a common label or an item in table
- tmpstring = _("Opens ports for pureftpd with broadcast allowed.");
-
- // TRANSLATORS: Description of a Service (rpm: sendmail), used as a common label or an item in table
- tmpstring = _("Firewall Configuration file for postfix");
-
- // TRANSLATORS: Name of Service (rpm: squid), can be used as check box, item in multiple selection box...
- tmpstring = _("Squid Service");
-
- // TRANSLATORS: Description of a Service (rpm: squid), used as a common label or an item in table
- tmpstring = _("Opens ports for Squid");
-
- // TRANSLATORS: Name of Service (rpm: sshd), can be used as check box, item in multiple selection box...
- tmpstring = _("Secure Shell Server");
-
- // TRANSLATORS: Description of a Service (rpm: sshd), used as a common label or an item in table
- tmpstring = _("Open ports for Secure Shell Server");
-
- // TRANSLATORS: Name of Service (rpm: svnserve), can be used as check box, item in multiple selection box...
- tmpstring = _("svnserve");
-
- // TRANSLATORS: Description of a Service (rpm: svnserve), used as a common label or an item in table
- tmpstring = _("Open ports for svnserve");
-
- // TRANSLATORS: Name of Service (rpm: talkd), can be used as check box, item in multiple selection box...
- tmpstring = _("Talk Server");
-
- // TRANSLATORS: Description of a Service (rpm: talkd), used as a common label or an item in table
- tmpstring = _("Open ports for Talk Server");
-
- // TRANSLATORS: Name of Service (rpm: tetrinet-server), can be used as check box, item in multiple selection box...
- tmpstring = _("Tetrinet Server");
-
- // TRANSLATORS: Description of a Service (rpm: tetrinet-server), used as a common label or an item in table
- tmpstring = _("Opens ports in firewall to make possible to connect clients to your server. ");
-
- // TRANSLATORS: Name of Service (rpm: vnc-httpd), can be used as check box, item in multiple selection box...
- tmpstring = _("VNC mini-HTTP server");
-
- // TRANSLATORS: Description of a Service (rpm: vnc-httpd), used as a common label or an item in table
- tmpstring = _("Opens the VNC HTTP ports so that browsers can connect.");
-
- // TRANSLATORS: Name of Service (rpm: vnc-server), can be used as check box, item in multiple selection box...
- tmpstring = _("VNC");
-
- // TRANSLATORS: Description of a Service (rpm: vnc-server), used as a common label or an item in table
- tmpstring = _("Opens VNC server ports so that viewers can connect.");
-
- // TRANSLATORS: Name of Service (rpm: vsftpd), can be used as check box, item in multiple selection box...
- tmpstring = _("vsftpd Server");
-
- // TRANSLATORS: Description of a Service (rpm: vsftpd), used as a common label or an item in table
- tmpstring = _("Opens ports for vsftpd Server.");
-
- // TRANSLATORS: Name of Service (rpm: xntp), can be used as check box, item in multiple selection box...
- tmpstring = _("xntp Server");
-
- // TRANSLATORS: Description of a Service (rpm: xntp), used as a common label or an item in table
- tmpstring = _("Opens ports for xntp.");
-
- // TRANSLATORS: Name of Service (rpm: ypbind), can be used as check box, item in multiple selection box...
- tmpstring = _("NIS Client");
-
- // TRANSLATORS: Description of a Service (rpm: ypbind), used as a common label or an item in table
- tmpstring = _("The ypbind daemon binds NIS clients to an NIS domain");
-
- // TRANSLATORS: Name of Service (rpm: ypserv), can be used as check box, item in multiple selection box...
- tmpstring = _("NIS Server");
-
- // TRANSLATORS: Description of a Service (rpm: ypserv), used as a common label or an item in table
- tmpstring = _("Configuration for a NIS master/slave server");
-
-}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.16.15/library/wizard/src/Progress.ycp new/yast2-2.16.16/library/wizard/src/Progress.ycp
--- old/yast2-2.16.15/library/wizard/src/Progress.ycp 2007-10-29 10:01:10.000000000 +0100
+++ new/yast2-2.16.16/library/wizard/src/Progress.ycp 2007-12-03 17:48:22.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Progress bar
* Authors: Petr Blahos
*
- * $Id: Progress.ycp 33164 2006-09-27 08:42:24Z jsrain $
+ * $Id: Progress.ycp 42628 2007-12-03 16:48:21Z locilka $
*
* Functions for progress bar.<br>
* <pre>
@@ -53,6 +53,8 @@
import "CommandLine";
import "Wizard";
import "Mode";
+ import "Directory";
+ import "FileUtils";
// Number of stages.
integer stages = 0;
@@ -73,6 +75,9 @@
integer super_step = 0;
list super_stages = [];
+ map display_info = UI::GetDisplayInfo();
+ boolean can_display_images = (display_info["HasImageSupport"]:false == true);
+
/**
* Sets progress bar state:
* on = normal operation, off = All Progress:: calls return immediatelly.
@@ -138,6 +143,69 @@
return `id (sformat ("mark_stage_%1",i));
}
+ string IconId (integer i) {
+ return sformat ("mark_icon_%1",i);
+ }
+
+ string FallbackIconInvisible () {
+ return Directory::icondir + "32x32/apps/yast-sudo.png";
+ }
+
+ string FallbackIconVisible () {
+ return Directory::icondir + "32x32/apps/yast-scripts.png";
+ }
+
+ list <string> global_invisible_icons_definition = [];
+ list <string> global_visible_icons_definition = [];
+
+ boolean use_icons_in_progress = false;
+ boolean has_icon_progress_bar = false;
+
+ string NormalizeIconPath (string one_icon, boolean visible) {
+ if (one_icon == nil || one_icon == "")
+ one_icon = (visible == true ? FallbackIconVisible() : FallbackIconInvisible());
+
+ if (! regexpmatch (one_icon, "\.[pP][nN][gG]$") && ! regexpmatch (one_icon, "\.[jJ][pP][gG]$")) {
+ one_icon = one_icon + ".png";
+ }
+
+ // relative path (to Directory::icondir)
+ if (regexpmatch (one_icon, "/") && ! regexpmatch (one_icon, "^/")) {
+ one_icon = Directory::icondir + one_icon;
+ // hopefully you know what you do
+ // just image name
+ } else if (! regexpmatch (one_icon, "/")) {
+ one_icon = Directory::icondir + "32x32/apps/" + one_icon;
+ }
+
+ if (! FileUtils::Exists (one_icon)) {
+ y2error ("Image %1 doesn't exist, using fallback", one_icon);
+ one_icon = (visible == true ? FallbackIconVisible() : FallbackIconInvisible());
+ }
+
+ return one_icon;
+ }
+
+ define term GenerateIdleIcons (integer number_of_stages) {
+ if (! can_display_images) return `Empty();
+
+ term ret = `HBox (`HSpacing (2));
+ integer i = -1;
+ string one_icon = "";
+
+ number_of_stages = number_of_stages - 1;
+
+ while (i < number_of_stages) {
+ i = i + 1;
+
+ one_icon = NormalizeIconPath (global_visible_icons_definition[i]:nil, false);
+ ret = add (ret, `Image (`id (IconId (i)), `opt (`disabled), one_icon, "[X]"));
+ ret = add (ret, `HSpacing (2));
+ }
+
+ return ret;
+ }
+
/**
* New complex progress bar with stages.
* @param window_title title of the window
@@ -193,8 +261,19 @@
});
if (0 != steps)
{ // stages and progress
+ term progress_icons = `Empty ();
+ if (use_icons_in_progress == true) {
+ y2milestone ("Using icons in progress");
+ progress_icons = GenerateIdleIcons (length);
+ has_icon_progress_bar = true;
+ } else {
+ y2milestone ("No progress icons defined");
+ has_icon_progress_bar = false;
+ }
+
bar = add (bar, `VBox (
`VStretch (),
+ progress_icons,
`ProgressBar (`id (`pb), progress_title, length, 0),
`VSpacing (2)
));
@@ -223,6 +302,42 @@
}
/**
+ * Function adds icon-support to progress dialog.
+ * Parameters are the same as for Progress::New() function with one parameter added.
+ *
+ * @param string window_title
+ * @param string progress_title
+ * @param integer length
+ * @param list<string> stg
+ * @param list tits
+ * @param string help_textmap
+ *
+ * @param list icons_definition
+ *
+ * @struct icons_definition = $[
+ * [ // first 'visible'
+ * "/path/to/icon-highlighted.png"
+ * "/path/to/another-icon-highlighted.png",
+ * ]
+ * [ // then 'invisible'
+ * "/path/to/icon-gryscale.png",
+ * nil, // fallback icon will be used
+ * ],
+ * ]
+ *
+ * @see Function Progress::New()
+ */
+ global define void NewProgressIcons (string window_title, string progress_title,
+ integer length, list<string> stg, list tits, string help_textmap, list icons_definition) {
+ global_visible_icons_definition = icons_definition[0]:[];
+ global_invisible_icons_definition = icons_definition[1]:[];
+
+ use_icons_in_progress = true;
+ New (window_title, progress_title, length, stg, tits, help_textmap);
+ use_icons_in_progress = false;
+ }
+
+ /**
* Create simple progress bar with no stages, only with progress bar.
* @param window_title Title of the window.
* @param progress_title Title of the progress bar.
@@ -233,6 +348,32 @@
New (window_title, progress_title, length, [], [], help_text);
}
+ integer last_highlighted_icon = -1;
+
+ /**
+ * Highlights a progress icon (changes the dimmed one
+ * into a normal one).
+ *
+ * @param integer current step ID
+ */
+ void HighlightProgressIcon (integer step_id) {
+ if (has_icon_progress_bar) {
+ if (last_highlighted_icon == nil) last_highlighted_icon = -1;
+
+ // some steps might have been skipped, change all (not changed yet)
+ // icons one by one
+ while (last_highlighted_icon < step_id) {
+ last_highlighted_icon = last_highlighted_icon + 1;
+
+ string icon_id = IconId (last_highlighted_icon);
+
+ if (UI::WidgetExists (`id (icon_id))) {
+ UI::ChangeWidget (`id (icon_id), `Enabled, true);
+ }
+ }
+ }
+ }
+
/**
* Uses current_step
*/
@@ -242,6 +383,9 @@
y2error (-2, "Progress bar has only %1 steps, not %2.", steps, current_step);
return ;
}
+
+ HighlightProgressIcon (current_step);
+
UI::ChangeWidget (`id (`pb), `Value, current_step);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.16.15/library/xml/src/XML.ycp new/yast2-2.16.16/library/xml/src/XML.ycp
--- old/yast2-2.16.15/library/xml/src/XML.ycp 2007-10-29 10:01:10.000000000 +0100
+++ new/yast2-2.16.16/library/xml/src/XML.ycp 2007-12-03 16:42:55.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: XML routines
* Authors: Anas Nashif
*
- * $Id: XML.ycp 26970 2006-01-11 16:31:13Z mvidner $
+ * $Id: XML.ycp 42596 2007-12-03 13:25:18Z ug $
*/
{
@@ -123,6 +123,25 @@
}
/**
+ * Read XML string into YCP
+ * @param XML string to read
+ * @return Map with YCP data
+ */
+ global define map XMLToYCPString( string xmlString) ``{
+ if (size(xmlString) > 0)
+ {
+ map out = (map) SCR::Read(.xml.string, xmlString);
+ y2debug("XML Agent output: %1", out);
+ return out;
+ }
+ else
+ {
+ y2warning("can't convert empty XML string");
+ return $[];
+ }
+ }
+
+ /**
* The error string from the xml parser.
* It should be used when the agent did not return content.
* A reset happens before a new XML parsing starts.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.16.15/Makefile.am new/yast2-2.16.16/Makefile.am
--- old/yast2-2.16.15/Makefile.am 2007-11-29 13:15:05.000000000 +0100
+++ new/yast2-2.16.16/Makefile.am 2007-12-04 13:35:20.000000000 +0100
@@ -23,13 +23,14 @@
ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages
LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl)
-COPYRIGHT_files_gpl = README COPYING COPYRIGHT.english
+COPYRIGHT_files_gpl = README COPYING
COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \
COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish
extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl))
+# less strict; prefer bzip2
AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip
# where devtools instal m4 snippets
# argh, executed literally
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.16.15/README new/yast2-2.16.16/README
--- old/yast2-2.16.15/README 2007-11-29 13:20:22.000000000 +0100
+++ new/yast2-2.16.16/README 2007-12-04 14:47:19.000000000 +0100
@@ -1,2 +1,2 @@
This program/library is part of YaST2
-See the file COPYRIGHT.english for license terms
+See the file COPYING for license terms
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.16.15/VERSION new/yast2-2.16.16/VERSION
--- old/yast2-2.16.15/VERSION 2007-11-29 13:19:09.000000000 +0100
+++ new/yast2-2.16.16/VERSION 2007-12-03 16:46:22.000000000 +0100
@@ -1 +1 @@
-2.16.15
+2.16.16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org