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

renamed columnheader from 'Type' to 'Filesystem'. Dunno why it was called 

* src/TreeView_Detail.cc: renamed columnheader from 'Type' to 'Filesystem'. Dunno why it was called 'Type' (maybe some PM legacy =)  )
* src/Win_GParted.cc: Made device busy warning a bit more sensible.
This commit is contained in:
Bart Hakvoort 2004-11-24 21:28:48 +00:00
parent 8e92e4b381
commit 0b302ee0ce
3 changed files with 20 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2004-11-24 Bart Hakvoort <gparted@users.sf.net>
* src/TreeView_Detail.cc: renamed columnheader from 'Type' to 'Filesystem'. Dunno why it was called 'Type' (maybe some PM legacy =) )
* src/Win_GParted.cc: Made device busy warning a bit more sensible.
2004-11-24 Bart Hakvoort <gparted@users.sf.net> 2004-11-24 Bart Hakvoort <gparted@users.sf.net>
* include/Utils.h, * include/Utils.h,

2
src/TreeView_Detail.cc
View File

@ -29,7 +29,7 @@ TreeView_Detail::TreeView_Detail( )
//append columns //append columns
this->append_column( _("Partition"), treeview_detail_columns.partition ); this->append_column( _("Partition"), treeview_detail_columns.partition );
this->append_column( _("Type"), treeview_detail_columns.type_square ); this->append_column( _("Filesystem"), treeview_detail_columns.type_square );
this->append_column( _("Size(MB)"), treeview_detail_columns.size ); this->append_column( _("Size(MB)"), treeview_detail_columns.size );
this->append_column( _("Used(MB)"), treeview_detail_columns.used ); this->append_column( _("Used(MB)"), treeview_detail_columns.used );
this->append_column( _("Unused(MB)"), treeview_detail_columns.unused ); this->append_column( _("Unused(MB)"), treeview_detail_columns.unused );

33
src/Win_GParted.cc
View File

@ -1145,41 +1145,28 @@ void Win_GParted::activate_apply()
thread ->join( ) ; thread ->join( ) ;
conn .disconnect( ) ; conn .disconnect( ) ;
//make list of involved devices which have at least one busy partition.. //find out if any of the involved devices is busy
std::vector <Glib::ustring> devicenames ; bool any_busy = false ;
for ( unsigned int t = 0; t < devices .size( ); t++ ) for ( unsigned int t = 0; t < devices .size( ) && ! any_busy; t++ )
if ( devices[ t ] .busy ) if ( devices[ t ] .busy )
for (unsigned int i = 0; i < operations .size( ); i++ ) for (unsigned int i = 0; i < operations .size( ) && ! any_busy; i++ )
if ( operations[ i ] .device_path == devices[ t ] .path ) if ( operations[ i ] .device_path == devices[ t ] .path )
{ any_busy = true ;
devicenames .push_back( devices[ t ] .path ) ;
break ;
}
//show warning if necessary //show warning if necessary
if ( devicenames .size( ) ) if ( any_busy )
{ {
str_temp = "<span weight=\"bold\" size=\"larger\">" ; str_temp = "<span weight=\"bold\" size=\"larger\">" ;
/*TO TRANSLATORS: after the colon (:) a list of devices will be shown */ str_temp += _("At least one operation was applied to a busy device.") ;
str_temp += _("The kernel was unable to re-read the partition table on:") ;
str_temp += "\n";
for (unsigned int t=0; t<devicenames .size( ); t++ )
str_temp += "- " + devicenames[ t ] + "\n";
str_temp += "</span>\n\n" ; str_temp += "</span>\n\n" ;
str_temp += _( "This means Linux won't know anything about the modifications you made until you reboot.") ; str_temp += _("A busy device is a device with at least one mounted partition.") ;
str_temp += "\n\n" ; str_temp += "\n";
if ( devicenames .size( ) > 1 ) str_temp += _("Since making changes to a busy device may confuse the kernel it is advisable to reboot your computer.") ;
str_temp += _( "You should reboot your computer before doing anything with these devices.") ;
else
str_temp += _( "You should reboot your computer before doing anything with this device.") ;
Gtk::MessageDialog dialog( *this, str_temp, true, Gtk::MESSAGE_WARNING, Gtk::BUTTONS_OK, true ); Gtk::MessageDialog dialog( *this, str_temp, true, Gtk::MESSAGE_WARNING, Gtk::BUTTONS_OK, true );
dialog .run( ) ; dialog .run( ) ;
} }
//wipe operations... //wipe operations...
operations.clear( ) ; operations.clear( ) ;
liststore_operations ->clear( ) ; liststore_operations ->clear( ) ;