Author: aschnell Date: Tue Jan 5 14:23:34 2010 New Revision: 60231 URL: http://svn.opensuse.org/viewcvs/yast?rev=60231&view=rev Log: - use HTML::List - moved import Modified: trunk/storage/storage/src/include/ep-dialogs.ycp trunk/storage/storage/src/include/ep-main.ycp Modified: trunk/storage/storage/src/include/ep-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-dialogs.ycp?rev=60231&r1=60230&r2=60231&view=diff ============================================================================== --- trunk/storage/storage/src/include/ep-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-dialogs.ycp Tue Jan 5 14:23:34 2010 @@ -9,7 +9,6 @@ { textdomain "storage"; - import "Icon"; include "partitioning/custom_part_lib.ycp"; @@ -836,18 +835,10 @@ UI::CloseDialog(); } - boolean ConfirmRecursiveDelete( string device, list<string> partitions, - string headline, string text_before, - string text_after ) - { - string plist = "<ul>"; - - foreach( string one_part, partitions, { - plist = plist + "<li>" + one_part + "</li>"; - }); - - plist = plist + "</ul>"; + boolean ConfirmRecursiveDelete(string device, list<string> devices, string headline, string text_before, + string text_after) + { term button_box = `ButtonBox ( `PushButton(`id(`yes), `opt(`okButton), Label::DeleteButton() ), `PushButton(`id(`no_button), `opt(`default, `cancelButton), Label::CancelButton()) @@ -867,7 +858,7 @@ `VSpacing (0.2), `Left( `Label( text_before ) ), `VSpacing (0.2), - `Left(`RichText(plist)), + `Left(`RichText(HTML::List(sort(devices)))), `VSpacing (0.2), `Left(`Label( text_after)), button_box @@ -875,14 +866,10 @@ ) ); - boolean success = (boolean) UI::OpenDialog( layout); - any ret = nil; - - if( success ){ - ret = UI::UserInput(); - UI::CloseDialog(); - } + UI::OpenDialog(layout); + symbol ret = (symbol) UI::UserInput(); + UI::CloseDialog(); - return (ret == `yes); + return ret == `yes; } } Modified: trunk/storage/storage/src/include/ep-main.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-main.ycp?rev=60231&r1=60230&r2=60231&view=diff ============================================================================== --- trunk/storage/storage/src/include/ep-main.ycp (original) +++ trunk/storage/storage/src/include/ep-main.ycp Tue Jan 5 14:23:34 2010 @@ -34,6 +34,7 @@ import "Directory"; import "HTML"; import "Map"; + import "Icon"; include "partitioning/lvm_ui_dialogs.ycp"; include "partitioning/raid_lib.ycp"; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org