Author: aschnell
Date: Fri Oct 17 10:47:23 2008
New Revision: 52319
URL: http://svn.opensuse.org/viewcvs/yast?rev=52319&view=rev
Log:
- layout improvments
Modified:
trunk/storage/storage/src/include/ep-dialogs.ycp
trunk/storage/storage/src/include/ep-hd-dialogs.ycp
trunk/storage/storage/src/include/ep-lvm-dialogs.ycp
trunk/storage/storage/src/include/ep-raid-dialogs.ycp
trunk/storage/storage/src/modules/Greasemonkey.ycp
Modified: trunk/storage/storage/src/include/ep-dialogs.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-dialogs.ycp?rev=52319&r1=52318&r2=52319&view=diff
==============================================================================
--- trunk/storage/storage/src/include/ep-dialogs.ycp (original)
+++ trunk/storage/storage/src/include/ep-dialogs.ycp Fri Oct 17 10:47:23 2008
@@ -103,9 +103,8 @@
list mountpoints = ProposeMountpoints( used_fs, mount );
term contents = `HVSquash(`VStackFrames(
- `Frame(_("Formatting Options"),
+ `FrameWithMarginBox(_("Formatting Options"),
`RadioButtonGroup(`id(`format),
- `MarginBox(2.0, 0.45,
`VBox(
`LeftRadioButtonWithAttachment(`id(`do_format), `opt(`notify),
_("Format partition"),
@@ -118,11 +117,9 @@
tmp1)
)
)
- )
),
- `Frame(_("Mounting Options"),
+ `FrameWithMarginBox(_("Mounting Options"),
`RadioButtonGroup(`id(`mount),
- `MarginBox(2.0, 0.45,
`VBox(
`LeftRadioButtonWithAttachment(`id(`do_mount), `opt(`notify),
_("Mount partition"),
@@ -138,7 +135,6 @@
`LeftRadioButton(`id(`do_not_mount), `opt(`notify),
_("Do not mount partition"))
)
- )
)
)
)
@@ -364,7 +360,7 @@
if (empty_pw_allowed)
label = label + "\n" + _("Empty password allowed.");
- term contents = `HVSquash(`Frame(_("Password"),
+ term contents = `HVSquash(`FrameWithMarginBox(_("Password"),
`VBox(
`Password(`id(`pw1),
// Label: get password for user root
Modified: trunk/storage/storage/src/include/ep-hd-dialogs.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-hd-dialogs.ycp?rev=52319&r1=52318&r2=52319&view=diff
==============================================================================
--- trunk/storage/storage/src/include/ep-hd-dialogs.ycp (original)
+++ trunk/storage/storage/src/include/ep-hd-dialogs.ycp Fri Oct 17 10:47:23 2008
@@ -41,8 +41,8 @@
// heading for a frame in a dialog
term contents = `HVSquash(
- `Frame(_("New Partition Type"),
- `MarginBox(2.0, 0.45, `RadioButtonGroup(`id(`partition_type), tmp))));
+ `FrameWithMarginBox(_("New Partition Type"),
+ `RadioButtonGroup(`id(`partition_type), tmp)));
MiniWorkflow::SetContents(Greasemonkey::Transform(contents), MiniWorkflowStepPartitionTypeHelptext());
MiniWorkflow::SetLastStep(false);
@@ -108,9 +108,8 @@
term contents = `HVSquash(
// frame heading
- `Frame(_("New Partition Size"),
+ `FrameWithMarginBox(_("New Partition Size"),
`RadioButtonGroup(`id(`size),
- `MarginBox(2.0, 0.45,
`VBox(
`LeftRadioButton(`id(`max_size), `opt(`notify),
// radio button text, %1 is replaced by size
@@ -121,7 +120,6 @@
`MinWidth(15, `InputField(`id(`size_input), `opt(`shrinkable), _("Size (e.g. 9.0 MB or 9.0 GB)")))
)
)
- )
)
)));
Modified: trunk/storage/storage/src/include/ep-lvm-dialogs.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-lvm-dialogs.ycp?rev=52319&r1=52318&r2=52319&view=diff
==============================================================================
--- trunk/storage/storage/src/include/ep-lvm-dialogs.ycp (original)
+++ trunk/storage/storage/src/include/ep-lvm-dialogs.ycp Fri Oct 17 10:47:23 2008
@@ -354,7 +354,7 @@
term frames = `VStackFrames();
frames = add(frames,
- `Frame(_("Size"),
+ `FrameWithMarginBox(_("Size"),
`RadioButtonGroup(`id(`size),
`VBox(
`LeftRadioButton(`id(`max_size), `opt(`notify),
@@ -376,7 +376,7 @@
});
// heading for frame
- frames = add(frames, `Frame("Stripes",
+ frames = add(frames, `FrameWithMarginBox("Stripes",
`HBox(
// combo box label
`Left(`ComboBoxSelected(`id(`stripes), `opt(`notify), _("Number"), stripes_list, `id(stripes))),
@@ -510,7 +510,7 @@
string lv_name = data["name"]:"";
- term contents = `HVSquash(`Frame("Name",
+ term contents = `HVSquash(`FrameWithMarginBox("Name",
`VBox(
`Left(`InputField(`id(`lvname), "Logical Volume", lv_name)))
)
Modified: trunk/storage/storage/src/include/ep-raid-dialogs.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-raid-dialogs.ycp?rev=52319&r1=52318&r2=52319&view=diff
==============================================================================
--- trunk/storage/storage/src/include/ep-raid-dialogs.ycp (original)
+++ trunk/storage/storage/src/include/ep-raid-dialogs.ycp Fri Oct 17 10:47:23 2008
@@ -106,7 +106,7 @@
term contents = `VBox(`Left(
// heading
- `HVSquash(`Frame(_("RAID Type"),
+ `HVSquash(`FrameWithMarginBox(_("RAID Type"),
`RadioButtonGroup(`id(`raid_type),
`VBox(
// Translators, 'Striping' is a technical term here. Translate only if
@@ -229,7 +229,7 @@
);
// heading
- term contents = `HVSquash(`Frame(_("RAID Options"), options));
+ term contents = `HVSquash(`FrameWithMarginBox(_("RAID Options"), options));
MiniWorkflow::SetContents(Greasemonkey::Transform(contents), MiniWorkflowStepRaidOptionsHelptext(data));
MiniWorkflow::SetLastStep(false);
Modified: trunk/storage/storage/src/modules/Greasemonkey.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Greasemonkey.ycp?rev=52319&r1=52318&r2=52319&view=diff
==============================================================================
--- trunk/storage/storage/src/modules/Greasemonkey.ycp (original)
+++ trunk/storage/storage/src/modules/Greasemonkey.ycp Fri Oct 17 10:47:23 2008
@@ -28,6 +28,14 @@
}
+ term FrameWithMarginBox(term old)
+ {
+ string title = old[0]:"error";
+ list args = sublist(argsof(old), 1);
+ return `Frame(title, toterm(`MarginBox, union([1.45, 0.45], args)));
+ }
+
+
/*
* ComboBoxSelected
*
@@ -154,6 +162,7 @@
map