Attachment #220438 for bug #391495

View | Details | Raw Unified | Return to bug 391495
Collapse All | Expand All




textdomain "samba-client";

import "Autologin";
import "CWMFirewallInterfaces";
import "Directory";
import "Label";
import "Message";

    // checkbox label
    string text_fam	= _("Start File Alteration Monitor");

    map<string,any> firewall_widget =
	CWMFirewallInterfaces::CreateOpenFirewallWidget ($[
	    "services"	: [ "samba-server" ],
	    "display_details" : true,
	]);
    term firewall_layout = firewall_widget["custom_widget"]:`VBox ();

    Wizard::SetContentsButtons( caption, `HVSquash( `VBox(
	// translators: frame label
	`Frame (_("Membership"),
	    `VBox (
		`HBox(
		    `HSpacing (0.2),
		    `InputField (`id(`workgroup), `opt (`hstretch),
		    `TextEntry (`id(`workgroup), `opt (`hstretch),
			(Stage::cont() ?
			_("&Domain") :
			// translators: text entry label

	    "guest_access"	: guest
	]),
	autoyast_term,
	ntp_term,
	firewall_layout
    )),
	(Stage::cont() ? HELPS["MembershipDialog_cont"]:"" :
	    HELPS["MembershipDialog_nocont"]:"") +

	    HELPS["MembershipDialog_NTP"]:""),
	Label::BackButton(), Stage::cont() ? Label::NextButton() : Label::FinishButton()
    );
    CWMFirewallInterfaces::OpenFirewallInit (firewall_widget, "");
    foreach (symbol t, [`mkhomedir, `caching, `ssh], {
	UI::ChangeWidget (`id(t), `Enabled, Samba::GetWinbind() || Stage::cont());
    });

    any ret = nil;
    while(true) {

	map event	= UI::WaitForEvent ();
	ret		= (symbol) event["ID"]:nil;
	CWMFirewallInterfaces::OpenFirewallHandle(firewall_widget,"",event);

	boolean use_winbind = Stage::cont() ? true :
	    (boolean)UI::QueryWidget(`id(`winbind), `Value);


the machine to enable it for all services.
"));
	    }
	    CWMFirewallInterfaces::OpenFirewallStore (firewall_widget,"",event);
	    break;
	} else if (ret == `back ) {
	    break;

Lines 32-37 Link Here

(-)Samba.ycp (+8 lines)
32	import "SambaNmbLookup";	32	import "SambaNmbLookup";
33	import "String";	33	import "String";
34	import "Summary";	34	import "Summary";
		35	import "SuSEFirewall";
35		36
36		37
37	/**	38	/**
Lines 553-558 Link Here
553	NetworkConfig::Read ();	554	NetworkConfig::Read ();
554	network_setup = NetworkConfig::Export ();	555	network_setup = NetworkConfig::Export ();
555		556
		557	SuSEFirewall::Read ();
		558
556	// finished	559	// finished
557	Progress::NextStage();	560	Progress::NextStage();
558	globals_configured = true;	561	globals_configured = true;
Lines 718-723 Link Here
718		721
719	WriteSSHSupport (ssh_support);	722	WriteSSHSupport (ssh_support);
720		723
		724	SuSEFirewall::WriteOnly ();
		725	if (!write_only)
		726	SuSEFirewall::ActivateConfiguration ();
		727
		728
721	// finished	729	// finished
722	Progress::NextStage();	730	Progress::NextStage();
723	modified = false;	731	modified = false;

Return to bug 391495

Lines 11-16 Link Here

(-)dialogs.ycp (-4 / +17 lines)
11	textdomain "samba-client";	11	textdomain "samba-client";
12		12
13	import "Autologin";	13	import "Autologin";
		14	import "CWMFirewallInterfaces";
14	import "Directory";	15	import "Directory";
15	import "Label";	16	import "Label";
16	import "Message";	17	import "Message";
Lines 217-230 Link Here
217	// checkbox label	218	// checkbox label
218	string text_fam = _("Start File Alteration Monitor");	219	string text_fam = _("Start File Alteration Monitor");
219		220
		221	map<string,any> firewall_widget =
		222	CWMFirewallInterfaces::CreateOpenFirewallWidget ($[
		223	"services" : [ "samba-server" ],
		224	"display_details" : true,
		225	]);
		226	term firewall_layout = firewall_widget["custom_widget"]:`VBox ();
		227
220	Wizard::SetContentsButtons( caption, `HVSquash( `VBox(	228	Wizard::SetContentsButtons( caption, `HVSquash( `VBox(
221	// translators: frame label	229	// translators: frame label
222	`Frame (_("Membership"),	230	`Frame (_("Membership"),
223	`VBox (	231	`VBox (
224	`HBox(	232	`HBox(
225	`HSpacing (0.2),	233	`HSpacing (0.2),
226	// `InputField (`id(`workgroup), `opt (`hstretch),	234	`InputField (`id(`workgroup), `opt (`hstretch),
227	`TextEntry (`id(`workgroup), `opt (`hstretch),
228	(Stage::cont() ?	235	(Stage::cont() ?
229	_("&Domain") :	236	_("&Domain") :
230	// translators: text entry label	237	// translators: text entry label
Lines 262-268 Link Here
262	"guest_access" : guest	269	"guest_access" : guest
263	]),	270	]),
264	autoyast_term,	271	autoyast_term,
265	ntp_term	272	ntp_term,
		273	firewall_layout
266	)),	274	)),
267	(Stage::cont() ? HELPS["MembershipDialog_cont"]:"" :	275	(Stage::cont() ? HELPS["MembershipDialog_cont"]:"" :
268	HELPS["MembershipDialog_nocont"]:"") +	276	HELPS["MembershipDialog_nocont"]:"") +
Lines 272-277 Link Here
272	HELPS["MembershipDialog_NTP"]:""),	280	HELPS["MembershipDialog_NTP"]:""),
273	Label::BackButton(), Stage::cont() ? Label::NextButton() : Label::FinishButton()	281	Label::BackButton(), Stage::cont() ? Label::NextButton() : Label::FinishButton()
274	);	282	);
		283	CWMFirewallInterfaces::OpenFirewallInit (firewall_widget, "");
275	foreach (symbol t, [`mkhomedir, `caching, `ssh], {	284	foreach (symbol t, [`mkhomedir, `caching, `ssh], {
276	UI::ChangeWidget (`id(t), `Enabled, Samba::GetWinbind() \|\| Stage::cont());	285	UI::ChangeWidget (`id(t), `Enabled, Samba::GetWinbind() \|\| Stage::cont());
277	});	286	});
Lines 287-293 Link Here
287	any ret = nil;	296	any ret = nil;
288	while(true) {	297	while(true) {
289		298
290	ret = UI::UserInput();	299	map event = UI::WaitForEvent ();
		300	ret = (symbol) event["ID"]:nil;
		301	CWMFirewallInterfaces::OpenFirewallHandle(firewall_widget,"",event);
		302
291	boolean use_winbind = Stage::cont() ? true :	303	boolean use_winbind = Stage::cont() ? true :
292	(boolean)UI::QueryWidget(`id(`winbind), `Value);	304	(boolean)UI::QueryWidget(`id(`winbind), `Value);
293		305
Lines 475-480 Link Here
475	the machine to enable it for all services.	487	the machine to enable it for all services.
476	"));	488	"));
477	}	489	}
		490	CWMFirewallInterfaces::OpenFirewallStore (firewall_widget,"",event);
478	break;	491	break;
479	} else if (ret == `back ) {	492	} else if (ret == `back ) {
480	break;	493	break;