Author: locilka
Date: Thu Aug 28 14:08:46 2008
New Revision: 50445
URL: http://svn.opensuse.org/viewcvs/yast?rev=50445&view=rev
Log:
- Pup-up dialogs adapted to new ButtonBox widget (FATE #303446).
- TextEntry -> InputField.
- Adapted RPM dependencies.
- 2.17.2
Modified:
trunk/firewall/VERSION
trunk/firewall/package/yast2-firewall.changes
trunk/firewall/src/subdialogs.ycp
trunk/firewall/src/uifunctions.ycp
trunk/firewall/yast2-firewall.spec.in
Modified: trunk/firewall/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/firewall/VERSION?rev=50445&r1=50444&r2=50445&view=diff
==============================================================================
--- trunk/firewall/VERSION (original)
+++ trunk/firewall/VERSION Thu Aug 28 14:08:46 2008
@@ -1 +1 @@
-2.17.1
+2.17.2
Modified: trunk/firewall/package/yast2-firewall.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/firewall/package/yast2-firewall.changes?rev=50445&r1=50444&r2=50445&view=diff
==============================================================================
--- trunk/firewall/package/yast2-firewall.changes (original)
+++ trunk/firewall/package/yast2-firewall.changes Thu Aug 28 14:08:46 2008
@@ -1,4 +1,12 @@
-------------------------------------------------------------------
+Thu Aug 28 14:06:47 CEST 2008 - locilka@suse.cz
+
+- Pup-up dialogs adapted to new ButtonBox widget (FATE #303446).
+- TextEntry -> InputField.
+- Adapted RPM dependencies.
+- 2.17.2
+
+-------------------------------------------------------------------
Wed Jul 16 18:50:14 CEST 2008 - locilka@suse.cz
- No more built-in YaST Firewall services...
Modified: trunk/firewall/src/subdialogs.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/firewall/src/subdialogs.ycp?rev=50445&r1=50444&r2=50445&view=diff
==============================================================================
--- trunk/firewall/src/subdialogs.ycp (original)
+++ trunk/firewall/src/subdialogs.ycp Thu Aug 28 14:08:46 2008
@@ -103,9 +103,9 @@
)
),
`VSpacing(1),
- `HBox (
- `PushButton(`id("ok"), Label::OKButton()),
- `PushButton(`id("cancel"), Label::CancelButton())
+ `ButtonBox (
+ `PushButton (`id("ok"), `opt (`okButton, `default, `key_F10), Label::OKButton()),
+ `PushButton (`id("cancel"), `opt (`cancelButton, `key_F9), Label::CancelButton())
)
)
);
@@ -121,43 +121,22 @@
foreach (string zone_id, map zone_attributes, zones_additons, {
user_defined_zones = add(user_defined_zones,
- `TextEntry(`id("zone_additions_" + zone_id), zone_attributes["name"]:"", zone_attributes["items"]:"")
+ `InputField (`id("zone_additions_" + zone_id), `opt (`hstretch), zone_attributes["name"]:"", zone_attributes["items"]:"")
);
});
- term network_manager = `Empty();
- //if (NetworkService::IsManaged()) {
- // network_manager = `VBox (
- // `Left (
- // `Label (
- // sformat(
- // // TRANSLATORS: an informative text in a popup dialog, more newlines are allowed
- // // %1 is the 'any' string (by default)
- // // %2 is the name of the EXT zone (by default)
- // _("You are currently using NetworkManager.
-//You need to have a string '%1' in the zone '%2'
-//to get a working configuration."),
- // SuSEFirewall::special_all_interface_string, SuSEFirewall::GetZoneFullName(SuSEFirewall::special_all_interface_zone)
- // )
- // )
- // ),
- // `VSpacing(1)
- // );
- //}
-
term dialog = `Frame (
// TRANSLATORS: frame label
_("Additional Interface Settings for Zones"),
`VBox (
`HStretch(),
`VSpacing(1),
- network_manager,
user_defined_zones,
`VSpacing(1),
`VSpacing(1),
- `HBox (
- `PushButton(`id("ok"), Label::OKButton()),
- `PushButton(`id("cancel"), Label::CancelButton())
+ `ButtonBox (
+ `PushButton (`id ("ok"), `opt (`okButton, `default, `key_F10), Label::OKButton()),
+ `PushButton (`id ("cancel"), `opt (`cancelButton, `key_F9), Label::CancelButton())
)
)
);
@@ -307,17 +286,17 @@
// TRANSLATORS: label, %1 is a zone name like "External Zone"
`Left ( `Label(sformat(_("Settings for Zone: %1"), zone_name)) ),
// TRANSLATORS: text entry
- `TextEntry(`id("additional_tcp"), _("&TCP Ports")),
+ `InputField (`id("additional_tcp"), `opt (`hstretch), _("&TCP Ports")),
// TRANSLATORS: text entry
- `TextEntry(`id("additional_udp"), _("&UDP Ports")),
+ `InputField (`id("additional_udp"), `opt (`hstretch), _("&UDP Ports")),
// TRANSLATORS: text entry
- `TextEntry(`id("additional_rpc"), _("&RPC Ports")),
+ `InputField (`id("additional_rpc"), `opt (`hstretch), _("&RPC Ports")),
// TRANSLATORS: text entry
- `TextEntry(`id("additional_ip"), _("&IP Protocols")),
+ `InputField (`id("additional_ip"), `opt (`hstretch), _("&IP Protocols")),
`VSpacing(1),
- `HBox (
- `PushButton(`id("ok"), Label::OKButton()),
- `PushButton(`id("cancel"), Label::CancelButton())
+ `ButtonBox (
+ `PushButton(`id("ok"), `opt(`okButton, `key_F10, `default), Label::OKButton()),
+ `PushButton(`id("cancel"), `opt (`cancelButton, `key_F9), Label::CancelButton())
)
)
))
@@ -452,7 +431,7 @@
`item( `id("0/0"), "0/0")
]),
// TRANSLATORS: text entry
- `TextEntry (`id("add_requested_ip"), _("Re&quested IP"))
+ `InputField (`id("add_requested_ip"), `opt (`hstretch), _("Re&quested IP"))
),
`VBox (
// TRANSLATORS: select box
@@ -461,7 +440,7 @@
`item( `id("udp"), "UDP")
]),
// TRANSLATORS: text entry
- `TextEntry (`id("add_requested_port"), _("R&equested Port"))
+ `InputField (`id("add_requested_port"), `opt (`hstretch), _("R&equested Port"))
)
),
`VSpacing(1),
@@ -469,14 +448,14 @@
`Left( `Label(_("Redirection:")) ),
`HBox (
// TRANSLATORS: text entry
- `TextEntry (`id("add_redirectto_ip"), _("Re&direct to Masqueraded IP")),
+ `InputField (`id("add_redirectto_ip"), `opt (`hstretch), _("Re&direct to Masqueraded IP")),
// TRANSLATORS: text entry
- `TextEntry (`id("add_redirectto_port"), _("&Redirect to Port"))
+ `InputField (`id("add_redirectto_port"), `opt (`hstretch), _("&Redirect to Port"))
),
`VSpacing(1),
- `HBox (
- `PushButton(`id("ok"), Label::AddButton()),
- `PushButton(`id("cancel"), Label::CancelButton())
+ `ButtonBox (
+ `PushButton (`id ("ok"), `opt (`okButton, `default, `key_F10), Label::AddButton()),
+ `PushButton (`id ("cancel"), `opt (`cancelButton, `key_F9), Label::CancelButton())
)
)
);
@@ -880,9 +859,9 @@
)
),
`VSpacing(1),
- `HBox (
- `PushButton(`id("ok"), Label::OKButton()),
- `PushButton(`id("cancel"), Label::CancelButton())
+ `ButtonBox (
+ `PushButton (`id ("ok"), `opt (`okButton, `default, `key_F10), Label::OKButton()),
+ `PushButton (`id ("cancel"), `opt (`cancelButton, `key_F9), Label::CancelButton())
)
)
);
@@ -942,22 +921,22 @@
`Frame (
_("Add New Allowing Rule"),
`VBox (
- `TextEntry(`id("add_source_network"), _("Source &Network")),
+ `InputField (`id("add_source_network"), `opt (`hstretch), _("Source &Network")),
`Left (`ComboBox (`id("add_protocol"), _("&Protocol"), [
`item( `id("tcp"), SuSEFirewall::GetProtocolTranslatedName("tcp")),
`item( `id("udp"), SuSEFirewall::GetProtocolTranslatedName("udp")),
`item( `id("_rpc_"), SuSEFirewall::GetProtocolTranslatedName("_rpc_")),
])),
- `TextEntry (`id("add_destination_port"), _("&Destination Port (Optional)")),
- `TextEntry (`id("add_source_port"), _("&Source Port (Optional)"))
+ `InputField (`id("add_destination_port"), `opt (`hstretch), _("&Destination Port (Optional)")),
+ `InputField (`id("add_source_port"), `opt (`hstretch), _("&Source Port (Optional)"))
)
),
`VSpacing(1),
- `HBox (
- `PushButton(`id("ok"), Label::AddButton()),
- `PushButton(`id("cancel"), Label::CancelButton())
+ `ButtonBox (
+ `PushButton (`id ("ok"), `opt (`okButton, `default, `key_F10), Label::AddButton()),
+ `PushButton (`id ("cancel"), `opt (`cancelButton, `key_F9), Label::CancelButton())
)
);
}
Modified: trunk/firewall/src/uifunctions.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/firewall/src/uifunctions.ycp?rev=50445&r1=50444&r2=50445&view=diff
==============================================================================
--- trunk/firewall/src/uifunctions.ycp (original)
+++ trunk/firewall/src/uifunctions.ycp Thu Aug 28 14:08:46 2008
@@ -1512,10 +1512,9 @@
`HWeight (1, `InputField (`id (`port), `opt (`disabled), _("Po&rt"), ""))
)),
`VSpacing (1),
- `HBox (
- `PushButton (`id (`ok), Label::AddButton()),
- `VSpacing (1),
- `PushButton (`id (`cancel), Label::CancelButton())
+ `ButtonBox (
+ `PushButton (`id (`ok), `opt (`okButton, `default, `key_F10), Label::AddButton()),
+ `PushButton (`id (`cancel), `opt (`cancelButton, `key_F9), Label::CancelButton())
)
)
);
Modified: trunk/firewall/yast2-firewall.spec.in
URL: http://svn.opensuse.org/viewcvs/yast/trunk/firewall/yast2-firewall.spec.in?rev=50445&r1=50444&r2=50445&view=diff
==============================================================================
--- trunk/firewall/yast2-firewall.spec.in (original)
+++ trunk/firewall/yast2-firewall.spec.in Thu Aug 28 14:08:46 2008
@@ -7,6 +7,9 @@
# SuSEFirewall::SetInstallPackagesIfMissing, bnc #388773
Requires: yast2 >= 2.17.6
+# ButtonBox widget
+Conflicts: yast2-ycp-ui-bindings < 2.17.3
+
Provides: yast2-config-firewall
Obsoletes: yast2-config-firewall
Provides: yast2-trans-firewall
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
