Hello community,
here is the log from the commit of package yast2 for openSUSE:Factory
checked in at Mon Jan 18 13:54:25 CET 2010.
--------
--- yast2/yast2.changes 2010-01-14 17:52:44.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2/yast2.changes 2010-01-15 13:49:57.000000000 +0100
@@ -1,0 +2,6 @@
+Fri Jan 15 11:44:39 CET 2010 - aschnell@suse.de
+
+- extended Report and Popup module (needed for fate #304500)
+- 2.19.4
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-2.19.3.tar.bz2
New:
----
yast2-2.19.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2.spec ++++++
--- /var/tmp/diff_new_pack.y571H6/_old 2010-01-18 13:53:27.000000000 +0100
+++ /var/tmp/diff_new_pack.y571H6/_new 2010-01-18 13:53:27.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2 (Version 2.19.3)
+# spec file for package yast2 (Version 2.19.4)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,10 +19,10 @@
Name: yast2
-Version: 2.19.3
+Version: 2.19.4
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-2.19.3.tar.bz2
+Source0: yast2-2.19.4.tar.bz2
Prefix: /usr
Group: System/YaST
License: GPLv2+
@@ -113,7 +113,7 @@
installation with YaST2.
%prep
-%setup -n yast2-2.19.3
+%setup -n yast2-2.19.4
%build
%{prefix}/bin/y2tool y2autoconf
++++++ yast2-2.19.3.tar.bz2 -> yast2-2.19.4.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.19.3/configure new/yast2-2.19.4/configure
--- old/yast2-2.19.3/configure 2009-11-10 15:53:52.000000000 +0100
+++ new/yast2-2.19.4/configure 2010-01-15 13:50:19.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for yast2 2.18.28.
+# Generated by GNU Autoconf 2.63 for yast2 2.19.4.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -596,8 +596,8 @@
# Identity of this package.
PACKAGE_NAME='yast2'
PACKAGE_TARNAME='yast2'
-PACKAGE_VERSION='2.18.28'
-PACKAGE_STRING='yast2 2.18.28'
+PACKAGE_VERSION='2.19.4'
+PACKAGE_STRING='yast2 2.19.4'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1277,7 +1277,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2 2.18.28 to adapt to many kinds of systems.
+\`configure' configures yast2 2.19.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1348,7 +1348,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2 2.18.28:";;
+ short | recursive ) echo "Configuration of yast2 2.19.4:";;
esac
cat <<\_ACEOF
@@ -1428,7 +1428,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2 configure 2.18.28
+yast2 configure 2.19.4
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1442,7 +1442,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2 $as_me 2.18.28, which was
+It was created by yast2 $as_me 2.19.4, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2422,7 +2422,7 @@
# Define the identity of the package.
PACKAGE='yast2'
- VERSION='2.18.28'
+ VERSION='2.19.4'
cat >>confdefs.h <<_ACEOF
@@ -2544,7 +2544,7 @@
-VERSION="2.18.28"
+VERSION="2.19.4"
RPMNAME="yast2"
MAINTAINER="Jiri Srain "
@@ -3606,7 +3606,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2 $as_me 2.18.28, which was
+This file was extended by yast2 $as_me 2.19.4, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3656,7 +3656,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-yast2 config.status 2.18.28
+yast2 config.status 2.19.4
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.19.3/configure.in new/yast2-2.19.4/configure.in
--- old/yast2-2.19.3/configure.in 2009-11-10 15:53:48.000000000 +0100
+++ new/yast2-2.19.4/configure.in 2010-01-15 13:50:16.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2, 2.18.28, http://bugs.opensuse.org/, yast2)
+AC_INIT(yast2, 2.19.4, http://bugs.opensuse.org/, yast2)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.18.28"
+VERSION="2.19.4"
RPMNAME="yast2"
MAINTAINER="Jiri Srain "
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.19.3/library/modules/Popup.ycp new/yast2-2.19.4/library/modules/Popup.ycp
--- old/yast2-2.19.3/library/modules/Popup.ycp 2009-03-23 12:27:07.000000000 +0100
+++ new/yast2-2.19.4/library/modules/Popup.ycp 2010-01-15 13:50:07.000000000 +0100
@@ -7,7 +7,7 @@
* Arvin Schnell
* Flags: Stable
*
- * $Id: Popup.ycp 56128 2009-03-16 09:04:30Z ug $
+ * $Id: Popup.ycp 60396 2010-01-15 12:50:06Z aschnell $
*
* Contains commonly used popup dialogs
* for general usage, e.g. Popup::YesNo(), Popup::ContinueCancel().
@@ -346,6 +346,52 @@
/**
+ * Generic error question popup with two buttons.
+ *
+ * Style guide hint: The first button has to have the semantics of "yes",
+ * "OK", "continue" etc., the second its opposite ("no", "cancel", ...).
+ * NEVER use this generic question popup to simply exchange the order of
+ * yes/no, continue/cancel or ok/cancel buttons!
+ *
+ * @param headline headline or Popup::NoHeadline()
+ * @param message message string
+ * @param yes_button_message label on affirmative buttons (on left side)
+ * @param no_button_message label on negating button (on right side)
+ * @param focus `focus_yes (first button) or `focus_no (second button)
+ * @screenshot screenshots/AnyQuestion.png
+ *
+ * @return true: first button has been clicked
+ * false: second button has been clicked
+ *
+ * @see YesNo
+ * @see ContinueCancel
+ *
+ * @example Popup::ErrorAnyQuestion( Label::WarningMsg(), "Do really want to ...?", "Install", "Don't do it", `focus_no );
+ */
+global boolean ErrorAnyQuestion(string headline,
+ string message,
+ string yes_button_message,
+ string no_button_message,
+ symbol focus)
+{
+ term button_box = AnyQuestionButtonBox ( yes_button_message, no_button_message, focus);
+ boolean success = (boolean) UI::OpenDialog(
+ `opt(`decorated),
+ popupLayoutInternal( headline, message, Icon::IconPath ("error"), button_box )
+ );
+
+ any ret = nil;
+
+ if (success == true) {
+ ret = UI::UserInput();
+ UI::CloseDialog();
+ }
+
+ return ret == `yes;
+}
+
+
+/**
* Timed question popup with two buttons and time display
*
* @param headline headline or Popup::NoHeadline()
@@ -387,6 +433,71 @@
);
any which_input = nil;
+
+ while (timeout_seconds > 0) {
+ which_input = UI::TimeoutUserInput( 1000 );
+
+ if (which_input == `timed_ok)
+ break;
+ if (which_input == `timed_stop)
+ {
+ UI::ReplaceWidget(`id(`replace_buttons), button_box);
+ while (which_input == `timed_stop)
+ which_input = UI::UserInput();
+ break;
+ }
+ timeout_seconds = timeout_seconds - 1;
+ if (success == true) UI::ChangeWidget (`id(`remaining_time), `Value, ""+timeout_seconds);
+ }
+
+ if (success == true) UI::CloseDialog();
+
+ return which_input == `yes;
+}
+
+
+/**
+ * Timed error question popup with two buttons and time display
+ *
+ * @param headline headline or Popup::NoHeadline()
+ * @param message message string
+ * @param yes_button_message label on affirmative buttons (on left side)
+ * @param no_button_message label on negating button (on right side)
+ * @param focus `focus_yes (first button) or `focus_no (second button)
+ * @param timeout_seconds timeout, if 0, normal behaviour
+ * @return boolean True if Yes, False if no
+ * @see AnyQuestion
+ */
+global boolean TimedErrorAnyQuestion( string headline,
+ string message,
+ string yes_button_message,
+ string no_button_message,
+ symbol focus ,
+ integer timeout_seconds)
+{
+ term button_box = AnyQuestionButtonBox ( yes_button_message, no_button_message, focus);
+ term timed =
+ `ReplacePoint(`id(`replace_buttons) ,
+ `VBox(
+ `HCenter(
+ `Label(`id(`remaining_time), "" + timeout_seconds)
+ ),
+ `ButtonBox (
+ // FIXME: BNC #422612, Use `opt(`noSanityCheck) later
+ `PushButton (`id (`timed_stop), `opt (`cancelButton), Label::StopButton()),
+ `PushButton (`id (`timed_ok), `opt (`default, `key_F10, `okButton), Label::OKButton())
+ ),
+ `VSpacing(0.2)
+ )
+ );
+
+
+ boolean success = (boolean) UI::OpenDialog(
+ `opt(`decorated),
+ popupLayoutInternal( headline, message, Icon::IconPath ("error"), timed )
+ );
+
+ any which_input = nil;
while (timeout_seconds > 0) {
which_input = UI::TimeoutUserInput( 1000 );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.19.3/library/modules/Report.ycp new/yast2-2.19.4/library/modules/Report.ycp
--- old/yast2-2.19.3/library/modules/Report.ycp 2008-05-13 13:13:43.000000000 +0200
+++ new/yast2-2.19.4/library/modules/Report.ycp 2010-01-15 13:50:07.000000000 +0100
@@ -5,7 +5,7 @@
* Authors: Ladislav Slezak
* Flags: Stable
*
- * $Id: Report.ycp 47448 2008-05-12 11:45:22Z mvidner $
+ * $Id: Report.ycp 60396 2010-01-15 12:50:06Z aschnell $
*
* Report module collects warnings and errors from modules in auto installation mode.
* Collected messages can be displayed later.
@@ -328,6 +328,57 @@
return ret;
}
+
+/**
+ * Question with headline and Yes/No Buttons
+ * @param headline Popup Headline
+ * @param message Popup Message
+ * @param yes_button_message Yes Button Message
+ * @param no_button_message No Button Message
+ * @param focus Which Button has the focus
+ * @return boolean True if Yes is pressed, otherwise false
+ */
+global boolean ErrorAnyQuestion(string headline,
+ string message,
+ string yes_button_message,
+ string no_button_message,
+ symbol focus)
+{
+ if (log_yesno_messages)
+ {
+ y2milestone(1, "%1", message);
+ }
+
+ boolean ret = false;
+ if (display_yesno_messages)
+ {
+ if (timeout_yesno_messages > 0)
+ {
+ ret = Popup::TimedErrorAnyQuestion(
+ headline,
+ message,
+ yes_button_message,
+ no_button_message,
+ focus,
+ timeout_yesno_messages);
+ }
+ else
+ {
+ ret = Popup::ErrorAnyQuestion(
+ headline,
+ message,
+ yes_button_message,
+ no_button_message,
+ focus );
+
+ }
+ }
+
+ yesno_messages = add(yesno_messages, message);
+ return ret;
+}
+
+
/**
* Store new message text
* @param message_string message text, it can contain new line characters ("\n")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.19.3/library/modules/Version.ycp new/yast2-2.19.4/library/modules/Version.ycp
--- old/yast2-2.19.3/library/modules/Version.ycp 2010-01-14 17:54:43.000000000 +0100
+++ new/yast2-2.19.4/library/modules/Version.ycp 2010-01-15 13:50:25.000000000 +0100
@@ -20,7 +20,7 @@
/**
* Version of the yast2 package
*/
-global string yast2 = "2.19.3";
+global string yast2 = "2.19.4";
/* EOF */
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.19.3/VERSION new/yast2-2.19.4/VERSION
--- old/yast2-2.19.3/VERSION 2010-01-14 17:53:35.000000000 +0100
+++ new/yast2-2.19.4/VERSION 2010-01-15 13:49:50.000000000 +0100
@@ -1 +1 @@
-2.19.3
+2.19.4
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org