Author: jsuchome Date: Thu May 22 08:30:54 2008 New Revision: 47779 URL: http://svn.opensuse.org/viewcvs/yast?rev=47779&view=rev Log: - pass correct service name to SuSEFirewallServices - move firewall config to the first dialog (bnc#390749) - 2.16.3 Modified: trunk/nis-client/VERSION trunk/nis-client/package/yast2-nis-client.changes trunk/nis-client/src/ui.ycp Modified: trunk/nis-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/nis-client/VERSION?rev=47779&r1=47778&r2=47779&view=diff ============================================================================== --- trunk/nis-client/VERSION (original) +++ trunk/nis-client/VERSION Thu May 22 08:30:54 2008 @@ -1 +1 @@ -2.16.2 +2.16.3 Modified: trunk/nis-client/package/yast2-nis-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/nis-client/package/yast2-nis-client.changes?rev=47779&r1=47778&r2=47779&view=diff ============================================================================== --- trunk/nis-client/package/yast2-nis-client.changes (original) +++ trunk/nis-client/package/yast2-nis-client.changes Thu May 22 08:30:54 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue May 20 15:27:26 CEST 2008 - jsuchome@suse.cz + +- pass correct service name to SuSEFirewallServices +- move firewall config to the first dialog (bnc#390749) +- 2.16.3 + +------------------------------------------------------------------- Fri May 16 16:40:22 CEST 2008 - jsrain@suse.cz - added categories Settings and System into desktop file Modified: trunk/nis-client/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nis-client/src/ui.ycp?rev=47779&r1=47778&r2=47779&view=diff ============================================================================== --- trunk/nis-client/src/ui.ycp (original) +++ trunk/nis-client/src/ui.ycp Thu May 22 08:30:54 2008 @@ -200,6 +200,20 @@ Wizard::SetScreenShotName ("nis-client-2a-single"); + map firewall_widget = + CWMFirewallInterfaces::CreateOpenFirewallWidget ($[ + "services" : [ "service:ypbind" ], + "display_details" : true, + // firewall openning help + "help" : _("<p><b>Firewall Settings</b><br> +To open the firewall to allow accessing the 'ypbind' service +from remote computers, set <b>Open Port in Firewall</b>. +To select interfaces on which to open the port, click <b>Firewall Details</b>. +This option is only available if the firewall is enabled.</p> +"), + ]); + term firewall_layout = firewall_widget["custom_widget"]:`VBox (); + // help text string help_text = _("<p>Enter your NIS domain, such as example.com, and the NIS server's address, such as nis.example.com or 10.20.1.1.</p> @@ -221,6 +235,8 @@ either locally or over NIS.</p>"); + help_text = help_text + firewall_widget["help"]:""; + boolean dhcp_wanted = Nis::dhcp_wanted || NetworkService::IsManaged (); string domain = Nis::GetDomain (); @@ -268,7 +284,7 @@ term con = nil; // frame label - term nis_frame = `Frame (_("NIS client"), + term nis_frame = `Frame (_("NIS client"), `HBox (`HSpacing (0.4), `VBox ( `VSpacing (0.2), `RadioButtonGroup (`id (`dhcpg), `VBox ( @@ -306,10 +322,10 @@ ) ), `VSpacing (0.3) - ) + ), `HSpacing (0.4)) ); - con = `VCenter ( + con = `HBox (`HSpacing (0.5), `VCenter ( `VBox ( `VSpacing (0.4), `RadioButtonGroup ( @@ -325,6 +341,9 @@ `VSpacing (1.2), nis_frame, `VSpacing (0.4), + `Frame ("", `HBox (`HSpacing (0.4), firewall_layout)), + `VSpacing (0.4), + // checkbox label `CheckBox (`id(`autofs), _("Start Auto&mounter"), autofs), `VSpacing (0.5), `PushButton (`id (`expert), `opt (`key_F7), @@ -333,7 +352,7 @@ _("E&xpert...") ), `VSpacing (0.4) - )); + )), `HSpacing (0.5)); Wizard::SetContentsButtons ( // dialog title @@ -341,8 +360,11 @@ Label::BackButton (), Stage::cont ()? Label::NextButton():Label::FinishButton ()); Wizard::RestoreAbortButton (); + CWMFirewallInterfaces::OpenFirewallInit (firewall_widget, ""); + UI::ChangeWidget (`id (`autofs), `Enabled, Nis::_autofs_allowed); + map event = $[]; symbol result = nil; repeat { @@ -360,7 +382,10 @@ UI::ChangeWidget (`id (`edit), `Enabled, !dhcp_wanted && yp_client); UI::ChangeWidget (`id (`adddomains), `Enabled, !dhcp_wanted && yp_client); - result = (symbol) UI::UserInput (); + event = UI::WaitForEvent (); + result = (symbol) event["ID"]:nil; + CWMFirewallInterfaces::OpenFirewallHandle(firewall_widget,"",event); + if (result == `cancel) { result = `abort; @@ -432,6 +457,9 @@ result = nil; continue; } + if (result == `next) + CWMFirewallInterfaces::OpenFirewallStore ( + firewall_widget,"",event); } } until (result == `back || result == `next || result == `expert || @@ -472,20 +500,6 @@ define symbol ExpertDialog () { Wizard::SetScreenShotName ("nis-client-2c-expert"); - map firewall_widget = - CWMFirewallInterfaces::CreateOpenFirewallWidget ($[ - "services" : [ "nis-client" ],// = portmap + ypbind - "display_details" : true, - // firewall openning help - "help" : _("<p><b>Firewall Settings</b><br> -To open the firewall to allow accessing the 'ypbind' service -from remote computers, set <b>Open Port in Firewall</b>. -To select interfaces on which to open the port, click <b>Firewall Details</b>. -This option is only available if the firewall is enabled.</p> -"), - ]); - term firewall_layout = firewall_widget["custom_widget"]:`VBox (); - // help text 1/4 string help_text = _("<p>Normally, it is possible for any host to query which server a client is using. Disabling <b>Answer Remote Hosts</b> restricts this only to the local host.</p>"); @@ -496,8 +510,6 @@ // help text 3/4 help_text = help_text + _("<p>See <b>man ypbind</b> for details on other options.</p>"); - help_text = help_text + firewall_widget["help"]:""; - boolean local_only = Nis::local_only; boolean broken_server = Nis::broken_server; string options = Nis::options; @@ -520,8 +532,7 @@ `VSpacing (0.2) ) ), - `VSpacing (), - firewall_layout + `VSpacing () )); Wizard::SetContentsButtons ( @@ -530,15 +541,12 @@ Label::CancelButton (), Label::OKButton ()); Wizard::HideAbortButton (); - CWMFirewallInterfaces::OpenFirewallInit (firewall_widget, ""); - map event = $[]; any result = nil; repeat { event = UI::WaitForEvent (); result = event["ID"]:nil; - CWMFirewallInterfaces::OpenFirewallHandle(firewall_widget,"",event); if (result == `cancel) { @@ -551,8 +559,6 @@ broken_server = (boolean) UI::QueryWidget (`id (`broken_server), `Value); // TODO: disallow " in options options = (string) UI::QueryWidget (`id (`options), `Value); - CWMFirewallInterfaces::OpenFirewallStore ( - firewall_widget,"",event); } } until (result == `back || result == `next || -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org