Author: aschnell Date: Fri Apr 11 17:26:09 2008 New Revision: 46433 URL: http://svn.opensuse.org/viewcvs/yast?rev=46433&view=rev Log: - backup commit Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-dialogs.ycp branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd-dialogs.ycp branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd-lib.ycp branches/tmp/aschnell/part-redesign/storage/src/include/ep-main.ycp Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/include/ep-dialogs.ycp?rev=46433&r1=46432&r2=46433&view=diff ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-dialogs.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-dialogs.ycp Fri Apr 11 17:26:09 2008 @@ -9,10 +9,6 @@ textdomain "storage"; - import "MiniWorkflow"; - import "Greasemonkey"; - - // TODO: y2milestones at begin and end of MiniWorkflowSteps as decorators // or in MiniWorkflow (Sequencer) module? 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=46433&r1=46432&r2=46433&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 Fri Apr 11 17:26:09 2008 @@ -9,12 +9,8 @@ textdomain "storage"; - import "MiniWorkflow"; - import "Greasemonkey"; - - symbol MiniWorkflowStepPartitionType(map &data) - { + { y2milestone("MiniWorkflowStepPartitionType data:%1", data); map possibilities = data["possibilities"]:$[]; @@ -24,17 +20,17 @@ if (possibilities[`primary, `possible]:false) // radio button text tmp = add(tmp, `Left(`RadioButton(`id(`primary), _("&Primary Partition"), - data["partition_type"]:false))); + data["type"]:`unknown == `primary))); if (possibilities[`logical, `possible]:false) // radio button text tmp = add(tmp, `Left(`RadioButton(`id(`logical), _("&Logical Partition"), - data["partition_type"]:false))); + data["type"]:`unknown == `logical))); if (possibilities[`extended, `possible]:false) // radio button text tmp = add(tmp, `Left(`RadioButton(`id(`extended), _("&Extended Partition"), - data["partition_type"]:false))); + data["type"]:`unknown == `extended))); // heading for a frame in a dialog term contents = `HVSquash(`Frame(_("Partition Type"), @@ -55,13 +51,13 @@ if (widget == `next) { if (UI::QueryWidget(`id(`primary), `Value) == true) - data["partition_type"] = `primary; + data["type"] = `primary; if (UI::QueryWidget(`id(`logical), `Value) == true) - data["partition_type"] = `logical; + data["type"] = `logical; if (UI::QueryWidget(`id(`extended), `Value) == true) - data["partition_type"] = `extended; + data["type"] = `extended; } y2milestone("MiniWorkflowStepPartitionType data:%1 ret:%2", data, widget); @@ -70,7 +66,7 @@ } - boolean DlgCreatePartition(map data) + boolean DlgCreatePartition(map &data) { map aliases = $[ "Type" : ``(MiniWorkflowStepPartitionType(data)), @@ -88,9 +84,9 @@ "Password" : $[ `finish : `finish ] ]; - symbol ret = MiniWorkflow::Run(_("Add Partition"), aliases, sequence, "Type"); + symbol widget = MiniWorkflow::Run(_("Add Partition"), aliases, sequence, "Type"); - return false; + return widget == `finish; } Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd-lib.ycp?rev=46433&r1=46432&r2=46433&view=diff ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd-lib.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd-lib.ycp Fri Apr 11 17:26:09 2008 @@ -97,7 +97,10 @@ map data = $[ "possibilities" : possibilities, "cyl_size" : disk["cyl_size"]:0 ]; - DlgCreatePartition(data); + if (DlgCreatePartition(data)) + { + y2milestone("create partition with %1", data); + } return false; } Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-main.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/include/ep-main.ycp?rev=46433&r1=46432&r2=46433&view=diff ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-main.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-main.ycp Fri Apr 11 17:26:09 2008 @@ -14,6 +14,8 @@ import "TreePanel"; import "Popup"; import "StorageFields"; + import "MiniWorkflow"; + import "Greasemonkey"; void UpdateNavigationTree(any new_focus); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org