Author: ug Date: Mon May 10 15:19:07 2010 New Revision: 61976 URL: http://svn.opensuse.org/viewcvs/yast?rev=61976&view=rev Log: cleanup Modified: trunk/autoinstallation/doc/ASKSection.xml trunk/autoinstallation/src/dialogs/ask.ycp Modified: trunk/autoinstallation/doc/ASKSection.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/ASKSection.xml?rev=61976&r1=61975&r2=61976&view=diff ============================================================================== --- trunk/autoinstallation/doc/ASKSection.xml (original) +++ trunk/autoinstallation/doc/ASKSection.xml Mon May 10 15:19:07 2010 @@ -292,7 +292,7 @@ <entry>debug</entry> <entry>a boolean that turns on debugging for the script execution <para><screen><debug config:type="boolean">true</debug></screen></para></entry> - <entry>optional (default is "false"). This value needs feedback to be turned on too.</entry> + <entry>optional (default is "true"). This value needs feedback to be turned on too.</entry> </row> <row> <entry>rerun_on_error (available since openSUSE 11.0)</entry> Modified: trunk/autoinstallation/src/dialogs/ask.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/dialogs/ask.ycp?rev=61976&r1=61975&r2=61976&view=diff ============================================================================== --- trunk/autoinstallation/src/dialogs/ask.ycp (original) +++ trunk/autoinstallation/src/dialogs/ask.ycp Mon May 10 15:19:07 2010 @@ -107,10 +107,11 @@ term dlg = `Dummy(); if( type == "boolean" ) { boolean on=(ask["default"]:nil=="true")?(true):(false); + term widget = `CheckBox(`id(entry_id), `opt(`notify), question,on ); if( frametitle != "" ) { - dlg = `Left( `Frame ( frametitle, `CheckBox(`id(entry_id), `opt(`notify), question,on ) ) ); + dlg = `Left( `Frame ( frametitle, widget ) ); } else { - dlg = `Left( `CheckBox(`id(entry_id), `opt(`notify), question,on ) ); + dlg = `Left( widget ); } } else if( type == "symbol" ) { list<any> dummy = []; @@ -118,29 +119,27 @@ boolean on=(e["value"]:`edge_of_dawn==ask["default"]:nil)?(true):(false); dummy = add( dummy, `item(`id(e["value"]:`none), e["label"]:"",on) ); }); + term widget = `ComboBox( `id(entry_id), `opt(`notify), question, dummy ); if( frametitle != "" ) { - dlg = `Left( `Frame ( frametitle, `ComboBox( `id(entry_id), `opt(`notify), question, dummy ) ) ); + dlg = `Left( `Frame ( frametitle, widget ) ); } else { - dlg = `Left( `ComboBox( `id(entry_id), `opt(`notify), question, dummy ) ); + dlg = `Left( widget ); } } else if( type == "static_text" ) { + term widget = `Label( `id(entry_id), ask["default"]:"" ); if( frametitle != "" ) { - dlg = `Left( `Frame ( frametitle, `Label( `id(entry_id), ask["default"]:"" ) ) ); + dlg = `Left( `Frame ( frametitle, widget ) ); } else { - dlg = `Left( `Label( `id(entry_id), ask["default"]:"" ) ); + dlg = `Left( widget ); } } else { if( ask["password"]:false == true ) { + term widget1 = `Password(`id(entry_id), `opt(`notify), question, ask["default"]:"" ); + term widget2 = `Password(`id(`pass2), `opt(`notify), "", ask["default"]:"" ); if( frametitle != "" ) { - dlg = `Left( `Frame ( frametitle, `VBox( - `Password(`id(entry_id), `opt(`notify), question, ask["default"]:"" ), - `Password(`id(`pass2), `opt(`notify), "", ask["default"]:"" ) - ) ) ); + dlg = `Left( `Frame ( frametitle, `VBox( widget1, widget2) ) ); } else { - dlg = `Left( `VBox( - `Password(`id(entry_id), `opt(`notify), question, ask["default"]:"" ), - `Password(`id(`pass2), `opt(`notify), "", ask["default"]:"" ) - ) ); + dlg = `Left( `VBox( widget1, widget2 ) ); } } else { if( haskey( ask, "selection" ) ) { @@ -149,16 +148,18 @@ boolean on=(e["value"]:""==ask["default"]:nil)?(true):(false); dummy = add( dummy, `item(`id(e["value"]:""), e["label"]:"",on) ); }); + term widget = `ComboBox( `id(entry_id), `opt(`notify), question, dummy ); if( frametitle != "" ) { - dlg = `Left( `Frame ( frametitle, `ComboBox( `id(entry_id), `opt(`notify), question, dummy ) ) ); + dlg = `Left( `Frame ( frametitle, widget ) ); } else { - dlg = `Left( `ComboBox( `id(entry_id), `opt(`notify), question, dummy ) ); + dlg = `Left( widget ); } } else { + term widget = `TextEntry(`id(entry_id), `opt(`notify), question, ask["default"]:"" ); if( frametitle != "" ) { - dlg = `Left( `Frame ( frametitle, `TextEntry(`id(entry_id), `opt(`notify), question, ask["default"]:"" ) ) ); + dlg = `Left( `Frame ( frametitle, widget ) ); } else { - dlg = `Left( `TextEntry(`id(entry_id), `opt(`notify), question, ask["default"]:"" ) ); + dlg = `Left( widget ); } } } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org