Fixed a bunch of issues with min. and max. sizes of filesystems.

* Fixed a bunch of issues with min. and max. sizes of filesystems.

ChangeLog

@@ -1,3 +1,7 @@
+2004-12-09 Bart Hakvoort  <gparted@users.sf.net>
+
+	* Fixed a bunch of issues with min. and max. sizes of filesystems.
+
 2004-12-10  Gil Osher  <dolfin@rpg.org.il>
 
  * configure.in: Added 'he' (Hebrew) to ALL_LINGUAS.

include/Dialog_Partition_New.h

@@ -30,7 +30,7 @@ class Dialog_Partition_New : public Dialog_Base_Partition
 {
 public:
 	Dialog_Partition_New() ;
-	void Set_Data( const Partition & partition, bool any_extended, unsigned short new_count, const std::vector <FS> & FILESYSTEMS, bool only_unformatted );
+	void Set_Data( const Partition & partition, bool any_extended, unsigned short new_count, const std::vector <FS> & FILESYSTEMS, bool only_unformatted, int cylinder_size );
 	Partition Get_New_Partition() ;//overridden function
 
 private:
@@ -41,6 +41,7 @@ private:
 	Gtk::Menu menu_type, menu_filesystem;
 
 	std::vector<FS> FILESYSTEMS ;
+	int cylinder_size ;
 	
 	//signal handlers
 	void optionmenu_changed( bool );

include/Utils.h

@@ -55,7 +55,7 @@ struct FS
 	FS( )
 	{
 		read = create = resize = move = check = copy = false ;
-		MIN = 1 ;
+		MIN = 0 ;
 		MAX = 0 ;
 	} 
 };

src/Dialog_Partition_New.cc

@@ -37,10 +37,11 @@ Dialog_Partition_New::Dialog_Partition_New( )
 	frame_resizer_base ->set_used( 0 ) ;
 }
 
-void Dialog_Partition_New::Set_Data( const Partition & partition, bool any_extended, unsigned short new_count, const std::vector <FS> & FILESYSTEMS, bool only_unformatted )
+void Dialog_Partition_New::Set_Data( const Partition & partition, bool any_extended, unsigned short new_count, const std::vector <FS> & FILESYSTEMS, bool only_unformatted, int cylinder_size )
 {
 	this ->new_count = new_count;
 	this ->selected_partition = partition;
+	this ->cylinder_size = cylinder_size ;
 	this ->FILESYSTEMS = FILESYSTEMS ;
 	this ->FILESYSTEMS .back( ) .filesystem = _("Unformatted") ;
 	this ->FILESYSTEMS .back( ) .create = true ;
@@ -113,6 +114,10 @@ void Dialog_Partition_New::Set_Data( const Partition & partition, bool any_exten
 	optionmenu_filesystem .set_history( first_creatable_fs ) ;
 	optionmenu_changed( false ) ;
 	
+	//euhrm, this wil only happen when there's a very small free space (usually the effect of a bad partitionmanager)
+	if ( selected_partition .Get_Length_MB( ) < cylinder_size )
+		frame_resizer_base ->set_sensitive( false ) ;
+			
 	this ->show_all_children( ) ;
 }
 
@@ -185,17 +190,24 @@ void Dialog_Partition_New::optionmenu_changed( bool type )
 	if ( ! type )
 	{
 		fs = FILESYSTEMS[ optionmenu_filesystem .get_history( ) ] ;
+		if ( fs .MIN < cylinder_size )
+			fs .MIN = cylinder_size ; 
+		
+		if ( selected_partition .Get_Length_MB( ) < fs .MIN )
+			fs .MIN = selected_partition .Get_Length_MB( ) ;
+				
+		fs .MAX = ( fs .MAX && ( fs .MAX - cylinder_size ) < TOTAL_MB ) ? fs .MAX - cylinder_size : TOTAL_MB ;
 		
 		//needed vor upper limit check (see also Dialog_Base_Partition::on_signal_resize )
 		selected_partition .filesystem = fs .filesystem ; 
 		
 		//set new spinbutton ranges
 		spinbutton_before .set_range( 0, TOTAL_MB - fs .MIN ) ;
-		spinbutton_size .set_range( fs .MIN, fs .MAX ? fs .MAX : TOTAL_MB ) ;
+		spinbutton_size .set_range( fs .MIN, fs .MAX ) ;
 		spinbutton_after .set_range( 0, TOTAL_MB  - fs .MIN ) ;
 				
 		//set contents of label_minmax
-		Set_MinMax_Text( fs .MIN, fs .MAX ? fs .MAX : TOTAL_MB ) ;
+		Set_MinMax_Text( fs .MIN, fs .MAX ) ;
 	}
 	
 	//set fitting resizer colors

src/GParted_Core.cc

@@ -303,7 +303,7 @@ bool GParted_Core::Create( const Glib::ustring & device_path, Partition & new_pa
 	if ( new_partition .type == GParted::EXTENDED )   
 		return Create_Empty_Partition( device_path, new_partition ) ;
 	
-	else if ( Create_Empty_Partition( device_path, new_partition ) > 0 )
+	else if ( Create_Empty_Partition( device_path, new_partition, ( new_partition .Get_Length_MB( ) - Get_Cylinder_Size( device_path ) ) < Get_FS( new_partition .filesystem, FILESYSTEMS ) .MIN ) > 0 )
 	{
 		set_proper_filesystem( new_partition .filesystem ) ;
 		

src/Win_GParted.cc

@@ -958,7 +958,13 @@ void Win_GParted::activate_new()
 	else if ( ! max_amount_prim_reached( ) )
 	{	
 		Dialog_Partition_New dialog;
-		dialog .Set_Data( selected_partition, any_extended, new_count, gparted_core .get_fs( ), devices [ current_device ] .readonly ) ;
+		
+		//calculate cylindersize
+			long cylinder_size = Sector_To_MB( devices[ current_device ] .heads * devices[ current_device ] .sectors ) ;
+			if ( cylinder_size < 1 )
+				cylinder_size = 1 ;
+			
+		dialog .Set_Data( selected_partition, any_extended, new_count, gparted_core .get_fs( ), devices [ current_device ] .readonly, cylinder_size ) ;
 		dialog .set_transient_for( *this );
 		
 		if ( dialog .run( ) == Gtk::RESPONSE_OK )

src/reiserfs.cc

@@ -44,7 +44,7 @@ FS reiserfs::get_filesystem_support( )
 	if ( ! system( "which dd 1>/dev/null 2>/dev/null" ) && fs .resize ) 
 		fs .copy = true ;
 	
-	fs .MIN = 40 ;
+	fs .MIN = 32 ;
 	
 	return fs ;
 }