Hello community,
here is the log from the commit of package yast2-firewall
checked in at Thu Sep 25 00:54:17 CEST 2008.
--------
--- yast2-firewall/yast2-firewall.changes 2008-09-10 16:43:41.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-firewall/yast2-firewall.changes 2008-09-17 13:35:23.000000000 +0200
@@ -1,0 +2,8 @@
+Wed Sep 17 13:32:35 CEST 2008 - locilka@suse.cz
+
+- Fixed button labels, helps, confirmation when deleting a selected
+ entry and enabling/disabling buttons considering the data listed
+ in tables - all according to YaST Style Guide (bnc #421049).
+- 2.17.4
+
+-------------------------------------------------------------------
Old:
----
yast2-firewall-2.17.3.tar.bz2
New:
----
yast2-firewall-2.17.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-firewall.spec ++++++
--- /var/tmp/diff_new_pack.W11932/_old 2008-09-25 00:54:05.000000000 +0200
+++ /var/tmp/diff_new_pack.W11932/_new 2008-09-25 00:54:05.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-firewall (Version 2.17.3)
+# spec file for package yast2-firewall (Version 2.17.4)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-firewall
-Version: 2.17.3
+Version: 2.17.4
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-firewall-2.17.3.tar.bz2
+Source0: yast2-firewall-2.17.4.tar.bz2
Prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite
BuildRequires: yast2 >= 2.16.47
@@ -51,7 +51,7 @@
Lukas Ocilka
%prep
-%setup -n yast2-firewall-2.17.3
+%setup -n yast2-firewall-2.17.4
%build
%{prefix}/bin/y2tool y2autoconf
@@ -83,8 +83,12 @@
%{prefix}/share/applications/YaST2/firewall.desktop
/usr/share/YaST2/schema/autoyast/rnc/firewall.rnc
%doc %{prefix}/share/doc/packages/yast2-firewall
-
%changelog
+* Wed Sep 17 2008 locilka@suse.cz
+- Fixed button labels, helps, confirmation when deleting a selected
+ entry and enabling/disabling buttons considering the data listed
+ in tables - all according to YaST Style Guide (bnc #421049).
+- 2.17.4
* Wed Sep 10 2008 locilka@suse.cz
- Handling pop-up window close button (`cancel) (bnc #419101).
- 2.17.3
++++++ yast2-firewall-2.17.3.tar.bz2 -> yast2-firewall-2.17.4.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-firewall-2.17.3/configure new/yast2-firewall-2.17.4/configure
--- old/yast2-firewall-2.17.3/configure 2008-09-10 16:44:35.000000000 +0200
+++ new/yast2-firewall-2.17.4/configure 2008-09-17 13:40:13.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-firewall 2.17.3.
+# Generated by GNU Autoconf 2.61 for yast2-firewall 2.17.4.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-firewall'
PACKAGE_TARNAME='yast2-firewall'
-PACKAGE_VERSION='2.17.3'
-PACKAGE_STRING='yast2-firewall 2.17.3'
+PACKAGE_VERSION='2.17.4'
+PACKAGE_STRING='yast2-firewall 2.17.4'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1197,7 +1197,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-firewall 2.17.3 to adapt to many kinds of systems.
+\`configure' configures yast2-firewall 2.17.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1268,7 +1268,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-firewall 2.17.3:";;
+ short | recursive ) echo "Configuration of yast2-firewall 2.17.4:";;
esac
cat <<\_ACEOF
@@ -1346,7 +1346,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-firewall configure 2.17.3
+yast2-firewall configure 2.17.4
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1360,7 +1360,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-firewall $as_me 2.17.3, which was
+It was created by yast2-firewall $as_me 2.17.4, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2181,7 +2181,7 @@
# Define the identity of the package.
PACKAGE='yast2-firewall'
- VERSION='2.17.3'
+ VERSION='2.17.4'
cat >>confdefs.h <<_ACEOF
@@ -2409,7 +2409,7 @@
-VERSION="2.17.3"
+VERSION="2.17.4"
RPMNAME="yast2-firewall"
MAINTAINER="Lukas Ocilka "
@@ -3304,7 +3304,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-firewall $as_me 2.17.3, which was
+This file was extended by yast2-firewall $as_me 2.17.4, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3347,7 +3347,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-firewall config.status 2.17.3
+yast2-firewall config.status 2.17.4
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-firewall-2.17.3/configure.in new/yast2-firewall-2.17.4/configure.in
--- old/yast2-firewall-2.17.3/configure.in 2008-09-10 16:44:32.000000000 +0200
+++ new/yast2-firewall-2.17.4/configure.in 2008-09-17 13:40:10.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-firewall, 2.17.3, http://bugs.opensuse.org/, yast2-firewall)
+AC_INIT(yast2-firewall, 2.17.4, http://bugs.opensuse.org/, yast2-firewall)
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.3"
+VERSION="2.17.4"
RPMNAME="yast2-firewall"
MAINTAINER="Lukas Ocilka "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-firewall-2.17.3/src/helps.ycp new/yast2-firewall-2.17.4/src/helps.ycp
--- old/yast2-firewall-2.17.3/src/helps.ycp 2008-04-14 12:11:58.000000000 +0200
+++ new/yast2-firewall-2.17.4/src/helps.ycp 2008-09-17 13:40:02.000000000 +0200
@@ -6,7 +6,7 @@
* Summary: Firewall dialogs helps
* Authors: Lukas Ocilka
*
- * $Id: helps.ycp 46543 2008-04-14 10:10:16Z locilka $
+ * $Id: helps.ycp 51217 2008-09-17 11:40:06Z locilka $
*
* File includes helps for yast2-firewall dialogs.
*/
@@ -57,7 +57,7 @@
<p>To allow a service, select the <b>Zone</b> and the
<b>Service to Allow</b> then press <b>Add</b>.
-To remove an allowed service, select the <b>Zone</b> and the <b>Allowed Service</b> then press <b>Remove</b>.</p>
+To remove an allowed service, select the <b>Zone</b> and the <b>Allowed Service</b> then press <b>Delete</b>.</p>
<p>By deselecting <b>Protect Firewall from Internal Zone</b>, remove
protection from the zone. All services and ports would be unprotected from this zone.</p>
@@ -89,7 +89,7 @@
transparently redirect any requested ports on your firewall to any internal IP.
To add a new redirect rule, press <b>Add</b> and complete the redirect form.</p>
-<p>To removed any redirect rule, select it in the table and press <b>Remove</b>.</p>
+<p>To removed any redirect rule, select it in the table and press <b>Delete</b>.</p>
"),
// TRANSLATORS: Simple broadcast configuration dialog help
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-firewall-2.17.3/src/subdialogs.ycp new/yast2-firewall-2.17.4/src/subdialogs.ycp
--- old/yast2-firewall-2.17.3/src/subdialogs.ycp 2008-08-28 14:08:46.000000000 +0200
+++ new/yast2-firewall-2.17.4/src/subdialogs.ycp 2008-09-17 13:40:02.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Configuration screens
* Authors: Lukas Ocilka
*
- * $Id: subdialogs.ycp 50445 2008-08-28 12:08:46Z locilka $
+ * $Id: subdialogs.ycp 51217 2008-09-17 11:40:06Z locilka $
*
* Configuration dialogs divided into smaller logic groups.
* Both Expert and Simple.
@@ -225,7 +225,7 @@
`VSpacing( 1.1 ),
`PushButton ( `id ( "add_allowed_service" ), `opt ( `hstretch ), " " + Label::AddButton() + " "),
- `PushButton ( `id ( "remove_allowed_service" ), `opt ( `hstretch ), " " + Label::RemoveButton() + " "),
+ `PushButton ( `id ( "remove_allowed_service" ), `opt ( `hstretch ), " " + Label::DeleteButton() + " "),
`Empty(`opt(`vstretch)),
@@ -263,7 +263,7 @@
),
`HBox (
`PushButton(`id("add_redirect_to_masquerade"), Label::AddButton()),
- `PushButton(`id("remove_redirect_to_masquerade"), Label::RemoveButton()),
+ `PushButton(`id("remove_redirect_to_masquerade"), Label::DeleteButton()),
`HStretch()
)
)
@@ -328,7 +328,7 @@
* `VSquash (
* `HBox (
* `PushButton(`id("add_masquerade_network"), Label::AddButton()),
- * `PushButton(`id("remove_masquerade_network"), Label::RemoveButton())
+ * `PushButton(`id("remove_masquerade_network"), Label::DeleteButton())
* )
* )
* )
@@ -366,7 +366,7 @@
* `item( `id("0/0"), "0/0")
* ]),
* // TRANSLATORS: text entry
- * `TextEntry (`id("add_destination_port"), _("Port"))
+ * `InputField (`id("add_destination_port"), `opt (`hstretch), _("Port"))
* ))
* ),
* `VSpacing(1),
@@ -407,7 +407,7 @@
),
`HBox (
`PushButton(`id("add_redirect_to_masquerade"), Label::AddButton()),
- `PushButton(`id("remove_redirect_to_masquerade"), Label::RemoveButton()),
+ `PushButton(`id("remove_redirect_to_masquerade"), Label::DeleteButton()),
`HStretch()
)
)
@@ -489,7 +489,7 @@
* `VSquash (
* `HBox (
* `PushButton(`id("add_transparent_redirection"), Label::AddButton()),
- * `PushButton(`id("remove_transparent_redirection"), Label::RemoveButton())
+ * `PushButton(`id("remove_transparent_redirection"), Label::DeleteButton())
* )
* )
* )
@@ -529,12 +529,12 @@
* ])
* ),
* `HWeight ( 10,
- * `TextEntry (`id("add_destination_port"), _("Requested Port"))
+ * `InputField (`id("add_destination_port"), `opt (`hstretch), _("Requested Port"))
* )
* ),
* `VSpacing(1),
* `Left ( `Label(_("Transparently Redirect To:")) ),
- * `TextEntry (`id("add_localredirect_port"), _("Local Port On 127.0.0.1")),
+ * `InputField (`id("add_localredirect_port"), `opt (`hstretch), _("Local Port On 127.0.0.1")),
* `VSpacing(1),
* `HBox (
* `PushButton(`id("ok"), Label::AddButton()),
@@ -572,7 +572,7 @@
* `VSquash (
* `HBox (
* `PushButton(`id("add_forward_network"), Label::AddButton()),
- * `PushButton(`id("remove_forward_network"), Label::RemoveButton())
+ * `PushButton(`id("remove_forward_network"), Label::DeleteButton())
* )
* )
* )
@@ -615,7 +615,7 @@
* ])
* ),
* `HWeight ( 10,
- * `TextEntry (`id("add_port"), _("Port"))
+ * `InputField (`id("add_port"), `opt (`hstretch), _("Port"))
* )
* ),
* `VSpacing(1),
@@ -658,7 +658,7 @@
* `Left (
* `HBox (
* // FIXME: fake frequency
- * `HVSquash ( `TextEntry (`id("frequency"), _("Frequency"), "3")),
+ * `HVSquash ( `InputField (`id("frequency"), `opt (`hstretch), _("Frequency"), "3")),
* `VBox ( `Label(""), `Label ("/") ),
* `ComboBox (`id("unit"), _("Unit"), [
* `item(`id("second"), _("Second")),
@@ -671,7 +671,7 @@
* `Left (
* `HBox (
* // FIXME: fake log file
- * `TextEntry (`id("file_name"), Label::FileName(), "/var/log/SuSEfirewall2"),
+ * `InputField (`id("file_name"), `opt (`hstretch), Label::FileName(), "/var/log/SuSEfirewall2"),
* `VBox ( `Label(""), `PushButton (`id("browse_logfile"), Label::BrowseButton()) )
* )
* )
@@ -795,7 +795,7 @@
* ])
* ),
* `HWeight ( 1,
- * `TextEntry (`id("htb_unit"), `opt(`hsquash), _("kbit/sec."))
+ * `InputField (`id("htb_unit"), `opt(`hsquash), _("kbit/sec."))
* )
* )
* )
@@ -907,7 +907,7 @@
),
`HBox (
`PushButton(`id("add_custom_rule"), Label::AddButton()),
- `PushButton(`id("remove_custom_rule"), Label::RemoveButton()),
+ `PushButton(`id("remove_custom_rule"), Label::DeleteButton()),
`HStretch ()
)
)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-firewall-2.17.3/src/uifunctions.ycp new/yast2-firewall-2.17.4/src/uifunctions.ycp
--- old/yast2-firewall-2.17.3/src/uifunctions.ycp 2008-09-10 16:43:51.000000000 +0200
+++ new/yast2-firewall-2.17.4/src/uifunctions.ycp 2008-09-17 13:40:02.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Configuration dialogs handling functions
* Authors: Lukas Ocilka
*
- * $Id: uifunctions.ycp 50973 2008-09-10 14:43:50Z locilka $
+ * $Id: uifunctions.ycp 51217 2008-09-17 11:40:06Z locilka $
*
* Configuration dialogs handling.
* Both Expert and Simple.
@@ -702,6 +702,10 @@
// disable or enable buttons, selectboxes, table
RedrawAllowedServicesDialog(current_zone);
+
+ if (size (allowed_services) == 0) {
+ UI::ChangeWidget(`id("remove_allowed_service"), `Enabled, false);
+ }
}
void InitAllowedServices (string key) {
@@ -750,9 +754,11 @@
SuSEFirewall::SetServicesForZones([add_service], [current_zone], true);
RedrawAllowedServices (current_zone);
} else if (ret == "remove_allowed_service") {
- string remove_service = (string) UI::QueryWidget(`id("table_allowed_services"), `CurrentItem);
- SuSEFirewall::SetServicesForZones([remove_service], [current_zone], false);
- RedrawAllowedServices (current_zone);
+ if (Confirm::DeleteSelected()) {
+ string remove_service = (string) UI::QueryWidget(`id("table_allowed_services"), `CurrentItem);
+ SuSEFirewall::SetServicesForZones([remove_service], [current_zone], false);
+ RedrawAllowedServices (current_zone);
+ }
} else if (ret == "advanced_allowed_service") {
// redraw when "OK" button pressed
if (HandlePopupAdditionalServices(current_zone)) {
@@ -1138,7 +1144,7 @@
replace_dialog = add(replace_dialog,
`HBox(
`HWeight( 40,
- `TextEntry(`id("bcast_ports_" + zone), zone_name, ports_for_zone)
+ `InputField (`id("bcast_ports_" + zone), `opt (`hstretch), zone_name, ports_for_zone)
),
`HWeight( 60,
`VBox (
@@ -1435,6 +1441,9 @@
if (UI::WidgetExists (`id ("table_broadcastreply")))
UI::ChangeWidget (`id ("table_broadcastreply"), `Items, items);
+
+ if (UI::WidgetExists (`id (`delete_br)))
+ UI::ChangeWidget (`id (`delete_br), `Enabled, (size (items) != 0));
}
void InitBroadcastReply (string key) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-firewall-2.17.3/VERSION new/yast2-firewall-2.17.4/VERSION
--- old/yast2-firewall-2.17.3/VERSION 2008-09-10 16:41:57.000000000 +0200
+++ new/yast2-firewall-2.17.4/VERSION 2008-09-17 13:32:30.000000000 +0200
@@ -1 +1 @@
-2.17.3
+2.17.4
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org