Author: locilka Date: Mon Jul 14 16:19:17 2008 New Revision: 49056 URL: http://svn.opensuse.org/viewcvs/yast?rev=49056&view=rev Log: - Icons for AC steps defined in control file. Modified: trunk/installation/control/control.openSUSE.xml trunk/installation/control/docs/control-section.xml trunk/installation/control/docs/examples/globals-automatic_configuration.xml trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/inst_automatic_configuration.ycp Modified: trunk/installation/control/control.openSUSE.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.openSUSE.xml?rev=49056&r1=49055&r2=49056&view=diff ============================================================================== --- trunk/installation/control/control.openSUSE.xml (original) +++ trunk/installation/control/control.openSUSE.xml Mon Jul 14 16:19:17 2008 @@ -62,6 +62,7 @@ --> ac_1 + <icon>yast-sw_single</icon> <type>scripts</type> initialization @@ -73,6 +74,7 @@ <!-- network proposal --> ac_2 + <icon>yast-network</icon> <type>proposals</type> lan @@ -87,6 +89,7 @@ <!-- hardware proposal --> ac_3 + <icon>yast-hwinfo</icon> <type>proposals</type> x11 @@ -98,6 +101,7 @@ <!-- finishing configuration --> ac_4 + <icon>yast-sysconfig</icon> <type>scripts</type> addon_update_sources Modified: trunk/installation/control/docs/control-section.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/docs/control-section.xml?rev=49056&r1=49055&r2=49056&view=diff ============================================================================== --- trunk/installation/control/docs/control-section.xml (original) +++ trunk/installation/control/docs/control-section.xml Mon Jul 14 16:19:17 2008 @@ -463,6 +463,10 @@ of YaST proposal without <emphasis>_proposal</emphasis> suffix, e.g., <emphasis>firewall</emphasis> would call <emphasis>firewall_proposal</emphasis>.</para> </listitem> + <listitem> + <para><emphasis>icon</emphasis> - plain icon filename (from 22x22 directory) without suffix + and without any explicit directory name, e.g., <emphasis>yast-network</emphasis>.</para> + </listitem> </itemizedlist> </section> Modified: trunk/installation/control/docs/examples/globals-automatic_configuration.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/docs/examples/globals-automatic_configuration.xml?rev=49056&r1=49055&r2=49056&view=diff ============================================================================== --- trunk/installation/control/docs/examples/globals-automatic_configuration.xml (original) +++ trunk/installation/control/docs/examples/globals-automatic_configuration.xml Mon Jul 14 16:19:17 2008 @@ -15,6 +15,7 @@ netprobe rpmcopy_secondstage + <icon>yast-lan</icon> ... @@ -28,6 +29,7 @@ sound tv + <icon>yast-hwinfo</icon> ... Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=49056&r1=49055&r2=49056&view=diff ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Mon Jul 14 16:19:17 2008 @@ -5,6 +5,7 @@ (base_product_license_directory) (FATE #304865). - Copying licenses to the system in copy_files_finish. - Reading the license directory in inst_license. +- Icons for AC steps defined in control file. ------------------------------------------------------------------- Fri Jul 11 11:11:11 CEST 2008 - locilka@suse.cz Modified: trunk/installation/src/clients/inst_automatic_configuration.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_automatic_configuration.ycp?rev=49056&r1=49055&r2=49056&view=diff ============================================================================== --- trunk/installation/src/clients/inst_automatic_configuration.ycp (original) +++ trunk/installation/src/clients/inst_automatic_configuration.ycp Mon Jul 14 16:19:17 2008 @@ -65,6 +65,7 @@ foreach (map one_step, acc, { map new_step = $[ "label" : one_step["text_id"]:"", + "icon" : one_step["icon"]:"yast", "type" : one_step["type"]:"scripts", "items" : maplist (string one_ic_item, (list <string>) one_step["ac_items"]:[], { return one_ic_item; @@ -87,6 +88,8 @@ y2error ("Unknown label text ID '%1', using fallback", new_step["label"]:""); new_step["label"] = _("Creating automatic configuration..."); } + + proposal_scripts_to_call = add (proposal_scripts_to_call, (map ) new_step); }); /** @@ -276,6 +279,13 @@ ); foreach (map one_autoconf_call, proposal_scripts_to_call, { + if (one_autoconf_call["icon"]:"" != "") { + Wizard::SetTitleIcon (one_autoconf_call["icon"]:""); + } else { + // generic YaST icon fallback + Wizard::SetTitleIcon ("yast"); + } + string type = one_autoconf_call["type"]:""; integer nr_of_steps = ((one_autoconf_call["type"]:"" == "proposals" ? 2:1) * size (one_autoconf_call["items"]:[])); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org