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

made set_partition_type() a bit more verbose and did some cleanups. 

* src/GParted_Core.cc: made set_partition_type() a bit more verbose
  and did some cleanups.
This commit is contained in:
Bart Hakvoort 2006-08-01 13:18:22 +00:00
parent 89a42f3f07
commit b0d6109ed0
2 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2006-08-01 Bart Hakvoort <hakvoort@cvs.gnome.org>
* src/GParted_Core.cc: made set_partition_type() a bit more verbose
and did some cleanups.
2006-08-01 Bart Hakvoort <hakvoort@cvs.gnome.org> 2006-08-01 Bart Hakvoort <hakvoort@cvs.gnome.org>
* include/Partition.h, * include/Partition.h,

39
src/GParted_Core.cc
View File

@ -699,31 +699,31 @@ GParted::FILESYSTEM GParted_Core::get_filesystem()
//standard libparted filesystems.. //standard libparted filesystems..
if ( lp_partition && lp_partition ->fs_type ) if ( lp_partition && lp_partition ->fs_type )
{ {
if ( static_cast<Glib::ustring>( lp_partition ->fs_type ->name ) == "extended" ) if ( Glib::ustring( lp_partition ->fs_type ->name ) == "extended" )
return GParted::FS_EXTENDED ; return GParted::FS_EXTENDED ;
else if ( static_cast<Glib::ustring>( lp_partition ->fs_type ->name ) == "ext2" ) else if ( Glib::ustring( lp_partition ->fs_type ->name ) == "ext2" )
return GParted::FS_EXT2 ; return GParted::FS_EXT2 ;
else if ( static_cast<Glib::ustring>( lp_partition ->fs_type ->name ) == "ext3" ) else if ( Glib::ustring( lp_partition ->fs_type ->name ) == "ext3" )
return GParted::FS_EXT3 ; return GParted::FS_EXT3 ;
else if ( static_cast<Glib::ustring>( lp_partition ->fs_type ->name ) == "linux-swap" ) else if ( Glib::ustring( lp_partition ->fs_type ->name ) == "linux-swap" )
return GParted::FS_LINUX_SWAP ; return GParted::FS_LINUX_SWAP ;
else if ( static_cast<Glib::ustring>( lp_partition ->fs_type ->name ) == "fat16" ) else if ( Glib::ustring( lp_partition ->fs_type ->name ) == "fat16" )
return GParted::FS_FAT16 ; return GParted::FS_FAT16 ;
else if ( static_cast<Glib::ustring>( lp_partition ->fs_type ->name ) == "fat32" ) else if ( Glib::ustring( lp_partition ->fs_type ->name ) == "fat32" )
return GParted::FS_FAT32 ; return GParted::FS_FAT32 ;
else if ( static_cast<Glib::ustring>( lp_partition ->fs_type ->name ) == "ntfs" ) else if ( Glib::ustring( lp_partition ->fs_type ->name ) == "ntfs" )
return GParted::FS_NTFS ; return GParted::FS_NTFS ;
else if ( static_cast<Glib::ustring>( lp_partition ->fs_type ->name ) == "reiserfs" ) else if ( Glib::ustring( lp_partition ->fs_type ->name ) == "reiserfs" )
return GParted::FS_REISERFS ; return GParted::FS_REISERFS ;
else if ( static_cast<Glib::ustring>( lp_partition ->fs_type ->name ) == "xfs" ) else if ( Glib::ustring( lp_partition ->fs_type ->name ) == "xfs" )
return GParted::FS_XFS ; return GParted::FS_XFS ;
else if ( static_cast<Glib::ustring>( lp_partition ->fs_type ->name ) == "jfs" ) else if ( Glib::ustring( lp_partition ->fs_type ->name ) == "jfs" )
return GParted::FS_JFS ; return GParted::FS_JFS ;
else if ( static_cast<Glib::ustring>( lp_partition ->fs_type ->name ) == "hfs" ) else if ( Glib::ustring( lp_partition ->fs_type ->name ) == "hfs" )
return GParted::FS_HFS ; return GParted::FS_HFS ;
else if ( static_cast<Glib::ustring>( lp_partition ->fs_type ->name ) == "hfs+" ) else if ( Glib::ustring( lp_partition ->fs_type ->name ) == "hfs+" )
return GParted::FS_HFSPLUS ; return GParted::FS_HFSPLUS ;
else if ( static_cast<Glib::ustring>( lp_partition ->fs_type ->name ) == "ufs" ) else if ( Glib::ustring( lp_partition ->fs_type ->name ) == "ufs" )
return GParted::FS_UFS ; return GParted::FS_UFS ;
} }
@ -1826,8 +1826,9 @@ bool GParted_Core::check_repair( const Partition & partition, std::vector<Operat
bool GParted_Core::set_partition_type( const Partition & partition, bool GParted_Core::set_partition_type( const Partition & partition,
std::vector<OperationDetail> & operation_details ) std::vector<OperationDetail> & operation_details )
{ {
operation_details .push_back( OperationDetail( _("set partitiontype") ) ) ; operation_details .push_back( OperationDetail(
//FIXME: be a little bit more verbose.. String::ucompose( _("set partitiontype on %1"), partition .get_path() ) ) ) ;
bool return_value = false ; bool return_value = false ;
if ( open_device_and_disk( partition .device_path ) ) if ( open_device_and_disk( partition .device_path ) )
@ -1844,7 +1845,15 @@ bool GParted_Core::set_partition_type( const Partition & partition,
lp_partition = ped_disk_get_partition_by_sector( lp_disk, partition .get_sector() ) ; lp_partition = ped_disk_get_partition_by_sector( lp_disk, partition .get_sector() ) ;
if ( lp_partition && ped_partition_set_system( lp_partition, fs_type ) && commit() ) if ( lp_partition && ped_partition_set_system( lp_partition, fs_type ) && commit() )
{
operation_details .back() .sub_details .push_back(
OperationDetail( String::ucompose( _("new partitiontype: %1"),
lp_partition ->fs_type ->name ),
STATUS_NONE,
FONT_ITALIC ) ) ;
return_value = wait_for_node( partition .get_path() ) ; return_value = wait_for_node( partition .get_path() ) ;
}
} }
close_device_and_disk() ; close_device_and_disk() ;