merge with Dev

This commit is contained in:
Desmis
2017-12-15 15:53:04 +01:00
6 changed files with 448 additions and 450 deletions

View File

@@ -46,11 +46,7 @@ ExifPanel::ExifPanel () : idata (nullptr)
exifTreeModel = Gtk::TreeStore::create (exifColumns);
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)-> bool {
return row->get_value (exifColumns.isSeparator);
}
);
exifTree->set_row_separator_func (sigc::mem_fun(*this, &ExifPanel::rowSeperatorFunc));
delicon = RTImage::createFromFile ("gtk-close.png");
keepicon = RTImage::createFromFile ("gtk-apply.png");
@@ -540,6 +536,11 @@ void ExifPanel::showAlltoggled ()
setImageData (idata);
}
bool ExifPanel::rowSeperatorFunc(const Glib::RefPtr<Gtk::TreeModel>& model, const Gtk::TreeModel::iterator& iter)
{
return iter->get_value(exifColumns.isSeparator);
}
void ExifPanel::editTag (Gtk::TreeModel::Children root, Glib::ustring name, Glib::ustring value)
{

View File

@@ -93,6 +93,7 @@ private:
void resetAllPressed();
void addPressed();
void showAlltoggled();
bool rowSeperatorFunc(const Glib::RefPtr<Gtk::TreeModel>& model, const Gtk::TreeModel::iterator& iter);
public:
ExifPanel ();