liz/rawTherapee
liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adding separators between frames in ExifPanel (see #4008)

Browse Source
This commit is contained in:
Hombre57 2017-08-20 22:51:06 +02:00
parent a056493e9a
commit ae19b6485a
2 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
rtgui/exifpanel.cc
View File

@ -45,6 +45,11 @@ ExifPanel::ExifPanel () : idata(nullptr)
exifTreeModel = Gtk::TreeStore::create(exifColumns); exifTreeModel = Gtk::TreeStore::create(exifColumns);
exifTree->set_model (exifTreeModel); exifTree->set_model (exifTreeModel);
exifTree->set_grid_lines(Gtk::TREE_VIEW_GRID_LINES_NONE);
exifTree->set_row_separator_func(
[&](const Glib::RefPtr<Gtk::TreeModel>& model, const Gtk::TreeModel::iterator& row)
{ return row->get_value (exifColumns.isSeparator); }
);
delicon = RTImage::createFromFile ("gtk-close.png"); delicon = RTImage::createFromFile ("gtk-close.png");
keepicon = RTImage::createFromFile ("gtk-apply.png"); keepicon = RTImage::createFromFile ("gtk-apply.png");
@ -184,18 +189,12 @@ void ExifPanel::setImageData (const FramesMetaData* id)
exifTreeModel->clear (); exifTreeModel->clear ();
if (id) { if (id) {
//bool first = true;
// HOMBRE: Should we only display the current frame's Exifs ?
for (unsigned int frameNum = 0; frameNum < id->getFrameCount (); ++frameNum) { for (unsigned int frameNum = 0; frameNum < id->getFrameCount (); ++frameNum) {
if ( id->getExifData (frameNum)) { if ( id->getExifData (frameNum)) {
/*
if (!first) {
Gtk::Separator *sep = Gtk::manage (new Gtk::Separator);
sep->set_orientation(Gtk::ORIENTATION_HORIZONTAL);
first = false;
}
*/
//id->getExifData ()->printAll (); //id->getExifData ()->printAll ();
if (frameNum > 0) {
addSeparator();
}
addDirectory (id->getExifData (frameNum), exifTreeModel->children()); addDirectory (id->getExifData (frameNum), exifTreeModel->children());
} }
} }
@ -233,6 +232,21 @@ Gtk::TreeModel::Children ExifPanel::addTag (const Gtk::TreeModel::Children& root
return row.children(); return row.children();
} }
Gtk::TreeModel::Children ExifPanel::addSeparator ()
{
Gtk::TreeModel::Row row = *(exifTreeModel->append(exifTreeModel->children()));
row[exifColumns.action] = rtexif::ActionCode::AC_INVALID;
row[exifColumns.editable] = false;
row[exifColumns.edited] = false;
row[exifColumns.field_nopango] = "";
row[exifColumns.value_nopango] = "";
row[exifColumns.orig_value] = "";
row[exifColumns.isSeparator] = true;
return row.children();
}
void ExifPanel::addDirectory (const TagDirectory* dir, Gtk::TreeModel::Children root) void ExifPanel::addDirectory (const TagDirectory* dir, Gtk::TreeModel::Children root)
{ {

3
rtgui/exifpanel.h
View File

@ -43,6 +43,7 @@ private:
Gtk::TreeModelColumn<rtexif::ActionCode> action; Gtk::TreeModelColumn<rtexif::ActionCode> action;
Gtk::TreeModelColumn<bool> editable; Gtk::TreeModelColumn<bool> editable;
Gtk::TreeModelColumn<bool> edited; Gtk::TreeModelColumn<bool> edited;
Gtk::TreeModelColumn<bool> isSeparator;
ExifColumns() ExifColumns()
{ {
@ -55,6 +56,7 @@ private:
add(value_nopango); add(value_nopango);
add(editable); add(editable);
add(orig_value); add(orig_value);
add(isSeparator);
} }
}; };
Glib::RefPtr<Gdk::Pixbuf> delicon; Glib::RefPtr<Gdk::Pixbuf> delicon;
@ -76,6 +78,7 @@ private:
void editTag (Gtk::TreeModel::Children root, Glib::ustring name, Glib::ustring value); void editTag (Gtk::TreeModel::Children root, Glib::ustring name, Glib::ustring value);
void updateChangeList (Gtk::TreeModel::Children root, std::string prefix); void updateChangeList (Gtk::TreeModel::Children root, std::string prefix);
void addDirectory (const rtexif::TagDirectory* dir, Gtk::TreeModel::Children root); void addDirectory (const rtexif::TagDirectory* dir, Gtk::TreeModel::Children root);
Gtk::TreeModel::Children addSeparator ();
Glib::ustring getSelection (bool onlyifeditable = false); Glib::ustring getSelection (bool onlyifeditable = false);
Glib::ustring getSelectedValue (); Glib::ustring getSelectedValue ();
void updateChangeList (); void updateChangeList ();