Author: aschnell Date: Thu Apr 17 16:41:57 2008 New Revision: 46793 URL: http://svn.opensuse.org/viewcvs/yast?rev=46793&view=rev Log: - tables everywhere Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-all.ycp branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd.ycp branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm.ycp Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-all.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/include/ep-all.ycp?rev=46793&r1=46792&r2=46793&view=diff ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-all.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-all.ycp Thu Apr 17 16:41:57 2008 @@ -14,6 +14,9 @@ symbol predicate_all(map disk, map partition) { + return `showandfollow; + + /* if (filter_ == `unused) return predicate_unused(disk, partition); @@ -39,12 +42,12 @@ { return `show; } + */ } list<symbol> fields = StorageFields::Filter([ `device, `size, `format, `type, - `mount_point, `mount_by, `start_cyl, - `end_cyl, `used_by ]); + `mount_point, `mount_by, `used_by ]); void CreateAllPanel(any user_data) @@ -61,6 +64,8 @@ Greasemonkey::Transform( `VBox( `Left(`Heading( sformat(_("Available Storage on %1"), short_hostname))), + + /* `HBox(`HStretch(), `ComboBoxSelected(`id(`filter), `opt(`notify), "Show", [`item(`id(`all), "All"), @@ -72,6 +77,8 @@ `item(`id(`nfs), "NFS"), `item(`id(`unused), "Unused Devices")], `id(filter_))), + */ + `Table(`id(`table), `opt(`keepSorting), header, table_list) ))); Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd.ycp?rev=46793&r1=46792&r2=46793&view=diff ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd.ycp Thu Apr 17 16:41:57 2008 @@ -13,50 +13,70 @@ include "partitioning/ep-hd-lib.ycp"; + symbol predicate_hd(map disk, map partition) + { + if (partition == nil) + { + if (contains([`CT_DMRAID, `CT_DISK], disk["type"]:`CT_UNKNOWN)) + return `showandfollow; + else + return `ignore; + } + else + { + return `show; + } + } + + void CreateHdMainPanel(any user_data) { - term frames = `VStackFrames(); + list<symbol> fields = StorageFields::Filter([ `device, `size, `format, + `type, `mount_point, `mount_by, + `start_cyl, `end_cyl, `used_by ]); - frames = add(frames, `Frame(_("Detection"), - `VBox( - `HStretch(), - `Left(`PushButton(`id(`rescan), _("Rescan Disks"))) - ) - )); - - term tmp = `VBox( - `HStretch(), - `Left(`PushButton(`id(`iscsi), _("Configure &iSCSI..."))), - `Left(`PushButton(`id(`multipath), _("Configure &Multipath..."))) + term header = StorageFields::TableHeader(fields); + + map target_map = Storage::GetTargetMap(); + list table_list = StorageFields::TableContents(fields, target_map, predicate_hd); + + term buttons = `HBox( + `PushButton(`id(`rescan), _("Rescan Disks")) ); - if (Arch::s390()) + if (Mode::installation()) { - tmp = add(tmp, `PushButton(`id(`dasd), _("Configure DASD..."))); - tmp = add(tmp, `PushButton(`id(`zfcp), _("Configure zFCP..."))); - tmp = add(tmp, `PushButton(`id(`xpram), _("Configure XPRAM..."))); + buttons = add(buttons, `PushButton(`id(`fstab), _("Import Mount Points..."))); } - frames = add(frames, `Frame(_("Configuration"), tmp)); + buttons = add(buttons, `HStretch()); - if (Mode::installation()) + list<term> configs = [ + // menu entry text + `item(`id(`iscsi), _("Configure &iSCSI...")), + // menu entry text + `item(`id(`multipath), _("Configure &Multipath...")), + ]; + + if (Arch::s390()) { - frames = add(frames, `Frame(_("Import"), - `VBox( - `HStretch(), - `Left(`PushButton(`id(`fstab), _("Import Mount Points..."))) - ) - )); + // menu entry text + configs = add(configs, `item(`id(`dasd), _("Configure DASD..."))); + // menu entry text + configs = add(configs, `item(`id(`zfcp), _("Configure zFCP..."))); + // menu entry text + configs = add(configs, `item(`id(`xpram), _("Configure XPRAM..."))); } + buttons = add(buttons, `MenuButton(_("Configure..."), configs)); + UI::ReplaceWidget(`tree_panel, - Greasemonkey::Transform( - `VBox( - `HStretch(), - `Left(`Heading(_("Hard Disks"))), - frames, - `VStretch() - )) + `VBox( + `Left(`Heading(_("Hard Disks"))), + `Table(`id(`table), `opt(`keepSorting), + header, table_list), + buttons + ) ); } Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm.ycp?rev=46793&r1=46792&r2=46793&view=diff ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm.ycp Thu Apr 17 16:41:57 2008 @@ -12,28 +12,42 @@ include "partitioning/ep-lvm-dialogs.ycp"; + symbol predicate_lvm(map disk, map partition) + { + if (partition == nil) + { + if (contains([`CT_LVM], disk["type"]:`CT_UNKNOWN)) + return `showandfollow; + else + return `ignore; + } + else + { + return `show; + } + } + + void CreateLvmMainPanel(any user_data) { + list<symbol> fields = StorageFields::Filter([ `device, `size, `format, `type, + `mount_point, `mount_by, `used_by, + `lvm_metadata, `pe_size, `stripes ]); + + term header = StorageFields::TableHeader(fields); + + map target_map = Storage::GetTargetMap(); + list table_list = StorageFields::TableContents(fields, target_map, predicate_lvm); + UI::ReplaceWidget(`tree_panel, - Greasemonkey::Transform( - `VBox( - `HStretch(), - `Left(`Heading("Volume Managment")), - `VStackFrames( - `Frame(_("New Volume Group"), - `VBox( - `HStretch(), - `Left(`PushButton(`id(`create_vg), "Create Volume Group...")) - ) - ), - `Frame(_("New Logical Volume"), - `VBox( - `HStretch(), - `Left(`PushButton(`id(`create_lv), "Create Logical Volume...")) - ) - ), - `VStretch() - ) + `VBox( + `Left(`Heading("Volume Managment")), + `Table(`id(`table), `opt(`keepSorting), + header, table_list), + `HBox( + `PushButton(`id(`create_vg), "Create Volume Group..."), + `PushButton(`id(`create_lv), "Create Logical Volume..."), + `HStretch() ) ) ); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org