Author: aschnell Date: Tue Apr 8 21:33:19 2008 New Revision: 46260 URL: http://svn.opensuse.org/viewcvs/yast?rev=46260&view=rev Log: - pure ui stuff Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-dialogs.ycp branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm-dialogs.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/sto... ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-dialogs.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-dialogs.ycp Tue Apr 8 21:33:19 2008 @@ -65,17 +65,17 @@ return `Frame(_("Mount"), `RadioButtonGroup(`id(`mount), `VBox( - `Left(`RadioButton(`id(`do_mount), - _("Mount partition"))), - IndentAfterRadioButton(`VBox( - `ComboBox(`id(`mount_point), `opt(`editable, `hstretch, `notify), - _("Mount Point"), mountpoints), - `PushButton(`id(`fstab_options), `opt(`hstretch), - // button text - _("Fs&tab Options...")) - )), - `Left(`RadioButton(`id(`do_not_mount), - _("Do not mount partition"))) + `LeftRadioButtonWithAttachment(`id(`do_mount), + _("Mount partition"), + `VBox( + `ComboBox(`id(`mount_point), `opt(`editable, `hstretch, `notify), + _("Mount Point"), mountpoints), + `PushButton(`id(`fstab_options), `opt(`hstretch), + // button text + _("Fs&tab Options...")) + )), + `LeftRadioButton(`id(`do_not_mount), + _("Do not mount partition")) ) ) ); Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/sto... ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm-dialogs.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm-dialogs.ycp Tue Apr 8 21:33:19 2008 @@ -171,8 +171,8 @@ any StepSize() { - MiniWorkflow::SetContents(Greasemonkey::Transform(`HVSquash(StackFrames([ FrameSize(`lv), - FrameStripes() ]))), + MiniWorkflow::SetContents(Greasemonkey::Transform(`HVSquash(`VStackFrames(FrameSize(`lv), + FrameStripes()))), "help"); MiniWorkflow::SetLastStep(false); @@ -184,8 +184,8 @@ any StepFormatMount() { // TODO almost identical to "Add Partitiion" - MiniWorkflow::SetContents(Greasemonkey::Transform(`HVSquash(StackFrames([ FrameFormat(`lv), - FrameMount(`lv) ]))), + MiniWorkflow::SetContents(Greasemonkey::Transform(`HVSquash(`VStackFrames(FrameFormat(`lv), + FrameMount(`lv)))), "help"); MiniWorkflow::SetLastStep(false); @@ -235,29 +235,64 @@ boolean DlgEditLogicalVolume(string device) { - // TODO: include stripes if newly create - UI::OpenDialog(`opt(`decorated), - // heading in a popup dialog - `VBox(`Left(`Heading(_("Edit Logical Volume"))), - StackFrames([ FrameVgName(), - FrameFormat(`lv), - FrameMount(`lv) ]), - `HBox( - `PushButton(`id(`cancel), Label::CancelButton()), - `PushButton(`id(`ok), `opt(`default), Label::OKButton()) - ) - ) - ); + // TODO: almost same as for partitions - symbol widget = nil; + any StepFormatMount() + { + MiniWorkflow::SetContents(Greasemonkey::Transform(`HVSquash(`VStackFrames( + FrameFormat(`lv), + FrameMount(`lv) + ))), + "help"); + + MiniWorkflow::SetLastStep(true); + + symbol widget = nil; + + repeat + { + widget = (symbol) MiniWorkflow::UserInput(); + } + until (widget == `abort || widget == `back || widget == `next); + + if (widget == `next) + { + if (UI::QueryWidget(`id(`crypt_fs), `Value) == true) + return `next; + else + return `finish; + } + + return widget; + } - repeat + any StepPassword() { - widget = (symbol) UI::UserInput(); + MiniWorkflow::SetContents(`HVSquash(FramePassword()), + "help"); + + MiniWorkflow::SetLastStep(true); + + any ret = MiniWorkflow::UserInput(); + + if (ret == `next) + return `finish; + + return ret; } - until (widget == `cancel || widget == `ok); - UI::CloseDialog(); + map<string, any> aliases = $[ + "FormatMount" : ``(StepFormatMount()), + "Password" : ``(StepPassword()) + ]; + + map<string, any> sequence = $[ + "FormatMount" : $[ `next : "Password", + `finish : `finish ], + "Password" : $[ `finish : `finish ] + ]; + + symbol widget = MiniWorkflow::Run(_("Edit Logical Volume"), aliases, sequence, "FormatMount"); 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/sto... ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-main.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-main.ycp Tue Apr 8 21:33:19 2008 @@ -23,24 +23,6 @@ } - term StackFrames(list<term> frames) - { - term tmp = `VBox(); - foreach(term frame, frames, { - if (size(tmp) != 0) - tmp = add(tmp, `VSpacing(0.5)); - tmp = add(tmp, frame); - }); - return `MarginBox(1, 0.5, tmp); - } - - - term IndentAfterRadioButton(term contents) - { - return `HBox(`HSpacing(4), contents); - } - - void UpdateNavigationTree(any new_focus); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org