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

Rename class to Dialog_FileSystem_Label (#741424) 

class Dialog_Partition_Label   -> Dialog_FileSystem_Label
file Dialog_Partition_Label.h  -> Dialog_FileSystem_Label.h
file Dialog_Partition_Label.cc -> Dialog_FileSystem_Label.cc

Bug 741424 - Add support for GPT partition names
This commit is contained in:
Mike Fleetwood 2014-12-19 21:08:28 +00:00 committed by Curtis Gedak
parent 04450c577c
commit e1dc89cd11
6 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/Dialog_Partition_Label.h → include/Dialog_FileSystem_Label.h
View File

@ -14,8 +14,8 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>. * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef GPARTED_DIALOG_PARTITION_LABEL_H #ifndef GPARTED_DIALOG_FILESYSTEM_LABEL_H
#define GPARTED_DIALOG_PARTITION_LABEL_H #define GPARTED_DIALOG_FILESYSTEM_LABEL_H
#include "../include/Partition.h" #include "../include/Partition.h"
#include "../include/i18n.h" #include "../include/i18n.h"
@ -31,11 +31,11 @@
namespace GParted namespace GParted
{ {
class Dialog_Partition_Label : public Gtk::Dialog class Dialog_FileSystem_Label : public Gtk::Dialog
{ {
public: public:
Dialog_Partition_Label( const Partition & partition ); Dialog_FileSystem_Label( const Partition & partition );
~Dialog_Partition_Label(); ~Dialog_FileSystem_Label();
Glib::ustring get_new_label(); Glib::ustring get_new_label();
private: private:
@ -44,4 +44,4 @@ private:
} //GParted } //GParted
#endif /* GPARTED_DIALOG_PARTITION_LABEL_H */ #endif /* GPARTED_DIALOG_FILESYSTEM_LABEL_H */

2
include/Makefile.am
View File

@ -8,9 +8,9 @@ EXTRA_DIST = \
DialogManageFlags.h \ DialogManageFlags.h \
Dialog_Base_Partition.h \ Dialog_Base_Partition.h \
Dialog_Disklabel.h \ Dialog_Disklabel.h \
Dialog_FileSystem_Label.h \
Dialog_Partition_Copy.h \ Dialog_Partition_Copy.h \
Dialog_Partition_Info.h \ Dialog_Partition_Info.h \
Dialog_Partition_Label.h \
Dialog_Partition_New.h \ Dialog_Partition_New.h \
Dialog_Partition_Resize_Move.h \ Dialog_Partition_Resize_Move.h \
Dialog_Progress.h \ Dialog_Progress.h \

2
po/POTFILES.in
View File

@ -6,9 +6,9 @@ include/Utils.h
src/Copy_Blocks.cc src/Copy_Blocks.cc
src/Dialog_Base_Partition.cc src/Dialog_Base_Partition.cc
src/Dialog_Disklabel.cc src/Dialog_Disklabel.cc
src/Dialog_FileSystem_Label.cc
src/Dialog_Partition_Copy.cc src/Dialog_Partition_Copy.cc
src/Dialog_Partition_Info.cc src/Dialog_Partition_Info.cc
src/Dialog_Partition_Label.cc
src/Dialog_Partition_New.cc src/Dialog_Partition_New.cc
src/Dialog_Partition_Resize_Move.cc src/Dialog_Partition_Resize_Move.cc
src/Dialog_Progress.cc src/Dialog_Progress.cc

8
src/Dialog_Partition_Label.cc → src/Dialog_FileSystem_Label.cc
View File

@ -14,12 +14,12 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>. * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
#include "../include/Dialog_Partition_Label.h" #include "../include/Dialog_FileSystem_Label.h"
namespace GParted namespace GParted
{ {
Dialog_Partition_Label::Dialog_Partition_Label( const Partition & partition ) Dialog_FileSystem_Label::Dialog_FileSystem_Label( const Partition & partition )
{ {
this ->set_resizable( false ) ; this ->set_resizable( false ) ;
this ->set_has_separator( false ) ; this ->set_has_separator( false ) ;
@ -61,11 +61,11 @@ Dialog_Partition_Label::Dialog_Partition_Label( const Partition & partition )
this ->show_all_children() ; this ->show_all_children() ;
} }
Dialog_Partition_Label::~Dialog_Partition_Label() Dialog_FileSystem_Label::~Dialog_FileSystem_Label()
{ {
} }
Glib::ustring Dialog_Partition_Label::get_new_label() Glib::ustring Dialog_FileSystem_Label::get_new_label()
{ {
return Utils::trim( Glib::ustring( entry ->get_text() ) ); return Utils::trim( Glib::ustring( entry ->get_text() ) );
} }

2
src/Makefile.am
View File

@ -19,9 +19,9 @@ gpartedbin_SOURCES = \
DialogManageFlags.cc \ DialogManageFlags.cc \
Dialog_Base_Partition.cc \ Dialog_Base_Partition.cc \
Dialog_Disklabel.cc \ Dialog_Disklabel.cc \
Dialog_FileSystem_Label.cc \
Dialog_Partition_Copy.cc \ Dialog_Partition_Copy.cc \
Dialog_Partition_Info.cc \ Dialog_Partition_Info.cc \
Dialog_Partition_Label.cc \
Dialog_Partition_New.cc \ Dialog_Partition_New.cc \
Dialog_Partition_Resize_Move.cc \ Dialog_Partition_Resize_Move.cc \
Dialog_Progress.cc \ Dialog_Progress.cc \

4
src/Win_GParted.cc
View File

@ -24,7 +24,7 @@
#include "../include/Dialog_Partition_Copy.h" #include "../include/Dialog_Partition_Copy.h"
#include "../include/Dialog_Partition_New.h" #include "../include/Dialog_Partition_New.h"
#include "../include/Dialog_Partition_Info.h" #include "../include/Dialog_Partition_Info.h"
#include "../include/Dialog_Partition_Label.h" #include "../include/Dialog_FileSystem_Label.h"
#include "../include/DialogManageFlags.h" #include "../include/DialogManageFlags.h"
#include "../include/OperationCopy.h" #include "../include/OperationCopy.h"
#include "../include/OperationCheck.h" #include "../include/OperationCheck.h"
@ -2473,7 +2473,7 @@ void Win_GParted::activate_check()
void Win_GParted::activate_label_filesystem() void Win_GParted::activate_label_filesystem()
{ {
Dialog_Partition_Label dialog( selected_partition ); Dialog_FileSystem_Label dialog( selected_partition );
dialog .set_transient_for( *this ); dialog .set_transient_for( *this );
if ( ( dialog .run() == Gtk::RESPONSE_OK ) if ( ( dialog .run() == Gtk::RESPONSE_OK )