removed warning about busy device. It's not really needed and it confuses

* src/Win_GParted.cc: removed warning about busy device. It's not
  really needed and it confuses people.
* include/Operation.h: set default status of operationdetails to NONE
* include/Dialog_Progress.h,
  src/Dialog_Progress.cc: implemented export of operationdetails to
  external file. This can be very usefull for debugging. (#329968)

ChangeLog

@@ -1,3 +1,12 @@
+2006-02-07 Bart Hakvoort <hakvoort@cvs.gnome.org>
+
+	* src/Win_GParted.cc: removed warning about busy device. It's not
+	  really needed and it confuses people.
+	* include/Operation.h: set default status of operationdetails to NONE
+	* include/Dialog_Progress.h,
+	  src/Dialog_Progress.cc: implemented export of operationdetails to
+	  external file. This can be very usefull for debugging. (#329968)
+	
 2006-02-02 Bart Hakvoort <hakvoort@cvs.gnome.org>
 
 	* include/GParted_Core.h,

include/Dialog_Progress.h

@@ -29,6 +29,8 @@
 #include <gtkmm/scrolledwindow.h>
 #include <gtkmm/expander.h>
 
+#include <fstream>
+
 namespace GParted
 {
 
@@ -47,6 +49,8 @@ private:
 	void on_cell_data_description( Gtk::CellRenderer * renderer, const Gtk::TreeModel::iterator & iter) ;
 	static void *static_pthread_apply_operation( void * p_dialog_progress ) ;
 	void on_cancel() ;
+	void on_save() ;
+	void echo_operation_details( const OperationDetails & operation_details, std::ofstream & out ) ;
 	
 	void on_response( int response_id ) ;
 	bool on_delete_event( GdkEventAny * event ) ;

include/Operation.h

@@ -42,7 +42,7 @@ struct OperationDetails
 	
 	OperationDetails()
 	{
-		status = EXECUTE ;
+		status = NONE ;
 	}
 
 	OperationDetails( const Glib::ustring & description, Status status = EXECUTE )

src/Dialog_Progress.cc

@@ -20,6 +20,7 @@
 #include <gtkmm/stock.h>
 #include <gtkmm/main.h>
 #include <gtkmm/messagedialog.h>
+#include <gtkmm/filechooserdialog.h>
 
 namespace GParted
 {
@@ -72,11 +73,13 @@ Dialog_Progress::Dialog_Progress( const std::vector<Operation> & operations )
 	//fill 'er up
 	for ( unsigned int t = 0 ; t < operations .size() ; t++ )
 	{
+		this ->operations[ t ] .operation_details .description = "<b>" + operations[ t ] .str_operation + "</b>" ;
+		
 		treerow = *( treestore_operations ->append() );
 		treerow[ treeview_operations_columns .operation_icon ] = operations[ t ] .operation_icon ;
-		treerow[ treeview_operations_columns .operation_description ] = "<b>" + operations[ t ] .str_operation + "</b>" ; 
+		treerow[ treeview_operations_columns .operation_description ] =
-
+			this ->operations[ t ] .operation_details .description ; 
-		this ->operations[ t ] .operation_details .description = operations[ t ] .str_operation ;
+		treerow[ treeview_operations_columns .hidden_status ] = OperationDetails::NONE ; 
 	}
 	
 	treeview_operations .get_column( 1 ) ->set_expand( true ) ;
@@ -106,53 +109,46 @@ Dialog_Progress::Dialog_Progress( const std::vector<Operation> & operations )
 void Dialog_Progress::update_operation_details( const Gtk::TreeRow & treerow, 
 					        const OperationDetails & operation_details ) 
 {
-	Gtk::TreeRow treerow_child ;
-	
 	//append new rows (if any)
 	for ( unsigned int t = treerow .children() .size() ; t < operation_details .sub_details .size() ; t++ )
 	{
-		treerow_child = *( treestore_operations ->append( treerow .children() ) ) ;
+		Gtk::TreeRow treerow_child = *( treestore_operations ->append( treerow .children() ) ) ;
 		
 		treerow_child[ treeview_operations_columns .operation_description ] =
 			operation_details .sub_details[ t ] .description ;
 		
 		treerow_child[ treeview_operations_columns .hidden_status ] = OperationDetails::NONE ;
 	}
-
+	
-	for ( unsigned int t = 0 ; t < operation_details .sub_details .size() ; t++ )
+	//check status and update if necessary
+	if ( operation_details .status != treerow[ treeview_operations_columns .hidden_status ] )
 	{
-		treerow_child = treerow .children()[ t ] ;
+		treerow[ treeview_operations_columns .hidden_status ] =	operation_details .status ;
 
-		if ( operation_details .sub_details[ t ] .status != treerow_child[ treeview_operations_columns .hidden_status ] )
+		switch ( operation_details .status )
 		{
-			treerow_child[ treeview_operations_columns .hidden_status ] =
+			case OperationDetails::EXECUTE:
-				operation_details .sub_details[ t ] .status ;
+				treerow[ treeview_operations_columns .status_icon ] = icon_execute ;
-
-			switch ( operation_details .sub_details[ t ] .status )
-			{
-				case OperationDetails::EXECUTE:
-					treerow_child[ treeview_operations_columns .status_icon ] = icon_execute ;
 					
-					break ;
+				break ;
-				case OperationDetails::SUCCES:
+			case OperationDetails::SUCCES:
-					treerow_child[ treeview_operations_columns .status_icon ] = icon_succes ;
+				treerow[ treeview_operations_columns .status_icon ] = icon_succes ;
+				
+				break ;
+			case OperationDetails::ERROR:
+				treerow[ treeview_operations_columns .status_icon ] = icon_error ;
+				
+				break ;
 					
-					break ;
+			default : 
-				case OperationDetails::ERROR:
+				treerow[ treeview_operations_columns .hidden_status ] = OperationDetails::NONE ;
-					treerow_child[ treeview_operations_columns .status_icon ] = icon_error ;
+				break ;
-					
-					break ;
-					
-				default : 
-					//plain, old-fashioned paranoia ;)
-					treerow_child[ treeview_operations_columns .hidden_status ] =
-						OperationDetails::NONE ;
-					break ;
-			}
 		}
-		
-		update_operation_details( treerow_child, operation_details .sub_details[ t ] ) ;
 	}
+
+	//and update the children..
+	for ( unsigned int t = 0 ; t < operation_details .sub_details .size() ; t++ )
+		update_operation_details( treerow .children()[ t ], operation_details .sub_details[ t ] ) ;
 }
 
 void Dialog_Progress::on_signal_show()
@@ -164,14 +160,19 @@ void Dialog_Progress::on_signal_show()
 		progressbar_all .set_text( String::ucompose( _("%1 of %2 operations completed"), t, operations .size() ) ) ;
 		progressbar_all .set_fraction( fraction * t ) ;
 		
-		static_cast<Gtk::TreeRow>( treestore_operations ->children()[ t ] )
+		treerow = treestore_operations ->children()[ t ] ;
-			[ treeview_operations_columns .status_icon ] = icon_execute ;
+
-		treeview_operations .set_cursor( static_cast<Gtk::TreePath>( treestore_operations ->children()[ t ] ) ) ;
+		//set status to 'execute'
+		operations[ t ] .operation_details .status = OperationDetails::EXECUTE ;
+		update_operation_details( treerow, operations[ t ] .operation_details ) ;
+
+		//set focus...
+		treeview_operations .set_cursor( static_cast<Gtk::TreePath>( treerow ) ) ;
 		
+		//and start..
 		pulse = true ;
 		pthread_create( & pthread, NULL, Dialog_Progress::static_pthread_apply_operation, this );
 		
-		treerow = treestore_operations ->children()[ t ] ;
 		while ( pulse )
 		{
 			update_operation_details( treerow, operations[ t ] .operation_details ) ;
@@ -184,16 +185,19 @@ void Dialog_Progress::on_signal_show()
 			usleep( 10000 ) ;
 		}
 
-		//final updates for this operation
+		//set status (succes/error) for this operation
+		operations[ t ] .operation_details .status =
+			succes ? OperationDetails::SUCCES : OperationDetails::ERROR ;
 		update_operation_details( treerow, operations[ t ] .operation_details ) ;
-		static_cast<Gtk::TreeRow>( treestore_operations ->children()[ t ] )
-			[ treeview_operations_columns .status_icon ] = succes ? icon_succes : icon_error ;
 	}
 	
+	//add save button
+	this ->add_button( _("_Save Details"), Gtk::RESPONSE_OK ) ; //there's no enum for SAVE
+	
 	//replace 'cancel' with 'close'
 	std::vector<Gtk::Widget *> children = this ->get_action_area() ->get_children() ;
 	this ->get_action_area() ->remove( * children .back() ) ;
-	this ->add_button( Gtk::Stock::CLOSE, Gtk::RESPONSE_OK );
+	this ->add_button( Gtk::Stock::CLOSE, Gtk::RESPONSE_CLOSE );
 
 	if ( cancel )
 	{
@@ -284,10 +288,98 @@ void Dialog_Progress::on_cancel()
 	}
 }
 
+void Dialog_Progress::on_save()
+{
+	Gtk::FileChooserDialog dialog( _("Save Details"), Gtk::FILE_CHOOSER_ACTION_SAVE ) ;
+	dialog .set_transient_for( *this ) ;
+	dialog .set_current_folder( Glib::get_home_dir() ) ;
+	dialog .set_current_name( "gparted_details.htm" ) ;
+	dialog .set_do_overwrite_confirmation( true ) ;
+	dialog .add_button( Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL ) ; 
+	dialog .add_button( Gtk::Stock::SAVE, Gtk::RESPONSE_OK ) ; //there's no enum for SAVE
+
+	if ( dialog .run() == Gtk::RESPONSE_OK )
+	{
+		std::ofstream out( dialog .get_filename() .c_str() ) ;
+		if ( out )
+		{
+			out << "GParted " << VERSION << "<BR><BR>" << std::endl ;
+			for ( unsigned int t = 0 ; t < operations .size() ; t++ )
+			{
+				echo_operation_details( operations[ t ] .operation_details, out ) ;
+				out << "<BR>========================================<BR><BR>" << std::endl ;
+			}
+				
+			out .close() ;
+		}
+	}
+}
+
+void Dialog_Progress::echo_operation_details( const OperationDetails & operation_details, std::ofstream & out ) 
+{
+	//replace '\n' with '<br>'
+	Glib::ustring temp = operation_details .description ;
+	for ( unsigned int index = temp .find( "\n" ) ; index < temp .length() ; index = temp .find( "\n" ) )
+		temp .replace( index, 1, "<BR>" ) ;
+	
+	//and export everything to some kind of html...
+	out << "<TABLE border=0>" << std::endl ;
+	out << "<TR>" << std::endl ;
+	out << "<TD colspan=2>" << std::endl ;
+	out << temp ;
+	
+	//show status...
+	if ( operation_details .status != OperationDetails::NONE )
+	{
+		out << "&nbsp;&nbsp;&nbsp;&nbsp;" ;
+		switch ( operation_details .status )
+		{
+			case OperationDetails::EXECUTE:
+				out << "( EXECUTING )" ;
+				break ;
+			case OperationDetails::SUCCES:
+				out << "( SUCCES )" ;
+				break ;
+			case OperationDetails::ERROR:
+				out << "( ERROR )" ;
+				break ;
+
+			default:
+				break ;
+		}
+	}
+	
+	out << std::endl ;
+	out << "</TD>" << std::endl ;
+	out << "</TR>" << std::endl ;
+	
+	if ( operation_details .sub_details. size() )
+	{
+		out << "<TR>" << std::endl ;
+		out << "<TD>&nbsp;&nbsp;&nbsp;&nbsp;</TD>" << std::endl ;
+		out << "<TD>" << std::endl ;
+
+		for ( unsigned int t = 0 ; t < operation_details .sub_details .size() ; t++ )
+			echo_operation_details( operation_details .sub_details[ t ], out ) ;
+
+		out << "</TD>" << std::endl ;
+		out << "</TR>" << std::endl ;
+	}
+	
+	out << "</TABLE>" << std::endl ;
+}
+
 void Dialog_Progress::on_response( int response_id ) 
 {
-	if ( response_id == Gtk::RESPONSE_CANCEL )
+	switch ( response_id )
-		on_cancel() ;
+	{
+		case Gtk::RESPONSE_OK:
+			on_save() ;
+			break ;
+		case Gtk::RESPONSE_CANCEL:
+			on_cancel() ;
+			break ;
+	}
 }
 
 bool Dialog_Progress::on_delete_event( GdkEventAny * event ) 

src/Win_GParted.cc

@@ -1446,31 +1446,15 @@ void Win_GParted::activate_apply( )
 		dialog_progress .signal_apply_operation .connect(
 			sigc::mem_fun(gparted_core, &GParted_Core::apply_operation_to_disk) ) ;
  
-		for ( ; dialog_progress .run() == Gtk::RESPONSE_CANCEL ; ) {}
+		int response ;
+		do
+		{
+			response = dialog_progress .run() ;
+		}
+		while ( response == Gtk::RESPONSE_CANCEL || response == Gtk::RESPONSE_OK ) ;
+		
 		dialog_progress .hide() ;
 		
-		//find out if any of the involved devices is busy
-		bool any_busy = false ;
-		for ( unsigned int t = 0; t < devices .size( ) && ! any_busy; t++ )
-			if ( devices[ t ] .highest_busy )
-				for (unsigned int i = 0; i < operations .size( ) && ! any_busy; i++ )
-					if ( operations[ i ] .device .path == devices[ t ] .path )
-						any_busy = true ;
-				
-		//show warning if necessary
-		if ( any_busy )
-		{
-			str_temp = "<span weight=\"bold\" size=\"larger\">" ;	
-			str_temp += _("At least one operation was applied to a busy device.") ;
-			str_temp += "</span>\n\n" ;
-			str_temp += _("A busy device is a device with at least one mounted partition.") ;
-			str_temp += "\n";
-			str_temp += _("Because making changes to a busy device may confuse the kernel, you are advised to reboot your computer.") ;
-
-			Gtk::MessageDialog dialog( *this, str_temp, true, Gtk::MESSAGE_WARNING, Gtk::BUTTONS_OK, true );
-			dialog .run() ;
-		}			
-					
 		//wipe operations...
 		operations.clear() ;
 		liststore_operations ->clear() ;