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

Fixed incorrect spelling of filesystem and mountpoint 

svn path=/trunk/; revision=970
This commit is contained in:
Curtis Gedak 2008-11-18 23:58:17 +00:00
parent 54611e93e4
commit c4bc4430c7
19 changed files with 124 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ChangeLog
View File

@ -1,5 +1,24 @@
2008-11-18 Curtis Gedak <gedakc@gmail.com> 2008-11-18 Curtis Gedak <gedakc@gmail.com>
* include/Partition.h,
include/Utils.h,
src/Dialog_Partition_Info.cc,
src/Dialog_Partition_New.cc,
src/Dialog_Partition_Resize_Move.cc,
src/ext2.cc,
src/ext3.cc,
src/fat16.cc,
src/fat32.cc,
src/GParted_Core.cc,
src/jfs.cc,
src/linux_swap.cc,
src/ntfs.cc,
src/OperationCheck.cc,
src/reiserfs.cc,
src/TreeView_Detail.cc,
src/Win_GParted.cc,
src/xfs.cc: Fixed incorrect spelling of filesystem and mountpoint.
* src/DialogFeatures.cc: Added translator comment. * src/DialogFeatures.cc: Added translator comment.
- Renamed button to improve clarity of meaning. - Renamed button to improve clarity of meaning.
- Closes GParted bug #561350 - Closes GParted bug #561350

2
include/Partition.h
View File

@ -43,7 +43,7 @@ enum PartitionStatus {
STAT_FORMATTED = 3 STAT_FORMATTED = 3
}; };
//FIXME: we should make a difference between partition- and filesystemsize. //FIXME: we should make a difference between partition- and file system size.
//especially in the core this can make a difference when giving detailed feedback. With new cairosupport in gtkmm //especially in the core this can make a difference when giving detailed feedback. With new cairosupport in gtkmm
//it's even possible to make stuff like this visible in the GUI in a nice and clear way //it's even possible to make stuff like this visible in the GUI in a nice and clear way
class Partition class Partition

2
include/Utils.h
View File

