Mirrors
/
gparted
mirror of https://gitlab.gnome.org/GNOME/gparted.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Display GUI column Mount Point correctly for encrypted file systems (#760080) 

For open dm-crypt mappings get the Mount Point value from the encrypted
file system Partition object.

Bug 760080 - Implement read-only LUKS support
This commit is contained in:
Mike Fleetwood 2015-12-28 19:11:37 +00:00 committed by Curtis Gedak
parent a58e85d193
commit b45af51a92
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/TreeView_Detail.cc
View File

@ -189,28 +189,35 @@ void TreeView_Detail::create_row( const Gtk::TreeRow & treerow, const Partition
if ( partition.filesystem == FS_LUKS && partition.busy )
{
FILESYSTEM display_fstype = dynamic_cast< const PartitionLUKS *>( &partition )->get_encrypted().filesystem;
const Partition & encrypted = dynamic_cast<const PartitionLUKS *>( &partition )->get_encrypted();
// file system
treerow[treeview_detail_columns.color] = Utils::get_color_as_pixbuf( display_fstype, 16, 16 );
treerow[treeview_detail_columns.color] = Utils::get_color_as_pixbuf( encrypted.filesystem, 16, 16 );
/* TO TRANSLATORS: means that this is an encrypted file system */
treerow[treeview_detail_columns.filesystem] = "[" + Glib::ustring( _("Encrypted") ) + "] " +
Utils::get_filesystem_string( display_fstype );
Utils::get_filesystem_string( encrypted.filesystem );
// mount point
treerow[treeview_detail_columns.mountpoint] = Glib::build_path( ", ", encrypted.get_mountpoints() );
}
else if ( partition.filesystem == FS_LUKS && ! partition.busy )
{
// file system
treerow[treeview_detail_columns.color] = Utils::get_color_as_pixbuf( partition.filesystem, 16, 16 );
treerow[treeview_detail_columns.filesystem] = "[" + Glib::ustring( _("Encrypted") ) + "]";
// mount point
treerow[treeview_detail_columns.mountpoint] = Glib::build_path( ", ", partition.get_mountpoints() );
}
else
{
// file system
treerow[treeview_detail_columns.color] = Utils::get_color_as_pixbuf( partition.filesystem, 16, 16 );
treerow[treeview_detail_columns.filesystem] = Utils::get_filesystem_string( partition.filesystem );
}
//mount point
treerow[ treeview_detail_columns .mountpoint ] = Glib::build_path( ", ", partition .get_mountpoints() ) ;
// mount point
treerow[treeview_detail_columns.mountpoint] = Glib::build_path( ", ", partition.get_mountpoints() );
}
//label
treerow[ treeview_detail_columns .label ] = partition.get_filesystem_label();