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

made some changes to progressdialog behaviour. 

* include/Dialog_Progress.h,
  src/Dialog_Progress.cc,
  src/Win_GParted.cc: made some changes to progressdialog behaviour.
This commit is contained in:
Bart Hakvoort 2006-01-26 15:54:44 +00:00
parent 4c3c61bdc1
commit 1f854ffef3
4 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2006-01-26 Bart Hakvoort <hakvoort@cvs.gnome.org>
* include/Dialog_Progress.h,
src/Dialog_Progress.cc,
src/Win_GParted.cc: made some changes to progressdialog behaviour.
2006-01-26 Bart Hakvoort <hakvoort@cvs.gnome.org> 2006-01-26 Bart Hakvoort <hakvoort@cvs.gnome.org>
* gparted.desktop.in, * gparted.desktop.in,

1
include/Dialog_Progress.h
View File

@ -43,6 +43,7 @@ public:
private: private:
void update_operation_details( const Gtk::TreeRow & treerow, const OperationDetails & operation_details ) ; void update_operation_details( const Gtk::TreeRow & treerow, const OperationDetails & operation_details ) ;
void on_signal_show() ; void on_signal_show() ;
void on_expander_changed() ;
static void *static_pthread_apply_operation( void * p_dialog_progress ) ; static void *static_pthread_apply_operation( void * p_dialog_progress ) ;
void on_response( int response_id ) ; void on_response( int response_id ) ;

11
src/Dialog_Progress.cc
View File

@ -26,6 +26,7 @@ namespace GParted
Dialog_Progress::Dialog_Progress( const std::vector<Operation> & operations ) Dialog_Progress::Dialog_Progress( const std::vector<Operation> & operations )
{ {
this ->set_resizable( false ) ;
this ->set_has_separator( false ) ; this ->set_has_separator( false ) ;
this ->set_title( _("Applying pending operations") ) ; this ->set_title( _("Applying pending operations") ) ;
this ->operations = operations ; this ->operations = operations ;
@ -52,7 +53,6 @@ Dialog_Progress::Dialog_Progress( const std::vector<Operation> & operations )
this ->get_vbox() ->pack_start( label_current, Gtk::PACK_SHRINK ); this ->get_vbox() ->pack_start( label_current, Gtk::PACK_SHRINK );
this ->get_vbox() ->pack_start( * Utils::mk_label( "<b>" + static_cast<Glib::ustring>( _("Completed Operations:") ) + "</b>" ), Gtk::PACK_SHRINK ); this ->get_vbox() ->pack_start( * Utils::mk_label( "<b>" + static_cast<Glib::ustring>( _("Completed Operations:") ) + "</b>" ), Gtk::PACK_SHRINK );
progressbar_all .set_size_request( 500, -1 ) ;
this ->get_vbox() ->pack_start( progressbar_all, Gtk::PACK_SHRINK ); this ->get_vbox() ->pack_start( progressbar_all, Gtk::PACK_SHRINK );
//create some icons here, instead of recreating them every time //create some icons here, instead of recreating them every time
@ -87,6 +87,8 @@ Dialog_Progress::Dialog_Progress( const std::vector<Operation> & operations )
expander_details .set_label( "<b>" + static_cast<Glib::ustring>( _("Details") ) + "</b>" ) ; expander_details .set_label( "<b>" + static_cast<Glib::ustring>( _("Details") ) + "</b>" ) ;
expander_details .set_use_markup( true ) ; expander_details .set_use_markup( true ) ;
expander_details .property_expanded() .signal_changed() .connect(
sigc::mem_fun(*this, &Dialog_Progress::on_expander_changed) );
expander_details .add( scrolledwindow ) ; expander_details .add( scrolledwindow ) ;
this ->get_vbox() ->pack_start( expander_details, Gtk::PACK_EXPAND_WIDGET ) ; this ->get_vbox() ->pack_start( expander_details, Gtk::PACK_EXPAND_WIDGET ) ;
@ -231,7 +233,12 @@ void Dialog_Progress::on_signal_show()
dialog .set_secondary_text( str_temp, true ) ; dialog .set_secondary_text( str_temp, true ) ;
dialog .run() ; dialog .run() ;
} }
} }
}
void Dialog_Progress::on_expander_changed()
{
this ->set_resizable( expander_details .get_expanded() ) ;
} }
void * Dialog_Progress::static_pthread_apply_operation( void * p_dialog_progress ) void * Dialog_Progress::static_pthread_apply_operation( void * p_dialog_progress )

1
src/Win_GParted.cc
View File

@ -1384,6 +1384,7 @@ void Win_GParted::activate_apply( )
dialog .hide() ; //hide confirmationdialog dialog .hide() ; //hide confirmationdialog
Dialog_Progress dialog_progress( operations ) ; Dialog_Progress dialog_progress( operations ) ;
dialog_progress .set_transient_for( *this ) ;
dialog_progress .signal_apply_operation .connect( dialog_progress .signal_apply_operation .connect(
sigc::mem_fun(gparted_core, &GParted_Core::apply_operation_to_disk) ) ; sigc::mem_fun(gparted_core, &GParted_Core::apply_operation_to_disk) ) ;