@ -79,7 +79,7 @@ enum SIZE_UNIT
UNIT_TIB = 5 UNIT_TIB = 5
} ; } ;
//struct to store filesysteminformation //struct to store file system information
struct FS struct FS
{ {
enum Support enum Support

2
src/Dialog_Partition_Info.cc
View File

@ -148,7 +148,7 @@ void Dialog_Partition_Info::Display_Info()
this ->get_vbox() ->pack_start( *table, Gtk::PACK_SHRINK ) ; this ->get_vbox() ->pack_start( *table, Gtk::PACK_SHRINK ) ;
//filesystem //filesystem
table ->attach( * Utils::mk_label( "<b>" + Glib::ustring( _("Filesystem:") ) + "</b>" ), table ->attach( * Utils::mk_label( "<b>" + Glib::ustring( _("File System:") ) + "</b>" ),
0, 1, 0, 1,
top, bottom, top, bottom,
Gtk::FILL ) ; Gtk::FILL ) ;

10
src/Dialog_Partition_New.cc
View File

@ -88,8 +88,8 @@ void Dialog_Partition_New::Set_Data( const Partition & partition,
sigc::bind<bool>( sigc::mem_fun( *this, &Dialog_Partition_New::optionmenu_changed ), true ) ); sigc::bind<bool>( sigc::mem_fun( *this, &Dialog_Partition_New::optionmenu_changed ), true ) );
table_create .attach( optionmenu_type, 1, 2, 0, 1, Gtk::FILL ); table_create .attach( optionmenu_type, 1, 2, 0, 1, Gtk::FILL );
//filesystems to choose from //file systems to choose from
table_create .attach( * Utils::mk_label( static_cast<Glib::ustring>( _("Filesystem:") ) + "\t" ), table_create .attach( * Utils::mk_label( static_cast<Glib::ustring>( _("File System:") ) + "\t" ),
0, 1, 1, 2, 0, 1, 1, 2,
Gtk::FILL ); Gtk::FILL );
@ -118,7 +118,7 @@ void Dialog_Partition_New::Set_Data( const Partition & partition,
TOTAL_MB = Utils::round( Utils::sector_to_unit( this ->selected_partition .get_length(), GParted::UNIT_MIB ) ) ; TOTAL_MB = Utils::round( Utils::sector_to_unit( this ->selected_partition .get_length(), GParted::UNIT_MIB ) ) ;
MB_PER_PIXEL = TOTAL_MB / 500.00 ; MB_PER_PIXEL = TOTAL_MB / 500.00 ;
//set first enabled filesystem //set first enabled file system
optionmenu_filesystem .set_history( first_creatable_fs ) ; optionmenu_filesystem .set_history( first_creatable_fs ) ;
optionmenu_changed( false ) ; optionmenu_changed( false ) ;
@ -268,7 +268,7 @@ void Dialog_Partition_New::optionmenu_changed( bool type )
void Dialog_Partition_New::Build_Filesystems_Menu( bool only_unformatted ) void Dialog_Partition_New::Build_Filesystems_Menu( bool only_unformatted )
{ {
//fill the filesystem menu with the filesystems (except for extended) //fill the file system menu with the file systems (except for extended)
for ( unsigned int t = 0 ; t < FILESYSTEMS .size( ) -1 ; t++ ) for ( unsigned int t = 0 ; t < FILESYSTEMS .size( ) -1 ; t++ )
{ {
menu_filesystem .items() .push_back( menu_filesystem .items() .push_back(
@ -281,7 +281,7 @@ void Dialog_Partition_New::Build_Filesystems_Menu( bool only_unformatted )
//unformatted is always available //unformatted is always available
menu_filesystem .items() .back() .set_sensitive( true ) ; menu_filesystem .items() .back() .set_sensitive( true ) ;
//find and set first enabled filesystem //find and set first enabled file system
for ( unsigned int t = 0 ; t < menu_filesystem .items() .size() ; t++ ) for ( unsigned int t = 0 ; t < menu_filesystem .items() .size() ; t++ )
if ( menu_filesystem .items()[ t ] .sensitive() ) if ( menu_filesystem .items()[ t ] .sensitive() )
{ {

4
src/Dialog_Partition_Resize_Move.cc
View File

@ -90,7 +90,7 @@ void Dialog_Partition_Resize_Move::Resize_Move_Normal( const std::vector<Partiti
Sector previous, next ; Sector previous, next ;
previous = next = 0 ; previous = next = 0 ;
//also check the partitions filesystem ( if this is a 'resize-only' then previous should be 0 ) //also check the partitions file system ( if this is a 'resize-only' then previous should be 0 )
if ( t >= 1 && partitions[t -1].type == GParted::TYPE_UNALLOCATED && ! this ->fixed_start ) if ( t >= 1 && partitions[t -1].type == GParted::TYPE_UNALLOCATED && ! this ->fixed_start )
{ {
previous = partitions[t -1] .get_length() ; previous = partitions[t -1] .get_length() ;
@ -116,7 +116,7 @@ void Dialog_Partition_Resize_Move::Resize_Move_Normal( const std::vector<Partiti
//set MIN //set MIN
if ( fs .shrink ) if ( fs .shrink )
{ {
//since some filesystems have lower limits we need to check for this //since some file systems have lower limits we need to check for this
if ( selected_partition .sectors_used > fs .MIN ) if ( selected_partition .sectors_used > fs .MIN )
fs .MIN = selected_partition .sectors_used ; fs .MIN = selected_partition .sectors_used ;

68
src/GParted_Core.cc
View File

@ -74,7 +74,7 @@ GParted_Core::GParted_Core()
std::cout << "libparted : " << ped_get_version() << std::endl ; std::cout << "libparted : " << ped_get_version() << std::endl ;
std::cout << "======================" << std::endl ; std::cout << "======================" << std::endl ;
//initialize filesystemlist //initialize file system list
find_supported_filesystems() ; find_supported_filesystems() ;
} }
@ -121,7 +121,7 @@ void GParted_Core::find_supported_filesystems()
xfs fs_xfs; xfs fs_xfs;
FILESYSTEMS .push_back( fs_xfs .get_filesystem_support() ) ; FILESYSTEMS .push_back( fs_xfs .get_filesystem_support() ) ;
//unknown filesystem (default when no match is found) //unknown file system (default when no match is found)
FS fs ; fs .filesystem = GParted::FS_UNKNOWN ; FS fs ; fs .filesystem = GParted::FS_UNKNOWN ;
FILESYSTEMS .push_back( fs ) ; FILESYSTEMS .push_back( fs ) ;
} }
@ -592,7 +592,7 @@ void GParted_Core::init_maps()
read_mountpoints_from_file( "/etc/mtab", mount_info ) ; read_mountpoints_from_file( "/etc/mtab", mount_info ) ;
read_mountpoints_from_file( "/etc/fstab", fstab_info ) ; read_mountpoints_from_file( "/etc/fstab", fstab_info ) ;
//sort the mountpoints and remove duplicates.. (no need to do this for fstab_info) //sort the mount points and remove duplicates.. (no need to do this for fstab_info)
for ( iter_mp = mount_info .begin() ; iter_mp != mount_info .end() ; ++iter_mp ) for ( iter_mp = mount_info .begin() ; iter_mp != mount_info .end() ; ++iter_mp )
{ {
std::sort( iter_mp ->second .begin(), iter_mp ->second .end() ) ; std::sort( iter_mp ->second .begin(), iter_mp ->second .end() ) ;
@ -648,7 +648,7 @@ void GParted_Core::read_mountpoints_from_file( const Glib::ustring & filename,
{ {
line = mountpoint ; line = mountpoint ;
//see if mountpoint contains spaces and deal with it //see if mount point contains spaces and deal with it
index = line .find( "\\040" ) ; index = line .find( "\\040" ) ;
if ( index < line .length() ) if ( index < line .length() )
line .replace( index, 4, " " ) ; line .replace( index, 4, " " ) ;
@ -775,7 +775,7 @@ void GParted_Core::set_device_partitions( Device & device )
GParted::FILESYSTEM GParted_Core::get_filesystem() GParted::FILESYSTEM GParted_Core::get_filesystem()
{ {
//standard libparted filesystems.. //standard libparted file systems..
if ( lp_partition && lp_partition ->fs_type ) if ( lp_partition && lp_partition ->fs_type )
{ {
if ( Glib::ustring( lp_partition ->fs_type ->name ) == "extended" ) if ( Glib::ustring( lp_partition ->fs_type ->name ) == "extended" )
@ -807,7 +807,7 @@ GParted::FILESYSTEM GParted_Core::get_filesystem()
} }
//other filesystems libparted couldn't detect (i've send patches for these filesystems to the parted guys) //other file systems libparted couldn't detect (i've send patches for these file systems to the parted guys)
char buf[512] ; char buf[512] ;
ped_device_open( lp_device ); ped_device_open( lp_device );
@ -819,14 +819,14 @@ GParted::FILESYSTEM GParted_Core::get_filesystem()
if ( Glib::ustring( buf ) == "ReIsEr4" ) if ( Glib::ustring( buf ) == "ReIsEr4" )
return GParted::FS_REISER4 ; return GParted::FS_REISER4 ;
//no filesystem found.... //no file system found....
temp = _( "Unable to detect filesystem! Possible reasons are:" ) ; temp = _( "Unable to detect file system! Possible reasons are:" ) ;
temp += "\n-"; temp += "\n-";
temp += _( "The filesystem is damaged" ) ; temp += _( "The file system is damaged" ) ;
temp += "\n-" ; temp += "\n-" ;
temp += _( "The filesystem is unknown to GParted" ) ; temp += _( "The file system is unknown to GParted" ) ;
temp += "\n-"; temp += "\n-";
temp += _( "There is no filesystem available (unformatted)" ) ; temp += _( "There is no file system available (unformatted)" ) ;
partition_temp .messages .push_back( temp ) ; partition_temp .messages .push_back( temp ) ;
@ -922,7 +922,7 @@ void GParted_Core::set_mountpoints( std::vector<Partition> & partitions )
} }
if ( partitions[ t ] .get_mountpoints() .empty() ) if ( partitions[ t ] .get_mountpoints() .empty() )
partitions[ t ] .messages .push_back( _("Unable to find mountpoint") ) ; partitions[ t ] .messages .push_back( _("Unable to find mount point") ) ;
} }
else else
{ {
@ -940,7 +940,7 @@ void GParted_Core::set_used_sectors( std::vector<Partition> & partitions )
{ {
struct statvfs sfs ; struct statvfs sfs ;
temp = _("Unable to read the contents of this filesystem!") ; temp = _("Unable to read the contents of this file system!") ;
temp += "\n" ; temp += "\n" ;
temp += _("Because of this some operations may be unavailable.") ; temp += _("Because of this some operations may be unavailable.") ;
@ -1149,9 +1149,9 @@ bool GParted_Core::create_partition( Partition & new_partition, OperationDetail
bool GParted_Core::create_filesystem( const Partition & partition, OperationDetail & operationdetail ) bool GParted_Core::create_filesystem( const Partition & partition, OperationDetail & operationdetail )
{ {
/*TO TRANSLATORS: looks like create new ext3 filesystem */ /*TO TRANSLATORS: looks like create new ext3 file system */
operationdetail .add_child( OperationDetail( String::ucompose( operationdetail .add_child( OperationDetail( String::ucompose(
_("create new %1 filesystem"), _("create new %1 file system"),
Utils::get_filesystem_string( partition .filesystem ) ) ) ) ; Utils::get_filesystem_string( partition .filesystem ) ) ) ) ;
bool succes = false ; bool succes = false ;
@ -1176,7 +1176,7 @@ bool GParted_Core::create_filesystem( const Partition & partition, OperationDeta
bool GParted_Core::format( const Partition & partition, OperationDetail & operationdetail ) bool GParted_Core::format( const Partition & partition, OperationDetail & operationdetail )
{ {
//remove all filesystem signatures... //remove all file system signatures...
erase_filesystem_signatures( partition ) ; erase_filesystem_signatures( partition ) ;
return set_partition_type( partition, operationdetail ) && create_filesystem( partition, operationdetail ) ; return set_partition_type( partition, operationdetail ) && create_filesystem( partition, operationdetail ) ;
@ -1297,7 +1297,7 @@ bool GParted_Core::move( const Device & device,
if ( check_repair_filesystem( partition_old, operationdetail ) ) if ( check_repair_filesystem( partition_old, operationdetail ) )
{ {
//NOTE: logical partitions are preceeded by metadata. To prevent this metadata from being //NOTE: logical partitions are preceeded by metadata. To prevent this metadata from being
//overwritten we move the partition first and only then the filesystem when moving to the left. //overwritten we move the partition first and only then the file system when moving to the left.
//(maybe i should do some reading on how non-msdos disklabels deal with metadata....) //(maybe i should do some reading on how non-msdos disklabels deal with metadata....)
if ( partition_new .sector_start < partition_old .sector_start ) if ( partition_new .sector_start < partition_old .sector_start )
{ {
@ -1334,14 +1334,14 @@ bool GParted_Core::move_filesystem( const Partition & partition_old,
OperationDetail & operationdetail ) OperationDetail & operationdetail )
{ {
if ( partition_new .sector_start < partition_old .sector_start ) if ( partition_new .sector_start < partition_old .sector_start )
operationdetail .add_child( OperationDetail( _("move filesystem to the left") ) ) ; operationdetail .add_child( OperationDetail( _("move file system to the left") ) ) ;
else if ( partition_new .sector_start > partition_old .sector_start ) else if ( partition_new .sector_start > partition_old .sector_start )
operationdetail .add_child( OperationDetail( _("move filesystem to the right") ) ) ; operationdetail .add_child( OperationDetail( _("move file system to the right") ) ) ;
else else
{ {
operationdetail .add_child( OperationDetail( _("move filesystem") ) ) ; operationdetail .add_child( OperationDetail( _("move file system") ) ) ;
operationdetail .get_last_child() .add_child( operationdetail .get_last_child() .add_child(
OperationDetail( _("new and old filesystem have the same position -- skipping this operation"), OperationDetail( _("new and old file system have the same position -- skipping this operation"),
STATUS_NONE, STATUS_NONE,
FONT_ITALIC ) ) ; FONT_ITALIC ) ) ;
@ -1462,7 +1462,7 @@ bool GParted_Core::resize( const Partition & partition_old,
if ( ! check_repair_filesystem( partition_new, operationdetail ) ) if ( ! check_repair_filesystem( partition_new, operationdetail ) )
succes = false ; succes = false ;
//expand filesystem to fit exactly in partition //expand file system to fit exactly in partition
if ( ! maximize_filesystem( partition_new, operationdetail ) ) if ( ! maximize_filesystem( partition_new, operationdetail ) )
succes = false ; succes = false ;
@ -1639,17 +1639,17 @@ bool GParted_Core::resize_filesystem( const Partition & partition_old,
{ {
if ( partition_new .get_length() < partition_old .get_length() ) if ( partition_new .get_length() < partition_old .get_length() )
{ {
operationdetail .add_child( OperationDetail( _("shrink filesystem") ) ) ; operationdetail .add_child( OperationDetail( _("shrink file system") ) ) ;
action = get_fs( partition_old .filesystem ) .shrink ; action = get_fs( partition_old .filesystem ) .shrink ;
} }
else if ( partition_new .get_length() > partition_old .get_length() ) else if ( partition_new .get_length() > partition_old .get_length() )
operationdetail .add_child( OperationDetail( _("grow filesystem") ) ) ; operationdetail .add_child( OperationDetail( _("grow file system") ) ) ;
else else
{ {
operationdetail .add_child( OperationDetail( _("resize filesystem") ) ) ; operationdetail .add_child( OperationDetail( _("resize file system") ) ) ;
operationdetail .get_last_child() .add_child( operationdetail .get_last_child() .add_child(
OperationDetail( OperationDetail(
_("new and old filesystem have the same size -- skipping this operation"), _("new and old file system have the same size -- skipping this operation"),
STATUS_NONE, STATUS_NONE,
FONT_ITALIC ) ) ; FONT_ITALIC ) ) ;
@ -1684,12 +1684,12 @@ bool GParted_Core::resize_filesystem( const Partition & partition_old,
bool GParted_Core::maximize_filesystem( const Partition & partition, OperationDetail & operationdetail ) bool GParted_Core::maximize_filesystem( const Partition & partition, OperationDetail & operationdetail )
{ {
operationdetail .add_child( OperationDetail( _("grow filesystem to fill the partition") ) ) ; operationdetail .add_child( OperationDetail( _("grow file system to fill the partition") ) ) ;
if ( get_fs( partition .filesystem ) .grow == GParted::FS::NONE ) if ( get_fs( partition .filesystem ) .grow == GParted::FS::NONE )
{ {
operationdetail .get_last_child() .add_child( operationdetail .get_last_child() .add_child(
OperationDetail( _("growing is not available for this filesystem"), OperationDetail( _("growing is not available for this file system"),
STATUS_NONE, STATUS_NONE,
FONT_ITALIC ) ) ; FONT_ITALIC ) ) ;
@ -1722,7 +1722,7 @@ bool GParted_Core::copy( const Partition & partition_src,
if ( succes && set_partition_type( partition_dst, operationdetail ) ) if ( succes && set_partition_type( partition_dst, operationdetail ) )
{ {
operationdetail .add_child( OperationDetail( operationdetail .add_child( OperationDetail(
String::ucompose( _("copy filesystem of %1 to %2"), String::ucompose( _("copy file system of %1 to %2"),
partition_src .get_path(), partition_src .get_path(),
partition_dst .get_path() ) ) ) ; partition_dst .get_path() ) ) ) ;
@ -1901,7 +1901,7 @@ void GParted_Core::rollback_transaction( const Partition & partition_src,
{ {
operationdetail .add_child( OperationDetail( _("rollback last transaction") ) ) ; operationdetail .add_child( OperationDetail( _("rollback last transaction") ) ) ;
//find out exactly which part of the filesystem was copied (and to where it was copied).. //find out exactly which part of the file system was copied (and to where it was copied)..
Partition temp_src = partition_src ; Partition temp_src = partition_src ;
Partition temp_dst = partition_dst ; Partition temp_dst = partition_dst ;
@ -1926,7 +1926,7 @@ void GParted_Core::rollback_transaction( const Partition & partition_src,
bool GParted_Core::check_repair_filesystem( const Partition & partition, OperationDetail & operationdetail ) bool GParted_Core::check_repair_filesystem( const Partition & partition, OperationDetail & operationdetail )
{ {
operationdetail .add_child( OperationDetail( operationdetail .add_child( OperationDetail(
String::ucompose( _("check filesystem on %1 for errors and (if possible) fix them"), String::ucompose( _("check file system on %1 for errors and (if possible) fix them"),
partition .get_path() ) ) ) ; partition .get_path() ) ) ) ;
bool succes = false ; bool succes = false ;
@ -1934,7 +1934,7 @@ bool GParted_Core::check_repair_filesystem( const Partition & partition, Operati
{ {
case GParted::FS::NONE: case GParted::FS::NONE:
operationdetail .get_last_child() .add_child( operationdetail .get_last_child() .add_child(
OperationDetail( _("checking is not available for this filesystem"), OperationDetail( _("checking is not available for this file system"),
STATUS_NONE, STATUS_NONE,
FONT_ITALIC ) ) ; FONT_ITALIC ) ) ;
@ -2320,7 +2320,7 @@ bool GParted_Core::erase_filesystem_signatures( const Partition & partition )
if ( lp_partition && ped_file_system_clobber( & lp_partition ->geom ) ) if ( lp_partition && ped_file_system_clobber( & lp_partition ->geom ) )
{ {
//filesystems not yet supported by libparted //file systems not yet supported by libparted
if ( ped_device_open( lp_device ) ) if ( ped_device_open( lp_device ) )
{ {
//reiser4 stores "ReIsEr4" at sector 128 //reiser4 stores "ReIsEr4" at sector 128
@ -2344,7 +2344,7 @@ bool GParted_Core::update_bootsector( const Partition & partition, OperationDeta
if ( partition .filesystem == FS_NTFS ) if ( partition .filesystem == FS_NTFS )
{ {
operationdetail .add_child( OperationDetail( operationdetail .add_child( OperationDetail(
String::ucompose( _("updating boot sector of %1 filesystem on %2"), String::ucompose( _("updating boot sector of %1 file system on %2"),
Utils::get_filesystem_string( partition .filesystem ), Utils::get_filesystem_string( partition .filesystem ),
partition .get_path() ) ) ) ; partition .get_path() ) ) ) ;

4
src/OperationCheck.cc
View File

@ -34,8 +34,8 @@ void OperationCheck::apply_to_visual( std::vector<Partition> & partitions )
void OperationCheck::create_description() void OperationCheck::create_description()
{ {
/*TO TRANSLATORS: looks like Check and repair filesystem (ext3) on /dev/hda4 */ /*TO TRANSLATORS: looks like Check and repair file system (ext3) on /dev/hda4 */
description = String::ucompose( _("Check and repair filesystem (%1) on %2"), description = String::ucompose( _("Check and repair file system (%1) on %2"),
Utils::get_filesystem_string( partition_original .filesystem ), Utils::get_filesystem_string( partition_original .filesystem ),
partition_original .get_path() ) ; partition_original .get_path() ) ;
} }

16
src/TreeView_Detail.cc
View File

@ -32,8 +32,8 @@ TreeView_Detail::TreeView_Detail()
//append columns //append columns
append_column( _("Partition"), treeview_detail_columns .path ); append_column( _("Partition"), treeview_detail_columns .path );
append_column( _("Filesystem"), treeview_detail_columns .color ); append_column( _("File System"), treeview_detail_columns .color );
append_column( _("Mountpoint"), treeview_detail_columns .mountpoint ); append_column( _("Mount Point"), treeview_detail_columns .mountpoint );
append_column( _("Label"), treeview_detail_columns .label ); append_column( _("Label"), treeview_detail_columns .label );
append_column( _("Size"), treeview_detail_columns .size ); append_column( _("Size"), treeview_detail_columns .size );
append_column( _("Used"), treeview_detail_columns .used ); append_column( _("Used"), treeview_detail_columns .used );
@ -51,11 +51,11 @@ TreeView_Detail::TreeView_Detail()
get_column( 0 ) ->add_attribute( cell_renderer_text ->property_foreground(), get_column( 0 ) ->add_attribute( cell_renderer_text ->property_foreground(),
treeview_detail_columns .text_color ); treeview_detail_columns .text_color );
//FILESYSTEM //FILE SYSTEM
//filesystem text //file system text
get_column( 1 ) ->pack_start( treeview_detail_columns .filesystem, true ); get_column( 1 ) ->pack_start( treeview_detail_columns .filesystem, true );
//colored text in Filesystem column //colored text in File System column
std::vector<Gtk::CellRenderer*> renderers = get_column( 1 ) ->get_cell_renderers() ; std::vector<Gtk::CellRenderer*> renderers = get_column( 1 ) ->get_cell_renderers() ;
cell_renderer_text = dynamic_cast<Gtk::CellRendererText*>( renderers .back() ) ; cell_renderer_text = dynamic_cast<Gtk::CellRendererText*>( renderers .back() ) ;
get_column( 1 ) ->add_attribute( cell_renderer_text ->property_foreground(), get_column( 1 ) ->add_attribute( cell_renderer_text ->property_foreground(),
@ -65,8 +65,8 @@ TreeView_Detail::TreeView_Detail()
get_column( 1 ) ->get_first_cell_renderer() ->property_xalign() = Gtk::ALIGN_LEFT ; get_column( 1 ) ->get_first_cell_renderer() ->property_xalign() = Gtk::ALIGN_LEFT ;
cell_renderer_text ->property_xalign() = Gtk::ALIGN_LEFT ; cell_renderer_text ->property_xalign() = Gtk::ALIGN_LEFT ;
//MOUNTPOINT //MOUNT POINT
//colored text in mountpoint column //colored text in mount point column
cell_renderer_text = dynamic_cast<Gtk::CellRendererText*>( get_column( 2 ) ->get_first_cell_renderer() ); cell_renderer_text = dynamic_cast<Gtk::CellRendererText*>( get_column( 2 ) ->get_first_cell_renderer() );
get_column( 2 ) ->add_attribute( cell_renderer_text ->property_foreground(), get_column( 2 ) ->add_attribute( cell_renderer_text ->property_foreground(),
treeview_detail_columns .mount_text_color ); treeview_detail_columns .mount_text_color );
@ -179,7 +179,7 @@ void TreeView_Detail::create_row( const Gtk::TreeRow & treerow, const Partition
treerow[ treeview_detail_columns .filesystem ] = treerow[ treeview_detail_columns .filesystem ] =
Utils::get_filesystem_string( partition .filesystem ) ; Utils::get_filesystem_string( partition .filesystem ) ;
//mountpoint //mount point
treerow[ treeview_detail_columns .mountpoint ] = Glib::build_path( ", ", partition .get_mountpoints() ) ; treerow[ treeview_detail_columns .mountpoint ] = Glib::build_path( ", ", partition .get_mountpoints() ) ;
//label //label

20
src/Win_GParted.cc
View File

@ -315,7 +315,7 @@ void Win_GParted::init_partition_menu()
index++ ; index++ ;
image = manage( new Gtk::Image( Gtk::Stock::CONVERT, Gtk::ICON_SIZE_MENU ) ); image = manage( new Gtk::Image( Gtk::Stock::CONVERT, Gtk::ICON_SIZE_MENU ) );
/*TO TRANSLATORS: menuitem which holds a submenu with filesystems.. */ /*TO TRANSLATORS: menuitem which holds a submenu with file systems.. */
menu_partition .items() .push_back( menu_partition .items() .push_back(
Gtk::Menu_Helpers::ImageMenuElem( _("_Format to"), Gtk::Menu_Helpers::ImageMenuElem( _("_Format to"),
*image, *image,
@ -330,7 +330,7 @@ void Win_GParted::init_partition_menu()
sigc::mem_fun( *this, &Win_GParted::toggle_swap_mount_state ) ) ); sigc::mem_fun( *this, &Win_GParted::toggle_swap_mount_state ) ) );
MENU_TOGGLE_MOUNT_SWAP = index++ ; MENU_TOGGLE_MOUNT_SWAP = index++ ;
/*TO TRANSLATORS: menuitem which holds a submenu with mountpoints.. */ /*TO TRANSLATORS: menuitem which holds a submenu with mount points.. */
menu_partition .items() .push_back( menu_partition .items() .push_back(
Gtk::Menu_Helpers::MenuElem( _("_Mount on"), * manage( new Gtk::Menu() ) ) ) ; Gtk::Menu_Helpers::MenuElem( _("_Mount on"), * manage( new Gtk::Menu() ) ) ) ;
MENU_MOUNT = index++ ; MENU_MOUNT = index++ ;
@ -887,7 +887,7 @@ void Win_GParted::set_valid_operations()
copied_partition != selected_partition ) copied_partition != selected_partition )
allow_paste( true ) ; allow_paste( true ) ;
//see if we can somehow check/repair this filesystem.... //see if we can somehow check/repair this file system....
if ( fs .check && selected_partition .status == GParted::STAT_REAL ) if ( fs .check && selected_partition .status == GParted::STAT_REAL )
allow_check( true ) ; allow_check( true ) ;
} }
@ -1364,7 +1364,7 @@ void Win_GParted::activate_paste()
{ {
Dialog_Partition_Copy dialog( gparted_core .get_fs( copied_partition .filesystem ), Dialog_Partition_Copy dialog( gparted_core .get_fs( copied_partition .filesystem ),
devices[ current_device ] .cylsize ) ; devices[ current_device ] .cylsize ) ;
//we don't need the messages/mountpoints of the source partition. //we don't need the messages/mount points of the source partition.
copied_partition .messages .clear() ; copied_partition .messages .clear() ;
copied_partition .clear_mountpoints() ; copied_partition .clear_mountpoints() ;
dialog .Set_Data( selected_partition, copied_partition ) ; dialog .Set_Data( selected_partition, copied_partition ) ;
@ -1545,7 +1545,7 @@ void Win_GParted::activate_format( GParted::FILESYSTEM new_fs )
fs .MAX && selected_partition .get_length() > fs .MAX ) fs .MAX && selected_partition .get_length() > fs .MAX )
{ {
Gtk::MessageDialog dialog( *this, Gtk::MessageDialog dialog( *this,
String::ucompose( _("Cannot format this filesystem to %1."), String::ucompose( _("Cannot format this file system to %1."),
Utils::get_filesystem_string( new_fs ) ) , Utils::get_filesystem_string( new_fs ) ) ,
false, false,
Gtk::MESSAGE_ERROR, Gtk::MESSAGE_ERROR,
@ -1554,12 +1554,12 @@ void Win_GParted::activate_format( GParted::FILESYSTEM new_fs )
if ( selected_partition .get_length() < fs .MIN ) if ( selected_partition .get_length() < fs .MIN )
dialog .set_secondary_text( String::ucompose( dialog .set_secondary_text( String::ucompose(
_( "A %1 filesystem requires a partition of at least %2."), _( "A %1 file system requires a partition of at least %2."),
Utils::get_filesystem_string( new_fs ), Utils::get_filesystem_string( new_fs ),
Utils::format_size( fs .MIN ) ) ); Utils::format_size( fs .MIN ) ) );
else else
dialog .set_secondary_text( String::ucompose( dialog .set_secondary_text( String::ucompose(
_( "A partition with a %1 filesystem has a maximum size of %2."), _( "A partition with a %1 file system has a maximum size of %2."),
Utils::get_filesystem_string( new_fs ), Utils::get_filesystem_string( new_fs ),
Utils::format_size( fs .MAX ) ) ); Utils::format_size( fs .MAX ) ) );
@ -1582,7 +1582,7 @@ void Win_GParted::activate_format( GParted::FILESYSTEM new_fs )
part_temp .status = GParted::STAT_FORMATTED ; part_temp .status = GParted::STAT_FORMATTED ;
//if selected_partition is NEW we simply remove the NEW operation from the list and //if selected_partition is NEW we simply remove the NEW operation from the list and
//add it again with the new filesystem //add it again with the new file system
if ( selected_partition .status == GParted::STAT_NEW ) if ( selected_partition .status == GParted::STAT_NEW )
{ {
//remove operation which creates this partition //remove operation which creates this partition
@ -1644,9 +1644,9 @@ void Win_GParted::thread_unmount_partition( bool * succes, Glib::ustring * error
if ( *succes && failed_mountpoints .size() ) if ( *succes && failed_mountpoints .size() )
{ {
*succes = false ; *succes = false ;
*error = _("The partition could not be unmounted from the following mountpoints:") ; *error = _("The partition could not be unmounted from the following mount points:") ;
*error += "\n\n<i>" + Glib::build_path( "\n", failed_mountpoints ) + "</i>\n\n" ; *error += "\n\n<i>" + Glib::build_path( "\n", failed_mountpoints ) + "</i>\n\n" ;
*error += _("Most likely other partitions are also mounted on these mountpoints. You are advised to unmount them manually.") ; *error += _("Most likely other partitions are also mounted on these mount points. You are advised to unmount them manually.") ;
} }
else else
*error = "<i>" + Glib::build_path( "\n", errors ) + "</i>" ; *error = "<i>" + Glib::build_path( "\n", errors ) + "</i>" ;

4
src/ext2.cc
View File

@ -43,7 +43,7 @@ FS ext2::get_filesystem_support()
{ {
fs .grow = FS::EXTERNAL ; fs .grow = FS::EXTERNAL ;
if ( fs .read ) //needed to determine a min filesystemsize.. if ( fs .read ) //needed to determine a min file system size..
fs .shrink = FS::EXTERNAL ; fs .shrink = FS::EXTERNAL ;
} }
@ -131,7 +131,7 @@ bool ext2::check_repair( const Partition & partition, OperationDetail & operatio
{ {
exit_status = execute_command( "e2fsck -f -y -v " + partition .get_path(), operationdetail ) ; exit_status = execute_command( "e2fsck -f -y -v " + partition .get_path(), operationdetail ) ;
//exitstatus 256 isn't documented, but it's returned when the 'FILESYSTEM IS MODIFIED' //exitstatus 256 isn't documented, but it's returned when the 'FILE SYSTEM IS MODIFIED'
//this is quite normal (especially after a copy) so we let the function return true... //this is quite normal (especially after a copy) so we let the function return true...
return ( exit_status == 0 || exit_status == 1 || exit_status == 2 || exit_status == 256 ) ; return ( exit_status == 0 || exit_status == 1 || exit_status == 2 || exit_status == 256 ) ;
} }

4
src/ext3.cc
View File

@ -44,7 +44,7 @@ FS ext3::get_filesystem_support()
{ {
fs .grow = GParted::FS::EXTERNAL ; fs .grow = GParted::FS::EXTERNAL ;
if ( fs .read ) //needed to determine a min filesystemsize.. if ( fs .read ) //needed to determine a min file system size..
fs .shrink = GParted::FS::EXTERNAL ; fs .shrink = GParted::FS::EXTERNAL ;
} }
@ -132,7 +132,7 @@ bool ext3::check_repair( const Partition & partition, OperationDetail & operatio
{ {
exit_status = execute_command( "e2fsck -f -y -v " + partition .get_path(), operationdetail ) ; exit_status = execute_command( "e2fsck -f -y -v " + partition .get_path(), operationdetail ) ;
//exitstatus 256 isn't documented, but it's returned when the 'FILESYSTEM IS MODIFIED' //exitstatus 256 isn't documented, but it's returned when the 'FILE SYSTEM IS MODIFIED'
//this is quite normal (especially after a copy) so we let the function return true... //this is quite normal (especially after a copy) so we let the function return true...
return ( exit_status == 0 || exit_status == 1 || exit_status == 2 || exit_status == 256 ) ; return ( exit_status == 0 || exit_status == 1 || exit_status == 2 || exit_status == 256 ) ;
} }

2
src/fat16.cc
View File

@ -33,7 +33,7 @@ FS fat16::get_filesystem_support()
FS fs ; FS fs ;
fs .filesystem = GParted::FS_FAT16 ; fs .filesystem = GParted::FS_FAT16 ;
//find out if we can create fat16 filesystems //find out if we can create fat16 file systems
if ( ! Glib::find_program_in_path( "mkdosfs" ) .empty() ) if ( ! Glib::find_program_in_path( "mkdosfs" ) .empty() )
fs .create = GParted::FS::EXTERNAL ; fs .create = GParted::FS::EXTERNAL ;

4
src/fat32.cc
View File

@ -33,7 +33,7 @@ FS fat32::get_filesystem_support()
FS fs ; FS fs ;
fs .filesystem = GParted::FS_FAT32 ; fs .filesystem = GParted::FS_FAT32 ;
//find out if we can create fat32 filesystems //find out if we can create fat32 file systems
if ( ! Glib::find_program_in_path( "mkdosfs" ) .empty() ) if ( ! Glib::find_program_in_path( "mkdosfs" ) .empty() )
fs .create = GParted::FS::EXTERNAL ; fs .create = GParted::FS::EXTERNAL ;
@ -62,7 +62,7 @@ FS fat32::get_filesystem_support()
void fat32::set_used_sectors( Partition & partition ) void fat32::set_used_sectors( Partition & partition )
{ {
//FIXME: i've encoutered a readonly fat32 filesystem.. this won't work with the -a ... best check also without the -a //FIXME: i've encoutered a readonly fat32 file system.. this won't work with the -a ... best check also without the -a
exit_status = Utils::execute_command( "dosfsck -a -v " + partition .get_path(), output, error, true ) ; exit_status = Utils::execute_command( "dosfsck -a -v " + partition .get_path(), output, error, true ) ;
if ( exit_status == 0 || exit_status == 1 || exit_status == 256 ) if ( exit_status == 0 || exit_status == 1 || exit_status == 256 )
{ {

12
src/jfs.cc
View File

@ -134,10 +134,10 @@ bool jfs::resize( const Partition & partition_new, OperationDetail & operationde
{ {
bool return_value = false ; bool return_value = false ;
Glib::ustring error ; Glib::ustring error ;
Glib::ustring TEMP_MP = Glib::get_tmp_dir() + "/gparted_tmp_jfs_mountpoint" ; Glib::ustring TEMP_MP = Glib::get_tmp_dir() + "/gparted_tmp_jfs_mount_point" ;
//create mountpoint... //create mount point...
operationdetail .add_child( OperationDetail( String::ucompose( _("create temporary mountpoint (%1)"), TEMP_MP ) ) ) ; operationdetail .add_child( OperationDetail( String::ucompose( _("create temporary mount point (%1)"), TEMP_MP ) ) ) ;
if ( ! mkdir( TEMP_MP .c_str(), 0 ) ) if ( ! mkdir( TEMP_MP .c_str(), 0 ) )
{ {
operationdetail .get_last_child() .set_status( STATUS_SUCCES ) ; operationdetail .get_last_child() .set_status( STATUS_SUCCES ) ;
@ -151,7 +151,7 @@ bool jfs::resize( const Partition & partition_new, OperationDetail & operationde
{ {
operationdetail .get_last_child() .set_status( STATUS_SUCCES ) ; operationdetail .get_last_child() .set_status( STATUS_SUCCES ) ;
//remount the partition to resize the filesystem //remount the partition to resize the file system
operationdetail .add_child( operationdetail .add_child(
OperationDetail( String::ucompose( _("remount %1 on %2 with the 'resize' flag enabled"), OperationDetail( String::ucompose( _("remount %1 on %2 with the 'resize' flag enabled"),
partition_new .get_path(), partition_new .get_path(),
@ -189,9 +189,9 @@ bool jfs::resize( const Partition & partition_new, OperationDetail & operationde
operationdetail .get_last_child() .set_status( STATUS_ERROR ) ; operationdetail .get_last_child() .set_status( STATUS_ERROR ) ;
} }
//remove the mountpoint.. //remove the mount point..
operationdetail .add_child( operationdetail .add_child(
OperationDetail( String::ucompose( _("remove temporary mountpoint (%1)"), TEMP_MP ) ) ) ; OperationDetail( String::ucompose( _("remove temporary mount point (%1)"), TEMP_MP ) ) ) ;
if ( ! rmdir( TEMP_MP .c_str() ) ) if ( ! rmdir( TEMP_MP .c_str() ) )
{ {
operationdetail .get_last_child() .set_status( STATUS_SUCCES ) ; operationdetail .get_last_child() .set_status( STATUS_SUCCES ) ;

4
src/linux_swap.cc
View File

@ -74,9 +74,9 @@ bool linux_swap::create( const Partition & new_partition, OperationDetail & oper
bool linux_swap::resize( const Partition & partition_new, OperationDetail & operationdetail, bool fill_partition ) bool linux_swap::resize( const Partition & partition_new, OperationDetail & operationdetail, bool fill_partition )
{ {
/*TO TRANSLATORS: looks like create new linux-swap filesystem */ /*TO TRANSLATORS: looks like create new linux-swap file system */
operationdetail .add_child( OperationDetail( operationdetail .add_child( OperationDetail(
String::ucompose( _("create new %1 filesystem"), Utils::get_filesystem_string( FS_LINUX_SWAP ) ) ) ) ; String::ucompose( _("create new %1 file system"), Utils::get_filesystem_string( FS_LINUX_SWAP ) ) ) ) ;
if ( create( partition_new, operationdetail .get_last_child() ) ) if ( create( partition_new, operationdetail .get_last_child() ) )
{ {
operationdetail .get_last_child() .set_status( STATUS_SUCCES ) ; operationdetail .get_last_child() .set_status( STATUS_SUCCES ) ;

2
src/ntfs.cc
View File

@ -45,7 +45,7 @@ FS ntfs::get_filesystem_support()
{ {
fs .grow = GParted::FS::EXTERNAL ; fs .grow = GParted::FS::EXTERNAL ;
if ( fs .read ) //needed to determine a min filesystemsize.. if ( fs .read ) //needed to determine a min file system size..
fs .shrink = GParted::FS::EXTERNAL ; fs .shrink = GParted::FS::EXTERNAL ;
} }

4
src/reiserfs.cc
View File

@ -46,7 +46,7 @@ FS reiserfs::get_filesystem_support()
{ {
fs .grow = GParted::FS::EXTERNAL ; fs .grow = GParted::FS::EXTERNAL ;
if ( fs .read ) //needed to determine a min filesystemsize.. if ( fs .read ) //needed to determine a min file system size..
fs .shrink = GParted::FS::EXTERNAL ; fs .shrink = GParted::FS::EXTERNAL ;
} }
@ -90,7 +90,7 @@ void reiserfs::set_used_sectors( Partition & partition )
void reiserfs::read_label( Partition & partition ) void reiserfs::read_label( Partition & partition )
{ {
//FIXME: i think running debugreiserfs takes a long time on filled filesystems, test for this... //FIXME: i think running debugreiserfs takes a long time on filled file systems, test for this...
if ( ! Utils::execute_command( "debugreiserfs " + partition .get_path(), output, error, true ) ) if ( ! Utils::execute_command( "debugreiserfs " + partition .get_path(), output, error, true ) )
{ {
partition .label = Utils::regexp_label( output, "^label:[\t ]*(.*)$" ) ; partition .label = Utils::regexp_label( output, "^label:[\t ]*(.*)$" ) ;

46
src/xfs.cc
View File

@ -135,7 +135,7 @@ bool xfs::write_label( const Partition & partition, OperationDetail & operationd
bool xfs::create( const Partition & new_partition, OperationDetail & operationdetail ) bool xfs::create( const Partition & new_partition, OperationDetail & operationdetail )
{ {
//mkfs.xfs will not create filesystem if label is longer than 12 characters, hence truncation. //mkfs.xfs will not create file system if label is longer than 12 characters, hence truncation.
Glib::ustring label = new_partition .label ; Glib::ustring label = new_partition .label ;
if( label .length() > 12 ) if( label .length() > 12 )
label = label.substr( 0, 12 ) ; label = label.substr( 0, 12 ) ;
@ -146,10 +146,10 @@ bool xfs::resize( const Partition & partition_new, OperationDetail & operationde
{ {
bool return_value = false ; bool return_value = false ;
Glib::ustring error ; Glib::ustring error ;
Glib::ustring TEMP_MP = Glib::get_tmp_dir() + "/gparted_tmp_xfs_mountpoint" ; Glib::ustring TEMP_MP = Glib::get_tmp_dir() + "/gparted_tmp_xfs_mount_point" ;
//create mountpoint... //create mount point...
operationdetail .add_child( OperationDetail( String::ucompose( _("create temporary mountpoint (%1)"), TEMP_MP ) ) ) ; operationdetail .add_child( OperationDetail( String::ucompose( _("create temporary mount point (%1)"), TEMP_MP ) ) ) ;
if ( ! mkdir( TEMP_MP .c_str(), 0 ) ) if ( ! mkdir( TEMP_MP .c_str(), 0 ) )
{ {
operationdetail .get_last_child() .set_status( STATUS_SUCCES ) ; operationdetail .get_last_child() .set_status( STATUS_SUCCES ) ;
@ -163,8 +163,8 @@ bool xfs::resize( const Partition & partition_new, OperationDetail & operationde
{ {
operationdetail .get_last_child() .set_status( STATUS_SUCCES ) ; operationdetail .get_last_child() .set_status( STATUS_SUCCES ) ;
//grow the mounted filesystem.. //grow the mounted file system..
operationdetail .add_child( OperationDetail( _("grow mounted filesystem") ) ) ; operationdetail .add_child( OperationDetail( _("grow mounted file system") ) ) ;
if ( ! execute_command ( "xfs_growfs " + TEMP_MP, operationdetail .get_last_child() ) ) if ( ! execute_command ( "xfs_growfs " + TEMP_MP, operationdetail .get_last_child() ) )
{ {
@ -196,9 +196,9 @@ bool xfs::resize( const Partition & partition_new, OperationDetail & operationde
operationdetail .get_last_child() .set_status( STATUS_ERROR ) ; operationdetail .get_last_child() .set_status( STATUS_ERROR ) ;
} }
//remove the mountpoint.. //remove the mount point..
operationdetail .add_child( operationdetail .add_child(
OperationDetail( String::ucompose( _("remove temporary mountpoint (%1)"), TEMP_MP ) ) ) ; OperationDetail( String::ucompose( _("remove temporary mount point (%1)"), TEMP_MP ) ) ) ;
if ( ! rmdir( TEMP_MP .c_str() ) ) if ( ! rmdir( TEMP_MP .c_str() ) )
{ {
operationdetail .get_last_child() .set_status( STATUS_SUCCES ) ; operationdetail .get_last_child() .set_status( STATUS_SUCCES ) ;
@ -227,28 +227,28 @@ bool xfs::copy( const Glib::ustring & src_part_path,
{ {
bool return_value = false ; bool return_value = false ;
Glib::ustring error ; Glib::ustring error ;
Glib::ustring SRC = Glib::get_tmp_dir() + "/gparted_tmp_xfs_src_mountpoint" ; Glib::ustring SRC = Glib::get_tmp_dir() + "/gparted_tmp_xfs_src_mount_point" ;
Glib::ustring DST = Glib::get_tmp_dir() + "/gparted_tmp_xfs_dest_mountpoint" ; Glib::ustring DST = Glib::get_tmp_dir() + "/gparted_tmp_xfs_dest_mount_point" ;
//create xfs filesystem on destination.. //create xfs file system on destination..
/*TO TRANSLATORS: looks like Create new xfs filesystem */ /*TO TRANSLATORS: looks like Create new xfs file system */
operationdetail .add_child( OperationDetail( operationdetail .add_child( OperationDetail(
String::ucompose( _("create new %1 filesystem"), Utils::get_filesystem_string( FS_XFS ) ) ) ) ; String::ucompose( _("create new %1 file system"), Utils::get_filesystem_string( FS_XFS ) ) ) ) ;
if ( create( Partition( dest_part_path ), operationdetail .get_last_child() ) ) if ( create( Partition( dest_part_path ), operationdetail .get_last_child() ) )
{ {
operationdetail .get_last_child() .set_status( STATUS_SUCCES ) ; operationdetail .get_last_child() .set_status( STATUS_SUCCES ) ;
//create source mountpoint... //create source mount point...
operationdetail .add_child( operationdetail .add_child(
OperationDetail( String::ucompose( _("create temporary mountpoint (%1)"), SRC ) ) ) ; OperationDetail( String::ucompose( _("create temporary mount point (%1)"), SRC ) ) ) ;
if ( ! mkdir( SRC .c_str(), 0 ) ) if ( ! mkdir( SRC .c_str(), 0 ) )
{ {
operationdetail .get_last_child() .set_status( STATUS_SUCCES ) ; operationdetail .get_last_child() .set_status( STATUS_SUCCES ) ;
//create destination mountpoint... //create destination mount point...
operationdetail .add_child( operationdetail .add_child(
OperationDetail( String::ucompose( _("create temporary mountpoint (%1)"), DST ) ) ) ; OperationDetail( String::ucompose( _("create temporary mount point (%1)"), DST ) ) ) ;
if ( ! mkdir( DST .c_str(), 0 ) ) if ( ! mkdir( DST .c_str(), 0 ) )
{ {
operationdetail .get_last_child() .set_status( STATUS_SUCCES ) ; operationdetail .get_last_child() .set_status( STATUS_SUCCES ) ;
@ -271,8 +271,8 @@ bool xfs::copy( const Glib::ustring & src_part_path,
{ {
operationdetail .get_last_child() .set_status( STATUS_SUCCES ) ; operationdetail .get_last_child() .set_status( STATUS_SUCCES ) ;
//copy filesystem.. //copy file system..
operationdetail .add_child( OperationDetail( _("copy filesystem") ) ) ; operationdetail .add_child( OperationDetail( _("copy file system") ) ) ;
if ( ! execute_command( if ( ! execute_command(
"xfsdump -J - " + SRC + " | xfsrestore -J - " + DST, "xfsdump -J - " + SRC + " | xfsrestore -J - " + DST,
@ -327,9 +327,9 @@ bool xfs::copy( const Glib::ustring & src_part_path,
operationdetail .get_last_child() .set_status( STATUS_ERROR ) ; operationdetail .get_last_child() .set_status( STATUS_ERROR ) ;
} }
//remove destination mountpoint.. //remove destination mount point..
operationdetail .add_child( operationdetail .add_child(
OperationDetail( String::ucompose( _("remove temporary mountpoint (%1)"), DST ) ) ) ; OperationDetail( String::ucompose( _("remove temporary mount point (%1)"), DST ) ) ) ;
if ( ! rmdir( DST .c_str() ) ) if ( ! rmdir( DST .c_str() ) )
{ {
operationdetail .get_last_child() .set_status( STATUS_SUCCES ) ; operationdetail .get_last_child() .set_status( STATUS_SUCCES ) ;
@ -350,9 +350,9 @@ bool xfs::copy( const Glib::ustring & src_part_path,
OperationDetail( Glib::strerror( errno ), STATUS_NONE ) ) ; OperationDetail( Glib::strerror( errno ), STATUS_NONE ) ) ;
} }
//remove source mountpoint.. //remove source mount point..
operationdetail .add_child( operationdetail .add_child(
OperationDetail( String::ucompose( _("remove temporary mountpoint (%1)"), SRC ) ) ) ; OperationDetail( String::ucompose( _("remove temporary mount point (%1)"), SRC ) ) ) ;
if ( ! rmdir( SRC .c_str() ) ) if ( ! rmdir( SRC .c_str() ) )
{ {
operationdetail .get_last_child() .set_status( STATUS_SUCCES ) ; operationdetail .get_last_child() .set_status( STATUS_SUCCES ) ;