Author: aschnell Date: Thu Apr 3 17:57:12 2008 New Revision: 46050 URL: http://svn.opensuse.org/viewcvs/yast?rev=46050&view=rev Log: - introducing Greasemonkey Added: branches/tmp/aschnell/part-redesign/storage/src/modules/Greasemonkey.ycp 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-lvm-dialogs.ycp branches/tmp/aschnell/part-redesign/storage/src/modules/Makefile.am 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=46050&r1=46049&r2=46050&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 Thu Apr 3 17:57:12 2008 @@ -14,12 +14,10 @@ return `Frame(_("Size"), `RadioButtonGroup(`id(`size), `VBox( - `Left(`RadioButton(`id(`max_size), "Maximum Size (XX.XX GB)")), - `Left(`RadioButton(`id(`manual_size), "Manual Size")), - IndentAfterRadioButton( - `MinWidth(15, `InputField(`id(`size), `opt(`shrinkable), "Size")) - )) - ) + `LeftRadioButton(`id(`max_size), "Maximum Size (XX.XX GB)"), + `LeftRadioButtonWithAttachment(`id(`manual_size), "Manual Size", + `MinWidth(15, `InputField(`id(`size), `opt(`shrinkable), "Size"))) + )) ); } 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=46050&r1=46049&r2=46050&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 Thu Apr 3 17:57:12 2008 @@ -10,6 +10,7 @@ import "MiniWorkflow"; + import "Greasemonkey"; term FramePartitionType(map possibilities) @@ -44,7 +45,7 @@ any StepType() { MiniWorkflow::SetContents(_("Add Partition"), - `HVSquash(FramePartitionType(possibilities)), + Greasemonkey::Transform(`HVSquash(FramePartitionType(possibilities))), "help"); MiniWorkflow::SetLastStep(false); @@ -55,7 +56,7 @@ any StepSize() { MiniWorkflow::SetContents(_("Add Partition"), - `HVSquash(FrameSize(`part)), + Greasemonkey::Transform(`HVSquash(FrameSize(`part))), "help"); MiniWorkflow::SetLastStep(false); @@ -66,10 +67,10 @@ any StepFormatMount() { MiniWorkflow::SetContents(_("Add Partition"), - `HVSquash(StackFrames( - [ FrameFormat(`part), - FrameMount(`part) ] - )), + Greasemonkey::Transform(`HVSquash(`VStackFrames( + FrameFormat(`part), + FrameMount(`part) + ))), "help"); MiniWorkflow::SetLastStep(true); @@ -82,7 +83,6 @@ if (widget == `crypt_fs) { - UI::ChangeWidget(`id(`huhu2), `Enabled, false); MiniWorkflow::SetLastStep(UI::QueryWidget(`id(`crypt_fs), `Value) != true); } else if (widget == `fs_options) 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/storage/src/include/ep-lvm-dialogs.ycp?rev=46050&r1=46049&r2=46050&view=diff ============================================================================== --- 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 Thu Apr 3 17:57:12 2008 @@ -45,7 +45,7 @@ ); MiniWorkflow::SetContents(_("Add Volume Group"), - contents, + Greasemonkey::Transform(contents), "help"); MiniWorkflow::SetLastStep(true); @@ -150,7 +150,7 @@ any StepName() { MiniWorkflow::SetContents(_("Add Logical Volume"), - `HVSquash(FrameVgNameNew()), + Greasemonkey::Transform(`HVSquash(FrameVgNameNew())), "help"); MiniWorkflow::SetLastStep(false); @@ -162,8 +162,8 @@ any StepSize() { MiniWorkflow::SetContents(_("Add Logical Volume"), - `HVSquash(StackFrames([ FrameSize(`lv), - FrameStripes() ])), + Greasemonkey::Transform(`HVSquash(StackFrames([ FrameSize(`lv), + FrameStripes() ]))), "help"); MiniWorkflow::SetLastStep(false); @@ -176,8 +176,8 @@ { // TODO almost identical to "Add Partitiion" MiniWorkflow::SetContents(_("Add Logical Volume"), - `HVSquash(StackFrames([ FrameFormat(`lv), - FrameMount(`lv) ])), + Greasemonkey::Transform(`HVSquash(StackFrames([ FrameFormat(`lv), + FrameMount(`lv) ]))), "help"); MiniWorkflow::SetLastStep(false); Added: branches/tmp/aschnell/part-redesign/storage/src/modules/Greasemonkey.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/modules/Greasemonkey.ycp?rev=46050&view=auto ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/modules/Greasemonkey.ycp (added) +++ branches/tmp/aschnell/part-redesign/storage/src/modules/Greasemonkey.ycp Thu Apr 3 17:57:12 2008 @@ -0,0 +1,109 @@ +/** + * File: Greasemonkey.ycp + * Package: yast2-storage + * Summary: Expert Partitioner + * Authors: Arvin Schnell + * + * Lets see if this turns out to be useful. + */ +{ + module "Greasemonkey"; + + + term VStackFrames(term t) + { + list<term> frames = (list<term>) argsof(t); + + 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 SizeUnit(term t) + + + term LeftRadioButton(term old) + { + // YCP has no function to construct a term from a symbol and list or args + + term t = `RadioButton(); + foreach(any arg, argsof(old), { t = add(t, arg); }); + return `Left(t); + } + + + /* + * LeftRadioButtonWithAttachment + * + * `LeftRadioButtonWithAttachment(`id(), `opt(), "text", content) + * + * `VBox( + * `Left(`Radiobutton(`id(), `opt(), "text")), + * `HBox(`HSpacing(4), contents) + * ) + */ + term LeftRadioButtonWithAttachment(term old) + { + list l = argsof(old); + + // YCP has no function to split a list! + + term t1 = `RadioButton(); + list t2 = remove(l, size(l)-1); + foreach(any arg, t2, { t1 = add(t1, arg); }); + + any content = l[size(l)-1]:nil; + + return `VBox(`Left(t1), `HBox(`HSpacing(4), content)); + } + + + map handlers = $[ + `VStackFrames : VStackFrames, + `LeftRadioButton : LeftRadioButton, + `LeftRadioButtonWithAttachment : LeftRadioButtonWithAttachment + ]; + + + global boolean Register(symbol s, term(term) handler) + { + if (haskey(handlers, s)) + { + y2error("handler already registered"); + return false; + } + else + { + handlers[s] = handler; + return true; + } + } + + + global term Transform(term old) + { + symbol s = symbolof(old); + + term(term) handler = handlers[s]:nil; + if (handler != nil) + return handler(old); + + // symbolof returns a symbol but toterm expects a string + term new = toterm(substring(sformat ("%1", s), 1)); + + foreach(any arg, argsof(old), { + if (is(arg, term)) + new = add(new, Transform((term) arg)); + else + new = add(new, arg); + }); + + return new; + } +} Modified: branches/tmp/aschnell/part-redesign/storage/src/modules/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/modules/Makefile.am?rev=46050&r1=46049&r2=46050&view=diff ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/modules/Makefile.am (original) +++ branches/tmp/aschnell/part-redesign/storage/src/modules/Makefile.am Thu Apr 3 17:57:12 2008 @@ -23,6 +23,7 @@ TreePanel.ycp \ TabPanel.ycp \ MiniWorkflow.ycp \ + Greasemonkey.ycp \ DualMultiSelectionBox.ycp EXTRA_DIST = $(module_DATA) $(ynclude_DATA) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org