White space tidy-up some of DialogFeatures

This commit is contained in:
Mike Fleetwood 2021-07-24 19:39:13 +01:00 committed by Curtis Gedak
parent e4427b0333
commit cf5a264b0e
2 changed files with 46 additions and 44 deletions

View File

@ -34,62 +34,64 @@
namespace GParted namespace GParted
{ {
class DialogFeatures : public Gtk::Dialog class DialogFeatures : public Gtk::Dialog
{ {
public: public:
DialogFeatures() ; DialogFeatures();
~DialogFeatures() ; ~DialogFeatures();
void load_filesystems(const std::vector<FS>& fss); void load_filesystems(const std::vector<FS>& fss);
private: private:
void load_one_filesystem(const FS& fs); void load_one_filesystem(const FS& fs);
Gtk::Frame legend_frame ; Gtk::Frame legend_frame;
Gtk::TreeView treeview_filesystems; Gtk::TreeView treeview_filesystems;
Gtk::TreeRow treerow; Gtk::TreeRow treerow;
Gtk::ScrolledWindow filesystems_scrolled ; Gtk::ScrolledWindow filesystems_scrolled ;
Glib::RefPtr<Gtk::ListStore> liststore_filesystems; Glib::RefPtr<Gtk::ListStore> liststore_filesystems;
struct treeview_filesystems_Columns : public Gtk::TreeModelColumnRecord struct treeview_filesystems_Columns : public Gtk::TreeModelColumnRecord
{ {
Gtk::TreeModelColumn<Glib::ustring> fsname; Gtk::TreeModelColumn<Glib::ustring> fsname;
Gtk::TreeModelColumn< Glib::RefPtr<Gdk::Pixbuf> > create ; Gtk::TreeModelColumn<Glib::RefPtr<Gdk::Pixbuf>> create;
Gtk::TreeModelColumn< Glib::RefPtr<Gdk::Pixbuf> > grow ; Gtk::TreeModelColumn<Glib::RefPtr<Gdk::Pixbuf>> grow;
Gtk::TreeModelColumn< Glib::RefPtr<Gdk::Pixbuf> > online_grow ; Gtk::TreeModelColumn<Glib::RefPtr<Gdk::Pixbuf>> online_grow;
Gtk::TreeModelColumn< Glib::RefPtr<Gdk::Pixbuf> > shrink ; Gtk::TreeModelColumn<Glib::RefPtr<Gdk::Pixbuf>> shrink;
Gtk::TreeModelColumn< Glib::RefPtr<Gdk::Pixbuf> > online_shrink ; Gtk::TreeModelColumn<Glib::RefPtr<Gdk::Pixbuf>> online_shrink;
Gtk::TreeModelColumn< Glib::RefPtr<Gdk::Pixbuf> > move ; Gtk::TreeModelColumn<Glib::RefPtr<Gdk::Pixbuf>> move;
Gtk::TreeModelColumn< Glib::RefPtr<Gdk::Pixbuf> > copy ; Gtk::TreeModelColumn<Glib::RefPtr<Gdk::Pixbuf>> copy;
Gtk::TreeModelColumn< Glib::RefPtr<Gdk::Pixbuf> > check ; Gtk::TreeModelColumn<Glib::RefPtr<Gdk::Pixbuf>> check;
Gtk::TreeModelColumn< Glib::RefPtr<Gdk::Pixbuf> > label ; Gtk::TreeModelColumn<Glib::RefPtr<Gdk::Pixbuf>> label;
Gtk::TreeModelColumn<Glib::RefPtr<Gdk::Pixbuf>> online_label; Gtk::TreeModelColumn<Glib::RefPtr<Gdk::Pixbuf>> online_label;
Gtk::TreeModelColumn< Glib::RefPtr<Gdk::Pixbuf> > uuid ; Gtk::TreeModelColumn<Glib::RefPtr<Gdk::Pixbuf>> uuid;
Gtk::TreeModelColumn<Glib::ustring> software ; Gtk::TreeModelColumn<Glib::ustring> software;
treeview_filesystems_Columns() treeview_filesystems_Columns()
{ {
add(fsname); add(fsname);
add( create ) ; add(create);
add( grow ) ; add(grow);
add( online_grow ) ; add(online_grow);
add( shrink ) ; add(shrink);
add( online_shrink ) ; add(online_shrink);
add( move ) ; add(move);
add( copy ) ; add(copy);
add( check ) ; add(check);
add( label ) ; add(label);
add(online_label); add(online_label);
add( uuid ) ; add(uuid);
add( software ) ; add(software);
} }
}; };
treeview_filesystems_Columns treeview_filesystems_columns ;
Glib::RefPtr<Gdk::Pixbuf> icon_yes, icon_no, icon_blank ; treeview_filesystems_Columns treeview_filesystems_columns;
Glib::RefPtr<Gdk::Pixbuf> icon_yes, icon_no, icon_blank;
}; };
} //GParted } //GParted
#endif /* GPARTED_DIALOGFEATURES_H */ #endif /* GPARTED_DIALOGFEATURES_H */

View File

@ -191,20 +191,20 @@ void DialogFeatures::load_filesystems(const std::vector<FS>& fss)
void DialogFeatures::load_one_filesystem(const FS& fs) 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.fsname] = Utils::get_filesystem_string(fs.fstype);
treerow[ treeview_filesystems_columns .create ] = fs .create ? 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.grow ] = fs.grow ? icon_yes : icon_no;
treerow[ treeview_filesystems_columns .online_grow ] = fs .online_grow ? icon_yes : icon_blank ; 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.shrink ] = fs.shrink ? icon_yes : icon_no;
treerow[ treeview_filesystems_columns .online_shrink ] = fs .online_shrink ? icon_yes : icon_blank ; 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.move ] = fs.move ? icon_yes : icon_no;
treerow[ treeview_filesystems_columns .copy ] = fs .copy ? 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.check ] = fs.check ? icon_yes : icon_no;
treerow[ treeview_filesystems_columns .label ] = fs .write_label ? 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.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.uuid ] = fs.write_uuid ? icon_yes : icon_no;
treerow[treeview_filesystems_columns.software] = Utils::get_filesystem_software(fs.fstype); treerow[treeview_filesystems_columns.software] = Utils::get_filesystem_software(fs.fstype);
} }