Author: aschnell Date: Fri Aug 8 21:59:18 2008 New Revision: 49894 URL: http://svn.opensuse.org/viewcvs/yast?rev=49894&view=rev Log: - added tab with used devices for device mapper devices Modified: trunk/storage/VERSION trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/ep-dm.ycp Modified: trunk/storage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/VERSION?rev=49894&r1=49893&r2=49894&view=diff ============================================================================== --- trunk/storage/VERSION (original) +++ trunk/storage/VERSION Fri Aug 8 21:59:18 2008 @@ -1 +1 @@ -2.17.13 +2.17.14 Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.changes?rev=49894&r1=49893&r2=49894&view=diff ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Fri Aug 8 21:59:18 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Aug 08 21:56:00 CEST 2008 - aschnell@suse.de + +- added tab with used devices for device mapper devices +- version 2.17.14 + +------------------------------------------------------------------- Fri Aug 08 15:01:11 CEST 2008 - aschnell@suse.de - integrated redesigned expert partitioner into installation Modified: trunk/storage/storage/src/include/ep-dm.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-dm.ycp?rev=49894&r1=49893&r2=49894&view=diff ============================================================================== --- trunk/storage/storage/src/include/ep-dm.ycp (original) +++ trunk/storage/storage/src/include/ep-dm.ycp Fri Aug 8 21:59:18 2008 @@ -44,7 +44,7 @@ } - void CreateDmPanel(any user_data) + void CreateDmOverviewTab(any user_data) { string dm_device = (string) user_data; @@ -54,7 +54,7 @@ `heading_filesystem, `fs_type, `mount_point, `mount_by, `uuid, `label ]); - UI::ReplaceWidget(`tree_panel, + UI::ReplaceWidget(`tab_panel, Greasemonkey::Transform( `VBox( `IconAndHeading(sformat(_("DM Device: %1"), dm_device), dm_icon), @@ -74,7 +74,7 @@ } - void HandleDmPanel(any user_data, symbol widget) + void HandleDmOverviewTab(any user_data, symbol widget) { string dm_device = (string) user_data; @@ -85,4 +85,68 @@ break; } } + + + void CreateDmDevicesTab(any user_data) + { + string part_device = (string) user_data; + + Debug("part_device", substring(part_device, 5)); + + symbol Predicate(map disk, map partition) + { + // TODO: this is sick + return StorageFields::PredicateUsedByDevice(disk, partition, [ "/dev/" + substring(part_device, 12) ]); + } + + list<symbol> fields = StorageSettings::FilterTable([ `device, `udev_path, `udev_id, `size, + `format, `type, `used_by ]); + + map target_map = Storage::GetTargetMap(); + + term table_header = StorageFields::TableHeader(fields); + list<term> table_contents = StorageFields::TableContents(fields, target_map, Predicate); + + UI::ReplaceWidget(`tab_panel, + `VBox( + `Table(`id(`table), `opt(`keepSorting, `notify), + table_header, table_contents) + ) + ); + + string helptext = _("<p>DM TODO</p>"); + + Wizard::RestoreHelp(helptext + StorageFields::TableHelptext(fields)); + } + + + void CreateDmPanel(any user_data) + { + string device = (string) user_data; + + map data = $[ `overview : $[ `create : CreateDmOverviewTab, `handle : HandleDmOverviewTab, `user_data : user_data ], + `devices : $[ `create : CreateDmDevicesTab, `user_data : user_data ] ]; + + UI::ReplaceWidget(`tree_panel, + Greasemonkey::Transform( + `VBox( + `IconAndHeading(sformat(_("Dm Device: %1"), device), dm_icon), + `DumbTab(`id(`tab), [ + `item(`id(`overview), _("&Overview")), + `item(`id(`devices), _("&Used Devices")) + ], + `ReplacePoint(`id(`tab_panel), TabPanel::empty_panel) + ) + ) + ) + ); + + TabPanel::Init(data); + } + + + void HandleDmPanel(any user_data, symbol widget) + { + TabPanel::Handle(widget); + } } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org