Author: locilka
Date: Mon Jul 14 17:45:06 2008
New Revision: 49070
URL: http://svn.opensuse.org/viewcvs/yast?rev=49070&view=rev
Log:
Icons for inst_finish
Test mode for inst_finish
Modified:
trunk/installation/package/yast2-installation.changes
trunk/installation/src/clients/inst_finish.ycp
Modified: trunk/installation/package/yast2-installation.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=49070&r1=49069&r2=49070&view=diff
==============================================================================
--- trunk/installation/package/yast2-installation.changes (original)
+++ trunk/installation/package/yast2-installation.changes Mon Jul 14 17:45:06 2008
@@ -8,6 +8,7 @@
- Icons for AC steps defined in control file.
- Adjusting DPMS 'off' when installation starts, DPMS 'on' when
finishes (FATE #304395).
+- Icons for inst_finish.
-------------------------------------------------------------------
Fri Jul 11 11:11:11 CEST 2008 - locilka@suse.cz
Modified: trunk/installation/src/clients/inst_finish.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_finish.ycp?rev=49070&r1=49069&r2=49070&view=diff
==============================================================================
--- trunk/installation/src/clients/inst_finish.ycp (original)
+++ trunk/installation/src/clients/inst_finish.ycp Mon Jul 14 17:45:06 2008
@@ -34,10 +34,19 @@
// added for fate# 303395
import "Directory";
-
if (GetInstArgs::going_back())
return `auto;
+ boolean test_mode = false;
+
+ if (size (WFM::Args()) > 0 && is (WFM::Args(0), string)) {
+ y2milestone ("Args: %1", WFM::Args());
+ if (WFM::Args(0) == "test")
+ test_mode = true;
+ }
+
+ if (test_mode) Wizard::CreateDialog();
+
// Help text for last dialog of base installation
string help_text = _("<p>
Please wait while the base system is being installed.
@@ -55,7 +64,7 @@
"live_copy_files",
"switch_scr",
],
- "icon" : "32x32/apps/pattern-basis.png",
+ "icon" : "pattern-basis",
],
$[
// progress stage
@@ -77,7 +86,7 @@
// bnc #340733
"system_settings",
],
- "icon" : "32x32/apps/yast-misc.png",
+ "icon" : "yast-desktop-select",
],
$[
// progress stage
@@ -85,7 +94,7 @@
"steps" : [
"bootloader",
],
- "icon" : "32x32/apps/yast-bootloader.png",
+ "icon" : "yast-bootloader",
],
$[
// progress stage
@@ -100,7 +109,7 @@
"autoinst_scripts2",
"installation_settings",
],
- "icon" : "32x32/apps/yast-dirinstall.png",
+ "icon" : "yast-network",
],
$[
// progress stage
@@ -116,12 +125,10 @@
"copy_logs",
"umount",
],
- "icon" : "32x32/apps/yast.png",
+ "icon" : "yast-scripts",
],
];
-list <string> progress_icons = [];
-
if (size (ProductControl::inst_finish) > 0)
{
y2milestone ("Using inst_finish steps definition from control file");
@@ -179,10 +186,6 @@
integer steps_count = 0;
-progress_icons = maplist (map