Author: aschnell Date: Wed Apr 23 17:51:40 2008 New Revision: 47006 URL: http://svn.opensuse.org/viewcvs/yast?rev=47006&view=rev Log: - cleanup 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 branches/tmp/aschnell/part-redesign/storage/src/include/ep-main.ycp branches/tmp/aschnell/part-redesign/storage/src/modules/StorageFields.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=47006&r1=47005&r2=47006&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 Wed Apr 23 17:51:40 2008 @@ -3,55 +3,14 @@ * Package: yast2-storage * Summary: Expert Partitioner * Authors: Arvin Schnell - * */ { textdomain "storage"; - symbol filter_ = `all; - - - symbol predicate_all(map disk, map partition) - { - return `showandfollow; - - /* - if (filter_ == `unused) - return predicate_unused(disk, partition); - - if (partition == nil) - { - if (filter_ == `all) - return `showandfollow; - - map tmp = $[ `CT_DMRAID : `disks, - `CT_DISK : `disks, - `CT_LVM : `lvm, - `CT_MD : `raid, - `CT_LOOP : `loop, - `CT_DM : `dm, - `CT_NFS : `nfs ]; - - if (tmp[disk["type"]:`CT_UNKNOWN]:`none == filter_) - return `showandfollow; - else - return `ignore; - } - else - { - return `show; - } - */ - } - - void CreateAllPanel(any user_data) { - import "Hostname"; - string short_hostname = Hostname::CurrentHostname(); - map target_map = Storage::GetTargetMap(); list<symbol> fields = StorageFields::Filter([ `device, `udev_path, `udev_id, `size, `format, `type, `mount_point, `mount_by, @@ -62,45 +21,18 @@ if (preferred_displayname != `id) fields = filter(symbol field, fields, { return field != `udev_id; }); - UI::ReplaceWidget(`tree_panel, - `VBox( - `Left(`Heading( sformat(_("Available Storage on %1"), short_hostname))), + map target_map = Storage::GetTargetMap(); - /* - `HBox(`HStretch(), - `ComboBoxSelected(`id(`filter), `opt(`notify), "Show", - [`item(`id(`all), "All"), - `item(`id(`disks), "Hard Disks"), - `item(`id(`lvm), "Volume Management"), - `item(`id(`raid), "RAID"), - `item(`id(`loop), "Crypt Files"), - `item(`id(`dm), "Device Mapper"), - `item(`id(`nfs), "NFS"), - `item(`id(`unused), "Unused Devices")], - `id(filter_))), - */ + term table_header = StorageFields::TableHeader(fields); + list table_contents = StorageFields::TableContents(fields, target_map, StorageFields::PredicateAll); - StorageFields::Table(fields, target_map, predicate_all) + UI::ReplaceWidget(`tree_panel, + `VBox( + `Left(`Heading(sformat(_("Available Storage on %1"), short_hostname))), + `Table(`id(`table), `opt(`keepSorting, `notify), + table_header, table_contents) )); Wizard::RestoreHelp("Help about view with all devices"); } - - - void HandleAllPanel(any user_data, symbol widget) - { - /* - if (widget == `filter) - { - symbol old_filter = filter_; - filter_ = (symbol) UI::QueryWidget(`filter, `Value); - if (old_filter != filter_) - { - map target_map = Storage::GetTargetMap(); - list table_list = StorageFields::TableContents(fields, target_map, predicate_all); - UI::ChangeWidget(`table, `Items, 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=47006&r1=47005&r2=47006&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 Wed Apr 23 17:51:40 2008 @@ -3,7 +3,6 @@ * Package: yast2-storage * Summary: Expert Partitioner * Authors: Arvin Schnell - * */ { textdomain "storage"; @@ -13,24 +12,13 @@ include "partitioning/ep-hd-lib.ycp"; - symbol predicate_hd(map disk, map partition) + void CreateHdMainPanel(any user_data) { - if (partition == nil) - { - if (contains([`CT_DMRAID, `CT_DISK], disk["type"]:`CT_UNKNOWN)) - return `showandfollow; - else - return `ignore; - } - else + symbol Predicate(map disk, map partition) { - return `show; + return StorageFields::PredicateType(disk, partition, [`CT_DMRAID, `CT_DISK]); } - } - - void CreateHdMainPanel(any user_data) - { list<symbol> fields = StorageFields::Filter([ `device, `udev_path, `udev_id, `size, `format, `type, `mount_point, `mount_by, `start_cyl, `end_cyl, `used_by ]); @@ -40,17 +28,18 @@ if (preferred_displayname != `id) fields = filter(symbol field, fields, { return field != `udev_id; }); - term header = StorageFields::TableHeader(fields); - map target_map = Storage::GetTargetMap(); - list table_list = StorageFields::TableContents(fields, target_map, predicate_hd); + + term table_header = StorageFields::TableHeader(fields); + list table_contents = StorageFields::TableContents(fields, target_map, Predicate); term buttons = `HBox( + // push button text `PushButton(`id(`rescan), _("Rescan Disks")) ); - if (Mode::installation()) - { + if (Mode::installation()) { + // push button text buttons = add(buttons, `PushButton(`id(`fstab), _("Import Mount Points..."))); } @@ -86,7 +75,7 @@ `VBox( `Left(`Heading(_("Hard Disks"))), `Table(`id(`table), `opt(`keepSorting,`notify ), - header, table_list), + table_header, table_contents), 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=47006&r1=47005&r2=47006&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 Wed Apr 23 17:51:40 2008 @@ -11,41 +11,30 @@ include "partitioning/ep-lvm-dialogs.ycp"; - symbol predicate_lvm(map disk, map partition) + void CreateLvmMainPanel(any user_data) { - if (partition == nil) - { - if (contains([`CT_LVM], disk["type"]:`CT_UNKNOWN)) - return `showandfollow; - else - return `ignore; - } - else + symbol Predicate(map disk, map partition) { - return `show; + return StorageFields::PredicateType(disk, partition, [`CT_LVM]); } - } - - 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); + + term table_header = StorageFields::TableHeader(fields); + list table_contents = StorageFields::TableContents(fields, target_map, Predicate); UI::ReplaceWidget(`tree_panel, `VBox( - `Left(`Heading("Volume Managment")), + `Left(`Heading(_("Volume Managment"))), `Table(`id(`table), `opt(`keepSorting, `notify), - header, table_list), + table_header, table_contents), `HBox( - `PushButton(`id(`create_vg), "Create Volume Group..."), - `PushButton(`id(`create_lv), "Create Logical Volume..."), + `PushButton(`id(`create_vg), _("Add Volume Group...")), + `PushButton(`id(`create_lv), _("Add Logical Volume...")), `HStretch() ) ) Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-main.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/include/ep-main.ycp?rev=47006&r1=47005&r2=47006&view=diff ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-main.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-main.ycp Wed Apr 23 17:51:40 2008 @@ -3,7 +3,6 @@ * Package: yast2-storage * Summary: Expert Partitioner * Authors: Arvin Schnell - * */ { textdomain "storage"; @@ -43,7 +42,7 @@ { // TODO: somehow use AlwaysHideDisk and AlwaysHidePartition - data = $[ `all : $[ `create : CreateAllPanel, `handle : HandleAllPanel ], + data = $[ `all : $[ `create : CreateAllPanel ], `hd : $[ `create : CreateHdMainPanel, `handle : HandleHdMainPanel ], `lvm : $[ `create : CreateLvmMainPanel, `handle : HandleLvmMainPanel ], `md : $[ `create : CreateRaidMainPanel, `handle : HandleRaidMainPanel ], Modified: branches/tmp/aschnell/part-redesign/storage/src/modules/StorageFields.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/modules/StorageFields.ycp?rev=47006&r1=47005&r2=47006&view=diff ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/modules/StorageFields.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/modules/StorageFields.ycp Wed Apr 23 17:51:40 2008 @@ -3,7 +3,6 @@ * Package: yast2-storage * Summary: Expert Partitioner * Authors: Arvin Schnell - * */ { module "StorageFields"; @@ -580,6 +579,34 @@ /** + * Predicate for Table and TableContents. + */ + global symbol PredicateAll(map disk, map partition) + { + return `showandfollow; + } + + + /** + * Predicate for Table and TableContents. + */ + global symbol PredicateType(map disk, map partition, list<symbol> types) + { + if (partition == nil) + { + if (contains(types, disk["type"]:`CT_UNKNOWN)) + return `showandfollow; + else + return `ignore; + } + else + { + return `show; + } + } + + + /** * The predicate function determines whether the disk/partition is * included. The predicate function takes two arguments, disk and * partition. For disks predicate is called with the partitions set to -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org