Restore Information dialog display of whole disk devices (#788308)

So they display as previously; as all grey in the graphic and with only
the correct attributes shown.

Fix up following switch from whole_device flag to TYPE_UNPARTITIONED.

Bug 788308 - Remove whole_device partition flag
This commit is contained in:
Mike Fleetwood 2016-08-20 16:51:06 +01:00 committed by Curtis Gedak
parent c1807ca504
commit bcd03e5c41
1 changed files with 5 additions and 5 deletions

View File

@ -126,7 +126,7 @@ void Dialog_Partition_Info::drawingarea_on_realize()
bool Dialog_Partition_Info::drawingarea_on_expose( GdkEventExpose *ev ) bool Dialog_Partition_Info::drawingarea_on_expose( GdkEventExpose *ev )
{ {
if ( partition .type != GParted::TYPE_UNALLOCATED ) if ( partition.filesystem != FS_UNALLOCATED )
{ {
//used //used
gc ->set_foreground( color_used ); gc ->set_foreground( color_used );
@ -270,7 +270,7 @@ void Dialog_Partition_Info::Display_Info()
top++, bottom++; top++, bottom++;
//label //label
if ( filesystem_ptn.type != TYPE_UNALLOCATED && filesystem_ptn.type != TYPE_EXTENDED ) if ( filesystem_ptn.filesystem != FS_UNALLOCATED && filesystem_ptn.type != TYPE_EXTENDED )
{ {
table ->attach( * Utils::mk_label( "<b>" + Glib::ustring( _("Label:") ) + "</b>"), table ->attach( * Utils::mk_label( "<b>" + Glib::ustring( _("Label:") ) + "</b>"),
1, 2, 1, 2,
@ -285,7 +285,7 @@ void Dialog_Partition_Info::Display_Info()
} }
// file system uuid // file system uuid
if ( filesystem_ptn.type != TYPE_UNALLOCATED && filesystem_ptn.type != TYPE_EXTENDED ) if ( filesystem_ptn.filesystem != FS_UNALLOCATED && filesystem_ptn.type != TYPE_EXTENDED )
{ {
table ->attach( * Utils::mk_label( "<b>" + Glib::ustring( _("UUID:") ) + "</b>"), table ->attach( * Utils::mk_label( "<b>" + Glib::ustring( _("UUID:") ) + "</b>"),
1, 2, 1, 2,
@ -309,7 +309,7 @@ void Dialog_Partition_Info::Display_Info()
static Glib::ustring luks_closed = _("Closed"); static Glib::ustring luks_closed = _("Closed");
//status //status
if ( filesystem_ptn.type != TYPE_UNALLOCATED && filesystem_ptn.status != STAT_NEW ) if ( filesystem_ptn.filesystem != FS_UNALLOCATED && filesystem_ptn.status != STAT_NEW )
{ {
//status //status
Glib::ustring str_temp ; Glib::ustring str_temp ;
@ -598,7 +598,7 @@ void Dialog_Partition_Info::Display_Info()
top++, bottom++, top++, bottom++,
Gtk::FILL ); Gtk::FILL );
if ( partition .type != GParted::TYPE_UNALLOCATED && partition .status != GParted::STAT_NEW ) if ( partition.filesystem != FS_UNALLOCATED && partition .status != GParted::STAT_NEW )
{ {
// name // name
table->attach( * Utils::mk_label( "<b>" + Glib::ustring( _("Name:") ) + "</b>"), table->attach( * Utils::mk_label( "<b>" + Glib::ustring( _("Name:") ) + "</b>"),