Author: jsrain
Date: Thu Aug 9 14:23:27 2007
New Revision: 40127
URL: http://svn.opensuse.org/viewcvs/yast?rev=40127&view=rev
Log:
added timezone and keyboard configuration to the installatoin proposal (#297620)
Added:
trunk/live-installer/src/live_save_config_finish.ycp
Modified:
trunk/live-installer/package/yast2-live-installer.changes
trunk/live-installer/src/control/live-install.xml
trunk/live-installer/src/inst_live_simple_proposal.ycp
Modified: trunk/live-installer/package/yast2-live-installer.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/package/yast2-live-installer.changes?rev=40127&r1=40126&r2=40127&view=diff
==============================================================================
--- trunk/live-installer/package/yast2-live-installer.changes (original)
+++ trunk/live-installer/package/yast2-live-installer.changes Thu Aug 9 14:23:27 2007
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Thu Aug 9 16:20:48 CEST 2007 - jsrain@suse.cz
+
+- added timezone and keyboard configuration to the installatoin
+ proposal (#297620)
+
+-------------------------------------------------------------------
Wed Aug 8 16:22:14 CEST 2007 - jsrain@suse.cz
- added missing help texts
Modified: trunk/live-installer/src/control/live-install.xml
URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/src/control/live-install.xml?rev=40127&r1=40126&r2=40127&view=diff
==============================================================================
--- trunk/live-installer/src/control/live-install.xml (original)
+++ trunk/live-installer/src/control/live-install.xml Thu Aug 9 14:23:27 2007
@@ -89,6 +89,7 @@
<label>Save configuration</label>
<steps config:type="list">
<step>ldconfig</step>
+ <step>live_save_config</step>
</steps>
@@ -122,6 +123,8 @@
hwinfo
partitions
bootloader
+ keyboard
+ timezone
</proposal>
</proposals>
Modified: trunk/live-installer/src/inst_live_simple_proposal.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/src/inst_live_simple_proposal.ycp?rev=40127&r1=40126&r2=40127&view=diff
==============================================================================
--- trunk/live-installer/src/inst_live_simple_proposal.ycp (original)
+++ trunk/live-installer/src/inst_live_simple_proposal.ycp Thu Aug 9 14:23:27 2007
@@ -12,6 +12,8 @@
import "Storage";
import "HTML";
import "Label";
+import "Keyboard";
+import "Timezone";
textdomain "live-installer";
@@ -39,6 +41,20 @@
]
);
+WFM::CallFunction ( "timezone_proposal",
+ [ "MakeProposal", $[
+ "force_reset" : false,
+ "language_changed" : false ]
+ ]
+);
+
+WFM::CallFunction ( "keyboard_proposal",
+ [ "MakeProposal", $[
+ "force_reset" : false,
+ "language_changed" : false ]
+ ]
+);
+
term contents = `VBox ();
// partitioning summary
@@ -89,7 +105,7 @@
other = true;
});
-contents = add (contents, `VSpacing (2));
+contents = add (contents, `VSpacing (1));
contents = add (contents, `Left (`Heading (_("System start-up"))));
contents = add (contents, `Left (`Label (other
? _("Ask whether to boot Linux or existing system")
@@ -97,6 +113,20 @@
contents = add (contents, `Left (`Label (sformat (_("System start time-out: %1 seconds"), timeout))));
// end of bootloader summary
+// keyboard entry
+
+contents = add (contents, `VSpacing (1));
+contents = add (contents, `Left (`Heading (_("Keyboard"))));
+contents = add (contents, `Left (`Label (Keyboard::MakeProposal (false, false))));
+
+// end of keyboard entry
+// timezone entry
+
+contents = add (contents, `VSpacing (1));
+contents = add (contents, `Left (`Heading (_("Time Zone"))));
+contents = add (contents, `Left (`Label (Timezone::timezone)));
+
+// end of timezone entry
contents = `HBox (`HSpacing (2), contents, `HSpacing (2));
contents = `VBox (
Added: trunk/live-installer/src/live_save_config_finish.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/src/live_save_config_finish.ycp?rev=40127&view=auto
==============================================================================
--- trunk/live-installer/src/live_save_config_finish.ycp (added)
+++ trunk/live-installer/src/live_save_config_finish.ycp Thu Aug 9 14:23:27 2007
@@ -0,0 +1,67 @@
+/**
+ * File:
+ * save_config_finish.ycp
+ *
+ * Module:
+ * Step of base installation finish
+ *
+ * Authors:
+ * Jiri Srain
+ *
+ * $Id: save_config_finish.ycp 36694 2007-03-05 14:17:54Z locilka $
+ *
+ */
+
+{
+
+textdomain "installation";
+
+import "Progress";
+import "Timezone";
+import "Keyboard";
+
+any ret = nil;
+string func = "";
+map param = $[];
+
+/* Check arguments */
+if(size(WFM::Args()) > 0 && is(WFM::Args(0), string)) {
+ func = (string)WFM::Args(0);
+ if(size(WFM::Args()) > 1 && is(WFM::Args(1), map))
+ param = (map)WFM::Args(1);
+}
+
+y2milestone ("starting save_config_finish");
+y2debug("func=%1", func);
+y2debug("param=%1", param);
+
+if (func == "Info")
+{
+ return (any)$[
+ "steps" : 1,
+ "when" : [ `installation, `update, `autoinst ],
+ ];
+}
+else if (func == "Write")
+{
+ // progress step title
+ Progress::Title (_("Saving keyboard configuration..."));
+ Keyboard::Save(true);
+ Progress::NextStep ();
+ // progress step title
+ Progress::Title (_("Saving time zone..."));
+ Timezone::Save();
+
+}
+else
+{
+ y2error ("unknown function: %1", func);
+ ret = nil;
+}
+
+y2debug("ret=%1", ret);
+y2milestone("save_config_finish finished");
+return ret;
+
+
+} /* EOF */
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
