Author: jsuchome Date: Thu Apr 26 16:24:02 2012 New Revision: 68030 URL: http://svn.opensuse.org/viewcvs/yast?rev=68030&view=rev Log: - check if configuration is prepared - updated help texts - 2.17.4 Added: branches/SuSE-Code-11-SP2-Branch/lxc/src/helps.ycp (with props) Modified: branches/SuSE-Code-11-SP2-Branch/lxc/VERSION branches/SuSE-Code-11-SP2-Branch/lxc/package/yast2-lxc.changes branches/SuSE-Code-11-SP2-Branch/lxc/src/Makefile.am branches/SuSE-Code-11-SP2-Branch/lxc/src/dialogs.ycp branches/SuSE-Code-11-SP2-Branch/lxc/src/wizards.ycp Modified: branches/SuSE-Code-11-SP2-Branch/lxc/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/lxc/VERSION?rev=68030&r1=68029&r2=68030&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/lxc/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/lxc/VERSION Thu Apr 26 16:24:02 2012 @@ -1 +1 @@ -2.17.3 +2.17.4 Modified: branches/SuSE-Code-11-SP2-Branch/lxc/package/yast2-lxc.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/lxc/package/yast2-lxc.changes?rev=68030&r1=68029&r2=68030&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/lxc/package/yast2-lxc.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/lxc/package/yast2-lxc.changes Thu Apr 26 16:24:02 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Apr 26 16:06:25 CEST 2012 - jsuchome@suse.cz + +- check if configuration is prepared +- updated help texts +- 2.17.4 + +------------------------------------------------------------------- Mon Apr 23 16:42:59 CEST 2012 - jsuchome@suse.cz - handle more consoles running Modified: branches/SuSE-Code-11-SP2-Branch/lxc/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/lxc/src/Makefile.am?rev=68030&r1=68029&r2=68030&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/lxc/src/Makefile.am (original) +++ branches/SuSE-Code-11-SP2-Branch/lxc/src/Makefile.am Thu Apr 26 16:24:02 2012 @@ -6,6 +6,7 @@ lxc.ycp ynclude_DATA = \ + helps.ycp \ wizards.ycp \ dialogs.ycp Modified: branches/SuSE-Code-11-SP2-Branch/lxc/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/lxc/src/dialogs.ycp?rev=68030&r1=68029&r2=68030&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/lxc/src/dialogs.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/lxc/src/dialogs.ycp Thu Apr 26 16:24:02 2012 @@ -40,6 +40,8 @@ import "Security"; import "Wizard"; +include "lxc/helps.ycp"; + // PIDs of running consoles (indexed by lxc names) map console_pids = $[]; @@ -156,9 +158,7 @@ `VSpacing () ), `HSpacing ()); - string help_text = ""; - - Wizard::SetContentsButtons(caption, contents, help_text, + Wizard::SetContentsButtons(caption, contents, HELPS["create"]:"", // button label Label::CancelButton(), _("Create")); @@ -464,7 +464,7 @@ `VSpacing () ), `HSpacing ()); - Wizard::SetContentsButtons(caption, contents, "overview", + Wizard::SetContentsButtons(caption, contents, HELPS["overview"]:"", Label::BackButton(), Label::FinishButton()); update_table (); Added: branches/SuSE-Code-11-SP2-Branch/lxc/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/lxc/src/helps.ycp?rev=68030&view=auto ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/lxc/src/helps.ycp (added) +++ branches/SuSE-Code-11-SP2-Branch/lxc/src/helps.ycp Thu Apr 26 16:24:02 2012 @@ -0,0 +1,67 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + +/** + * File: include/lxc/helps.ycp + * Package: Configuration of lxc + * Summary: Help texts of all the dialogs + * Authors: Jiri Suchomel + * + * $Id$ + */ + +{ + +textdomain "lxc"; + +/** + * All helps are here + */ +map HELPS = $[ + + /* Read dialog help */ + "read" : _("<p><b><big>Initializing LXC Configuration</big></b><br> +Please wait...<br></p> +"), + + // Overview dialog help, part 1 + "overview" : _("<p><b><big>LXC Overview</big></b><br> +Here, see the list of configured Linux Containers (LXC) with their current status. +<p>Use <b>Create</b> to create new container. Delete existing one with <b>Destroy</b>. +</p>") + + + // Overview dialog help, part 2 +_("<p>You can start selected container with <b>Start</b>. The container is started in background. You can connect to it using <b>Connect</b> button or manually using <tt>lxc-console</tt> command. Once in console, you can close it from within or using the <b>Disconnect</b> button.</p> +<p>Note that <b>Connect</b> option is not available in text mode.</p>"), + + // Create dialog help, part 1 + "create" : _("<p><b><big>Creating New Container</big></b></p>") + + + // Create dialog help, part 2 +_("<p>Choose a <b>Name</b>, <b>Template</b> and enter network settings for the new container. If there's no bridge device configured yet, use <b>Configure Network</b> button and create one. Select a root password to use in the container.</p>") + + + // Create dialog help, part 3 +_("<p>Use <b>Create</b> to start the creation process.</p>") + + +]; + +/* EOF */ +} Modified: branches/SuSE-Code-11-SP2-Branch/lxc/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/lxc/src/wizards.ycp?rev=68030&r1=68029&r2=68030&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/lxc/src/wizards.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/lxc/src/wizards.ycp Thu Apr 26 16:24:02 2012 @@ -43,6 +43,7 @@ * @return `abort if aborted and `next otherwise */ symbol ReadDialog() { + Wizard::RestoreHelp(HELPS["read"]:""); if (!Confirm::MustBeRoot()) return `abort; boolean ret = Lxc::Read(); return ret ? `next : `abort; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org