Author: aschnell Date: Tue Sep 2 10:24:27 2008 New Revision: 50542 URL: http://svn.opensuse.org/viewcvs/yast?rev=50542&view=rev Log: - work on messages Modified: trunk/storage/storage/src/include/ep-loop-lib.ycp trunk/storage/storage/src/include/ep-loop.ycp Modified: trunk/storage/storage/src/include/ep-loop-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-loop-lib.ycp?rev=50542&r1=50541&r2=50542&view=diff ============================================================================== --- trunk/storage/storage/src/include/ep-loop-lib.ycp (original) +++ trunk/storage/storage/src/include/ep-loop-lib.ycp Tue Sep 2 10:24:27 2008 @@ -20,8 +20,6 @@ if (DlgCreateLoop(data)) { - Debug("create loop from data", data); - Storage::UpdateLoop(data["device"]:"", data["fpath"]:"", data["create_file"]:false, data["size_k"]:0); @@ -53,6 +51,7 @@ if (data["used_by"]:"" != "") { + // error popup, %1 is replaced by device name Popup::Error(sformat(_("The Crypt File %1 is in use. It cannot be edited. To edit %1, make sure it is not used."), device)); return; @@ -60,8 +59,6 @@ if (DlgEditLoop(data)) { - Debug("edit loop from data", data); - Storage::ChangeVolumeProperties(data); UpdateNavigationTree(nil); @@ -75,6 +72,7 @@ { if (device == nil) { + // error popup Popup::Error(_("No crypt file selected.")); return; } Modified: trunk/storage/storage/src/include/ep-loop.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-loop.ycp?rev=50542&r1=50541&r2=50542&view=diff ============================================================================== --- trunk/storage/storage/src/include/ep-loop.ycp (original) +++ trunk/storage/storage/src/include/ep-loop.ycp Tue Sep 2 10:24:27 2008 @@ -31,10 +31,12 @@ Greasemonkey::Transform( `VBox( `HStretch(), + // heading `IconAndHeading(_("Crypt Files"), loop_icon), `Table(`id(`table), `opt(`keepSorting, `notify), table_header, table_contents), `HBox( + // push button text `Left(`PushButton(`id(`add), _("Add Crypt File..."))), `HStretch() ) @@ -42,7 +44,8 @@ ) ); - string helptext = _("<p>Crypt Files TODO</p>"); + // helptext + string helptext = _("<p>This view shows all crypt files.</p>"); Wizard::RestoreHelp(helptext + StorageFields::TableHelptext(fields)); } @@ -71,18 +74,23 @@ UI::ReplaceWidget(`tree_panel, Greasemonkey::Transform( `VBox( + // heading `IconAndHeading(sformat(_("Crypt File: %1"), part_device), loop_icon), `HStretch(), StorageFields::Overview(fields, target_map, part_device), `HBox( + // push button text `PushButton(`id(`edit), _("Edit...")), + // push button text `PushButton(`id(`delete), _("Delete...")), `HStretch() ) )) ); - string helptext = _("<p>Crypt Files TODO</p>"); + // helptext + string helptext = _("<p>This view shows detailed information of the +selected crypt file.</p>"); Wizard::RestoreHelp(helptext + StorageFields::OverviewHelptext(fields)); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org