Author: kmachalkova
Date: Thu Sep 4 13:24:48 2008
New Revision: 50656
URL: http://svn.opensuse.org/viewcvs/yast?rev=50656&view=rev
Log:
- Make helptext visible from outside (esp. when
embedded in partitioner)
- Switching of helptexts depending on active tab
Modified:
trunk/nfs-client/src/nfs-client4part.ycp
trunk/nfs-client/src/ui.ycp
Modified: trunk/nfs-client/src/nfs-client4part.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/src/nfs-client4part.ycp?rev=50656&r1=50655&r2=50656&view=diff
==============================================================================
--- trunk/nfs-client/src/nfs-client4part.ycp (original)
+++ trunk/nfs-client/src/nfs-client4part.ycp Thu Sep 4 13:24:48 2008
@@ -9,6 +9,7 @@
textdomain "nfs";
import "Nfs";
+ import "Wizard";
include "nfs/ui.ycp";
/*y2milestone("----------------------------------------");
@@ -26,6 +27,7 @@
}
if (func == "CreateUI")
{
+ Wizard::SetHelpText( help_text1 );
return MainDialogLayout();
}
Modified: trunk/nfs-client/src/ui.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/src/ui.ycp?rev=50656&r1=50655&r2=50656&view=diff
==============================================================================
--- trunk/nfs-client/src/ui.ycp (original)
+++ trunk/nfs-client/src/ui.ycp Thu Sep 4 13:24:48 2008
@@ -412,6 +412,25 @@
list< map > nfs_entries = Nfs::nfs_entries;
map modify_line = $[];
+ // Help, part 1 of 3
+ string help_text1 = _("<p>The table contains all directories
+exported from remote servers and mounted locally via NFS (NFS shares).</p>") +
+
+ // Help, part 2 of 3
+ _("<p>Each NFS share is identified by remote NFS server address and
+exported directory, local directory where the remote directory is mounted,
+NFS type (either plain nfs or nfsv4) and mount options. For further information
+about mounting NFS and mount options, refer to <tt>man nfs.</tt></p>") +
+
+ // Help, part 3 of 3
+_("<p>To mount a new NFS share, use <B>Add</B> button. To change the configuration of
+currently mounted share, use <B>Edit</B> button. Remove and unmount selected share by
+<B>Delete</B> button.</p>");
+
+
+ string help_text2 = _("FIXME: add some setup details here") +
+ fw_cwm_widget["help"]:"";
+
term FstabTab()
{
term fstab_content =
@@ -570,12 +589,14 @@
SaveFstabEntries( );
UI::ReplaceWidget(`id(`rp), SettingsTab() );
InitSettings();
+ Wizard::SetHelpText( help_text2 );
}
else if ( widget == `overview )
{
SaveSettings( $[ "ID" : widget ] );
UI::ReplaceWidget(`id(`rp), FstabTab() );
InitFstabEntries();
+ Wizard::SetHelpText( help_text1 );
}
}
@@ -588,29 +609,11 @@
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"),
- MainDialogLayout(), help_text,
+ MainDialogLayout(), help_text1,
Label::BackButton (),
Label::FinishButton ());
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org