diff options
author | Maarten Vanraes <alien@mageia.org> | 2016-08-07 21:27:44 +0200 |
---|---|---|
committer | Maarten Vanraes <alien@mageia.org> | 2016-08-07 21:27:44 +0200 |
commit | bfab1a42096dcbebab99935183650c762eb97928 (patch) | |
tree | 002949b3c405cc9a06d44ef2fdffa5e201af7685 | |
parent | dd37b99c2e32b3357edcd64f0f11aba0d6e2e5d0 (diff) | |
download | manatools-topic/manatools-disk_backend.tar manatools-topic/manatools-disk_backend.tar.gz manatools-topic/manatools-disk_backend.tar.bz2 manatools-topic/manatools-disk_backend.tar.xz manatools-topic/manatools-disk_backend.zip |
manadisk: use visualization types for choosing vizualisationtopic/manatools-disk_backend
-rw-r--r-- | lib/ManaTools/Module/Disk.pm | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/lib/ManaTools/Module/Disk.pm b/lib/ManaTools/Module/Disk.pm index 8fd1232b..926466cf 100644 --- a/lib/ManaTools/Module/Disk.pm +++ b/lib/ManaTools/Module/Disk.pm @@ -479,18 +479,18 @@ sub _rebuildItems { my $eventHandler = shift; my $container = shift; for my $i (@{$info}) { - if ($i->{type} eq 'tab') { - return $self->_rebuildTab($eventHandler, $container, $i->{part}, @{$i->{items}}); - } - if ($i->{type} eq 'buttonbox') { - return $self->_rebuildButtonBox($eventHandler, $container, $i->{part}, @{$i->{items}}); - } - if ($i->{type} eq 'list') { + if ($i->{visual} eq ManaTools::Shared::Visualization->listVisualization) { return $self->_rebuildList($eventHandler, $container, $i->{part}, @{$i->{items}}); } - if ($i->{type} eq 'tree') { + if ($i->{visual} eq ManaTools::Shared::Visualization->treeVisualization) { return $self->_rebuildTree($eventHandler, $container, $i->{part}, @{$i->{items}}); } + if ($i->{visual} eq ManaTools::Shared::Visualization->tabVisualization) { + return $self->_rebuildTab($eventHandler, $container, $i->{part}, @{$i->{items}}); + } + if ($i->{visual} eq ManaTools::Shared::Visualization->buttonboxVisualization) { + return $self->_rebuildButtonBox($eventHandler, $container, $i->{part}, @{$i->{items}}); + } } return undef; } @@ -499,7 +499,6 @@ sub _expandItem { my $self = shift; my $part = shift; my $infos = []; - my $type = 'list'; my @items; # get parts @@ -513,7 +512,7 @@ sub _expandItem { # merge all children from these Parts for my $p (@items) { - push @{$infos}, {parent => $part, part => $p, type => ( $p->type() eq 'Disks' ? 'tab' : $p->type() eq 'PartitionTable' ? 'buttonbox' : $type ), items => [sort {$a->label() cmp $b->label()} $p->children()]}; + push @{$infos}, {parent => $part, part => $p, visual => $p->childVisualization(), items => [sort {$a->label() cmp $b->label()} $p->children()]}; } return $infos; } @@ -701,8 +700,14 @@ sub _adminDiskPanel { ## start the info structure my $info = { disks => $module->_expandItem(), - unused => {type => 'list', items => [sort {$a->label() cmp $b->label()} grep {$_->does('ManaTools::Shared::disk_backend::BlockDevice')} $backend->findnopart(undef, 'child')]}, - fs => {type => 'tree', items => [grep {!defined($_->parentmount())} $backend->findpart('Mount')]} + unused => { + visual => ManaTools::Shared::Visualization->listVisualization, + items => [sort {$a->label() cmp $b->label()} grep {$_->does('ManaTools::Shared::disk_backend::BlockDevice')} $backend->findnopart(undef, 'child')], + }, + fs => { + visual => ManaTools::Shared::Visualization->treeVisualization, + items => [grep {!defined($_->parentmount())} $backend->findpart('Mount')], + }, }; ## fs Part should be linked to all the mounts (hierarchial) |