Merge branch 'dev' into metadata-exiv2

- Rating (#5325) not yet implemented
This commit is contained in:
Flössie
2019-09-24 14:30:54 +02:00
539 changed files with 7707 additions and 5098 deletions

View File

@@ -14,7 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with RawTherapee. If not, see <http://www.gnu.org/licenses/>.
* along with RawTherapee. If not, see <https://www.gnu.org/licenses/>.
*/
#include <unordered_set>
@@ -139,12 +139,10 @@ ExifPanel::ExifPanel() :
show_all ();
}
ExifPanel::~ExifPanel ()
{
}
void ExifPanel::read (const ProcParams* pp, const ParamsEdited* pedited)
{
disableListener ();
@@ -162,21 +160,18 @@ void ExifPanel::write (ProcParams* pp, ParamsEdited* pedited)
pp->exif = *changeList;
}
void ExifPanel::setDefaults (const ProcParams* defParams, const ParamsEdited* pedited)
{
*defChangeList = defParams->exif;
}
void ExifPanel::setImageData (const FramesMetaData* id)
{
idata = id;
}
Gtk::TreeModel::Children ExifPanel::addTag(const std::string &key, const Glib::ustring &label, const Glib::ustring &value, bool editable, bool edited)
{
auto root = exifTreeModel->children();
@@ -201,7 +196,6 @@ Gtk::TreeModel::Children ExifPanel::addTag(const std::string &key, const Glib::u
return row.children();
}
void ExifPanel::refreshTags()
{
Glib::RefPtr<Gtk::TreeSelection> selection = exifTree->get_selection();
@@ -265,7 +259,6 @@ void ExifPanel::refreshTags()
}
}
void ExifPanel::exifSelectionChanged ()
{
@@ -285,7 +278,6 @@ void ExifPanel::exifSelectionChanged ()
}
}
void ExifPanel::resetIt(const Gtk::TreeModel::const_iterator& iter)
{
if (!iter) {
@@ -296,7 +288,6 @@ void ExifPanel::resetIt(const Gtk::TreeModel::const_iterator& iter)
changeList->erase(key);
}
void ExifPanel::resetPressed ()
{
@@ -310,7 +301,6 @@ void ExifPanel::resetPressed ()
notifyListener();
}
void ExifPanel::resetAllPressed ()
{
setImageData(idata);
@@ -319,7 +309,6 @@ void ExifPanel::resetAllPressed ()
notifyListener ();
}
void ExifPanel::addPressed ()
{
@@ -400,7 +389,6 @@ void ExifPanel::addPressed ()
delete hb2;
}
void ExifPanel::notifyListener ()
{
if (listener) {