Merge branch 'dev' into metadata-exiv2

This commit is contained in:
Thanatomanic
2021-04-27 09:59:52 +02:00
249 changed files with 22554 additions and 8710 deletions

View File

@@ -79,6 +79,7 @@ IPTCPanel::IPTCPanel():
embeddedData(new rtengine::procparams::IPTCPairs)
{
set_orientation(Gtk::ORIENTATION_VERTICAL);
set_spacing (4);
Gtk::Grid* iptc = Gtk::manage( new Gtk::Grid () );
@@ -138,7 +139,7 @@ IPTCPanel::IPTCPanel():
// --------------------------
Gtk::HSeparator* hsep1 = Gtk::manage( new Gtk::HSeparator () );
Gtk::Separator* hsep1 = Gtk::manage( new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL) );
setExpandAlignProperties(hsep1, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
iptc->attach (*hsep1, 0, row++, 2, 1);
@@ -182,7 +183,7 @@ IPTCPanel::IPTCPanel():
iptc->attach (*scrolledWindowkw, 0, row++, 2, 1);
// --------------------------
Gtk::HSeparator* hsep2 = Gtk::manage( new Gtk::HSeparator () );
Gtk::Separator* hsep2 = Gtk::manage( new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL) );
setExpandAlignProperties(hsep2, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
iptc->attach (*hsep2, 0, row++, 2, 1);
// --------------------------
@@ -235,7 +236,7 @@ IPTCPanel::IPTCPanel():
iptc->attach (*scrolledWindowsc, 0, row++, 2, 1);
// --------------------------
Gtk::HSeparator* hsep3 = Gtk::manage( new Gtk::HSeparator () );
Gtk::Separator* hsep3 = Gtk::manage( new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL) );
setExpandAlignProperties(hsep3, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
iptc->attach (*hsep3, 0, row++, 2, 1);
// --------------------------
@@ -295,7 +296,7 @@ IPTCPanel::IPTCPanel():
// --------------------------
Gtk::HSeparator* hsep4 = Gtk::manage( new Gtk::HSeparator () );
Gtk::Separator* hsep4 = Gtk::manage( new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL) );
setExpandAlignProperties(hsep4, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
iptc->attach (*hsep4, 0, row++, 2, 1);