[yast-commit] r65402 - in /trunk/firewall: package/yast2-firewall.changes src/subdialogs.ycp src/summary.ycp src/uifunctions.ycp

Author: locilka Date: Fri Aug 26 13:41:52 2011 New Revision: 65402 URL: http://svn.opensuse.org/viewcvs/yast?rev=65402&view=rev Log: - Fixed Custom Rules dialog to handle additional flags (bnc#712670) Modified: trunk/firewall/package/yast2-firewall.changes trunk/firewall/src/subdialogs.ycp trunk/firewall/src/summary.ycp trunk/firewall/src/uifunctions.ycp Modified: trunk/firewall/package/yast2-firewall.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/firewall/package/yast2-firewall.changes?rev=65402&r1=65401&r2=65402&view=diff ============================================================================== --- trunk/firewall/package/yast2-firewall.changes (original) +++ trunk/firewall/package/yast2-firewall.changes Fri Aug 26 13:41:52 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Aug 26 13:33:57 CEST 2011 - locilka@suse.cz + +- Fixed Custom Rules dialog to handle additional flags (bnc#712670) + +------------------------------------------------------------------- Fri Aug 5 12:32:00 CEST 2011 - tgoettlicher@suse.de - fixed .desktop file (bnc #681249) Modified: trunk/firewall/src/subdialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/firewall/src/subdialogs.ycp?rev=65402&r1=65401&r2=65402&view=diff ============================================================================== --- trunk/firewall/src/subdialogs.ycp (original) +++ trunk/firewall/src/subdialogs.ycp Fri Aug 26 13:41:52 2011 @@ -903,7 +903,8 @@ _("Source Network"), _("Protocol"), _("Destination Port"), - _("Source Port") + _("Source Port"), + _("Options") ), [] ), @@ -930,7 +931,8 @@ `item( `id("_rpc_"), SuSEFirewall::GetProtocolTranslatedName("_rpc_")), ])), `InputField (`id("add_destination_port"), `opt (`hstretch), _("&Destination Port (Optional)")), - `InputField (`id("add_source_port"), `opt (`hstretch), _("&Source Port (Optional)")) + `InputField (`id("add_source_port"), `opt (`hstretch), _("&Source Port (Optional)")), + `InputField (`id("add_options"), `opt (`hstretch), _("Additiona &Options (Optional)")) ) ), Modified: trunk/firewall/src/summary.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/firewall/src/summary.ycp?rev=65402&r1=65401&r2=65402&view=diff ============================================================================== --- trunk/firewall/src/summary.ycp (original) +++ trunk/firewall/src/summary.ycp Fri Aug 26 13:41:52 2011 @@ -280,11 +280,12 @@ foreach (map one_rule, custom_rules, { string proto = one_rule["protocol"]:"tcp"; string one_rule_s = li_start + sformat ( - _("Network: <i>%1</i>, Protocol: <i>%2</i>, Destination port: <i>%3</i>, Source port: <i>%4</i>"), + _("Network: <i>%1</i>, Protocol: <i>%2</i>, Destination port: <i>%3</i>, Source port: <i>%4</i>, Options: <i>%5</i>"), String::EscapeTags (one_rule["network"]:_("All")), String::EscapeTags (SuSEFirewall::GetProtocolTranslatedName (one_rule["protocol"]:_("All"))), (one_rule["dport"]:"" != "" ? String::EscapeTags (UserReadablePortName (one_rule["dport"]:"", proto)) : _("All")), - (one_rule["sport"]:"" != "" ? String::EscapeTags (UserReadablePortName (one_rule["sport"]:"", proto)) : _("All")) + (one_rule["sport"]:"" != "" ? String::EscapeTags (UserReadablePortName (one_rule["sport"]:"", proto)) : _("All")), + (one_rule["options"]:"" != "" ? String::EscapeTags (one_rule["options"]:"") : _("None")) ) + li_end; rules = rules + one_rule_s; }); Modified: trunk/firewall/src/uifunctions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/firewall/src/uifunctions.ycp?rev=65402&r1=65401&r2=65402&view=diff ============================================================================== --- trunk/firewall/src/uifunctions.ycp (original) +++ trunk/firewall/src/uifunctions.ycp Fri Aug 26 13:41:52 2011 @@ -1244,7 +1244,8 @@ one_rule["network"]:"", SuSEFirewall::GetProtocolTranslatedName (one_rule["protocol"]:""), UserReadablePortName (one_rule["dport"]:"", one_rule["protocol"]:""), - UserReadablePortName (one_rule["sport"]:"", "") + UserReadablePortName (one_rule["sport"]:"", ""), + one_rule["options"]:"" ); }); @@ -1324,6 +1325,7 @@ string add_protocol = (string) UI::QueryWidget(`id("add_protocol"), `Value); string add_destination_port = (string) UI::QueryWidget(`id("add_destination_port"), `Value); string add_source_port = (string) UI::QueryWidget(`id("add_source_port"), `Value); + string add_options = (string) UI::QueryWidget(`id("add_options"), `Value); // network is mandatory if (add_source_network == "" || ! CheckNetwork (add_source_network)) { @@ -1367,8 +1369,9 @@ $[ "network" : add_source_network, "protocol" : add_protocol, - "dport" : add_destination_port, - "sport" : add_source_port + "dport" : add_destination_port, + "sport" : add_source_port, + "options" : add_options, ] ); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org