Hello community,
here is the log from the commit of package yast2-add-on
checked in at Wed Aug 29 22:07:10 CEST 2007.
--------
--- yast2-add-on/yast2-add-on.changes 2007-08-27 18:12:15.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-add-on/yast2-add-on.changes 2007-08-29 13:09:20.000000000 +0200
@@ -1,0 +2,15 @@
+Wed Aug 29 10:21:17 CEST 2007 - locilka@suse.cz
+
+- Using new Wizard window without installation steps displayed when
+ adding new Add-On. Dialog help is visible immediately. Restoring
+ dialog buttons when redrawing list of used Add-Ons (#305788).
+- Requesting confirmation when user wants to delete already added
+ Add-On (#305802).
+- Not skipping to the "Add-On Product Media" dialog in case of
+ going_back in the installation workflow even if there is not
+ Add-On in use yet (#305809).
+- Disabling [ Next ] button in Media Selection dialog unless some
+ media type is selected (#305850).
+- 2.15.14
+
+-------------------------------------------------------------------
Old:
----
yast2-add-on-2.15.13.tar.bz2
New:
----
yast2-add-on-2.15.14.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-add-on.spec ++++++
--- /var/tmp/diff_new_pack.o29319/_old 2007-08-29 22:06:58.000000000 +0200
+++ /var/tmp/diff_new_pack.o29319/_new 2007-08-29 22:06:58.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-add-on (Version 2.15.13)
+# spec file for package yast2-add-on (Version 2.15.14)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-add-on
-Version: 2.15.13
+Version: 2.15.14
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-add-on-2.15.13.tar.bz2
+Source0: yast2-add-on-2.15.14.tar.bz2
prefix: /usr
Requires: autoyast2-installation
# WorkflowManager module
@@ -47,7 +47,7 @@
Lukas Ocilka
%prep
-%setup -n yast2-add-on-2.15.13
+%setup -n yast2-add-on-2.15.14
%build
%{prefix}/bin/y2tool y2autoconf
@@ -86,6 +86,18 @@
%doc %{prefix}/share/doc/packages/yast2-add-on
%changelog
+* Wed Aug 29 2007 - locilka@suse.cz
+- Using new Wizard window without installation steps displayed when
+ adding new Add-On. Dialog help is visible immediately. Restoring
+ dialog buttons when redrawing list of used Add-Ons (#305788).
+- Requesting confirmation when user wants to delete already added
+ Add-On (#305802).
+- Not skipping to the "Add-On Product Media" dialog in case of
+ going_back in the installation workflow even if there is not
+ Add-On in use yet (#305809).
+- Disabling [ Next ] button in Media Selection dialog unless some
+ media type is selected (#305850).
+- 2.15.14
* Mon Aug 27 2007 - locilka@suse.cz
- Adjusting Add-On's name if set in SourceDialogs when adding it
during installation and on a running system (#304659).
++++++ yast2-add-on-2.15.13.tar.bz2 -> yast2-add-on-2.15.14.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-2.15.13/add-on.pot new/yast2-add-on-2.15.14/add-on.pot
--- old/yast2-add-on-2.15.13/add-on.pot 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-add-on-2.15.14/add-on.pot 2007-08-29 10:46:48.000000000 +0200
@@ -0,0 +1,428 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR , YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-08-29 10:46+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: LANGUAGE \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. radio button
+#: src/add-on-workflow.ycp:90
+msgid "&Scan Using SLP..."
+msgstr ""
+
+#. radio button
+#: src/add-on-workflow.ycp:92
+msgid "&FTP..."
+msgstr ""
+
+#. radio button
+#: src/add-on-workflow.ycp:94
+msgid "&HTTP..."
+msgstr ""
+
+#. radio button
+#: src/add-on-workflow.ycp:96
+msgid "HTT&PS..."
+msgstr ""
+
+#. radio button
+#: src/add-on-workflow.ycp:98
+msgid "&SMB/CIFS"
+msgstr ""
+
+#. radio button
+#: src/add-on-workflow.ycp:100
+msgid "&NFS..."
+msgstr ""
+
+#. radio button
+#: src/add-on-workflow.ycp:102 src/add-on-workflow.ycp:119
+msgid "&CD..."
+msgstr ""
+
+#. radio button
+#: src/add-on-workflow.ycp:104 src/add-on-workflow.ycp:121
+msgid "&DVD..."
+msgstr ""
+
+#. radio button
+#: src/add-on-workflow.ycp:106 src/add-on-workflow.ycp:123
+msgid "&Local Directory..."
+msgstr ""
+
+#. radio button
+#: src/add-on-workflow.ycp:108 src/add-on-workflow.ycp:125
+msgid "Specify &URL..."
+msgstr ""
+
+#. dialog caption
+#: src/add-on-workflow.ycp:134 src/add-on.ycp:56
+msgid "Add-On Product Media"
+msgstr ""
+
+#. help
+#: src/add-on-workflow.ycp:136
+msgid ""
+"<p><big><b>Catalog Media</b></big><br>\n"
+"Add-on products can be installed from CD, over a\n"
+"network, or from the hard disk.</p>\n"
+msgstr ""
+
+#. help, continued
+#: src/add-on-workflow.ycp:142
+msgid ""
+"<p>\n"
+"To install add-on product from <b>CD</b>,\n"
+"have the product CD set or the DVD available.</p>"
+msgstr ""
+
+#. help, continued
+#: src/add-on-workflow.ycp:147
+msgid ""
+"<p>\n"
+"The product CDs can be copied to the hard disk.\n"
+"Insert the path where the first\n"
+"CD is located, for example, /data1/<b>CD1</b>.\n"
+"Only the base path is required if all CDs are copied\n"
+"into one directory.</p>\n"
+msgstr ""
+
+#. help, continued
+#: src/add-on-workflow.ycp:156
+msgid ""
+"<p>\n"
+"Network installation requires a working network connection.\n"
+"Specify the directory where the packages from\n"
+"the first CD are located, such as /data1/CD1.</p>\n"
+msgstr ""
+
+#. yes-no popup
+#. if (Stage::initial())
+#. {
+#. if (Popup::ConfirmAbort (`painless))
+#. break;
+#. }
+#. else
+#. {
+#. yes-no popup
+#: src/add-on-workflow.ycp:225 src/add-on-workflow.ycp:471
+#: src/add-on-workflow.ycp:760
+msgid "Really abort add-on product installation?"
+msgstr ""
+
+#. popup error message, %1 is the package name
+#: src/add-on-workflow.ycp:252
+#, ycp-format
+msgid ""
+"Cannot search for SLP installation sources\n"
+"without having %1 package installed"
+msgstr ""
+
+#: src/add-on-workflow.ycp:283
+msgid "Insert the add-on product CD"
+msgstr ""
+
+#: src/add-on-workflow.ycp:284
+msgid "Insert the add-on product DVD"
+msgstr ""
+
+#. error report
+#: src/add-on-workflow.ycp:370
+msgid "No catalog found on medium."
+msgstr ""
+
+#. busy message
+#: src/add-on-workflow.ycp:387
+msgid "Initializing new source..."
+msgstr ""
+
+#. error report
+#: src/add-on-workflow.ycp:415 src/add-on-workflow.ycp:518
+msgid "Failed to initialize the catalog."
+msgstr ""
+
+#. placeholder for unknown directory
+#. place holder for unknown URL
+#. placeholder for unknown path
+#. placeholder for unknown URL
+#. placeholder for unknown path
+#. summary item, %1 is product name, %2 media URL, %3 directory on media
+#: src/add-on-workflow.ycp:433 src/add-on-workflow.ycp:438
+#: src/add-on-workflow.ycp:932 src/add-on-workflow.ycp:938
+#: src/add-on_proposal.ycp:32 src/add-on_proposal.ycp:36
+msgid "Unknown"
+msgstr ""
+
+#. table cell, %1 is URL, %2 is directory name
+#: src/add-on-workflow.ycp:436 src/add-on-workflow.ycp:936
+#, ycp-format
+msgid "URL: %1, Directory: %2"
+msgstr ""
+
+#. dialog caption
+#: src/add-on-workflow.ycp:442
+msgid "Catalog Selection"
+msgstr ""
+
+#. help text
+#: src/add-on-workflow.ycp:444
+msgid ""
+"<p><big><b>Catalog Selection</b></big><br>\n"
+"There were multiple catalogs found on the selected medium.\n"
+"Select the catalog to use.</p>\n"
+msgstr ""
+
+#: src/add-on-workflow.ycp:451
+msgid "&Found Catalogs"
+msgstr ""
+
+#. popup message
+#: src/add-on-workflow.ycp:487
+msgid "Select a catalog."
+msgstr ""
+
+#. table cell
+#: src/add-on-workflow.ycp:588
+msgid "No product found in the catalog"
+msgstr ""
+
+#. error pop-up
+#: src/add-on-workflow.ycp:658 src/add-on-workflow.ycp:815
+msgid ""
+"The product on the media is already installed\n"
+"or selected for installation."
+msgstr ""
+
+#. message popup
+#: src/add-on-workflow.ycp:676
+msgid "Dependencies of the add-on product cannot be fulfilled."
+msgstr ""
+
+#. dialog caption
+#: src/add-on-workflow.ycp:733
+msgid "Product Selection"
+msgstr ""
+
+#. multi selection list
+#: src/add-on-workflow.ycp:737
+msgid "Available Products"
+msgstr ""
+
+#. help text
+#: src/add-on-workflow.ycp:741
+msgid ""
+"<p><b><big>Product Selection</big></b><br>\n"
+"There were multiple products found in the catalog. Select the products\n"
+"to install.</p>\n"
+msgstr ""
+
+#. message popup
+#: src/add-on-workflow.ycp:802
+msgid "Dependencies of the selected add-on products cannot be fulfilled."
+msgstr ""
+
+#. main screen heading
+#. feedback heading
+#. TRANSLATORS: dialog caption
+#: src/add-on-workflow.ycp:919 src/add-on.ycp:114
+#: src/inst_language_add-on.ycp:114 src/inst_language_add-on.ycp:163
+msgid "Add-On Product Installation"
+msgstr ""
+
+#. Help for add-on products
+#: src/add-on-workflow.ycp:922
+msgid ""
+"<p><big><b>Add-On Product Installation</b></big></br>\n"
+"Here see all add-on products that are selected for installation.\n"
+"To add a new product, click <b>Add</b>. To remove an already added one,\n"
+"select it and click <b>Delete</b>.</p>"
+msgstr ""
+
+#. table header
+#: src/add-on-workflow.ycp:948
+msgid "Media"
+msgstr ""
+
+#. table header
+#: src/add-on-workflow.ycp:950
+msgid "Product"
+msgstr ""
+
+#. TRANSLATORS: pop-up headline
+#: src/add-on-workflow.ycp:1022
+msgid "Warning: Not enough memory!"
+msgstr ""
+
+#. TRANSLATORS: pop-up question
+#: src/add-on-workflow.ycp:1024
+msgid ""
+"Your system does not seem to have enough memory to use add-on products\n"
+"during installation. You can enable add-on products later when the\n"
+"system is running.\n"
+"\n"
+"Do you want to skip using add-on products?"
+msgstr ""
+
+#. message report
+#: src/add-on-workflow.ycp:1103
+msgid "Select a product to delete."
+msgstr ""
+
+#. TRANSLATORS: commandline help
+#: src/add-on.ycp:33
+msgid ""
+"\n"
+"Add-On Module Help\n"
+"------------------\n"
+"\n"
+"To add a new Add-On product via command-line, use this syntax:\n"
+" /sbin/yast2 add-on URL\n"
+"URL is the path to the Add-On source.\n"
+"\n"
+"Examples of URL:\n"
+"http://server.name/directory/Lang-AddOn-10.2-i386/\n"
+"ftp://server.name/directory/Lang-AddOn-10.2-i386/\n"
+"nfs://server.name/directory/SDK1-SLE-i386/\n"
+"disk://dev/sda5/directory/Product/CD1/\n"
+"cd://\n"
+"dvd://\n"
+msgstr ""
+
+#. busy message (dialog)
+#. TRANSLATORS: dialog content - a very simple label
+#: src/add-on.ycp:58 src/inst_language_add-on.ycp:116
+msgid "Initializing..."
+msgstr ""
+
+#. help
+#. TRANSLATORS: help text
+#: src/add-on.ycp:60 src/inst_language_add-on.ycp:118
+msgid "<p>Initializing add-on products...</p>"
+msgstr ""
+
+#: src/add-on.ycp:117
+msgid "Reading packages available on the installation sources..."
+msgstr ""
+
+#: src/add-on_auto.ycp:59
+#, ycp-format
+msgid "<li>Media: %1, Path: %2, Product: %3</li>\n"
+msgstr ""
+
+#. error report
+#: src/add-on_auto.ycp:162
+msgid "Failed to add add-on product."
+msgstr ""
+
+#. summary string
+#: src/add-on_proposal.ycp:41
+msgid "No add-on product selected for installation"
+msgstr ""
+
+#. this is a heading
+#: src/add-on_proposal.ycp:69
+msgid "Add-On Products"
+msgstr ""
+
+#. this is a menu entry
+#: src/add-on_proposal.ycp:71
+msgid "Add-On &Products"
+msgstr ""
+
+#. TRANSLATORS: popup message
+#: src/inst_language_add-on.ycp:77
+msgid "Installation of the Language Extension has been finished."
+msgstr ""
+
+#. TRANSLATORS:: multi-selection box
+#: src/inst_language_add-on.ycp:170
+msgid "&Select Language Extensions to Be Installed"
+msgstr ""
+
+#. TRANSLATORS: help text
+#: src/inst_language_add-on.ycp:177
+msgid "<p>Select language extensions to be installed and click <b>Accept</b>.</p>"
+msgstr ""
+
+#. TRANSLATORS: popup question
+#: src/inst_language_add-on.ycp:194
+msgid "Are you sure you want to abort the add-on product installation?"
+msgstr ""
+
+#: src/inst_language_add-on.ycp:203
+msgid ""
+"There are no selected languages to be installed.\n"
+"Are you sure you want to abort the installation?"
+msgstr ""
+
+#. TRANSLATORS: multiselection box item, %1 stands for 'ar', 'mk', 'zh_TW'
+#. it used only as a fallback
+#: src/inst_language_add-on.ycp:251
+#, ycp-format
+msgid "Language %1"
+msgstr ""
+
+#. TRANSLATORS: error message - the module does not provide command line interface
+#: src/vendor.ycp:29
+msgid "There is no user interface available for this module."
+msgstr ""
+
+#. VENDOR: main screen heading
+#: src/vendor.ycp:92
+msgid "Vendor Driver CD"
+msgstr ""
+
+#. VENDOR: cant mount /dev/cdrom popup
+#: src/vendor.ycp:108
+msgid "Please insert the vendor CD-ROM"
+msgstr ""
+
+#. VENDOR: vendor cd contains wrong data
+#: src/vendor.ycp:157 src/vendor.ycp:171 src/vendor.ycp:219
+msgid ""
+"Could not find driver data on the CD-ROM.\n"
+"Aborting now."
+msgstr ""
+
+#. VENDOR: vendor cd doesn't contain data for current system and linux version
+#: src/vendor.ycp:194
+msgid ""
+"The CD-ROM data does not match the running Linux system.\n"
+"Aborting now.\n"
+msgstr ""
+
+#. VENDOR: dialog heading
+#: src/vendor.ycp:256
+msgid "Installing driver..."
+msgstr ""
+
+#. VENDOR: popup if installation of driver failed
+#: src/vendor.ycp:265
+msgid ""
+"The installation failed.\n"
+"Contact the address on the CD-ROM.\n"
+msgstr ""
+
+#. VENDOR: message box with number of drivers installed
+#: src/vendor.ycp:277
+#, ycp-format
+msgid "Installed %1 drivers from CD"
+msgstr ""
+
+#. VENDOR: message box with error text
+#: src/vendor.ycp:282
+msgid ""
+"No driver data found on the CD-ROM.\n"
+"Aborting now."
+msgstr ""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-2.15.13/configure new/yast2-add-on-2.15.14/configure
--- old/yast2-add-on-2.15.13/configure 2007-08-23 17:35:20.000000000 +0200
+++ new/yast2-add-on-2.15.14/configure 2007-08-29 13:18:32.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for yast2-add-on 2.15.12.
+# Generated by GNU Autoconf 2.60 for yast2-add-on 2.15.14.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -559,8 +559,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-add-on'
PACKAGE_TARNAME='yast2-add-on'
-PACKAGE_VERSION='2.15.12'
-PACKAGE_STRING='yast2-add-on 2.15.12'
+PACKAGE_VERSION='2.15.14'
+PACKAGE_STRING='yast2-add-on 2.15.14'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1181,7 +1181,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-add-on 2.15.12 to adapt to many kinds of systems.
+\`configure' configures yast2-add-on 2.15.14 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1252,7 +1252,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-add-on 2.15.12:";;
+ short | recursive ) echo "Configuration of yast2-add-on 2.15.14:";;
esac
cat <<\_ACEOF
@@ -1330,7 +1330,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-add-on configure 2.15.12
+yast2-add-on configure 2.15.14
generated by GNU Autoconf 2.60
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1344,7 +1344,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-add-on $as_me 2.15.12, which was
+It was created by yast2-add-on $as_me 2.15.14, which was
generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -2145,7 +2145,7 @@
# Define the identity of the package.
PACKAGE='yast2-add-on'
- VERSION='2.15.12'
+ VERSION='2.15.14'
cat >>confdefs.h <<_ACEOF
@@ -2372,7 +2372,7 @@
-VERSION="2.15.12"
+VERSION="2.15.14"
RPMNAME="yast2-add-on"
MAINTAINER="Lukas Ocilka "
@@ -3258,7 +3258,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-add-on $as_me 2.15.12, which was
+This file was extended by yast2-add-on $as_me 2.15.14, which was
generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3301,7 +3301,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-add-on config.status 2.15.12
+yast2-add-on config.status 2.15.14
configured by $0, generated by GNU Autoconf 2.60,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-2.15.13/configure.in new/yast2-add-on-2.15.14/configure.in
--- old/yast2-add-on-2.15.13/configure.in 2007-08-23 17:35:14.000000000 +0200
+++ new/yast2-add-on-2.15.14/configure.in 2007-08-29 13:18:27.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.15.7 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-add-on, 2.15.12, http://bugs.opensuse.org/, yast2-add-on)
+AC_INIT(yast2-add-on, 2.15.14, http://bugs.opensuse.org/, yast2-add-on)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.15.12"
+VERSION="2.15.14"
RPMNAME="yast2-add-on"
MAINTAINER="Lukas Ocilka "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-2.15.13/src/add-on-workflow.ycp new/yast2-add-on-2.15.14/src/add-on-workflow.ycp
--- old/yast2-add-on-2.15.13/src/add-on-workflow.ycp 2007-08-27 17:08:12.000000000 +0200
+++ new/yast2-add-on-2.15.14/src/add-on-workflow.ycp 2007-08-29 13:08:30.000000000 +0200
@@ -29,9 +29,13 @@
import "SuSEFirewall";
import "Stage";
import "Wizard";
+import "Confirm";
+import "GetInstArgs";
include "packager/inst_source_dialogs.ycp";
+boolean going_back_in_workflow = GetInstArgs::going_back();
+
/**
* Initialize current inst. sources
*/
@@ -87,25 +91,25 @@
`RadioButtonGroup (`id (`type), `VBox (
`VStretch (),
// radio button
- `Left (`RadioButton(`id(`slp), _("&Scan Using SLP..."))),
+ `Left (`RadioButton(`id(`slp), `opt(`notify), _("&Scan Using SLP..."))),
// radio button
- `Left (`RadioButton(`id(`ftp), _("&FTP..."))),
+ `Left (`RadioButton(`id(`ftp), `opt(`notify), _("&FTP..."))),
// radio button
- `Left (`RadioButton(`id(`http), _("&HTTP..."))),
+ `Left (`RadioButton(`id(`http), `opt(`notify), _("&HTTP..."))),
// radio button
- `Left (`RadioButton(`id(`https), _("HTT&PS..."))),
+ `Left (`RadioButton(`id(`https), `opt(`notify), _("HTT&PS..."))),
// radio button
- `Left (`RadioButton(`id(`samba), _("&SMB/CIFS"))),
+ `Left (`RadioButton(`id(`samba), `opt(`notify), _("&SMB/CIFS"))),
// radio button
- `Left (`RadioButton(`id(`nfs), _("&NFS..."))),
+ `Left (`RadioButton(`id(`nfs), `opt(`notify), _("&NFS..."))),
// radio button
- `Left (`RadioButton(`id(`cd), _("&CD..."))),
+ `Left (`RadioButton(`id(`cd), `opt(`notify), _("&CD..."))),
// radio button
- `Left (`RadioButton(`id(`dvd), _("&DVD..."))),
+ `Left (`RadioButton(`id(`dvd), `opt(`notify), _("&DVD..."))),
// radio button
- `Left (`RadioButton(`id(`local_dir), _("&Local Directory..."))),
+ `Left (`RadioButton(`id(`local_dir), `opt(`notify), _("&Local Directory..."))),
// radio button
- `Left (`RadioButton (`id (`specify_url),_("Specify &URL..."))),
+ `Left (`RadioButton (`id (`specify_url), `opt(`notify), _("Specify &URL..."))),
`VStretch ()
))), `HStretch ()
);
@@ -116,13 +120,13 @@
`RadioButtonGroup (`id (`type), `VBox (
`VStretch (),
// radio button
- `Left (`RadioButton(`id(`cd), _("&CD..."))),
+ `Left (`RadioButton(`id(`cd), `opt(`notify), _("&CD..."))),
// radio button
- `Left (`RadioButton(`id(`dvd), _("&DVD..."))),
+ `Left (`RadioButton(`id(`dvd), `opt(`notify), _("&DVD..."))),
// radio button
- `Left (`RadioButton(`id(`local_dir), _("&Local Directory..."))),
+ `Left (`RadioButton(`id(`local_dir), `opt(`notify), _("&Local Directory..."))),
// radio button
- `Left (`RadioButton (`id (`specify_url),_("Specify &URL..."))),
+ `Left (`RadioButton (`id (`specify_url), `opt(`notify), _("Specify &URL..."))),
`VStretch ()
))), `HStretch ()
);
@@ -164,6 +168,10 @@
Wizard::DisableBackButton();
Wizard::RestoreAbortButton();
Wizard::SetAbortButton (`cancel, Label::CancelButton());
+
+ // disable the button unless some option is selected
+ // bugzilla #305850
+ Wizard::DisableNextButton();
}
/**
@@ -197,10 +205,15 @@
y2milestone ("Running media select dialog");
CreateMediaSelectDialog();
+ // all supported types
+ // bugzilla #305850
+ list rb_rets = [`slp, `ftp, `http, `https, `samba, `nfs, `cd, `dvd, `local_dir, `specify_url];
+
symbol ret = nil;
string url = "";
while (ret == nil) {
ret = (symbol) UI::UserInput ();
+
if (ret == `back) {
// bugzilla #216910
// `back means - return to the previous dialog
@@ -211,9 +224,7 @@
} else {
break;
}
- }
- else if (ret == `abort || ret == `cancel)
- {
+ } else if (ret == `abort || ret == `cancel) {
ret = `abort;
// Just return back (abort adding new Add-On) in installation
@@ -228,14 +239,24 @@
ret = nil;
continue;
- }
- else if (ret != `next)
+ // one radio button selected
+ } else if (ret != nil && contains (rb_rets, ret)) {
+ // bugzilla #305850
+ Wizard::EnableNextButton();
+ ret = nil;
+ // next loop
continue;
-
+ } else if (ret == `next) {
+ y2milestone ("Media type selected...");
+ } else {
+ y2error ("Unknown ret: %1", ret);
+ continue;
+ }
createResult = nil;
symbol input = (symbol)UI::QueryWidget (`id (`type), `CurrentButton);
y2milestone ("Current: %1", input);
+
if ( input == `slp )
{
string required_package = "yast2-slp";
@@ -958,7 +979,13 @@
)
);
+ // bugzilla #305788
+ Wizard::RestoreBackButton();
+ Wizard::RestoreAbortButton();
+ Wizard::RestoreNextButton();
+
Wizard::SetContentsButtons (title, contents, help, back_button, next_button);
+
if (! enable_back) Wizard::DisableBackButton();
if (! enable_next) Wizard::DisableNextButton();
@@ -1050,27 +1077,29 @@
boolean not_enough_memory = (Stage::initial() && HasInsufficientMemory());
boolean no_addons = (size (AddOnProduct::add_on_products) == 0);
+ // bugzilla #239630
+ // It might be dangerous to add more installation sources in installation
+ // on machine with less memory
+ // Do not report when some add-ons are already in use
+ if (not_enough_memory && ! no_addons) {
+ if (! ContinueIfInsufficientMemory ()) return `next;
+ }
+
// FATE #301928 - Saving one click
- if (no_addons) {
+ // Bugzilla #305809 if "going_back", do not save that click!
+ if (no_addons && ! going_back_in_workflow) {
+ y2milestone ("Skipping to media_select");
+ // only once
+ going_back_in_workflow = false;
ret = `first_time;
}
// Show Add-Ons table
- if (not_enough_memory || ! no_addons) {
- Redraw (enable_back, enable_next, back_button, next_button);
- }
+ Redraw (enable_back, enable_next, back_button, next_button);
// store the initial settings, only once
WorkflowManager::SetBaseWorkflow (false);
- // bugzilla #239630
- // It might be dangerous to add more installation sources in installation
- // on machine with less memory
- // Do not report when some add-ons are already in use
- if (not_enough_memory && no_addons) {
- if (! ContinueIfInsufficientMemory ()) return `next;
- }
-
// added / removed
boolean some_addon_changed = false;
@@ -1096,6 +1125,12 @@
continue;
}
+ // bugzilla #305802
+ if (! Confirm::DeleteSelected()) {
+ continue;
+ }
+ y2milestone ("Deleting %1 %2", selected, AddOnProduct::add_on_products[selected]:nil);
+
// remove whole media if the product is the only one on the media
integer media = AddOnProduct::add_on_products[selected, "media"]:-1;
integer med_count = size (filter (map prod,
@@ -1128,7 +1163,15 @@
// adding new add-on
} else if (ret == `add) {
+
+ // bugzilla #305788
+ // Use new wizard window for adding new Add-On.
+ // Do not use "Steps" dialog.
+ Wizard::OpenNextBackDialog();
+ Wizard::SetDesktopIcon("vendor");
symbol ret = RunWizard ();
+ Wizard::CloseDialog();
+
if (ret == `next) {
// Add-On product has been added, integrate it (change workflow, use y2update)
AddOnProduct::Integrate (AddOnProduct::src_id);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-2.15.13/VERSION new/yast2-add-on-2.15.14/VERSION
--- old/yast2-add-on-2.15.13/VERSION 2007-08-27 18:12:20.000000000 +0200
+++ new/yast2-add-on-2.15.14/VERSION 2007-08-29 10:23:52.000000000 +0200
@@ -1 +1 @@
-2.15.13
+2.15.14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org