From 7a413f6401b260b94b7b849858cae42f045ae366 Mon Sep 17 00:00:00 2001 From: Bart Hakvoort Date: Fri, 1 Dec 2006 13:01:46 +0000 Subject: [PATCH] added libparted version string to details export. * include/Dialog_Progress.h, include/GParted_Core.h, src/Dialog_Progress.cc, src/GParted_Core.cc, src/Win_GParted.cc: added libparted version string to details export. --- ChangeLog | 9 +++++++++ include/Dialog_Progress.h | 1 + include/GParted_Core.h | 1 + src/Dialog_Progress.cc | 1 + src/GParted_Core.cc | 5 +++++ src/Win_GParted.cc | 2 ++ 6 files changed, 19 insertions(+) diff --git a/ChangeLog b/ChangeLog index 46bc5411..593b226f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2006-12-01 Bart Hakvoort + + * include/Dialog_Progress.h, + include/GParted_Core.h, + src/Dialog_Progress.cc, + src/GParted_Core.cc, + src/Win_GParted.cc: added libparted version string to details + export. + 2006-11-26 Bart Hakvoort * src/Win_GParted.cc: fixed bug with copying partition to a disk diff --git a/include/Dialog_Progress.h b/include/Dialog_Progress.h index e37cee20..361b31cd 100644 --- a/include/Dialog_Progress.h +++ b/include/Dialog_Progress.h @@ -41,6 +41,7 @@ public: ~Dialog_Progress(); sigc::signal< bool, Operation * > signal_apply_operation ; + sigc::signal< Glib::ustring > signal_get_libparted_version ; private: void on_signal_update( const OperationDetail & operationdetail ) ; diff --git a/include/GParted_Core.h b/include/GParted_Core.h index 784b3da3..08f00a92 100644 --- a/include/GParted_Core.h +++ b/include/GParted_Core.h @@ -50,6 +50,7 @@ public: std::vector get_disklabeltypes() ; std::vector get_all_mountpoints() ; std::map get_available_flags( const Partition & partition ) ; + Glib::ustring get_libparted_version() ; private: //detectionstuff.. diff --git a/src/Dialog_Progress.cc b/src/Dialog_Progress.cc index 4db26e96..b1ce7be6 100644 --- a/src/Dialog_Progress.cc +++ b/src/Dialog_Progress.cc @@ -343,6 +343,7 @@ void Dialog_Progress::on_save() if ( out ) { out << "GParted " << VERSION << "

" << std::endl ; + out << "Libparted " << signal_get_libparted_version .emit() << "

" << std::endl ; for ( unsigned int t = 0 ; t < operations .size() ; t++ ) { echo_operation_details( operations[ t ] ->operation_detail, out ) ; diff --git a/src/GParted_Core.cc b/src/GParted_Core.cc index 4201cc4c..5cab43fd 100644 --- a/src/GParted_Core.cc +++ b/src/GParted_Core.cc @@ -449,6 +449,11 @@ std::map GParted_Core::get_available_flags( const Partition return flag_info ; } + +Glib::ustring GParted_Core::get_libparted_version() +{ + return ped_get_version() ; +} //private functions... diff --git a/src/Win_GParted.cc b/src/Win_GParted.cc index 5e1851b8..58cc57b2 100644 --- a/src/Win_GParted.cc +++ b/src/Win_GParted.cc @@ -1837,6 +1837,8 @@ void Win_GParted::activate_apply() dialog_progress .set_transient_for( *this ) ; dialog_progress .signal_apply_operation .connect( sigc::mem_fun(gparted_core, &GParted_Core::apply_operation_to_disk) ) ; + dialog_progress .signal_get_libparted_version .connect( + sigc::mem_fun(gparted_core, &GParted_Core::get_libparted_version) ) ; int response ; do