------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.
http://bugs.kde.org/show_bug.cgi?id=139658
------- Additional Comments From caulier.gilles kdemail net 2007-01-09 09:42 -------
SVN commit 621602 by cgilles:
digikam from trunk : show more informations in About pannel about shared library version used : Exiv2 and Gphoto2.
CCBUGS: 139658
M +95 -96 Makefile.am
M +25 -3 main.cpp
--- trunk/extragear/graphics/digikam/digikam/Makefile.am #621601:621602
@ -1,26 +1,25 @
METASOURCES = AUTO
INCLUDES = -I$(top_srcdir)/digikam/sqlite \
- -I$(top_srcdir)/digikam/libs/histogram \
- -I$(top_srcdir)/digikam/libs/levels \
- -I$(top_srcdir)/digikam/libs/curves \
- -I$(top_srcdir)/digikam/libs/themeengine \
- -I$(top_srcdir)/digikam/libs/widgets/common \
- -I$(top_srcdir)/digikam/libs/thumbbar \
- -I$(top_srcdir)/digikam/libs/jpegutils \
- -I$(top_srcdir)/digikam/libs/dcraw \
- -I$(top_srcdir)/digikam/libs/dimg \
- -I$(top_srcdir)/digikam/libs/dmetadata \
- -I$(top_srcdir)/digikam/libs/imageproperties \
- -I$(top_srcdir)/digikam/libs/threadimageio \
- -I$(top_srcdir)/digikam/libs/dialogs \
- -I$(top_builddir)/digikam/libs/dialogs \
- -I$(top_srcdir)/digikam/utilities/cameragui \
- -I$(top_srcdir)/digikam/utilities/imageeditor/editor \
- -I$(top_srcdir)/digikam/utilities/imageeditor/canvas \
- -I$(top_srcdir)/digikam/utilities/splashscreen \
- -I$(top_srcdir)/digikam/utilities/setup \
- $(LIBKIPI_CFLAGS) $(all_includes)
+ -I$(top_srcdir)/digikam/libs/histogram \
+ -I$(top_srcdir)/digikam/libs/levels \
+ -I$(top_srcdir)/digikam/libs/curves \
+ -I$(top_srcdir)/digikam/libs/themeengine \
+ -I$(top_srcdir)/digikam/libs/widgets/common \
+ -I$(top_srcdir)/digikam/libs/thumbbar \
+ -I$(top_srcdir)/digikam/libs/jpegutils \
+ -I$(top_srcdir)/digikam/libs/dcraw \
+ -I$(top_srcdir)/digikam/libs/dimg \
+ -I$(top_srcdir)/digikam/libs/dmetadata \
+ -I$(top_srcdir)/digikam/libs/imageproperties \
+ -I$(top_srcdir)/digikam/libs/threadimageio \
+ -I$(top_srcdir)/digikam/libs/dialogs \
+ -I$(top_srcdir)/digikam/utilities/cameragui \
+ -I$(top_srcdir)/digikam/utilities/imageeditor/editor \
+ -I$(top_srcdir)/digikam/utilities/imageeditor/canvas \
+ -I$(top_srcdir)/digikam/utilities/splashscreen \
+ -I$(top_srcdir)/digikam/utilities/setup \
+ $(LIBKIPI_CFLAGS) $(GPHOTO_CFLAGS) $(all_includes)
# -- shared digiKam library rules -----------------------------------------------
@ -31,81 +30,81 @
# to unbreak compilation with './configure -enable-final' option. I suspect a problem with
# X11 header included into albumfolderview.cpp.
libdigikam_la_SOURCES = kdateedit.cpp \
- album.cpp \
- albumdb.cpp \
- albumdb_sqlite2.cpp \
- albumiconview.cpp \
- albumicongroupitem.cpp \
- albumiconitem.cpp \
- albumitemhandler.cpp \
- albumfiletip.cpp \
- albumfolderview.cpp \
- albumhistory.cpp \
- albumlister.cpp \
- albummanager.cpp \
- albumpropsedit.cpp \
- albumsettings.cpp \
- albumthumbnailloader.cpp \
- albumwidgetstack.cpp \
- batchthumbsgenerator.cpp \
- cameradragobject.cpp \
- cameralist.cpp \
- cameratype.cpp \
- datefolderview.cpp \
- dcopiface.cpp \
- dcopiface.skel \
- digikamapp.cpp \
- digikamfirstrun.cpp \
- digikamview.cpp \
- dio.cpp \
- dragobjects.cpp \
- firstrun.cpp \
- folderitem.cpp \
- folderview.cpp \
- iconview.cpp \
- icongroupitem.cpp \
- iconitem.cpp \
- imageattributeswatch.cpp \
- imageinfo.cpp \
- imagepreviewwidget.cpp \
- imagepreviewview.cpp \
- kdatetimeedit.cpp \
- kdatepickerpopup.cpp \
- kipiinterface.cpp \
- mediaplayerview.cpp \
- monthwidget.cpp \
- pixmapmanager.cpp \
- ratingwidget.cpp \
- scanlib.cpp \
- searchadvanceddialog.cpp \
- searchfolderview.cpp \
- searchquickdialog.cpp \
- searchresultsview.cpp \
- searchresultsitem.cpp \
- searchwidgets.cpp \
- syncjob.cpp \
- tagcreatedlg.cpp \
- tagfilterview.cpp \
- tagfolderview.cpp \
- tagspopupmenu.cpp \
- upgradedb_sqlite2tosqlite3.cpp \
- welcomepageview.cpp
+ album.cpp \
+ albumdb.cpp \
+ albumdb_sqlite2.cpp \
+ albumiconview.cpp \
+ albumicongroupitem.cpp \
+ albumiconitem.cpp \
+ albumitemhandler.cpp \
+ albumfiletip.cpp \
+ albumfolderview.cpp \
+ albumhistory.cpp \
+ albumlister.cpp \
+ albummanager.cpp \
+ albumpropsedit.cpp \
+ albumsettings.cpp \
+ albumthumbnailloader.cpp \
+ albumwidgetstack.cpp \
+ batchthumbsgenerator.cpp \
+ cameradragobject.cpp \
+ cameralist.cpp \
+ cameratype.cpp \
+ datefolderview.cpp \
+ dcopiface.cpp \
+ dcopiface.skel \
+ digikamapp.cpp \
+ digikamfirstrun.cpp \
+ digikamview.cpp \
+ dio.cpp \
+ dragobjects.cpp \
+ firstrun.cpp \
+ folderitem.cpp \
+ folderview.cpp \
+ iconview.cpp \
+ icongroupitem.cpp \
+ iconitem.cpp \
+ imageattributeswatch.cpp \
+ imageinfo.cpp \
+ imagepreviewwidget.cpp \
+ imagepreviewview.cpp \
+ kdatetimeedit.cpp \
+ kdatepickerpopup.cpp \
+ kipiinterface.cpp \
+ mediaplayerview.cpp \
+ monthwidget.cpp \
+ pixmapmanager.cpp \
+ ratingwidget.cpp \
+ scanlib.cpp \
+ searchadvanceddialog.cpp \
+ searchfolderview.cpp \
+ searchquickdialog.cpp \
+ searchresultsview.cpp \
+ searchresultsitem.cpp \
+ searchwidgets.cpp \
+ syncjob.cpp \
+ tagcreatedlg.cpp \
+ tagfilterview.cpp \
+ tagfolderview.cpp \
+ tagspopupmenu.cpp \
+ upgradedb_sqlite2tosqlite3.cpp \
+ welcomepageview.cpp
libdigikam_la_LIBADD = $(LIB_KIO) $(LIB_SQLITE3) $(LIB_KABC) $(LIB_KHTML) \
- $(LIBKIPI_LIBS) $(LIB_KUTILS) $(EXIV2_LIBS) \
- $(top_builddir)/digikam/sqlite/libsqlite.la \
- $(top_builddir)/digikam/libs/thumbbar/libthumbbar.la \
- $(top_builddir)/digikam/libs/themeengine/libthemeengine.la \
- $(top_builddir)/digikam/libs/widgets/libwidgets.la \
- $(top_builddir)/digikam/libs/dialogs/libdialog.la \
- $(top_builddir)/digikam/libs/jpegutils/libjpegutils.la \
- $(top_builddir)/digikam/libs/imageproperties/libimagepropertiesdigikam.la \
- $(top_builddir)/digikam/libs/threadimageio/libthreadimageio.la \
- $(top_builddir)/digikam/utilities/cameragui/libcameragui.la \
- $(top_builddir)/digikam/utilities/imageeditor/canvas/libdimgcanvas.la \
- $(top_builddir)/digikam/utilities/imageeditor/editor/libdimgeditor.la \
- $(top_builddir)/digikam/utilities/splashscreen/libsplashscreen.la \
- $(top_builddir)/digikam/utilities/setup/libsetup.la
+ $(LIBKIPI_LIBS) $(LIB_KUTILS) $(EXIV2_LIBS) \
+ $(top_builddir)/digikam/sqlite/libsqlite.la \
+ $(top_builddir)/digikam/libs/thumbbar/libthumbbar.la \
+ $(top_builddir)/digikam/libs/themeengine/libthemeengine.la \
+ $(top_builddir)/digikam/libs/widgets/libwidgets.la \
+ $(top_builddir)/digikam/libs/dialogs/libdialog.la \
+ $(top_builddir)/digikam/libs/jpegutils/libjpegutils.la \
+ $(top_builddir)/digikam/libs/imageproperties/libimagepropertiesdigikam.la \
+ $(top_builddir)/digikam/libs/threadimageio/libthreadimageio.la \
+ $(top_builddir)/digikam/utilities/cameragui/libcameragui.la \
+ $(top_builddir)/digikam/utilities/imageeditor/canvas/libdimgcanvas.la \
+ $(top_builddir)/digikam/utilities/imageeditor/editor/libdimgeditor.la \
+ $(top_builddir)/digikam/utilities/splashscreen/libsplashscreen.la \
+ $(top_builddir)/digikam/utilities/setup/libsetup.la
libdigikam_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
@ -115,10 +114,10 @
digikam_SOURCES = main.cpp
digikam_LDADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) \
- $(LIBSOCKET) $(LIB_KFILE) $(LIB_KPARTS) $(LIB_KUTILS) \
- libdigikam.la
+ $(LIBSOCKET) $(LIB_KFILE) $(LIB_KPARTS) $(LIB_KUTILS) \
+ libdigikam.la
-digikam_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_KUTILS)
+digikam_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_KUTILS)
rcdir = $(kde_datadir)/digikam
rc_DATA = digikamui.rc
--- trunk/extragear/graphics/digikam/digikam/main.cpp #621601:621602
@ -47,6 +47,17 @
#include <libkipi/version.h>
+// Exiv2 includes.
+
+#include <exiv2/exiv2_version.h>
+
+// Gphoto2 includes.
+
+extern "C"
+{
+#include <gphoto2-version.h>
+}
+
// Local includes.
#include "version.h"
@ -64,10 +75,19 @
int main(int argc, char *argv[])
{
- QString description = QString(I18N_NOOP("A Photo-Management Application for KDE")) +
+ QString Exiv2Ver = QString("%1.%2.%3").arg(EXIV2_MAJOR_VERSION)
+ .arg(EXIV2_MINOR_VERSION)
+ .arg(EXIV2_PATCH_VERSION);
+
+ QString Gphoto2Ver = QString(gp_library_version(GP_VERSION_SHORT)[0]);
+
+ QString libInfo = QString(I18N_NOOP("Using Kipi library version %1")).arg(kipi_version) +
QString("\n") +
- QString(I18N_NOOP("Using Kipi library version %1"))
- .arg(kipi_version);
+ QString(I18N_NOOP("Using Exiv2 library version %1")).arg(Exiv2Ver) +
+ QString("\n") +
+ QString(I18N_NOOP("Using Gphoto2 library version %1")).arg(Gphoto2Ver);
+
+ QString description = QString(I18N_NOOP("A Photo-Management Application for KDE"));
KAboutData aboutData( "digikam",
I18N_NOOP("digiKam"),
@ -78,6 +98,8 @
0,
"
http://www.digikam.org");
+ aboutData.setOtherText(libInfo.latin1());
+
aboutData.addAuthor ( "Caulier Gilles",
I18N_NOOP("Main developer and coordinator"),
"caulier dot gilles at kdemail dot net",
_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel
Locked
