[Kde-imaging] extragear/libs/kipi-plugins/metadataedit

[Gilles Caulier]

SVN commit 596705 by cgilles:

kipiplugins from trunk : MetadataEdit plugin: Exif Date & Time informations editor is fully implemented.

CCMAIL: kde-imaging at kde.org
CCBUGS: 103255

 M  +1 -1      Makefile.am  
 A             exifdatetime.cpp   [License: GPL]
 A             exifdatetime.h   [License: GPL]
 M  +18 -11    exifeditdialog.cpp  


--- trunk/extragear/libs/kipi-plugins/metadataedit/Makefile.am #596704:596705
@@ -13,7 +13,7 @@
 	                                 metadataitem.cpp iptceditdialog.cpp iptccaption.cpp \
 	                                 iptccredits.cpp iptcstatus.cpp iptcorigin.cpp \
 	                                 iptcdatetime.cpp iptckeywords.cpp iptccategories.cpp \
-	                                 exifeditdialog.cpp exifcaption.cpp 
+	                                 exifeditdialog.cpp exifcaption.cpp exifdatetime.cpp 
 
 # Libs needed by the plugin
 kipiplugin_metadataedit_la_LIBADD = $(top_builddir)/kipi-plugins/common/exiv2iface/libexiv2iface.la \
--- trunk/extragear/libs/kipi-plugins/metadataedit/exifeditdialog.cpp #596704:596705
@@ -38,6 +38,7 @@
 // Local includes.
 
 #include "exifcaption.h"
+#include "exifdatetime.h"
 #include "exifeditdialog.h"
 #include "exifeditdialog.moc"
 
@@ -59,30 +60,34 @@
         page_datetime = 0;
 
         captionPage   = 0;
-/*        keywordsPage  = 0;
+        datetimePage  = 0;
+/*
+        keywordsPage  = 0;
         creditsPage   = 0;
         statusPage    = 0;
         originPage    = 0;
-        datetimePage  = 0;*/
+*/
     }
 
     QByteArray   exifData;
 
     QFrame         *page_caption;
+    QFrame         *page_datetime;
     QFrame         *page_keywords;
     QFrame         *page_categories;
     QFrame         *page_credits;
     QFrame         *page_status;
     QFrame         *page_origin;
-    QFrame         *page_datetime;
 
     EXIFCaption    *captionPage;
-/*    EXIFKeywords   *keywordsPage;
+    EXIFDateTime   *datetimePage;
+/*
+    EXIFKeywords   *keywordsPage;
     EXIFCategories *categoriesPage;
     EXIFCredits    *creditsPage;
     EXIFStatus     *statusPage;
     EXIFOrigin     *originPage;
-    EXIFDateTime   *datetimePage;*/
+*/
 };
 
 EXIFEditDialog::EXIFEditDialog(QWidget* parent, QByteArray exifData, const QString& fileName)
@@ -98,6 +103,10 @@
                                  BarIcon("editclear", KIcon::SizeMedium));
     d->captionPage     = new EXIFCaption(d->page_caption, d->exifData);
 
+    d->page_datetime   = addPage(i18n("Date & Time"), i18n("EXIF Date and Time Informations"),
+                                 BarIcon("today", KIcon::SizeMedium));
+    d->datetimePage    = new EXIFDateTime(d->page_datetime, d->exifData);
+
 /*    d->page_keywords   = addPage(i18n("Keywords"), i18n("EXIF Keywords Informations"),
                                  BarIcon("bookmark", KIcon::SizeMedium));
     d->keywordsPage    = new EXIFKeywords(d->page_keywords, d->exifData);
@@ -117,10 +126,6 @@
     d->page_origin     = addPage(i18n("Origin"), i18n("EXIF Origin Informations"),
                                  BarIcon("www", KIcon::SizeMedium));
     d->originPage      = new EXIFOrigin(d->page_origin, d->exifData);
-
-    d->page_datetime   = addPage(i18n("Date & Time"), i18n("EXIF Date and Time Informations"),
-                                 BarIcon("today", KIcon::SizeMedium));
-    d->datetimePage    = new EXIFDateTime(d->page_datetime, d->exifData);
 */
 
     readSettings();
@@ -170,12 +175,14 @@
 void EXIFEditDialog::slotOk()
 {
     d->captionPage->applyMetadata(d->exifData);
-/*    d->keywordsPage->applyMetadata(d->exifData);
+    d->datetimePage->applyMetadata(d->exifData);
+/*
+    d->keywordsPage->applyMetadata(d->exifData);
     d->categoriesPage->applyMetadata(d->exifData);
     d->creditsPage->applyMetadata(d->exifData);
     d->statusPage->applyMetadata(d->exifData);
     d->originPage->applyMetadata(d->exifData);
-    d->datetimePage->applyMetadata(d->exifData);*/
+*/
     saveSettings();
     accept();
 }