Rename class to OperationLabelFileSystem (#741424)
class OperationLabelPartition -> OperationLabelFileSystem file OperationLabelPartition.h -> OperationLabelFileSystem.h file OperationLabelPartition.cc -> OperationLabelFileSystem.cc Bug 741424 - Add support for GPT partition names
This commit is contained in:
parent
3630b9c83b
commit
04450c577c
|
@ -31,7 +31,7 @@ EXTRA_DIST = \
|
|||
OperationDelete.h \
|
||||
OperationDetail.h \
|
||||
OperationFormat.h \
|
||||
OperationLabelPartition.h \
|
||||
OperationLabelFileSystem.h \
|
||||
OperationResizeMove.h \
|
||||
Partition.h \
|
||||
PipeCapture.h \
|
||||
|
|
|
@ -14,22 +14,22 @@
|
|||
* along with this program; if not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#ifndef GPARTED_OPERATIONLABELPARTITION_H
|
||||
#define GPARTED_OPERATIONLABELPARTITION_H
|
||||
#ifndef GPARTED_OPERATIONLABELFILESYSTEM_H
|
||||
#define GPARTED_OPERATIONLABELFILESYSTEM_H
|
||||
|
||||
#include "../include/Operation.h"
|
||||
|
||||
namespace GParted
|
||||
{
|
||||
|
||||
class OperationLabelPartition : public Operation
|
||||
class OperationLabelFileSystem : public Operation
|
||||
{
|
||||
public:
|
||||
OperationLabelPartition( const Device & device,
|
||||
const Partition & partition_orig,
|
||||
const Partition & partition_new ) ;
|
||||
OperationLabelFileSystem( const Device & device,
|
||||
const Partition & partition_orig,
|
||||
const Partition & partition_new );
|
||||
|
||||
void apply_to_visual( std::vector<Partition> & partitions ) ;
|
||||
void apply_to_visual( std::vector<Partition> & partitions );
|
||||
|
||||
private:
|
||||
void create_description() ;
|
||||
|
@ -37,4 +37,4 @@ private:
|
|||
|
||||
} //GParted
|
||||
|
||||
#endif /* GPARTED_OPERATIONLABELPARTITION_H */
|
||||
#endif /* GPARTED_OPERATIONLABELFILESYSTEM_H */
|
|
@ -26,7 +26,7 @@ src/OperationCheck.cc
|
|||
src/OperationCreate.cc
|
||||
src/OperationDelete.cc
|
||||
src/OperationFormat.cc
|
||||
src/OperationLabelPartition.cc
|
||||
src/OperationLabelFileSystem.cc
|
||||
src/OperationResizeMove.cc
|
||||
src/Partition.cc
|
||||
src/TreeView_Detail.cc
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
#include "../include/OperationFormat.h"
|
||||
#include "../include/OperationResizeMove.h"
|
||||
#include "../include/OperationChangeUUID.h"
|
||||
#include "../include/OperationLabelPartition.h"
|
||||
#include "../include/OperationLabelFileSystem.h"
|
||||
#include "../include/Proc_Partitions_Info.h"
|
||||
|
||||
#include "../include/btrfs.h"
|
||||
|
|
|
@ -42,7 +42,7 @@ gpartedbin_SOURCES = \
|
|||
OperationDelete.cc \
|
||||
OperationDetail.cc \
|
||||
OperationFormat.cc \
|
||||
OperationLabelPartition.cc \
|
||||
OperationLabelFileSystem.cc \
|
||||
OperationResizeMove.cc \
|
||||
Partition.cc \
|
||||
PipeCapture.cc \
|
||||
|
|
|
@ -13,15 +13,15 @@
|
|||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "../include/OperationLabelPartition.h"
|
||||
|
||||
#include "../include/OperationLabelFileSystem.h"
|
||||
|
||||
namespace GParted
|
||||
{
|
||||
|
||||
OperationLabelPartition::OperationLabelPartition( const Device & device,
|
||||
const Partition & partition_orig,
|
||||
const Partition & partition_new )
|
||||
OperationLabelFileSystem::OperationLabelFileSystem( const Device & device,
|
||||
const Partition & partition_orig,
|
||||
const Partition & partition_new )
|
||||
{
|
||||
type = OPERATION_LABEL_FILESYSTEM;
|
||||
|
||||
|
@ -30,12 +30,12 @@ OperationLabelPartition::OperationLabelPartition( const Device & device,
|
|||
this ->partition_new = partition_new ;
|
||||
}
|
||||
|
||||
void OperationLabelPartition::apply_to_visual( std::vector<Partition> & partitions )
|
||||
void OperationLabelFileSystem::apply_to_visual( std::vector<Partition> & partitions )
|
||||
{
|
||||
if ( partition_original .inside_extended )
|
||||
{
|
||||
index_extended = find_index_extended( partitions ) ;
|
||||
|
||||
|
||||
if ( index_extended >= 0 )
|
||||
index = find_index_original( partitions[ index_extended ] .logicals ) ;
|
||||
|
||||
|
@ -51,7 +51,7 @@ void OperationLabelPartition::apply_to_visual( std::vector<Partition> & partitio
|
|||
}
|
||||
}
|
||||
|
||||
void OperationLabelPartition::create_description()
|
||||
void OperationLabelFileSystem::create_description()
|
||||
{
|
||||
if( partition_new.get_filesystem_label().empty() ) {
|
||||
/* TO TRANSLATORS: looks like Clear file system Label on /dev/hda3 */
|
|
@ -33,7 +33,7 @@
|
|||
#include "../include/OperationFormat.h"
|
||||
#include "../include/OperationResizeMove.h"
|
||||
#include "../include/OperationChangeUUID.h"
|
||||
#include "../include/OperationLabelPartition.h"
|
||||
#include "../include/OperationLabelFileSystem.h"
|
||||
#include "../include/LVM2_PV_Info.h"
|
||||
#include "../config.h"
|
||||
|
||||
|
@ -2485,7 +2485,7 @@ void Win_GParted::activate_label_filesystem()
|
|||
|
||||
part_temp.set_filesystem_label( dialog.get_new_label() );
|
||||
|
||||
Operation * operation = new OperationLabelPartition( devices[ current_device ],
|
||||
Operation * operation = new OperationLabelFileSystem( devices[current_device],
|
||||
selected_partition, part_temp ) ;
|
||||
operation ->icon = render_icon( Gtk::Stock::EXECUTE, Gtk::ICON_SIZE_MENU );
|
||||
|
||||
|
|
Loading…
Reference in New Issue