From kde-commits Mon Jun 30 21:02:59 2014 From: Marcel Wiesweg Date: Mon, 30 Jun 2014 21:02:59 +0000 To: kde-commits Subject: [kipi-plugins] metadataedit/xmp: Apply patch by Alan Pater Message-Id: X-MARC-Message: https://marc.info/?l=kde-commits&m=140416218715338 Git commit 6414115e0f9d8f28240fb75180d0353938eb30c4 by Marcel Wiesweg. Committed on 30/06/2014 at 21:02. Pushed by mwiesweg into branch 'master'. Apply patch by Alan Pater BUG: 313203 M +101 -14 metadataedit/xmp/xmpcredits.cpp http://commits.kde.org/kipi-plugins/6414115e0f9d8f28240fb75180d0353938eb30c4 diff --git a/metadataedit/xmp/xmpcredits.cpp b/metadataedit/xmp/xmpcredits.= cpp index 2609aed..aa648dc 100644 --- a/metadataedit/xmp/xmpcredits.cpp +++ b/metadataedit/xmp/xmpcredits.cpp @@ -5,6 +5,7 @@ * * Date : 2007-10-24 * Description : XMP credits settings page. + * Modified : 2014-04-22 Alan Pater * * Copyright (C) 2007-2013 by Gilles Caulier * @@ -334,9 +335,14 @@ void XMPCredits::readMetadata(QByteArray& xmpData) = d->bylineTitleEdit->setEnabled(d->bylineTitleCheck->isChecked()); = + // -------------------------------------------------------- + d->emailEdit->clear(); d->emailCheck->setChecked(false); - data =3D meta.getXmpTagString("Xmp.iptc.CiEmailWork", false); + data =3D meta.getXmpTagString("Xmp.iptc.CreatorContactInfo/Iptc4xmpCor= e:CiEmailWork", false); + + if (data.isNull()) + data =3D meta.getXmpTagString("Xmp.iptc.CiEmailWork", false); = if (!data.isNull()) { @@ -346,9 +352,14 @@ void XMPCredits::readMetadata(QByteArray& xmpData) = d->emailEdit->setEnabled(d->emailCheck->isChecked()); = + // -------------------------------------------------------- + d->urlEdit->clear(); d->urlCheck->setChecked(false); - data =3D meta.getXmpTagString("Xmp.iptc.CiUrlWork", false); + data =3D meta.getXmpTagString("Xmp.iptc.CreatorContactInfo/Iptc4xmpCor= e:CiUrlWork", false); + + if (data.isNull()) + data =3D meta.getXmpTagString("Xmp.iptc.CiUrlWork", false); = if (!data.isNull()) { @@ -358,9 +369,14 @@ void XMPCredits::readMetadata(QByteArray& xmpData) = d->urlEdit->setEnabled(d->urlCheck->isChecked()); = + // -------------------------------------------------------- + d->phoneEdit->clear(); d->phoneCheck->setChecked(false); - data =3D meta.getXmpTagString("Xmp.iptc.CiTelWork", false); + data =3D meta.getXmpTagString("Xmp.iptc.CreatorContactInfo/Iptc4xmpCor= e:CiTelWork", false); + + if (data.isNull()) + data =3D meta.getXmpTagString("Xmp.iptc.CiTelWork", false); = if (!data.isNull()) { @@ -370,9 +386,14 @@ void XMPCredits::readMetadata(QByteArray& xmpData) = d->phoneEdit->setEnabled(d->phoneCheck->isChecked()); = + // -------------------------------------------------------- + d->addressEdit->clear(); d->addressCheck->setChecked(false); - data =3D meta.getXmpTagString("Xmp.iptc.CiAdrExtadr", false); + data =3D meta.getXmpTagString("Xmp.iptc.CreatorContactInfo/Iptc4xmpCor= e:CiAdrExtadr", false); + + if (data.isNull()) + data =3D meta.getXmpTagString("Xmp.iptc.CiAdrExtadr", false); = if (!data.isNull()) { @@ -382,9 +403,14 @@ void XMPCredits::readMetadata(QByteArray& xmpData) = d->addressEdit->setEnabled(d->addressCheck->isChecked()); = + // -------------------------------------------------------- + d->postalCodeEdit->clear(); d->postalCodeCheck->setChecked(false); - data =3D meta.getXmpTagString("Xmp.iptc.CiAdrPcode", false); + data =3D meta.getXmpTagString("Xmp.iptc.CreatorContactInfo/Iptc4xmpCor= e:CiAdrPcode", false); + + if (data.isNull()) + data =3D meta.getXmpTagString("Xmp.iptc.CiAdrPcode", false); = if (!data.isNull()) { @@ -394,9 +420,14 @@ void XMPCredits::readMetadata(QByteArray& xmpData) = d->postalCodeEdit->setEnabled(d->postalCodeCheck->isChecked()); = + // -------------------------------------------------------- + d->cityEdit->clear(); d->cityCheck->setChecked(false); - data =3D meta.getXmpTagString("Xmp.iptc.CiAdrCity", false); + data =3D meta.getXmpTagString("Xmp.iptc.CreatorContactInfo/Iptc4xmpCor= e:CiAdrCity", false); + + if (data.isNull()) + data =3D meta.getXmpTagString("Xmp.iptc.CiAdrCity", false); = if (!data.isNull()) { @@ -406,9 +437,14 @@ void XMPCredits::readMetadata(QByteArray& xmpData) = d->cityEdit->setEnabled(d->cityCheck->isChecked()); = + // -------------------------------------------------------- + d->countryEdit->clear(); d->countryCheck->setChecked(false); - data =3D meta.getXmpTagString("Xmp.iptc.CiAdrCtry", false); + data =3D meta.getXmpTagString("Xmp.iptc.CreatorContactInfo/Iptc4xmpCor= e:CiAdrCtry", false); + + if (data.isNull()) + data =3D meta.getXmpTagString("Xmp.iptc.CiAdrCtry", false); = if (!data.isNull()) { @@ -418,6 +454,8 @@ void XMPCredits::readMetadata(QByteArray& xmpData) = d->countryEdit->setEnabled(d->countryCheck->isChecked()); = + // -------------------------------------------------------- + d->creditEdit->clear(); d->creditCheck->setChecked(false); data =3D meta.getXmpTagString("Xmp.photoshop.Credit", false); @@ -430,6 +468,8 @@ void XMPCredits::readMetadata(QByteArray& xmpData) = d->creditEdit->setEnabled(d->creditCheck->isChecked()); = + // -------------------------------------------------------- + d->sourceEdit->clear(); d->sourceCheck->setChecked(false); data =3D meta.getXmpTagString("Xmp.photoshop.Source", false); @@ -464,40 +504,86 @@ void XMPCredits::applyMetadata(QByteArray& xmpData) else meta.removeXmpTag("Xmp.photoshop.AuthorsPosition"); = + // -------------------------------------------------------- + if (d->emailCheck->isChecked()) - meta.setXmpTagString("Xmp.iptc.CiEmailWork", d->emailEdit->text()); + { + meta.setXmpTagString("Xmp.iptc.CreatorContactInfo/Iptc4xmpCore:CiE= mailWork", d->emailEdit->text()); + meta.removeXmpTag("Xmp.iptc.CiEmailWork"); + } else + { meta.removeXmpTag("Xmp.iptc.CiEmailWork"); + meta.removeXmpTag("Xmp.iptc.CreatorContactInfo/Iptc4xmpCore:CiEmai= lWork"); + } = if (d->urlCheck->isChecked()) - meta.setXmpTagString("Xmp.iptc.CiUrlWork", d->urlEdit->text()); + { + meta.setXmpTagString("Xmp.iptc.CreatorContactInfo/Iptc4xmpCore:CiU= rlWork", d->urlEdit->text()); + meta.removeXmpTag("Xmp.iptc.CiUrlWork"); + } else + { meta.removeXmpTag("Xmp.iptc.CiUrlWork"); + meta.removeXmpTag("Xmp.iptc.CreatorContactInfo/Iptc4xmpCore:CiUrlW= ork"); + } = if (d->phoneCheck->isChecked()) - meta.setXmpTagString("Xmp.iptc.CiTelWork", d->phoneEdit->text()); + { + meta.setXmpTagString("Xmp.iptc.CreatorContactInfo/Iptc4xmpCore:CiT= elWork", d->phoneEdit->text()); + meta.removeXmpTag("Xmp.iptc.CiTelWork"); + } else + { meta.removeXmpTag("Xmp.iptc.CiTelWork"); + meta.removeXmpTag("Xmp.iptc.CreatorContactInfo/Iptc4xmpCore:CiTelW= ork"); + } = if (d->addressCheck->isChecked()) - meta.setXmpTagString("Xmp.iptc.CiAdrExtadr", d->addressEdit->text(= )); + { + meta.setXmpTagString("Xmp.iptc.CreatorContactInfo/Iptc4xmpCore:CiA= drExtadr", d->addressEdit->text()); + meta.removeXmpTag("Xmp.iptc.CiAdrExtadr"); + } else + { meta.removeXmpTag("Xmp.iptc.CiAdrExtadr"); + meta.removeXmpTag("Xmp.iptc.CreatorContactInfo/Iptc4xmpCore:CiAdrE= xtadr"); + } = if (d->postalCodeCheck->isChecked()) - meta.setXmpTagString("Xmp.iptc.CiAdrPcode", d->postalCodeEdit->tex= t()); + { + meta.setXmpTagString("Xmp.iptc.CreatorContactInfo/Iptc4xmpCore:CiA= drPcode", d->postalCodeEdit->text()); + meta.removeXmpTag("Xmp.iptc.CiAdrPcode"); + } else + { meta.removeXmpTag("Xmp.iptc.CiAdrPcode"); + meta.removeXmpTag("Xmp.iptc.CreatorContactInfo/Iptc4xmpCore:CiAdrP= code"); + } = if (d->cityCheck->isChecked()) - meta.setXmpTagString("Xmp.iptc.CiAdrCity", d->cityEdit->text()); + { + meta.setXmpTagString("Xmp.iptc.CreatorContactInfo/Iptc4xmpCore:CiA= drCity", d->cityEdit->text()); + meta.removeXmpTag("Xmp.iptc.CiAdrCity"); + } else + { meta.removeXmpTag("Xmp.iptc.CiAdrCity"); + meta.removeXmpTag("Xmp.iptc.CreatorContactInfo/Iptc4xmpCore:CiAdrC= ity"); + } = if (d->countryCheck->isChecked()) - meta.setXmpTagString("Xmp.iptc.CiAdrCtry", d->countryEdit->text()); + { + meta.setXmpTagString("Xmp.iptc.CreatorContactInfo/Iptc4xmpCore:CiA= drCtry", d->countryEdit->text()); + meta.removeXmpTag("Xmp.iptc.CiAdrCtry"); + } else + { meta.removeXmpTag("Xmp.iptc.CiAdrCtry"); + meta.removeXmpTag("Xmp.iptc.CreatorContactInfo/Iptc4xmpCore:CiAdrC= try"); + } + + // -------------------------------------------------------- = if (d->creditCheck->isChecked()) meta.setXmpTagString("Xmp.photoshop.Credit", d->creditEdit->text()= ); @@ -519,3 +605,4 @@ void XMPCredits::applyMetadata(QByteArray& xmpData) } = } // namespace KIPIMetadataEditPlugin +