[gparted] Rename member object to filesystem_label_entry (#746214)
- From: Curtis Gedak <gedakc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gparted] Rename member object to filesystem_label_entry (#746214)
- Date: Wed, 25 Mar 2015 19:08:25 +0000 (UTC)
commit fc599270c2562e4d139104e1bbb84c935086bc8a
Author: Mike Fleetwood <mike fleetwood googlemail com>
Date: Sat Mar 14 15:10:41 2015 +0000
Rename member object to filesystem_label_entry (#746214)
Rename Gtk::Entry object entry -> filesystem_label_entry in the
Dialog_Partition_New class. This is in preparation for the introduction
of the partition name entry box in the Create New Partition dialog.
Bug 746214 - Partition name enhancements
include/Dialog_Partition_New.h | 2 +-
src/Dialog_Partition_New.cc | 16 ++++++++--------
2 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/include/Dialog_Partition_New.h b/include/Dialog_Partition_New.h
index dfa7c7a..f12402e 100644
--- a/include/Dialog_Partition_New.h
+++ b/include/Dialog_Partition_New.h
@@ -43,7 +43,7 @@ private:
Gtk::Table table_create;
Gtk::OptionMenu optionmenu_type, optionmenu_filesystem;
Gtk::Menu menu_type, menu_filesystem;
- Gtk::Entry entry;
+ Gtk::Entry filesystem_label_entry;
std::vector<FS> FILESYSTEMS ;
diff --git a/src/Dialog_Partition_New.cc b/src/Dialog_Partition_New.cc
index cd12407..287b40d 100644
--- a/src/Dialog_Partition_New.cc
+++ b/src/Dialog_Partition_New.cc
@@ -131,12 +131,12 @@ void Dialog_Partition_New::Set_Data( const Partition & partition,
table_create .attach( * Utils::mk_label( Glib::ustring( _("Label:") ) ),
0, 1, 3, 4, Gtk::FILL ) ;
//Create Text entry box
- entry .set_width_chars( 20 );
- entry .set_activates_default( true );
- entry .set_text( partition.get_filesystem_label() );
- entry .select_region( 0, entry .get_text_length() );
+ filesystem_label_entry.set_width_chars( 20 );
+ filesystem_label_entry.set_activates_default( true );
+ filesystem_label_entry.set_text( partition.get_filesystem_label() );
+ filesystem_label_entry.select_region( 0, filesystem_label_entry.get_text_length() );
//Add entry box to table
- table_create .attach( entry, 1, 2, 3, 4, Gtk::FILL ) ;
+ table_create.attach( filesystem_label_entry, 1, 2, 3, 4, Gtk::FILL );
//set some widely used values...
MIN_SPACE_BEFORE_MB = Dialog_Base_Partition::MB_Needed_for_Boot_Record( selected_partition ) ;
@@ -202,7 +202,7 @@ Partition Dialog_Partition_New::Get_New_Partition( Byte_Value sector_size )
selected_partition.inside_extended, false );
//Retrieve Label info
- part_temp.set_filesystem_label( Utils::trim( entry.get_text() ) );
+ part_temp.set_filesystem_label( Utils::trim( filesystem_label_entry.get_text() ) );
//grow new partition a bit if freespaces are < 1 MiB
if ( (part_temp.sector_start - selected_partition.sector_start) < (MEBIBYTE / sector_size) )
@@ -318,8 +318,8 @@ void Dialog_Partition_New::optionmenu_changed( bool type )
frame_resizer_base->set_rgb_partition_color(color_temp);
}
- //set partition name entry box length
- entry .set_max_length( Utils::get_filesystem_label_maxlength( fs.filesystem ) ) ;
+ // Maximum length of the file system label varies according to the selected file system type.
+ filesystem_label_entry.set_max_length( Utils::get_filesystem_label_maxlength( fs.filesystem ) );
frame_resizer_base ->Draw_Partition() ;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]