Author: aschnell
Date: Sun Jun 22 23:39:34 2008
New Revision: 48484
URL: http://svn.opensuse.org/viewcvs/yast?rev=48484&view=rev
Log:
- cleanup
Modified:
branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd-dialogs.ycp
Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd-dialogs.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd-dialogs.ycp?rev=48484&r1=48483&r2=48484&view=diff
==============================================================================
--- branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd-dialogs.ycp (original)
+++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd-dialogs.ycp Sun Jun 22 23:39:34 2008
@@ -17,30 +17,28 @@
{
y2milestone("MiniWorkflowStepPartitionType data:%1", data);
+ symbol type = data["type"]:`unknown;
map slots = data["slots"]:$[];
term tmp = `VBox();
if (haskey(slots, `primary))
// radio button text
- tmp = add(tmp, `LeftRadioButton(`id(`primary), _("&Primary Partition"),
- data["type"]:`unknown == `primary));
+ tmp = add(tmp, `LeftRadioButton(`id(`primary), _("&Primary Partition"), type == `primary));
if (haskey(slots, `extended))
// radio button text
- tmp = add(tmp, `LeftRadioButton(`id(`extended), _("&Extended Partition"),
- data["type"]:`unknown == `extended));
-
+ tmp = add(tmp, `LeftRadioButton(`id(`extended), _("&Extended Partition"), type == `extended));
+
if (haskey(slots, `logical))
// radio button text
- tmp = add(tmp, `LeftRadioButton(`id(`logical), _("&Logical Partition"),
- data["type"]:`unknown == `logical));
+ tmp = add(tmp, `LeftRadioButton(`id(`logical), _("&Logical Partition"), type == `logical));
// heading for a frame in a dialog
term contents = `HVSquash(`Frame(_("Partition Type"),
`RadioButtonGroup(`id(`partition_type), tmp)));
- MiniWorkflow::SetContents(Greasemonkey::Transform(contents), "help");
+ MiniWorkflow::SetContents(Greasemonkey::Transform(contents), "TODO");
MiniWorkflow::SetLastStep(false);
@@ -49,12 +47,19 @@
repeat
{
widget = MiniWorkflow::UserInput();
+
+ switch (widget)
+ {
+ case `next:
+ type = (symbol) UI::QueryWidget(`id(`partition_type), `Value);
+ break;
+ }
}
until (widget == `abort || widget == `back || widget == `next);
if (widget == `next)
{
- data["type"] = UI::QueryWidget(`id(`partition_type), `Value);
+ data["type"] = type;
map r = Storage::NextPartition(data["disk_device"]:"", data["type"]:`none);
data["device"] = r["device"]:"";
@@ -117,9 +122,6 @@
}
-
-
-
boolean DlgEditPartition(string device)
{
map