Author: aschnell Date: Tue Apr 8 16:41:18 2008 New Revision: 46245 URL: http://svn.opensuse.org/viewcvs/yast?rev=46245&view=rev Log: - layout stuff Modified: branches/tmp/aschnell/part-redesign/storage/src/include/custom_part_dialogs.ycp branches/tmp/aschnell/part-redesign/storage/src/include/ep-dialogs.ycp branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm-dialogs.ycp Modified: branches/tmp/aschnell/part-redesign/storage/src/include/custom_part_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/include/custom_part_dialogs.ycp?rev=46245&r1=46244&r2=46245&view=diff ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/custom_part_dialogs.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/custom_part_dialogs.ycp Tue Apr 8 16:41:18 2008 @@ -911,7 +911,7 @@ if( !Arch::s390 () ) { boolean cr = new_val["enc_type"]:`none != `none; - CryptWidget = `VBox( `VSpacing(0.7), + CryptWidget = `VBox( // `VSpacing(0.7), `Left(`CheckBox(`id(`crypt_fs), `opt(`notify), // button text _("&Encrypt file system"), cr ))); 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=46245&r1=46244&r2=46245&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 Tue Apr 8 16:41:18 2008 @@ -15,8 +15,11 @@ `RadioButtonGroup(`id(`size), `VBox( `LeftRadioButton(`id(`max_size), "Maximum Size (XX.XX GB)"), - `LeftRadioButtonWithAttachment(`id(`manual_size), "Manual Size", - `MinWidth(15, `InputField(`id(`size), `opt(`shrinkable), "Size"))) + `LeftRadioButtonWithAttachment(`id(`manual_size), "Manual Size", + `VBox( + // `MinWidth(15, `InputField(`id(`size), `opt(`shrinkable), "Size")), + `SizeUnit(), + `Left(`Label("Cylinder size is X.XX MB")))) )) ); } @@ -24,24 +27,20 @@ term FrameFormat(symbol flavour) { - term tmp = `VBox( - `Left(`RadioButton(`id(`do_not_format), `opt(`notify), - _("Do not format the partition")))); - + term tmp = `Empty(); if (flavour == `part) - tmp = add(tmp, IndentAfterRadioButton(`VBox(`id(`huhu1), FsidComboBox($[], FileSystems::GetAllFileSystems(true, true))))); - + tmp = `VBox(FsidComboBox($[], FileSystems::GetAllFileSystems(true, true))); + return `Frame(_("Format"), - `VBox( - `RadioButtonGroup(`id(`format), - `VBox( - tmp, - `VBox(`Left(`RadioButton(`id(`do_format), `opt(`notify), - _("Format the partition"))), - IndentAfterRadioButton( - `VBox(`id(`huhu2), - FileSystemsComboBox($[], FileSystems::GetAllFileSystems(true, true))))) - )) + `RadioButtonGroup(`id(`format), + `VBox( + `LeftRadioButtonWithAttachment(`id(`do_format), `opt(`notify), + _("Format the partition"), + FileSystemsComboBox($[], FileSystems::GetAllFileSystems(true, true))), + `LeftRadioButtonWithAttachment(`id(`do_not_format), `opt(`notify), + _("Do not format the partition"), + tmp) + ) ) ); } @@ -64,22 +63,20 @@ mountpoints = union([mount], mountpoints); return `Frame(_("Mount"), - `VBox( - `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"))) - ) - ) + `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"))) + ) ) ); } 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=46245&r1=46244&r2=46245&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 Tue Apr 8 16:41:18 2008 @@ -129,8 +129,8 @@ { return `Frame("Name", `VBox( - `Left(`ComboBox("Volume Group:", ["system", "data"])), - `Left(`InputField("Logical Volume:")))); + `Left(`ComboBox("Volume Group", ["system", "data"])), + `Left(`InputField("Logical Volume")))); } @@ -147,8 +147,8 @@ { return `Frame("Stripes", `HBox( - `Left(`ComboBox("Stripes:", ["1", "2", "3", "4"])), - `Left(`ComboBox("Stripe Size:", ["4 KB", "8 KB", "16 KB", "32 KB"])), + `Left(`ComboBox("Stripes", ["1", "2", "3", "4"])), + `Left(`ComboBox("Stripe Size", ["4 kB", "8 kB", "16 kB", "32 kB"])), `HStretch()) ); } @@ -197,7 +197,7 @@ any StepPassword() { // TODO identical to "Add Partitiion" - MiniWorkflow::SetContents(`HVSquash(FramePassword()), + MiniWorkflow::SetContents(Greasemonkey::Transform(`HVSquash(FramePassword())), "help"); MiniWorkflow::SetLastStep(true); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org