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

Switch to using struct FS_Limits inside Dialog_Partition_New (#787204) 

Change Dialog_Partition_New to use a fs_limits rather than struct FS
and .MIN and .MAX.  No passing of struct FS_Limits required.  Just use
the FILESYSTEMS vector of struct FS to provide the file system type and
look up it's size limits each time the selection changes.

Bug 787204 - Minimum and maximum size of the UDF partition/disk
This commit is contained in:
Mike Fleetwood 2018-01-15 18:07:58 +00:00 committed by Curtis Gedak
parent 53b7a75894
commit 4fa262d7e3
2 changed files with 37 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/Dialog_Partition_New.h
View File

@ -21,6 +21,7 @@
#include "Dialog_Base_Partition.h" #include "Dialog_Base_Partition.h"
#include "Device.h" #include "Device.h"
#include "Partition.h" #include "Partition.h"
#include "Utils.h"
#include <gtkmm/optionmenu.h> #include <gtkmm/optionmenu.h>
@ -50,6 +51,7 @@ private:
unsigned short new_count, unsigned short new_count,
const std::vector<FS> & FILESYSTEMS ); const std::vector<FS> & FILESYSTEMS );
void Build_Filesystems_Menu( bool only_unformatted ) ; void Build_Filesystems_Menu( bool only_unformatted ) ;
Byte_Value get_filesystem_min_limit( FILESYSTEM fstype );
Gtk::Table table_create; Gtk::Table table_create;
Gtk::OptionMenu optionmenu_type, optionmenu_filesystem; Gtk::OptionMenu optionmenu_type, optionmenu_filesystem;

57
src/Dialog_Partition_New.cc
View File

