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

support showing of warning icon even when a partition is mounted. 

* include/TreeView_Detail.h,
  src/TreeView_Detail.cc: support showing of warning icon even when a
  partition is mounted.
This commit is contained in:
Bart Hakvoort 2006-03-06 13:39:21 +00:00
parent cca8bb415d
commit 0fd04602c1
4 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2006-03-06 Bart Hakvoort <hakvoort@cvs.gnome.org>
* include/TreeView_Detail.h,
src/TreeView_Detail.cc: support showing of warning icon even when a
partition is mounted.
2006-03-06 Bart Hakvoort <hakvoort@cvs.gnome.org>
* src/Win_GParted.cc: made message about max. primary partitions a bit

11
include/TreeView_Detail.h
View File

@ -64,7 +64,7 @@ private:
//columns for this treeview
struct treeview_detail_Columns : public Gtk::TreeModelColumnRecord
{
Gtk::TreeModelColumn<Glib::ustring> partition;
Gtk::TreeModelColumn<Glib::ustring> path;
Gtk::TreeModelColumn<Glib::ustring> filesystem;
Gtk::TreeModelColumn<Glib::ustring> mountpoint;
Gtk::TreeModelColumn<Glib::ustring> size;
@ -73,15 +73,16 @@ private:
Gtk::TreeModelColumn< Glib::RefPtr<Gdk::Pixbuf> > color;
Gtk::TreeModelColumn<Glib::ustring> text_color;
Gtk::TreeModelColumn< Glib::RefPtr<Gdk::Pixbuf> > status_icon;
Gtk::TreeModelColumn< Glib::RefPtr<Gdk::Pixbuf> > error_icon;
Gtk::TreeModelColumn<Glib::ustring> flags;
Gtk::TreeModelColumn<Partition> partition_struct; //hidden column ( see also on_button_press_event )
Gtk::TreeModelColumn<Partition> partition; //hidden column
treeview_detail_Columns( )
treeview_detail_Columns()
{
add( partition ); add( filesystem ); add( mountpoint ) ;
add( path ); add( filesystem ); add( mountpoint ) ;
add( size ); add( used ); add( unused );
add( color ); add( text_color ); add( status_icon );
add( flags ); add(partition_struct);
add( error_icon ) ; add( flags ); add( partition );
}
};

2
src/GParted_Core.cc
View File

@ -439,7 +439,7 @@ void GParted_Core::set_used_sectors( std::vector<Partition> & partitions )
if ( partitions[ t ] .busy )
{
if ( partitions[ t ] .mountpoints .size() > 0 )
{
{
if ( statvfs( partitions[ t ] .mountpoints .back() .c_str(), &sfs ) == 0 )
partitions[ t ] .Set_Unused( sfs .f_bfree * (sfs .f_bsize / 512) ) ;
else

29
src/TreeView_Detail.cc
View File

@ -16,12 +16,11 @@
*/
#include "../include/TreeView_Detail.h"
#include <gtkmm/main.h>
namespace GParted
{
TreeView_Detail::TreeView_Detail( )
TreeView_Detail::TreeView_Detail()
{
block = false ;
@ -32,7 +31,7 @@ TreeView_Detail::TreeView_Detail( )
treeselection ->signal_changed() .connect( sigc::mem_fun( *this, &TreeView_Detail::on_selection_changed ) );
//append columns
append_column( _("Partition"), treeview_detail_columns .partition );
append_column( _("Partition"), treeview_detail_columns .path );
append_column( _("Filesystem"), treeview_detail_columns .color );
append_column( _("Mountpoint"), treeview_detail_columns .mountpoint );
append_column( _("Size"), treeview_detail_columns .size );
@ -40,7 +39,8 @@ TreeView_Detail::TreeView_Detail( )
append_column( _("Unused"), treeview_detail_columns .unused );
append_column( _("Flags"), treeview_detail_columns .flags );
//status_icon
//icons
get_column( 0 ) ->pack_start( treeview_detail_columns .error_icon, false );
get_column( 0 ) ->pack_start( treeview_detail_columns .status_icon, false );
//filesystem text
@ -122,7 +122,7 @@ bool TreeView_Detail::set_selected( Gtk::TreeModel::Children rows, const Partiti
{
for ( unsigned int t = 0 ; t < rows .size() ; t++ )
{
if ( static_cast<Partition>( rows[ t ] [ treeview_detail_columns .partition_struct ] ) == partition )
if ( static_cast<Partition>( rows[ t ] [ treeview_detail_columns .partition ] ) == partition )
{
if ( inside_extended )
expand_all() ;
@ -140,18 +140,19 @@ bool TreeView_Detail::set_selected( Gtk::TreeModel::Children rows, const Partiti
void TreeView_Detail::create_row( const Gtk::TreeRow & treerow, const Partition & partition )
{
//FIXME: this approach is too simplistic, we need to display the lock AND the warning icon if necessary
//e.g. if statvfs in the core fails, we need to display both icons...
if ( partition .busy )
treerow[ treeview_detail_columns .status_icon ] = render_icon( Gtk::Stock::DIALOG_AUTHENTICATION, Gtk::ICON_SIZE_BUTTON );
else if ( partition .error != "" )
treerow[ treeview_detail_columns .status_icon ] = render_icon( Gtk::Stock::DIALOG_WARNING, Gtk::ICON_SIZE_BUTTON );
treerow[ treeview_detail_columns .status_icon ] =
render_icon( Gtk::Stock::DIALOG_AUTHENTICATION, Gtk::ICON_SIZE_BUTTON );
treerow[ treeview_detail_columns .partition ] = partition .partition;
if ( ! partition .error .empty() )
treerow[ treeview_detail_columns .error_icon ] =
render_icon( Gtk::Stock::DIALOG_WARNING, Gtk::ICON_SIZE_BUTTON );
treerow[ treeview_detail_columns .path ] = partition .partition ;
//this fixes a weird issue (see #169683 for more info)
if ( partition .type == GParted::TYPE_EXTENDED && partition .busy )
treerow[ treeview_detail_columns .partition ] = treerow[ treeview_detail_columns .partition ] + " " ;
treerow[ treeview_detail_columns .path ] = treerow[ treeview_detail_columns .path ] + " " ;
treerow[ treeview_detail_columns .color ] = Utils::get_color_as_pixbuf( partition .filesystem, 16, 16 ) ;
@ -181,7 +182,7 @@ void TreeView_Detail::create_row( const Gtk::TreeRow & treerow, const Partition
Glib::build_path( ", ", partition .flags ) ;
//hidden column (partition object)
treerow[ treeview_detail_columns .partition_struct ] = partition;
treerow[ treeview_detail_columns .partition ] = partition;
}
bool TreeView_Detail::on_button_press_event( GdkEventButton * event )
@ -209,7 +210,7 @@ void TreeView_Detail::on_selection_changed()
if ( ! block && treeselection ->get_selected() != 0 )
{
row = static_cast<Gtk::TreeRow>( * treeselection ->get_selected() ) ;
signal_partition_selected .emit( row[ treeview_detail_columns .partition_struct ], true ) ;
signal_partition_selected .emit( row[ treeview_detail_columns .partition ], true ) ;
}
}