Author: jsrain
Date: Mon Jul 30 17:29:36 2007
New Revision: 39803
URL: http://svn.opensuse.org/viewcvs/yast?rev=39803&view=rev
Log:
added simplified installation overview
Added:
trunk/live-installer/src/inst_live_full_proposal.ycp
trunk/live-installer/src/inst_live_simple_proposal.ycp
trunk/live-installer/src/inst_live_welcome.ycp
Modified:
trunk/live-installer/package/yast2-live-installer.changes
trunk/live-installer/src/LiveInstaller.ycp
trunk/live-installer/src/Makefile.am
trunk/live-installer/src/control/live-install.xml
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=39803&r1=39802&r2=39803&view=diff
==============================================================================
--- trunk/live-installer/package/yast2-live-installer.changes (original)
+++ trunk/live-installer/package/yast2-live-installer.changes Mon Jul 30 17:29:36 2007
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+Mon Jul 30 17:27:29 CEST 2007 - jsrain@suse.cz
+
+- added simplified installation overview
+
+-------------------------------------------------------------------
Tue Jul 17 17:22:34 CEST 2007 - jsrain@suse.cz
- initial version
Modified: trunk/live-installer/src/LiveInstaller.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/src/LiveInstaller.ycp?rev=39803&r1=39802&r2=39803&view=diff
==============================================================================
--- trunk/live-installer/src/LiveInstaller.ycp (original)
+++ trunk/live-installer/src/LiveInstaller.ycp Mon Jul 30 17:29:36 2007
@@ -39,5 +39,7 @@
global string live_control_file =
"/etc/YaST2/live-install.xml";
+global boolean run_full_proposal = false;
+
/* EOF */
}
Modified: trunk/live-installer/src/Makefile.am
URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/src/Makefile.am?rev=39803&r1=39802&r2=39803&view=diff
==============================================================================
--- trunk/live-installer/src/Makefile.am (original)
+++ trunk/live-installer/src/Makefile.am Mon Jul 30 17:29:36 2007
@@ -10,7 +10,10 @@
inst_live_add_base_repo.ycp \
inst_live_sw_select.ycp \
live_copy_files_finish.ycp \
- live_runme_at_boot_finish.ycp
+ live_runme_at_boot_finish.ycp \
+ inst_live_welcome.ycp \
+ inst_live_full_proposal.ycp \
+ inst_live_simple_proposal.ycp
desktop_DATA = \
live-installer.desktop
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=39803&r1=39802&r2=39803&view=diff
==============================================================================
--- trunk/live-installer/src/control/live-install.xml (original)
+++ trunk/live-installer/src/control/live-install.xml Mon Jul 30 17:29:36 2007
@@ -124,63 +124,6 @@
bootloader
</proposal>
- <proposal>
- <label>Network Configuration</label>
- <name>network</name>
- <stage>continue,normal</stage>
- yes
-
-
- <name>lan</name>
- 20
-
-
- <name>networkmanager</name>
- 5
-
-
- <name>ipv6</name>
- 15
-
-
- <name>dsl</name>
- 30
-
-
- <name>isdn</name>
- 40
-
-
- <name>modem</name>
- 50
-
-
- <name>remote</name>
- 60
-
-
- <name>firewall</name>
- 10
-
-
- <name>proxy</name>
- 70
-
-
- </proposal>
- <proposal>
- <label>Hardware Configuration</label>
- <name>hardware</name>
- <stage>continue</stage>
- yes
-
- x11
- printer
- sound
- tv
- bluetooth
-
- </proposal>
</proposals>
<!-- Stage: Initial, Mode: Installation -->
@@ -196,8 +139,17 @@
<stage>initial</stage>
<modules config:type="list">
<module>
- <label>Installation Summary</label>
- <name>inst_proposal</name>
+ <label>Welcome</label>
+ <name>inst_live_welcome</name>
+ </module>
+ <module>
+ <label>Installation Settings</label>
+ <name>inst_live_simple_proposal</name>
+ <proposal>initial</proposal>
+ </module>
+ <module>
+ <label>Installation Settings</label>
+ <name>inst_live_full_proposal</name>
<proposal>initial</proposal>
</module>
<module>
@@ -242,30 +194,27 @@
<name>inst_root</name>
</module>
<module>
- <label>Hostname</label>
- <name>inst_hostname</name>
- </module>
- <module>
- <label>Network</label>
- <name>inst_proposal</name>
- <proposal>network</proposal>
+ <label>Users</label>
+ <name>user</name>
</module>
<module>
<label>Network</label>
<name>inst_fam</name>
</module>
<module>
- <label>Network</label>
+ <label>Online Update</label>
<name>inst_ask_net_test</name>
</module>
<module>
- <label>Network</label>
+ <label>Online Update</label>
<name>inst_do_net_test</name>
</module>
+<!--
<module>
<label>Configure Software Management</label>
<name>inst_live_add_base_repo</name>
</module>
+-->
<module>
<label>Online Update</label>
<name>ask_online_update</name>
@@ -286,23 +235,6 @@
<name>inst_additional_repos</name>
</module>
-->
- <module>
- <label>Software Installation</label>
- <name>inst_live_sw_select</name>
- </module>
- <module>
- <label>Software Installation</label>
- <name>inst_rpmcopy</name>
- </module>
- <module>
- <label>Users</label>
- <name>auth</name>
- no
- </module>
- <module>
- <label>Users</label>
- <name>user</name>
- </module>
<module>
<label>Clean Up</label>
<name>suseconfig</name>
@@ -310,18 +242,10 @@
no
</module>
<module>
- <label>Release Notes</label>
- <name>release_notes</name>
- </module>
- <module>
- <label>Hardware Configuration</label>
- <name>proposal</name>
- <proposal>hardware</proposal>
+ <name>congratulate</name>
+ yes
+ yes
</module>
- <module>
- <label>Hardware Configuration</label>
- <name>save_hardware_status</name>
- </module>
</modules>
</workflow>
</workflows>
Added: trunk/live-installer/src/inst_live_full_proposal.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/src/inst_live_full_proposal.ycp?rev=39803&view=auto
==============================================================================
--- trunk/live-installer/src/inst_live_full_proposal.ycp (added)
+++ trunk/live-installer/src/inst_live_full_proposal.ycp Mon Jul 30 17:29:36 2007
@@ -0,0 +1,13 @@
+/**
+ *
+ */
+{
+
+import "LiveInstaller";
+
+if (LiveInstaller::run_full_proposal)
+ return (symbol) WFM::CallFunction ("inst_proposal", WFM::Args ());
+
+return `next;
+
+}
Added: 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=39803&view=auto
==============================================================================
--- trunk/live-installer/src/inst_live_simple_proposal.ycp (added)
+++ trunk/live-installer/src/inst_live_simple_proposal.ycp Mon Jul 30 17:29:36 2007
@@ -0,0 +1,142 @@
+/**
+ *
+ */
+{
+
+import "BootCommon";
+import "GetInstArgs";
+import "Popup";
+import "Product";
+import "Wizard";
+import "LiveInstaller";
+import "Storage";
+import "HTML";
+
+textdomain "live-installer";
+
+Wizard::SetContents (
+ _("Installation settings"),
+ `Label (_("Analyzing the system")),
+ "",
+ false,
+ false
+);
+
+WFM::CallFunction ( "partitions_proposal",
+ [ "MakeProposal", $[
+ "force_reset" : false,
+ "language_changed" : false ]
+ ]
+);
+
+WFM::CallFunction ( "bootloader_proposal",
+ [ "MakeProposal", $[
+ "force_reset" : false,
+ "language_changed" : false ]
+ ]
+);
+
+// partitioning summary
+
+map tm = Storage::GetTargetMap ();
+integer used = 0;
+integer free = 0;
+
+list<string> disks = [];
+
+foreach (string disk, map data, tm, {
+ list