@ -18,6 +18,7 @@
#include "Dialog_Partition_New.h" #include "Dialog_Partition_New.h"
#include "GParted_Core.h" #include "GParted_Core.h"
#include "Partition.h" #include "Partition.h"
#include "Utils.h"
namespace GParted namespace GParted
{ {
@ -172,7 +173,7 @@ void Dialog_Partition_New::set_data( const Device & device,
//set spinbuttons initial values //set spinbuttons initial values
spinbutton_after .set_value( 0 ) ; spinbutton_after .set_value( 0 ) ;
spinbutton_size .set_value( ceil( fs .MAX / double(MEBIBYTE) ) ) ; spinbutton_size.set_value( ceil( fs_limits.max_size / double(MEBIBYTE) ) );
spinbutton_before .set_value( MIN_SPACE_BEFORE_MB ) ; spinbutton_before .set_value( MIN_SPACE_BEFORE_MB ) ;
//Disable resizing when the total area is less than two mebibytes //Disable resizing when the total area is less than two mebibytes
@ -339,35 +340,36 @@ void Dialog_Partition_New::optionmenu_changed( bool type )
{ {
fs = FILESYSTEMS[ optionmenu_filesystem .get_history() ] ; fs = FILESYSTEMS[ optionmenu_filesystem .get_history() ] ;
if ( fs .MIN < MEBIBYTE ) FileSystem *filesystem_object = GParted_Core::get_filesystem_object( fs.filesystem );
fs .MIN = MEBIBYTE ; fs_limits = FS_Limits(); // Copy new default no limits struct
if ( filesystem_object != NULL )
fs_limits = filesystem_object->get_filesystem_limits();
if ( new_partition->get_byte_length() < fs.MIN ) if ( fs_limits.min_size < MEBIBYTE )
fs.MIN = new_partition->get_byte_length(); fs_limits.min_size = MEBIBYTE;
if ( ! fs .MAX || ( fs .MAX > ((TOTAL_MB - MIN_SPACE_BEFORE_MB) * MEBIBYTE) ) ) if ( new_partition->get_byte_length() < fs_limits.min_size )
fs .MAX = ((TOTAL_MB - MIN_SPACE_BEFORE_MB) * MEBIBYTE) ; fs_limits.min_size = new_partition->get_byte_length();
if ( ! fs_limits.max_size || ( fs_limits.max_size > ((TOTAL_MB - MIN_SPACE_BEFORE_MB) * MEBIBYTE) ) )
fs_limits.max_size = (TOTAL_MB - MIN_SPACE_BEFORE_MB) * MEBIBYTE;
frame_resizer_base ->set_x_min_space_before( Utils::round( MIN_SPACE_BEFORE_MB / MB_PER_PIXEL ) ) ; frame_resizer_base ->set_x_min_space_before( Utils::round( MIN_SPACE_BEFORE_MB / MB_PER_PIXEL ) ) ;
frame_resizer_base ->set_size_limits( Utils::round( fs .MIN / (MB_PER_PIXEL * MEBIBYTE) ), frame_resizer_base->set_size_limits( Utils::round( fs_limits.min_size / (MB_PER_PIXEL * MEBIBYTE) ),
Utils::round( fs .MAX / (MB_PER_PIXEL * MEBIBYTE) ) ) ; Utils::round( fs_limits.max_size / (MB_PER_PIXEL * MEBIBYTE) ) );
//set new spinbutton ranges //set new spinbutton ranges
spinbutton_before .set_range( MIN_SPACE_BEFORE_MB spinbutton_before.set_range( MIN_SPACE_BEFORE_MB,
, TOTAL_MB - ceil( fs .MIN / double(MEBIBYTE) ) TOTAL_MB - ceil( fs_limits.min_size / double(MEBIBYTE) ) );
) ; spinbutton_size.set_range( ceil( fs_limits.min_size / double(MEBIBYTE) ),
spinbutton_size .set_range( ceil( fs .MIN / double(MEBIBYTE) ) ceil( fs_limits.max_size / double(MEBIBYTE) ) );
, ceil( fs .MAX / double(MEBIBYTE) ) spinbutton_after.set_range( 0,
) ; TOTAL_MB - MIN_SPACE_BEFORE_MB
spinbutton_after .set_range( 0 - ceil( fs_limits.min_size / double(MEBIBYTE) ) );
, TOTAL_MB - MIN_SPACE_BEFORE_MB
- ceil( fs .MIN / double(MEBIBYTE) )
) ;
//set contents of label_minmax //set contents of label_minmax
Set_MinMax_Text( ceil( fs .MIN / double(MEBIBYTE) ) Set_MinMax_Text( ceil( fs_limits.min_size / double(MEBIBYTE) ),
, ceil( fs .MAX / double(MEBIBYTE) ) ceil( fs_limits.max_size / double(MEBIBYTE) ) );
) ;
} }
//set fitting resizer colors //set fitting resizer colors
@ -403,7 +405,7 @@ void Dialog_Partition_New::Build_Filesystems_Menu( bool only_unformatted )
Gtk::Menu_Helpers::MenuElem( Utils::get_filesystem_string( FILESYSTEMS[ t ] .filesystem ) ) ) ; Gtk::Menu_Helpers::MenuElem( Utils::get_filesystem_string( FILESYSTEMS[ t ] .filesystem ) ) ) ;
menu_filesystem .items() .back() .set_sensitive( menu_filesystem .items() .back() .set_sensitive(
! only_unformatted && FILESYSTEMS[ t ] .create && ! only_unformatted && FILESYSTEMS[ t ] .create &&
new_partition->get_byte_length() >= FILESYSTEMS[t].MIN ); new_partition->get_byte_length() >= get_filesystem_min_limit( FILESYSTEMS[t].filesystem ) );
//use ext4/3/2 as first/second/third choice default file system //use ext4/3/2 as first/second/third choice default file system
//(Depends on ordering in FILESYSTEMS for preference) //(Depends on ordering in FILESYSTEMS for preference)
if ( ( FILESYSTEMS[ t ] .filesystem == FS_EXT2 || if ( ( FILESYSTEMS[ t ] .filesystem == FS_EXT2 ||
@ -431,4 +433,13 @@ void Dialog_Partition_New::Build_Filesystems_Menu( bool only_unformatted )
} }
} }
Byte_Value Dialog_Partition_New::get_filesystem_min_limit( FILESYSTEM fstype )
{
FileSystem *filesystem_object = GParted_Core::get_filesystem_object( fstype );
FS_Limits fs_limits;
if ( filesystem_object != NULL )
fs_limits = filesystem_object->get_filesystem_limits();
return fs_limits.min_size;
}
} //GParted } //GParted