Author: visnov Date: Mon Oct 6 13:24:31 2008 New Revision: 51854 URL: http://svn.opensuse.org/viewcvs/yast?rev=51854&view=rev Log: added icon to Confirm::Detection Modified: trunk/yast2/library/wizard/src/Confirm.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/library/wizard/src/Confirm.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/wizard/src/Confirm.ycp?rev=51854&r1=51853&r2=51854&view=diff ============================================================================== --- trunk/yast2/library/wizard/src/Confirm.ycp (original) +++ trunk/yast2/library/wizard/src/Confirm.ycp Mon Oct 6 13:24:31 2008 @@ -18,6 +18,7 @@ textdomain "base"; +import "Icon"; import "Label"; import "Mode"; import "Popup"; @@ -30,12 +31,18 @@ /** * Confirm hardware detection (only in manual installation) * @param class hardware class (network cards) + * @param icon_name name of the icon. If nil, generic hardware icon will be used * @return true on continue */ -global define boolean Detection(string class) ``{ +global define boolean Detection(string class, string icon_name) ``{ if(Linuxrc::manual () != true) return true; + if( icon_name == nil ) + icon_name = "yast-hardware"; + + term icon = Icon::Image ( icon_name, $[] ); + boolean result = detection_cache[class]:nil; if (result != nil) { y2milestone ("Detection cached result: %1 -> %2", class, result); @@ -62,7 +69,7 @@ // This is in information message. Next come the // hardware class name (network cards). `HVCenter(`Label(_("YaST2 will detect the following hardware:"))), - `HVCenter(`Heading(class)), + `HVCenter(`HBox(icon, `HSpacing(0.5), `Heading(class))), `VSpacing(0.5) ))), `ButtonBox ( Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=51854&r1=51853&r2=51854&view=diff ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Mon Oct 6 13:24:31 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Oct 6 13:23:09 CEST 2008 - visnov@suse.cz + +- Added icon to hardware detection confirmation (bnc #431276) + +------------------------------------------------------------------- Fri Oct 3 00:26:13 CEST 2008 - locilka@suse.cz - Fixed Makefiles by using [[:upper:]]*.ycp where needed. -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org