From cf5a264b0e10d3ad09a19d4cb06d00dc2430b5f1 Mon Sep 17 00:00:00 2001 From: Mike Fleetwood Date: Sat, 24 Jul 2021 19:39:13 +0100 Subject: [PATCH] White space tidy-up some of DialogFeatures --- include/DialogFeatures.h | 66 +++++++++++++++++++++------------------- src/DialogFeatures.cc | 24 +++++++-------- 2 files changed, 46 insertions(+), 44 deletions(-) diff --git a/include/DialogFeatures.h b/include/DialogFeatures.h index b78a1356..60b05cb3 100644 --- a/include/DialogFeatures.h +++ b/include/DialogFeatures.h @@ -34,62 +34,64 @@ namespace GParted { + class DialogFeatures : public Gtk::Dialog { public: - DialogFeatures() ; - ~DialogFeatures() ; + DialogFeatures(); + ~DialogFeatures(); void load_filesystems(const std::vector& fss); private: void load_one_filesystem(const FS& fs); - Gtk::Frame legend_frame ; + Gtk::Frame legend_frame; Gtk::TreeView treeview_filesystems; Gtk::TreeRow treerow; Gtk::ScrolledWindow filesystems_scrolled ; Glib::RefPtr liststore_filesystems; - - struct treeview_filesystems_Columns : public Gtk::TreeModelColumnRecord + + struct treeview_filesystems_Columns : public Gtk::TreeModelColumnRecord { Gtk::TreeModelColumn fsname; - Gtk::TreeModelColumn< Glib::RefPtr > create ; - Gtk::TreeModelColumn< Glib::RefPtr > grow ; - Gtk::TreeModelColumn< Glib::RefPtr > online_grow ; - Gtk::TreeModelColumn< Glib::RefPtr > shrink ; - Gtk::TreeModelColumn< Glib::RefPtr > online_shrink ; - Gtk::TreeModelColumn< Glib::RefPtr > move ; - Gtk::TreeModelColumn< Glib::RefPtr > copy ; - Gtk::TreeModelColumn< Glib::RefPtr > check ; - Gtk::TreeModelColumn< Glib::RefPtr > label ; + Gtk::TreeModelColumn> create; + Gtk::TreeModelColumn> grow; + Gtk::TreeModelColumn> online_grow; + Gtk::TreeModelColumn> shrink; + Gtk::TreeModelColumn> online_shrink; + Gtk::TreeModelColumn> move; + Gtk::TreeModelColumn> copy; + Gtk::TreeModelColumn> check; + Gtk::TreeModelColumn> label; Gtk::TreeModelColumn> online_label; - Gtk::TreeModelColumn< Glib::RefPtr > uuid ; - Gtk::TreeModelColumn software ; - - treeview_filesystems_Columns() + Gtk::TreeModelColumn> uuid; + Gtk::TreeModelColumn software; + + treeview_filesystems_Columns() { add(fsname); - add( create ) ; - add( grow ) ; - add( online_grow ) ; - add( shrink ) ; - add( online_shrink ) ; - add( move ) ; - add( copy ) ; - add( check ) ; - add( label ) ; + add(create); + add(grow); + add(online_grow); + add(shrink); + add(online_shrink); + add(move); + add(copy); + add(check); + add(label); add(online_label); - add( uuid ) ; - add( software ) ; + add(uuid); + add(software); } }; - - treeview_filesystems_Columns treeview_filesystems_columns ; - Glib::RefPtr icon_yes, icon_no, icon_blank ; + treeview_filesystems_Columns treeview_filesystems_columns; + + Glib::RefPtr icon_yes, icon_no, icon_blank; }; + } //GParted #endif /* GPARTED_DIALOGFEATURES_H */ diff --git a/src/DialogFeatures.cc b/src/DialogFeatures.cc index de58dbea..a874cae1 100644 --- a/src/DialogFeatures.cc +++ b/src/DialogFeatures.cc @@ -191,20 +191,20 @@ void DialogFeatures::load_filesystems(const std::vector& fss) void DialogFeatures::load_one_filesystem(const FS& fs) { - treerow = *( liststore_filesystems ->append() ); + treerow = *(liststore_filesystems->append()); treerow[treeview_filesystems_columns.fsname] = Utils::get_filesystem_string(fs.fstype); - treerow[ treeview_filesystems_columns .create ] = fs .create ? icon_yes : icon_no ; - treerow[ treeview_filesystems_columns .grow ] = fs .grow ? icon_yes : icon_no ; - treerow[ treeview_filesystems_columns .online_grow ] = fs .online_grow ? icon_yes : icon_blank ; - treerow[ treeview_filesystems_columns .shrink ] = fs .shrink ? icon_yes : icon_no ; - treerow[ treeview_filesystems_columns .online_shrink ] = fs .online_shrink ? icon_yes : icon_blank ; - treerow[ treeview_filesystems_columns .move ] = fs .move ? icon_yes : icon_no ; - treerow[ treeview_filesystems_columns .copy ] = fs .copy ? icon_yes : icon_no ; - treerow[ treeview_filesystems_columns .check ] = fs .check ? icon_yes : icon_no ; - treerow[ treeview_filesystems_columns .label ] = fs .write_label ? icon_yes : icon_no ; - treerow[treeview_filesystems_columns.online_label] = fs.online_write_label ? icon_yes : icon_blank; - treerow[ treeview_filesystems_columns .uuid ] = fs .write_uuid ? icon_yes : icon_no ; + treerow[treeview_filesystems_columns.create ] = fs.create ? icon_yes : icon_no; + treerow[treeview_filesystems_columns.grow ] = fs.grow ? icon_yes : icon_no; + treerow[treeview_filesystems_columns.online_grow ] = fs.online_grow ? icon_yes : icon_blank; + treerow[treeview_filesystems_columns.shrink ] = fs.shrink ? icon_yes : icon_no; + treerow[treeview_filesystems_columns.online_shrink] = fs.online_shrink ? icon_yes : icon_blank; + treerow[treeview_filesystems_columns.move ] = fs.move ? icon_yes : icon_no; + treerow[treeview_filesystems_columns.copy ] = fs.copy ? icon_yes : icon_no; + treerow[treeview_filesystems_columns.check ] = fs.check ? icon_yes : icon_no; + treerow[treeview_filesystems_columns.label ] = fs.write_label ? icon_yes : icon_no; + treerow[treeview_filesystems_columns.online_label ] = fs.online_write_label ? icon_yes : icon_blank; + treerow[treeview_filesystems_columns.uuid ] = fs.write_uuid ? icon_yes : icon_no; treerow[treeview_filesystems_columns.software] = Utils::get_filesystem_software(fs.fstype); }