diff --git a/ChangeLog b/ChangeLog index 4bb4a5dd..0b9792fa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2004-10-22 Bart Hakvoort + + * src/Dialog_Partition_Info.cc: codecleanups.. Hey! i was bored :P + 2004-10-22 Bart Hakvoort * src/Device.cc: removed libparted messagesdialog. instead, show them on the console. They proved to be pretty useless. diff --git a/src/Dialog_Partition_Info.cc b/src/Dialog_Partition_Info.cc index 283934be..35ac631a 100644 --- a/src/Dialog_Partition_Info.cc +++ b/src/Dialog_Partition_Info.cc @@ -29,162 +29,162 @@ Dialog_Partition_Info::Dialog_Partition_Info( const Partition & partition ) /*TO TRANSLATORS: dialogtitle, looks like Information about /dev/hda3 */ this->set_title( String::ucompose( _( "Information about %1"), partition.partition ) ); - init_drawingarea() ; + init_drawingarea( ) ; //add label for detail and fill with relevant info - Display_Info() ; + Display_Info( ) ; //display error (if any) if ( partition .error != "" ) { - frame = manage( new Gtk::Frame() ); + frame = manage( new Gtk::Frame( ) ); frame ->set_border_width( 10 ); image = manage( new Gtk::Image( Gtk::Stock::DIALOG_WARNING, Gtk::ICON_SIZE_BUTTON ) ); - hbox = manage( new Gtk::HBox() ); + hbox = manage( new Gtk::HBox( ) ); hbox ->pack_start( *image, Gtk::PACK_SHRINK ) ; hbox ->pack_start( * mk_label( " " + (Glib::ustring) _( "Libparted message:" ) + " " ), Gtk::PACK_SHRINK ) ; frame ->set_label_widget( *hbox ) ; - frame ->add( * mk_label( "" + partition.error + "", true, true, true ) ); + frame ->add( * mk_label( "" + partition.error + "", true, true, true ) ) ; this ->get_vbox() ->pack_start( *frame, Gtk::PACK_SHRINK ) ; } - this->add_button( Gtk::Stock::CLOSE, Gtk::RESPONSE_OK ); - this->show_all_children(); + this ->add_button( Gtk::Stock::CLOSE, Gtk::RESPONSE_OK ) ; + this ->show_all_children( ) ; } -void Dialog_Partition_Info::drawingarea_on_realize( ) +void Dialog_Partition_Info::drawingarea_on_realize( ) { - gc = Gdk::GC::create( drawingarea .get_window() ); + gc = Gdk::GC::create( drawingarea .get_window( ) ) ; - drawingarea .get_window() ->set_background( color_partition ); + drawingarea .get_window( ) ->set_background( color_partition ) ; } -bool Dialog_Partition_Info::drawingarea_on_expose( GdkEventExpose *ev ) +bool Dialog_Partition_Info::drawingarea_on_expose( GdkEventExpose *ev ) { - if ( partition.type != GParted::UNALLOCATED ) + if ( partition .type != GParted::UNALLOCATED ) { //used - gc ->set_foreground( color_used ); - drawingarea .get_window() ->draw_rectangle( gc, true, BORDER, BORDER, used ,34 ); + gc ->set_foreground( color_used ); + drawingarea .get_window( ) ->draw_rectangle( gc, true, BORDER, BORDER, used, 34 ) ; //unused - gc ->set_foreground( color_unused ); - drawingarea .get_window() ->draw_rectangle( gc, true, BORDER + used, BORDER, unused,34 ); + gc ->set_foreground( color_unused ); + drawingarea .get_window( ) ->draw_rectangle( gc, true, BORDER + used, BORDER, unused, 34 ) ; } //text - gc ->set_foreground( color_text ); - drawingarea .get_window() ->draw_layout( gc, BORDER +5, BORDER +1 , pango_layout ) ; + gc ->set_foreground( color_text ); + drawingarea .get_window( ) ->draw_layout( gc, BORDER +5, BORDER +1 ,pango_layout ) ; return true; } -void Dialog_Partition_Info::init_drawingarea() +void Dialog_Partition_Info::init_drawingarea( ) { drawingarea .set_size_request( 375, 50 ) ; - drawingarea.signal_realize().connect( sigc::mem_fun(*this, &Dialog_Partition_Info::drawingarea_on_realize) ) ; - drawingarea.signal_expose_event().connect( sigc::mem_fun(*this, &Dialog_Partition_Info::drawingarea_on_expose) ) ; + drawingarea .signal_realize( ).connect( sigc::mem_fun(*this, &Dialog_Partition_Info::drawingarea_on_realize) ) ; + drawingarea .signal_expose_event( ).connect( sigc::mem_fun(*this, &Dialog_Partition_Info::drawingarea_on_expose) ) ; - frame = manage( new Gtk::Frame() ); - frame ->add ( drawingarea ) ; + frame = manage( new Gtk::Frame( ) ) ; + frame ->add( drawingarea ) ; - frame ->set_shadow_type(Gtk::SHADOW_ETCHED_OUT); - frame ->set_border_width( 10 ); - hbox = manage( new Gtk::HBox() ) ; + frame ->set_shadow_type( Gtk::SHADOW_ETCHED_OUT ) ; + frame ->set_border_width( 10 ) ; + hbox = manage( new Gtk::HBox( ) ) ; hbox ->pack_start( *frame, Gtk::PACK_EXPAND_PADDING ) ; - this ->get_vbox() ->pack_start( *hbox, Gtk::PACK_SHRINK ) ; + this ->get_vbox( ) ->pack_start( *hbox, Gtk::PACK_SHRINK ) ; //calculate proportional width of used and unused used = unused = 0 ; - used = (int) ( ( (375 - BORDER *2) / ( (double) (partition.sector_end - partition.sector_start) / partition.sectors_used ) )+0.5 ) ; + used = (int) ( ( (375 - BORDER *2) / ( (double) (partition .sector_end - partition .sector_start) / partition .sectors_used ) )+0.5 ) ; unused = 375 - used - (BORDER *2) ; //allocate some colors - color_used.set( "#F8F8BA" ); this ->get_colormap() ->alloc_color( color_used ) ; + color_used.set( "#F8F8BA" ); this ->get_colormap( ) ->alloc_color( color_used ) ; - partition .type == GParted::EXTENDED ? color_unused.set( "darkgrey" ) : color_unused.set( "white" ) ; - this ->get_colormap() ->alloc_color( color_unused ) ; + partition .type == GParted::EXTENDED ? color_unused .set( "darkgrey" ) : color_unused .set( "white" ) ; + this ->get_colormap( ) ->alloc_color( color_unused ) ; - color_text.set( "black" ); this ->get_colormap() ->alloc_color( color_text ) ; - color_partition = partition.color ; this ->get_colormap() ->alloc_color( color_partition ) ; + color_text .set( "black" ); this ->get_colormap( ) ->alloc_color( color_text ) ; + color_partition = partition .color ; this ->get_colormap( ) ->alloc_color( color_partition ) ; //set text of pangolayout - pango_layout = drawingarea .create_pango_layout ( partition .partition + "\n" + String::ucompose( _("%1 MB"), partition .Get_Length_MB() ) ) ; + pango_layout = drawingarea .create_pango_layout ( partition .partition + "\n" + String::ucompose( _("%1 MB"), partition .Get_Length_MB( ) ) ) ; } -void Dialog_Partition_Info::Display_Info() +void Dialog_Partition_Info::Display_Info( ) { int top =0, bottom = 1; - table = manage( new Gtk::Table() ) ; + table = manage( new Gtk::Table( ) ) ; table ->set_border_width( 5 ) ; table ->set_col_spacings(10 ) ; - this ->get_vbox() ->pack_start( *table , Gtk::PACK_SHRINK ) ; + this ->get_vbox( ) ->pack_start( *table, Gtk::PACK_SHRINK ) ; //filesystem - table ->attach( * mk_label( "" + (Glib::ustring) _( "Filesystem:" ) + "" ) , 0,1,top, bottom ,Gtk::FILL); - table ->attach( * mk_label( partition .filesystem ), 1,2, top++, bottom++, Gtk::FILL); + table ->attach( * mk_label( "" + (Glib::ustring) _( "Filesystem:" ) + "" ) , 0, 1, top, bottom, Gtk::FILL ); + table ->attach( * mk_label( partition .filesystem ), 1, 2, top++, bottom++, Gtk::FILL); //size table ->attach( * mk_label( "" + (Glib::ustring) _( "Size:" ) + "" ), 0,1,top, bottom,Gtk::FILL); - table ->attach( * mk_label( String::ucompose( _("%1 MB"), this ->partition .Get_Length_MB() ) ) , 1,2, top++, bottom++,Gtk::FILL); + table ->attach( * mk_label( String::ucompose( _("%1 MB"), this ->partition .Get_Length_MB( ) ) ), 1, 2, top++, bottom++,Gtk::FILL ); if ( partition.sectors_used != -1 ) { //calculate relative diskusage - int percent_used = (int) ( (double) partition.Get_Used_MB() / partition .Get_Length_MB() *100 +0.5 ) ; + int percent_used = (int) ( (double) partition.Get_Used_MB( ) / partition .Get_Length_MB( ) *100 +0.5 ) ; //used - table ->attach( * mk_label( "" + (Glib::ustring) _( "Used:" ) + "" ), 0,1, top, bottom,Gtk::FILL); - table ->attach( * mk_label( String::ucompose( _("%1 MB"), this ->partition .Get_Used_MB() ) ) , 1,2, top, bottom,Gtk::FILL); - table ->attach( * mk_label( "\t\t\t( " + num_to_str( percent_used ) + "% )"), 1,2, top++, bottom++,Gtk::FILL); + table ->attach( * mk_label( "" + (Glib::ustring) _( "Used:" ) + "" ), 0,1, top, bottom,Gtk::FILL ) ; + table ->attach( * mk_label( String::ucompose( _("%1 MB"), this ->partition .Get_Used_MB( ) ) ), 1, 2, top, bottom, Gtk::FILL ) ; + table ->attach( * mk_label( "\t\t\t( " + num_to_str( percent_used ) + "% )"), 1, 2, top++, bottom++, Gtk::FILL ) ; //unused table ->attach( * mk_label( "" + (Glib::ustring) _( "Unused:" ) + "" ), 0,1, top, bottom,Gtk::FILL); - table ->attach( * mk_label( String::ucompose( _("%1 MB"), this ->partition .Get_Unused_MB() ) ) , 1,2, top, bottom,Gtk::FILL); - table ->attach( * mk_label( "\t\t\t( " + num_to_str( 100 - percent_used ) + "% )"), 1,2, top++, bottom++,Gtk::FILL); + table ->attach( * mk_label( String::ucompose( _("%1 MB"), this ->partition .Get_Unused_MB( ) ) ), 1, 2, top, bottom, Gtk::FILL ) ; + table ->attach( * mk_label( "\t\t\t( " + num_to_str( 100 - percent_used ) + "% )"), 1, 2, top++, bottom++, Gtk::FILL ) ; } //flags if ( partition.type != GParted::UNALLOCATED ) { - table ->attach( * mk_label( "" + (Glib::ustring) _( "Flags:" ) + "" ), 0,1, top, bottom,Gtk::FILL); - table ->attach( * mk_label( partition .flags ), 1,2, top++, bottom++,Gtk::FILL); + table ->attach( * mk_label( "" + (Glib::ustring) _( "Flags:" ) + "" ), 0, 1, top, bottom, Gtk::FILL ) ; + table ->attach( * mk_label( partition .flags ), 1, 2, top++, bottom++, Gtk::FILL ) ; } //one blank line - table ->attach( * mk_label( "" ), 1,2, top++, bottom++,Gtk::FILL); + table ->attach( * mk_label( "" ), 1, 2, top++, bottom++, Gtk::FILL ) ; - if ( partition.type != GParted::UNALLOCATED && partition .status != GParted::STAT_NEW ) + if ( partition .type != GParted::UNALLOCATED && partition .status != GParted::STAT_NEW ) { //path - table ->attach( * mk_label( "" + (Glib::ustring) _( "Path:" ) + "" ), 0,1, top, bottom,Gtk::FILL); - table ->attach( * mk_label( partition .partition ), 1,2, top++, bottom++,Gtk::FILL); + table ->attach( * mk_label( "" + (Glib::ustring) _( "Path:" ) + "" ), 0, 1, top, bottom, Gtk::FILL ) ; + table ->attach( * mk_label( partition .partition ), 1, 2, top++, bottom++, Gtk::FILL ) ; //realpath (this sucks) char real_path[4096] ; - realpath( partition.partition.c_str() , real_path ); + realpath( partition .partition .c_str( ) , real_path ) ; //only show realpath if it's diffent from the short path... if ( partition.partition != real_path ) { - table ->attach( * mk_label( "" + (Glib::ustring) _( "Real Path:" ) + "" ), 0,1, top, bottom,Gtk::FILL); - table ->attach( * mk_label( real_path ), 1,2, top++, bottom++,Gtk::FILL); + table ->attach( * mk_label( "" + (Glib::ustring) _( "Real Path:" ) + "" ), 0, 1, top, bottom, Gtk::FILL ) ; + table ->attach( * mk_label( real_path ), 1,2, top++, bottom++, Gtk::FILL ) ; } //status Glib::ustring str_temp ; - table ->attach( * mk_label( "" + (Glib::ustring) _( "Status:" ) + "" ), 0,1, top, bottom,Gtk::FILL); + table ->attach( * mk_label( "" + (Glib::ustring) _( "Status:" ) + "" ), 0,1, top, bottom, Gtk::FILL) ; if ( partition.busy ) - str_temp = Find_Status() ; + str_temp = Find_Status( ) ; else if ( partition.type == GParted::EXTENDED ) str_temp = _("Not busy (There are no mounted logical partitions)" ) ; else if ( partition.filesystem == "linux-swap" ) @@ -192,37 +192,37 @@ void Dialog_Partition_Info::Display_Info() else str_temp = _("Not mounted" ) ; - table ->attach( * mk_label( str_temp ), 1,2, top++, bottom++,Gtk::FILL); + table ->attach( * mk_label( str_temp ), 1, 2, top++, bottom++, Gtk::FILL ) ; } //one blank line - table ->attach( * mk_label( "" ), 1, 2, top++, bottom++, Gtk::FILL); + table ->attach( * mk_label( "" ), 1, 2, top++, bottom++, Gtk::FILL ) ; //first sector - table ->attach( * mk_label( "" + (Glib::ustring) _( "First Sector:" ) + "" ), 0, 1, top, bottom, Gtk::FILL); + table ->attach( * mk_label( "" + (Glib::ustring) _( "First Sector:" ) + "" ), 0, 1, top, bottom, Gtk::FILL ) ; table ->attach( * mk_label( num_to_str( partition.sector_start ) ), 1,2, top++, bottom++,Gtk::FILL); //last sector - table ->attach( * mk_label( "" + (Glib::ustring) _( "Last Sector:" ) + "" ), 0,1, top, bottom,Gtk::FILL); - table ->attach( * mk_label( num_to_str( partition.sector_end ) ), 1,2, top++, bottom++,Gtk::FILL); + table ->attach( * mk_label( "" + (Glib::ustring) _( "Last Sector:" ) + "" ), 0, 1, top, bottom, Gtk::FILL ) ; + table ->attach( * mk_label( num_to_str( partition.sector_end ) ), 1, 2, top++, bottom++, Gtk::FILL ) ; //total sectors - table ->attach( * mk_label( "" + (Glib::ustring) _( "Total Sectors:" ) + "" ), 0,1, top, bottom,Gtk::FILL); - table ->attach( * mk_label( num_to_str( partition.sector_end - partition.sector_start ) ), 1,2, top++, bottom++,Gtk::FILL); + table ->attach( * mk_label( "" + (Glib::ustring) _( "Total Sectors:" ) + "" ), 0, 1, top, bottom, Gtk::FILL ) ; + table ->attach( * mk_label( num_to_str( partition .sector_end - partition .sector_start ) ), 1, 2, top++, bottom++, Gtk::FILL ) ; } -Glib::ustring Dialog_Partition_Info::Find_Status() +Glib::ustring Dialog_Partition_Info::Find_Status( ) { - if ( partition.type == GParted::EXTENDED ) + if ( partition .type == GParted::EXTENDED ) return _("Busy (At least one logical partition is mounted)" ) ; - else if ( partition.filesystem == "linux-swap" ) + else if ( partition .filesystem == "linux-swap" ) return _("Active") ; //try to find the mountpoint in /proc/mounts //get realpath - char real_path[4096] ; - realpath( partition.partition.c_str() , real_path ); + char real_path[ 4096 ] ; + realpath( partition .partition .c_str( ), real_path ); Glib::ustring mountpoint, partition_real_path = real_path ; //because root partition is listed as /dev/root we need te compare against te real path.. @@ -231,12 +231,12 @@ Glib::ustring Dialog_Partition_Info::Find_Status() while ( getline( file_mounts, line ) ) { - realpath( line.substr( 0, line.find( ' ' ) ) .c_str(), real_path ); + realpath( line .substr( 0, line.find( ' ' ) ) .c_str( ), real_path ); if ( partition_real_path == real_path ) { //this is so cool =) - mountpoint = line.substr( line.find( ' ' ) +1, line .length() ) ; + mountpoint = line.substr( line .find( ' ' ) +1, line .length( ) ) ; mountpoint = mountpoint .substr( 0, mountpoint .find( ' ' ) ) ; break ; @@ -245,22 +245,22 @@ Glib::ustring Dialog_Partition_Info::Find_Status() } - file_mounts .close() ; + file_mounts .close( ) ; //sometimes rootdevices are not listed as paths. I'll take a guess and just enter / here...( we'll look into this when complaints start coming in :P ) - if ( mountpoint .empty() ) + if ( mountpoint .empty( ) ) mountpoint = "/" ; return String::ucompose( _("Mounted on %1"), mountpoint ) ; } -Dialog_Partition_Info::~Dialog_Partition_Info() +Dialog_Partition_Info::~Dialog_Partition_Info( ) { - this ->get_colormap() ->free_colors( color_used, 1 ) ; - this ->get_colormap() ->free_colors( color_unused, 1 ) ; - this ->get_colormap() ->free_colors( color_text, 1 ) ; - this ->get_colormap() ->free_colors( color_partition, 1 ) ; + this ->get_colormap( ) ->free_colors( color_used, 1 ) ; + this ->get_colormap( ) ->free_colors( color_unused, 1 ) ; + this ->get_colormap( ) ->free_colors( color_text, 1 ) ; + this ->get_colormap( ) ->free_colors( color_partition, 1 ) ; }