Author: kmachalkova
Date: Thu Aug 14 13:10:50 2008
New Revision: 50063
URL: http://svn.opensuse.org/viewcvs/yast?rev=50063&view=rev
Log:
Rearranged, in order to be used from outside
(esp. client for partitioner)
Modified:
trunk/nfs-client/src/ui.ycp
Modified: trunk/nfs-client/src/ui.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/src/ui.ycp?rev=50063&r1=50062&r2=50063&view=diff
==============================================================================
--- trunk/nfs-client/src/ui.ycp (original)
+++ trunk/nfs-client/src/ui.ycp Thu Aug 14 13:10:50 2008
@@ -402,68 +402,18 @@
return nil;
}
-
-
- /**
- * NFS client dialog itselfs
- * @return `back, `abort or `next
- */
- define symbol FstabDialog () ``{
- Wizard::SetScreenShotName ("nfs-client-1-fstab");
-
- boolean changed = false;
-
- // firewall widget using CWM
- map fw_settings = $[
- "services": [ "nfs-client" ],
- "display_details": true,
- ];
- map fw_cwm_widget = CWMFirewallInterfaces::CreateOpenFirewallWidget (fw_settings);
-
- // Help, part 1 of 3
- string help_text = _("<P>The table contains all the NFS entries
-for /etc/fstab.
-To change the configuration, use <B>Add</B>, <B>Edit</B>, and
-<B>Delete</B>.</P>
-");
-
- // Help, part 2 of 3; Label::BackButton, Label::FinishButton
- help_text = help_text + _("<P>To confirm the changes, press <B>Finish</B>. To cancel them,
-use <B>Back</B>.</P>\n");
-
- // Help, part 3 of 3
- help_text = help_text + _("<P>For further information about fstab,
-refer to <tt>man fstab</tt>.</P>
-");
-
- help_text = help_text + fw_cwm_widget["help"]:"";
-
-
- list > nfs_entries = Nfs::nfs_entries;
-
- void InitFstabEntries( )
- {
- UI::ChangeWidget (`id(`fstable), `Items, FstabTableItems (nfs_entries));
- }
-
- void InitSettings( )
- {
- CWMFirewallInterfaces::OpenFirewallInit (fw_cwm_widget, "");
- UI::ChangeWidget(`id(`enable_nfs4), `Value, Nfs::nfs4_enabled);
- }
-
- void SaveFstabEntries( map event )
- {
- Nfs::nfs_entries = nfs_entries;
- }
-
- void SaveSettings( map event )
- {
- CWMFirewallInterfaces::OpenFirewallStore (fw_cwm_widget, "", event);
- Nfs::nfs4_enabled = (boolean) UI::QueryWidget(`id(`enable_nfs4),`Value);
- }
-
- term fstab_contents =
+ // firewall widget using CWM
+ map fw_settings = $[
+ "services": [ "service:nfs-client" ],
+ "display_details": true,
+ ];
+ map fw_cwm_widget = CWMFirewallInterfaces::CreateOpenFirewallWidget (fw_settings);
+
+ list > nfs_entries = Nfs::nfs_entries;
+
+ term FstabTab()
+ {
+ term fstab_content =
`VBox(
`Table(`id(`fstable), `opt(`notify, `immediate),
`header(
@@ -486,11 +436,18 @@
// #211570
`HStretch ())
);
+
+ return fstab_content;
+
+ }
+
+ term SettingsTab()
+ {
term settings_content =
`VBox(
//`VSpacing (1),
`HBox(
- `Left(`CheckBox(`id(`enable_nfs4), `opt(`notify), _("Enable NFSv4"))),
+ `Left(`CheckBox(`id(`enable_nfs4), `opt(`notify), _("Enable NFSv4"))),
`Left(`InputField(`id(`nfs4_domain), _("NFSv4 Domain Name"))),
`HStretch()
),
@@ -499,28 +456,163 @@
`VStretch()
);
- term contents =
+ return settings_content;
+ }
+
+ term MainDialogLayout()
+ {
+ term contents =
`VBox(
- `DumbTab(
+ `DumbTab(
[ `item(`id(`overview),_("&NFS Shares")),
`item(`id(`settings), _("NFS &Settings")) ],
- `ReplacePoint(`id(`rp), fstab_contents)
+ `ReplacePoint(`id(`rp), FstabTab())
)
);
+ return contents;
+ }
+
+ void InitFstabEntries( )
+ {
+ UI::ChangeWidget (`id(`fstable), `Items, FstabTableItems (nfs_entries));
+
+ integer entryno = (integer) UI::QueryWidget(`id(`fstable), `CurrentItem);
+ UI::ChangeWidget (`id(`editbut), `Enabled, entryno != nil);
+ UI::ChangeWidget (`id(`delbut), `Enabled, entryno != nil);
+
+ // Kludge, because a `Table still does not have a shortcut.
+ // Simple to solve here: there's only the table and buttons,
+ // so it is OK to always set focus to the table
+ UI::SetFocus (`id (`fstable));
+
+ }
+
+ void InitSettings( )
+ {
+ CWMFirewallInterfaces::OpenFirewallInit (fw_cwm_widget, "");
+ UI::ChangeWidget(`id(`enable_nfs4), `Value, Nfs::nfs4_enabled);
+ }
+
+ void SaveFstabEntries( )
+ {
+ Nfs::nfs_entries = nfs_entries;
+ }
+
+ void SaveSettings( map event )
+ {
+ CWMFirewallInterfaces::OpenFirewallStore (fw_cwm_widget, "", event);
+ Nfs::nfs4_enabled = (boolean) UI::QueryWidget(`id(`enable_nfs4),`Value);
+ }
+
+ void HandleEvent( any widget )
+ {
+ integer entryno = -1;
+ // handle the events, enable/disable the button, show the popup if button clicked
+ if ( UI::WidgetExists(`id("_cwm_firewall_details")) && UI::WidgetExists(`id("_cwm_open_firewall")) )
+ CWMFirewallInterfaces::OpenFirewallHandle (fw_cwm_widget, "", $[ "ID" : widget ]);
+ /*changed =
+ true || // TODO: fw changed, #44106
+ true; // TODO: nfs changed*/
+ if ( UI::WidgetExists(`id(`fstable)) )
+ entryno = (integer) UI::QueryWidget(`id(`fstable), `CurrentItem);
+
+ if (widget == `newbut)
+ {
+ map entry = GetFstabEntry (nil, (list<map>) union (Nfs::non_nfs_entries, nfs_entries));
+
+ if (entry != nil)
+ nfs_entries = add (nfs_entries, entry);
+
+ UI::ChangeWidget (`id(`fstable), `Items, FstabTableItems (nfs_entries));
+ }
+ else if (widget == `editbut)
+ {
+ integer count = 0;
+ map entry = GetFstabEntry (nfs_entries[entryno]:$[], // Default values
+ (list<map>) union (Nfs::non_nfs_entries, remove (nfs_entries, entryno)));
+ if (entry != nil)
+ {
+ integer count = 0;
+ nfs_entries = maplist(map ent, nfs_entries, ``{
+ count = count+1;
+ if (count-1 != entryno)
+ return ent;
+ return entry;
+ });
+
+ UI::ChangeWidget (`id(`fstable), `Items, FstabTableItems (nfs_entries));
+ }
+ }
+ else if (widget == `delbut && size (nfs_entries) > 0)
+ {
+ integer count = 0;
+ nfs_entries = remove (nfs_entries, entryno);
+
+ UI::ChangeWidget (`id(`fstable), `Items, FstabTableItems (nfs_entries));
+ }
+ else if (widget == `enable_nfs4)
+ {
+ boolean enabled = (boolean) UI::QueryWidget(`id(`enable_nfs4), `Value);
+ UI::ChangeWidget( `id(`nfs4_domain), `Enabled, enabled);
+ }
+ else if ( widget == `settings )
+ {
+ SaveFstabEntries( );
+ UI::ReplaceWidget(`id(`rp), SettingsTab() );
+ InitSettings();
+ }
+ else if ( widget == `overview )
+ {
+ SaveSettings( $[ "ID" : widget ] );
+ UI::ReplaceWidget(`id(`rp), FstabTab() );
+ InitFstabEntries();
+ }
+ }
+
+ /**
+ * NFS client dialog itselfs
+ * @return `back, `abort or `next
+ */
+ define symbol FstabDialog () ``{
+ Wizard::SetScreenShotName ("nfs-client-1-fstab");
+
+ boolean changed = false;
+
+ // Help, part 1 of 3
+ string help_text = _("<P>The table contains all the NFS entries
+for /etc/fstab.
+To change the configuration, use <B>Add</B>, <B>Edit</B>, and
+<B>Delete</B>.</P>
+");
+
+ // Help, part 2 of 3; Label::BackButton, Label::FinishButton
+ help_text = help_text + _("<P>To confirm the changes, press <B>Finish</B>. To cancel them,
+use <B>Back</B>.</P>\n");
+
+ // Help, part 3 of 3
+ help_text = help_text + _("<P>For further information about fstab,
+refer to <tt>man fstab</tt>.</P>
+");
+
+ help_text = help_text + fw_cwm_widget["help"]:"";
+
+ nfs_entries = Nfs::nfs_entries;
+
// dialog heading
Wizard::SetContentsButtons(_("NFS Client Configuration"),
- contents, help_text,
+ MainDialogLayout(), help_text,
Label::BackButton (),
Label::FinishButton ());
// initialize the widget (set the current value)
//CWMFirewallInterfaces::OpenFirewallInit (fw_cwm_widget, "");
- UI::ChangeWidget (`id(`editbut), `Enabled, false);
- UI::ChangeWidget (`id(`delbut), `Enabled, false);
- UI::ChangeWidget (`id(`enable_nfs4), `Value, Nfs::nfs4_enabled);
- UI::ChangeWidget (`id(`nfs4_domain), `Enabled, Nfs::nfs4_enabled);
+ //UI::ChangeWidget (`id(`editbut), `Enabled, false);
+ //UI::ChangeWidget (`id(`delbut), `Enabled, false);
+ //UI::ChangeWidget (`id(`enable_nfs4), `Value, Nfs::nfs4_enabled);
+ //UI::ChangeWidget (`id(`nfs4_domain), `Enabled, Nfs::nfs4_enabled);
+ InitFstabEntries();
map event = nil;
any ret = nil;
@@ -529,7 +621,7 @@
do
{
- if ( UI::WidgetExists(`id(`fstable)) )
+ /*if ( UI::WidgetExists(`id(`fstable)) )
{
entryno = (integer) UI::QueryWidget(`id(`fstable), `CurrentItem);
UI::ChangeWidget (`id(`editbut), `Enabled, entryno != nil);
@@ -540,7 +632,7 @@
// so it is OK to always set focus to the table
UI::SetFocus (`id (`fstable));
- }
+ }*/
event = UI::WaitForEvent ();
ret = event["ID"]:nil;
@@ -550,11 +642,11 @@
}
// handle the events, enable/disable the button, show the popup if button clicked
- if ( UI::WidgetExists(`id("_cwm_firewall_details")) && UI::WidgetExists(`id("_cwm_open_firewall")) )
+ /*if ( UI::WidgetExists(`id("_cwm_firewall_details")) && UI::WidgetExists(`id("_cwm_open_firewall")) )
CWMFirewallInterfaces::OpenFirewallHandle (fw_cwm_widget, "", event);
- /*changed =
+ changed =
true || // TODO: fw changed, #44106
- true; // TODO: nfs changed*/
+ true; // TODO: nfs changed
if ( UI::WidgetExists(`id(`fstable)) )
entryno = (integer) UI::QueryWidget(`id(`fstable), `CurrentItem);
@@ -600,19 +692,21 @@
else if ( ret == `settings )
{
SaveFstabEntries( event );
- UI::ReplaceWidget(`id(`rp), settings_content);
+ UI::ReplaceWidget(`id(`rp), SettingsTab() );
InitSettings();
}
else if ( ret == `overview )
{
SaveSettings( event );
- UI::ReplaceWidget(`id(`rp), fstab_contents);
+ UI::ReplaceWidget(`id(`rp), FstabTab() );
InitFstabEntries();
- }
+ }*/
else if (ret == `abort && changed && !Popup::ReallyAbort (true))
{
ret = `again;
}
+ else
+ HandleEvent( ret );
}
while (ret != `back && ret != `next && ret != `abort);
@@ -620,7 +714,7 @@
{
// grab current settings, store them to SuSEFirewall::
if( UI::WidgetExists(`id(`fstable)) )
- SaveFstabEntries( event );
+ SaveFstabEntries( );
if( UI::WidgetExists(`id(`enable_nfs4)) )
SaveSettings( event );
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
kmachalkova＠svn.opensuse.org