Hello community,
here is the log from the commit of package yast2-scanner
checked in at Fri Nov 21 15:59:40 CET 2008.
--------
--- yast2-scanner/yast2-scanner.changes 2008-11-04 12:43:21.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-scanner/yast2-scanner.changes 2008-11-21 12:38:35.611378000 +0100
@@ -1,0 +2,11 @@
+Fri Nov 21 11:46:49 CET 2008 - jsmeix@suse.de
+
+- V 2.17.3
+- Removed the "Cancel" button from the Overview dialog
+ because there is nothing to "Cancel" here.
+ Do no longer restore the outdated default button names
+ when a dialog is closed to avoid too many visible
+ changes of button names.
+ (See Novell/Suse Bugzilla bnc#440560).
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-scanner-2.17.2.tar.bz2
New:
----
yast2-scanner-2.17.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-scanner.spec ++++++
--- /var/tmp/diff_new_pack.J19152/_old 2008-11-21 15:59:21.000000000 +0100
+++ /var/tmp/diff_new_pack.J19152/_new 2008-11-21 15:59:21.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-scanner (Version 2.17.2)
+# spec file for package yast2-scanner (Version 2.17.3)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -20,12 +20,12 @@
Url: http://en.opensuse.org/YaST
Name: yast2-scanner
-Version: 2.17.2
+Version: 2.17.3
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-scanner-2.17.2.tar.bz2
+Source0: yast2-scanner-2.17.3.tar.bz2
Prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files xorg-x11-libX11-devel yast2 yast2-devtools yast2-testsuite
Requires: yast2
@@ -53,7 +53,7 @@
Johannes Meixner
%prep
-%setup -n yast2-scanner-2.17.2
+%setup -n yast2-scanner-2.17.3
%build
%{prefix}/bin/y2tool y2autoconf
@@ -94,6 +94,14 @@
%{prefix}/lib/YaST2/bin/displaytest
%doc %{prefix}/share/doc/packages/yast2-scanner
%changelog
+* Fri Nov 21 2008 jsmeix@suse.de
+- V 2.17.3
+- Removed the "Cancel" button from the Overview dialog
+ because there is nothing to "Cancel" here.
+ Do no longer restore the outdated default button names
+ when a dialog is closed to avoid too many visible
+ changes of button names.
+ (See Novell/Suse Bugzilla bnc#440560).
* Tue Nov 04 2008 jsmeix@suse.de
- V 2.17.2
- Removed the "Back" button from the Overview dialog
++++++ yast2-scanner-2.17.2.tar.bz2 -> yast2-scanner-2.17.3.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.17.2/configure new/yast2-scanner-2.17.3/configure
--- old/yast2-scanner-2.17.2/configure 2008-11-04 12:24:33.000000000 +0100
+++ new/yast2-scanner-2.17.3/configure 2008-11-21 11:57:50.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-scanner 2.17.2.
+# Generated by GNU Autoconf 2.61 for yast2-scanner 2.17.3.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -728,8 +728,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-scanner'
PACKAGE_TARNAME='yast2-scanner'
-PACKAGE_VERSION='2.17.2'
-PACKAGE_STRING='yast2-scanner 2.17.2'
+PACKAGE_VERSION='2.17.3'
+PACKAGE_STRING='yast2-scanner 2.17.3'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1438,7 +1438,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-scanner 2.17.2 to adapt to many kinds of systems.
+\`configure' configures yast2-scanner 2.17.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1509,7 +1509,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-scanner 2.17.2:";;
+ short | recursive ) echo "Configuration of yast2-scanner 2.17.3:";;
esac
cat <<\_ACEOF
@@ -1615,7 +1615,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-scanner configure 2.17.2
+yast2-scanner configure 2.17.3
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1629,7 +1629,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-scanner $as_me 2.17.2, which was
+It was created by yast2-scanner $as_me 2.17.3, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2450,7 +2450,7 @@
# Define the identity of the package.
PACKAGE='yast2-scanner'
- VERSION='2.17.2'
+ VERSION='2.17.3'
cat >>confdefs.h <<_ACEOF
@@ -2678,7 +2678,7 @@
-VERSION="2.17.2"
+VERSION="2.17.3"
RPMNAME="yast2-scanner"
MAINTAINER="Johannes Meixner "
@@ -22553,7 +22553,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-scanner $as_me 2.17.2, which was
+This file was extended by yast2-scanner $as_me 2.17.3, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -22606,7 +22606,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-scanner config.status 2.17.2
+yast2-scanner config.status 2.17.3
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.17.2/configure.in new/yast2-scanner-2.17.3/configure.in
--- old/yast2-scanner-2.17.2/configure.in 2008-11-04 12:24:16.000000000 +0100
+++ new/yast2-scanner-2.17.3/configure.in 2008-11-21 11:57:35.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-scanner, 2.17.2, http://bugs.opensuse.org/, yast2-scanner)
+AC_INIT(yast2-scanner, 2.17.3, http://bugs.opensuse.org/, yast2-scanner)
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.17.2"
+VERSION="2.17.3"
RPMNAME="yast2-scanner"
MAINTAINER="Johannes Meixner "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.17.2/src/dialogs.ycp new/yast2-scanner-2.17.3/src/dialogs.ycp
--- old/yast2-scanner-2.17.2/src/dialogs.ycp 2008-11-04 12:42:49.000000000 +0100
+++ new/yast2-scanner-2.17.3/src/dialogs.ycp 2008-11-21 12:38:14.000000000 +0100
@@ -4,8 +4,8 @@
* Summary: Dialogs definitions
* Authors: Johannes Meixner
*
- * $Id: dialogs.ycp 52876 2008-11-04 11:42:48Z jsmeix $
- * $Id: dialogs.ycp 52876 2008-11-04 11:42:48Z jsmeix $
+ * $Id: dialogs.ycp 53508 2008-11-21 11:38:13Z jsmeix $
+ * $Id: dialogs.ycp 53508 2008-11-21 11:38:13Z jsmeix $
*/
{
@@ -136,13 +136,33 @@
// According to http://en.opensuse.org/YaST/Style_Guide#Single_Configuration.2FOverview.2FEd...
// the "finish" button in an Overview dialog must now be named "OK":
Wizard::SetNextButton( `next, Label::OKButton() );
- // Do not have a "Back" button in the Overview dialog
- // because in the Overview dialog there is nothing where to go back,
- // see http://en.opensuse.org/YaST/Style_Guide#Single_Configuration.2FOverview.2FEd...
+ // In the Overview dialog it does not make sense to have a button with "back" functionality
+ // which is named "Cancel" according to the new YaST style guide at
+ // http://en.opensuse.org/YaST/Style_Guide#Single_Configuration.2FOverview.2FEd...
+ // because there is nothing to "cancel" in the Overview dialog because it
+ // only shows information about the current state of the configuration
+ // but the Overview dialog itself does not do any change of the configuration.
+ // The Overview dialog has actually the same meaning for the user
+ // as a plain notification popup which has only a "OK" button.
+ // If the user does not agree to what is shown in the Overview dialog
+ // he must launch a configuration sub-dialog to change the configuration.
+ // If the user accepted in such a configuration sub-dialog what he changed
+ // via the "OK" button there, the change is applied and the Overview dialog
+ // shows the new current state of the configuration, see
+ // http://en.opensuse.org/YaST/Development/Printer_Enhancement#Basic_Implementa...:
+ // so that it is not possible to "cancel" the change in the Overview dialog.
+ // Any change of the configuration is done in sub-dialogs which are called
+ // from the Overview dialog (even the "Confirm Deletion" popup is such a sub-dialog)
+ // and in all those sub-dialogs there is a button with "cancel" functionality.
Wizard::HideBackButton();
// According to http://en.opensuse.org/YaST/Style_Guide#Single_Configuration.2FOverview.2FEd...
- // the "abort" button in an Overview dialog must now be named "cancel":
- Wizard::SetAbortButton( `abort, Label::CancelButton() );
+ // there is no longer a "abort" functionality which exits the whole module.
+ // Instead this button is now named "Cancel" and its functionality is
+ // to go back to the Overview dialog (i.e. what the "back" button would do)
+ // because it reads "Cancel - Closes the window and returns to the overview."
+ // In this case this does not make sense because this is already the "overview".
+ // Therefore the button with the "abort" functionality is not shown at all:
+ Wizard::HideAbortButton();
any ret = nil;
while(true)
{ // UI::UserInput returns the label of the button which was cklicked:
@@ -365,8 +385,6 @@
_("Deactivate %1?"), backend_name ) ) )
{ continue;
}
- Wizard::DisableBackButton();
- Wizard::DisableAbortButton();
Wizard::DisableNextButton();
if( ! Scanner::DeactivateBackend( backend_name, -1, true ) )
{ Popup::Error( // Message of a Popup::Error
@@ -375,8 +393,6 @@
// was called and this function would have shown more specific messages.
sformat( _("Failed to deactivate %1."), backend_name ) );
}
- Wizard::EnableBackButton();
- Wizard::EnableAbortButton();
Wizard::EnableNextButton();
// Exit this dialog and run it again via the sequencer in wizards.ycp
// to get it updated after the delete via calling OverviewContents():
@@ -530,12 +546,6 @@
continue;
}
y2milestone( "OverviewDialog returns: %1", ret );
- // Re-set the default ID and label for the button with the "next" functionality for further wizard dialogs:
- Wizard::SetNextButton( `next, Label::NextButton() );
- // Restore the above hidden button with "back" functionality for other wizard dialogs:
- Wizard::RestoreBackButton();
- // Re-set the default ID and label for the button with the "abort" functionality for further wizard dialogs:
- Wizard::SetAbortButton( `abort, Label::AbortButton() );
return ret;
}
@@ -762,10 +772,6 @@
y2milestone( "Ignoring unexpected returncode in SelectModelDialog: %1", ret );
continue;
}
- // Re-set the default ID and label for the button with the "abort" functionality for further wizard dialogs:
- Wizard::SetAbortButton( `abort, Label::AbortButton() );
- // Re-enable the above disabled button with the "back" functionality for further wizard dialogs:
- Wizard::EnableBackButton();
return ret;
}
@@ -805,7 +811,6 @@
// so that I do not show any "abort"/"cancel" button here at all:
Wizard::HideAbortButton();
Wizard::DisableBackButton();
- Wizard::DisableAbortButton();
Wizard::DisableNextButton();
if( ! Scanner::ActivateBackend( "", Scanner::selected_model_database_index, true ) )
{ Popup::Error( sformat( // Message of a Popup::Error where %1 will be replaced by the driver (backend) name.
@@ -814,14 +819,12 @@
_("Failed to activate %1."), backend_name ) );
}
Wizard::EnableBackButton();
- Wizard::EnableAbortButton();
Wizard::EnableNextButton();
any ret = nil;
while(true)
{ ret = UI::UserInput();
if( ret == `back )
{ Wizard::DisableBackButton();
- Wizard::DisableAbortButton();
Wizard::DisableNextButton();
if( ! Scanner::DeactivateBackend( "", Scanner::selected_model_database_index, false ) )
{ Popup::Error( sformat( // Message of a Popup::Error where %1 will be replaced by the driver (backend) name.
@@ -830,7 +833,6 @@
_("Failed to deactivate %1."), backend_name ) );
}
Wizard::EnableBackButton();
- Wizard::EnableAbortButton();
Wizard::EnableNextButton();
break;
}
@@ -840,8 +842,6 @@
y2milestone( "Ignoring unexpected returncode in ConfigureBackendDialog: %1", ret );
continue;
}
- // Restore the above hidden button with "abort" functionality for other wizard dialogs:
- Wizard::RestoreAbortButton();
return ret;
}
@@ -1136,16 +1136,13 @@
}
}
Wizard::DisableBackButton();
- Wizard::DisableAbortButton();
Wizard::DisableNextButton();
if( ! Scanner::SetupNetworkScanningConfig() )
{ Wizard::EnableBackButton();
- Wizard::EnableAbortButton();
Wizard::EnableNextButton();
continue;
}
Wizard::EnableBackButton();
- Wizard::EnableAbortButton();
Wizard::EnableNextButton();
break;
}
@@ -1155,8 +1152,6 @@
y2milestone( "Ignoring unexpected returncode in ConfigureBackendDialog: %1", ret );
continue;
}
- // Restore the above hidden button with "abort" functionality for other wizard dialogs:
- Wizard::RestoreAbortButton();
return ret;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.17.2/VERSION new/yast2-scanner-2.17.3/VERSION
--- old/yast2-scanner-2.17.2/VERSION 2008-11-04 09:17:48.000000000 +0100
+++ new/yast2-scanner-2.17.3/VERSION 2008-11-21 11:46:46.000000000 +0100
@@ -1 +1 @@
-2.17.2
+2.17.3
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org