Author: aschnell
Date: Thu Apr 15 12:32:38 2010
New Revision: 61711
URL: http://svn.opensuse.org/viewcvs/yast?rev=61711&view=rev
Log:
- improved layout of dialog for importing mount points
- allow to format system volumes in dialog for importing mount points
Modified:
trunk/storage/package/yast2-storage.changes
trunk/storage/storage/src/include/custom_part_dialogs.ycp
trunk/storage/storage/src/include/custom_part_lib.ycp
trunk/storage/storage/src/include/ep-lib.ycp
Modified: trunk/storage/package/yast2-storage.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.changes?rev=61711&r1=61710&r2=61711&view=diff
==============================================================================
--- trunk/storage/package/yast2-storage.changes (original)
+++ trunk/storage/package/yast2-storage.changes Thu Apr 15 12:32:38 2010
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+Thu Apr 15 12:04:37 CEST 2010 - aschnell@suse.de
+
+- improved layout of dialog for importing mount points
+
+-------------------------------------------------------------------
Fri Apr 09 10:08:21 CEST 2010 - aschnell@suse.de
- added requires for Perl (bnc #595024)
Modified: trunk/storage/storage/src/include/custom_part_dialogs.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/custom_part_dialogs.ycp?rev=61711&r1=61710&r2=61711&view=diff
==============================================================================
--- trunk/storage/storage/src/include/custom_part_dialogs.ycp (original)
+++ trunk/storage/storage/src/include/custom_part_dialogs.ycp Thu Apr 15 12:32:38 2010
@@ -1161,8 +1161,8 @@
* @return targetMap new or unmodified targetMap
*---------------------------------------------------------------------
*/
-define integer FstabAddDialog( list table_input )
- ``{
+integer FstabAddDialog(list table_input, boolean& format_sys)
+ {
y2milestone( "FstabAddDialog start %1", table_input );
if( table_input == [] || table_input == nil )
{
@@ -1184,9 +1184,7 @@
_("<P>To ignore these mount points, <BR> press <B>No</B>.</P>");
UI::OpenDialog(
- `opt(`decorated ),
- `HBox(
- `VBox( `HSpacing(20), `RichText(help_text)),
+ `opt(`decorated),
`VBox( `VSpacing(1),
`ReplacePoint( `id(`heading), `Empty() ),
`HBox(
@@ -1197,16 +1195,32 @@
),
`HSpacing(3.0)
),
-
+ `ReplacePoint(`id(`select), `Empty()),
+ `VSpacing(1),
+ `Left(`CheckBox(`id(`format_sys), _("Format system volumes"), true)),
`VSpacing(1),
// popup text
`Heading(_("Would you like to use these mount points
for your new installation?")),
`VSpacing(1),
- `ReplacePoint( `id(`bbox), `Empty() )
- ))
+ `ButtonBox(
+ `PushButton(`id(`help), `opt(`helpButton), Label::HelpButton()),
+ `PushButton(`id(`ok), `opt(`default), Label::YesButton()),
+ `PushButton(`id(`cancel), Label::NoButton())
+ )
+ )
);
+ UI::ChangeWidget(`help, `HelpText, help_text);
+
+ if (size(table_input) > 1)
+ {
+ UI::ReplaceWidget(`id(`select), `HBox(
+ `PushButton(`id(`show_prev), _("Show &Previous")),
+ `PushButton(`id(`show_next), _("Show &Next"))
+ ));
+ }
+
symbol userinput = `none;
integer idx = 0;
repeat
@@ -1217,50 +1231,41 @@
/etc/fstab found on %1"), table_input[idx,"root"]:"/dev/emil" );
UI::ReplaceWidget( `id(`heading), `Heading( tmp ) );
- UI::ChangeWidget( `id(`table), `Items, table_input[idx,"tbl"]:[] );
+ UI::ChangeWidget(`id(`table), `Items, table_input[idx, "tbl"]:[]);
+ UI::ChangeWidget(`id(`table), `CurrentItem, nil);
- term bbox = `HBox( `PushButton( `id(`ok), `opt(`default),
- Label::YesButton() ),
- `PushButton(`id(`cancel), Label::NoButton())
- );
- if( size(table_input)>0 )
- {
- bbox = add( bbox, `HSpacing(5) );
- if( idx>0 )
- {
- bbox = add( bbox,
- `PushButton( `id(`show_p), _("Show &Previous") ));
- }
- if( idx