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

added 'time remaining' to progressfeedback. 

* src/GParted_Core.cc: added 'time remaining' to progressfeedback.
This commit is contained in:
Bart Hakvoort 2006-08-16 20:30:26 +00:00
parent 64d85c3e3c
commit a6b853ad8f
2 changed files with 35 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2006-08-16 Bart Hakvoort <hakvoort@cvs.gnome.org>
* src/GParted_Core.cc: added 'time remaining' to progressfeedback.
2006-08-15 Bart Hakvoort <hakvoort@cvs.gnome.org> 2006-08-15 Bart Hakvoort <hakvoort@cvs.gnome.org>
* include/GParted_Core.h, * include/GParted_Core.h,

37
src/GParted_Core.cc
View File

@ -352,7 +352,7 @@ bool GParted_Core::apply_operation_to_disk( Operation * operation )
break ; break ;
} }
if ( ! succes && libparted_messages .size() > 0 ) if ( libparted_messages .size() > 0 )
{ {
operation ->operation_detail .sub_details .push_back( operation ->operation_detail .sub_details .push_back(
OperationDetail( _("libparted messages"), STATUS_INFO ) ) ; OperationDetail( _("libparted messages"), STATUS_INFO ) ) ;
@ -1658,13 +1658,38 @@ void GParted_Core::set_progress_info( Sector total,
Sector done, Sector done,
std::time_t time_start, std::time_t time_start,
OperationDetail & operationdetail ) OperationDetail & operationdetail )
{//FIXME, add time remaining to the progress_text (remaining xx:xx:xx) {
operationdetail .progress_text = operationdetail .fraction = done / static_cast<double>( total ) ;
String::ucompose( _("%1 of %2 copied"), Utils::format_size( done ), Utils::format_size( total ) ) ;
double sec_per_frac = (std::time( NULL ) - time_start) / static_cast<double>( operationdetail .fraction ) ;
std::time_t time_remaining = Utils::round( (1.0 - operationdetail .fraction) * sec_per_frac ) ;
//format it a bit..
Glib::ustring time ;
int unit = static_cast<int>( time_remaining / 3600 ) ;
if ( unit < 10 )
time += "0" ;
time += Utils::num_to_str( unit ) + ":" ;
time_remaining %= 3600 ;
unit = static_cast<int>( time_remaining / 60 ) ;
if ( unit < 10 )
time += "0" ;
time += Utils::num_to_str( unit ) + ":" ;
time_remaining %= 60 ;
if ( time_remaining < 10 )
time += "0" ;
time += Utils::num_to_str( time_remaining ) ;
operationdetail .progress_text = String::ucompose( _("%1 of %2 copied (%3 remaining)"),
Utils::format_size( done ),
Utils::format_size( total ),
time ) ;
operationdetail .set_description( String::ucompose( _("%1 of %2 copied"), done, total ), FONT_ITALIC ) ; operationdetail .set_description( String::ucompose( _("%1 of %2 copied"), done, total ), FONT_ITALIC ) ;
operationdetail .fraction = done / static_cast<double>( total ) ;
} }
bool GParted_Core::find_optimal_blocksize( const Partition & partition_old, bool GParted_Core::find_optimal_blocksize( const Partition & partition_old,