[Digikam-devel] extragear/libs/kipi-plugins/metadataedit

[Gilles Caulier]

SVN commit 728834 by cgilles:

kipi-plugins from trunk (KDE4) : XMP metadata editor : add dialog page to edit Credits informations.
CCMAIL: digikam-devel at kde.org
CCMAIL: kde-imaging at kde.org


 M  +1 -0      CMakeLists.txt  
 AM            xmpcredits.cpp   [License: GPL]
 AM            xmpcredits.h   [License: GPL]
 M  +10 -11    xmpeditdialog.cpp  


--- trunk/extragear/libs/kipi-plugins/metadataedit/CMakeLists.txt #728833:728834
@@ -27,6 +27,7 @@
                                       xmpcategories.cpp
                                       xmpsubjects.cpp
 				      xmporigin.cpp
+				      xmpcredits.cpp
                                       commenteditdialog.cpp
                                       commentremovedialog.cpp
    )
** trunk/extragear/libs/kipi-plugins/metadataedit/xmpcredits.cpp #property svn:eol-style
   + native
** trunk/extragear/libs/kipi-plugins/metadataedit/xmpcredits.h #property svn:eol-style
   + native
--- trunk/extragear/libs/kipi-plugins/metadataedit/xmpeditdialog.cpp #728833:728834
@@ -60,9 +60,9 @@
 #include "xmpcategories.h"
 #include "xmpsubjects.h"
 #include "xmporigin.h"
+#include "xmpcredits.h"
 
 /*
-#include "xmpcredits.h"
 #include "xmpstatus.h"
 #include "xmpproperties.h"
 #include "xmpenvelope.h"
@@ -98,9 +98,9 @@
         contentPage     = 0;
         subjectsPage    = 0;
         originPage      = 0;
+        creditsPage     = 0;
 /*
         propertiesPage  = 0;
-        creditsPage     = 0;
         statusPage      = 0;
         envelopePage    = 0;
 */
@@ -132,10 +132,9 @@
     XMPCategories            *categoriesPage;
     XMPSubjects              *subjectsPage;
     XMPOrigin                *originPage;
-
+    XMPCredits               *creditsPage;
 /*
     XMPProperties            *propertiesPage;
-    XMPCredits               *creditsPage;
     XMPStatus                *statusPage;
     XMPEnvelope              *envelopePage;
 */
@@ -176,13 +175,13 @@
     d->page_origin->setHeader(i18n("<qt>Origin Information<br>"
                     "<i>Use this panel for formal descriptive information about the image</i></qt>"));
     d->page_origin->setIcon(KIcon("network"));
-/*
+
     d->creditsPage  = new XMPCredits(this);
     d->page_credits = addPage(d->creditsPage, i18n("Credits"));
     d->page_credits->setHeader(i18n("<qt>Credits Information<br>"
                      "<i>Use this panel to record copyright information about the image</i></qt>"));
     d->page_credits->setIcon(KIcon("kontact-contacts"));
-*/
+
     d->subjectsPage  = new XMPSubjects(this);
     d->page_subjects = addPage(d->subjectsPage, i18n("Subjects"));
     d->page_subjects->setHeader(i18n("<qt>Subjects Information<br>"
@@ -260,10 +259,10 @@
 
     connect(d->categoriesPage, SIGNAL(signalModified()),
             this, SLOT(slotModified()));
-/*
+
     connect(d->creditsPage, SIGNAL(signalModified()),
             this, SLOT(slotModified()));
-
+/*
     connect(d->statusPage, SIGNAL(signalModified()),
             this, SLOT(slotModified()));
 
@@ -366,8 +365,8 @@
     d->subjectsPage->readMetadata(d->xmpData);
     d->keywordsPage->readMetadata(d->xmpData);
     d->categoriesPage->readMetadata(d->xmpData);
-/*
     d->creditsPage->readMetadata(d->xmpData);
+/*
     d->statusPage->readMetadata(d->xmpData);
     d->propertiesPage->readMetadata(d->xmpData);
     d->envelopePage->readMetadata(d->xmpData);
@@ -379,8 +378,8 @@
     d->page_subjects->setEnabled(!d->isReadOnly);
     d->page_keywords->setEnabled(!d->isReadOnly);
     d->page_categories->setEnabled(!d->isReadOnly);
-/*
     d->page_credits->setEnabled(!d->isReadOnly);
+/*
     d->page_status->setEnabled(!d->isReadOnly);
     d->page_properties->setEnabled(!d->isReadOnly);
     d->page_envelope->setEnabled(!d->isReadOnly);
@@ -418,8 +417,8 @@
         d->subjectsPage->applyMetadata(d->xmpData);
         d->keywordsPage->applyMetadata(d->xmpData);
         d->categoriesPage->applyMetadata(d->xmpData);
-/*
         d->creditsPage->applyMetadata(d->xmpData);
+/*
         d->statusPage->applyMetadata(d->xmpData);
         d->propertiesPage->applyMetadata(d->xmpData);
         d->envelopePage->applyMetadata(d->xmpData);