[Digikam-devel] extragear/graphics/digikam

[Gilles Caulier]

SVN commit 526689 by cgilles:

digikam from trunk : metadata setup page : add exiv2 logo to give more visibility to end users about internal metadata management interface.

CCMAIL: digikam-devel at kde.org 


 M  +1 -1      digikam/pics/Makefile.am  
 AM            digikam/pics/exiv2logo.png  
 M  +1 -1      utilities/setup/setup.cpp  
 M  +29 -3     utilities/setup/setupmetadata.cpp  
 M  +4 -0      utilities/setup/setupmetadata.h  


--- trunk/extragear/graphics/digikam/digikam/pics/Makefile.am #526688:526689
@@ -1,7 +1,7 @@
 digikampicdir = $(kde_datadir)/digikam/data
 digikampic_DATA = image_broken.png histogram-lin.png histogram-log.png \
 	          image-full.png image-selection.png rating.png digikamlogo.png \
-	          worldmap.png gphotologo.png lcmslogo.png 
+	          worldmap.png gphotologo.png lcmslogo.png exiv2logo.png 
 
 iconsdir = $(kde_datadir)/digikam/icons/hicolor/32x32/actions
 icons_DATA = tag.png tag-folder.png tag-events.png tag-people.png tag-places.png 
** trunk/extragear/graphics/digikam/digikam/pics/exiv2logo.png #property svn:mime-type
   + application/octet-stream
--- trunk/extragear/graphics/digikam/utilities/setup/setup.cpp #526688:526689
@@ -121,7 +121,7 @@
                               BarIcon("folder_image", KIcon::SizeMedium));
     d->generalPage = new SetupGeneral(d->page_general, this);
 
-    d->page_metadata = addPage(i18n("Metadata"), i18n("Embedded Image Informations"),
+    d->page_metadata = addPage(i18n("Metadata"), i18n("Embedded Image Informations Management"),
                                BarIcon("exifinfo", KIcon::SizeMedium));
     d->metadataPage = new SetupMetadata(d->page_metadata);
 
--- trunk/extragear/graphics/digikam/utilities/setup/setupmetadata.cpp #526688:526689
@@ -30,6 +30,8 @@
 #include <qcheckbox.h>
 #include <qlabel.h>
 #include <qwhatsthis.h>
+#include <qtooltip.h>
+#include <qhbox.h>
 
 // KDE includes.
 
@@ -37,6 +39,11 @@
 #include <kactivelabel.h>
 #include <kdialog.h>
 #include <klineedit.h>
+#include <kurllabel.h>
+#include <kiconloader.h>
+#include <kglobalsettings.h>
+#include <kstandarddirs.h>
+#include <kapplication.h>
 
 // // Local includes.
 
@@ -187,7 +194,17 @@
 
     // --------------------------------------------------------
     
-    KActiveLabel* explanation = new KActiveLabel(parent);
+    QHBox *hbox = new QHBox(parent);
+
+    KURLLabel *exiv2LogoLabel = new KURLLabel(hbox);
+    exiv2LogoLabel->setText(QString::null);
+    exiv2LogoLabel->setURL("http://www.exiv2.org");
+    KGlobal::dirs()->addResourceType("exiv2logo", KGlobal::dirs()->kde_default("data") + "digikam/data");
+    QString directory = KGlobal::dirs()->findResourceDir("exiv2logo", "exiv2logo.png");
+    exiv2LogoLabel->setPixmap( QPixmap( directory + "exiv2logo.png" ) );
+    QToolTip::add(exiv2LogoLabel, i18n("Visit Exiv2 project website"));
+
+    KActiveLabel* explanation = new KActiveLabel(hbox);
     explanation->setText(i18n("<p><b>EXIF</b> is a standard used by most digital cameras today to store "
                               "technicals information about photograph. You can learn more "
                               "about EXIF at <a href='http://www.exif.org'>www.exif.org</a>.</p>"
@@ -195,13 +212,17 @@
                               "embeded informations in pictures. You can learn more "
                               "about IPTC at <a href='http://www.iptc.org/IIM'>www.iptc.org</a>.</p>"));
     
-    mainLayout->addWidget(explanation);
-
+    mainLayout->addWidget(hbox);
     mainLayout->addStretch();
 
+    // --------------------------------------------------------
+
     connect(d->savePhotographerIdIptcBox, SIGNAL(toggled(bool)),
             d->photographerIdGroup, SLOT(setEnabled(bool)));
   
+    connect(exiv2LogoLabel, SIGNAL(leftClickedURL(const QString&)),
+            this, SLOT(processExiv2URL(const QString&)));
+
     readSettings();
     adjustSize();
   
@@ -213,6 +234,11 @@
     delete d;
 }
 
+void SetupMetadata::processExiv2URL(const QString& url)
+{
+    KApplication::kApplication()->invokeBrowser(url);
+}
+
 void SetupMetadata::applySettings()
 {
     AlbumSettings* settings = AlbumSettings::instance();
--- trunk/extragear/graphics/digikam/utilities/setup/setupmetadata.h #526688:526689
@@ -47,6 +47,10 @@
 
     void readSettings();
 
+private slots:
+
+    void processExiv2URL(const QString& url);
+
 private:
 
     SetupMetadataPriv* d;