diff --git a/ChangeLog b/ChangeLog index ae2c142d..64ae2489 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-08-27 Bart Hakvoort + + * include/DialogFeatures.h, + src/DialogFeatures.cc: added legend (#353104) + * src/fat32.cc: added FIXME + 2006-08-27 Bart Hakvoort * src/ntfs.cc: replaced ntfscluster with ntfsresize (see #350789) diff --git a/include/DialogFeatures.h b/include/DialogFeatures.h index d05c4e7f..8780da74 100644 --- a/include/DialogFeatures.h +++ b/include/DialogFeatures.h @@ -23,6 +23,7 @@ #include #include #include +#include namespace GParted { @@ -38,6 +39,8 @@ public: private: void show_filesystem( const FS & fs ) ; + Gtk::HBox *hbox ; + Gtk::Image *image ; Gtk::TreeView treeview_filesystems; Gtk::TreeRow treerow; Glib::RefPtr liststore_filesystems; diff --git a/src/DialogFeatures.cc b/src/DialogFeatures.cc index 32652123..bce63b21 100644 --- a/src/DialogFeatures.cc +++ b/src/DialogFeatures.cc @@ -44,6 +44,19 @@ DialogFeatures::DialogFeatures() treeview_filesystems .get_selection() ->set_mode( Gtk::SELECTION_NONE ); treeview_filesystems .set_rules_hint( true ) ; get_vbox() ->pack_start( treeview_filesystems ) ; + + //legend.. + hbox = manage( new Gtk::HBox ) ; + image = manage( new Gtk::Image( Gtk::Stock::APPLY, Gtk::ICON_SIZE_LARGE_TOOLBAR ) ); + hbox ->pack_start( *image, Gtk::PACK_SHRINK ) ; + hbox ->pack_start( * Utils::mk_label( _("Available") ), Gtk::PACK_EXPAND_WIDGET ) ; + get_vbox() ->pack_start( *hbox ) ; + + hbox = manage( new Gtk::HBox ) ; + image = manage( new Gtk::Image( Gtk::Stock::CANCEL, Gtk::ICON_SIZE_LARGE_TOOLBAR ) ); + hbox ->pack_start( *image, Gtk::PACK_SHRINK ) ; + hbox ->pack_start( * Utils::mk_label( _("Not Available") ), Gtk::PACK_EXPAND_WIDGET ) ; + get_vbox() ->pack_start( *hbox ) ; //initialize icons icon_yes = render_icon( Gtk::Stock::APPLY, Gtk::ICON_SIZE_LARGE_TOOLBAR ) ; diff --git a/src/fat32.cc b/src/fat32.cc index e164a0e1..029e0f98 100644 --- a/src/fat32.cc +++ b/src/fat32.cc @@ -50,6 +50,7 @@ FS fat32::get_filesystem_support() 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 exit_status = Utils::execute_command( "dosfsck -a -v " + partition .get_path(), output, error, true ) ; if ( exit_status == 0 || exit_status == 1 ) {