[Digikam-devel] extragear/graphics/digikam

[Gilles Caulier]

SVN commit 476074 by cgilles:

Showfoto and digiKam Image Editor pics and icons :

- Do not mix pictures and source code for more visibility.
- Fix missing showfoto action icons if showfoto is installed alone (without digiKam).

CCMAIL: digikam-devel at kde.org

 M  +4 -7      showfoto/Makefile.am  
 D             showfoto/hi128-app-showfoto.png  
 D             showfoto/hi16-app-showfoto.png  
 D             showfoto/hi22-app-showfoto.png  
 D             showfoto/hi32-action-slideshow.png  
 D             showfoto/hi32-app-showfoto.png  
 D             showfoto/hi48-app-showfoto.png  
 D             showfoto/hi64-app-showfoto.png  
 A             showfoto/pics (directory)  
 A             showfoto/pics/Makefile.am  
 AM            showfoto/pics/hi128-app-showfoto.png  
 AM            showfoto/pics/hi16-app-showfoto.png  
 AM            showfoto/pics/hi22-app-showfoto.png  
 AM            showfoto/pics/hi32-action-flip.png  
 AM            showfoto/pics/hi32-action-histogram.png  
 AM            showfoto/pics/hi32-action-resize_image.png  
 AM            showfoto/pics/hi32-action-slideshow.png  
 AM            showfoto/pics/hi32-app-showfoto.png  
 AM            showfoto/pics/hi48-app-showfoto.png  
 AM            showfoto/pics/hi64-app-showfoto.png  
 AM            showfoto/pics/showfoto-splash.png  
 D             showfoto/showfoto-splash.png  
 M  +3 -4      utilities/imageeditor/Makefile.am  
 D             utilities/imageeditor/hi32-action-flip.png  
 D             utilities/imageeditor/hi32-action-histogram.png  
 D             utilities/imageeditor/hi32-action-resize_image.png  
 A             utilities/imageeditor/pics (directory)  
 A             utilities/imageeditor/pics/Makefile.am  
 AM            utilities/imageeditor/pics/hi32-action-flip.png  
 AM            utilities/imageeditor/pics/hi32-action-histogram.png  
 AM            utilities/imageeditor/pics/hi32-action-resize_image.png  


--- trunk/extragear/graphics/digikam/showfoto/Makefile.am #476073:476074
@@ -1,3 +1,7 @@
+SUBDIRS = pics
+
+METASOURCES = AUTO  
+
 bin_PROGRAMS = showfoto
 
 INCLUDES = -I$(top_srcdir)/digikam/utilities/imageeditor \
@@ -26,16 +30,9 @@
 
 showfoto_LDFLAGS = $(KDE_RPATH) $(all_libraries)
 
-METASOURCES = AUTO  
-
 rcdir = $(kde_datadir)/showfoto
 rc_DATA = showfotoui.rc
 
-showfotosplashpicdir = $(kde_datadir)/showfoto
-showfotosplashpic_DATA = showfoto-splash.png
-
 xdg_apps_DATA = showfoto.desktop
 
-KDE_ICON = showfoto 
 
-
** trunk/extragear/graphics/digikam/showfoto/pics/hi128-app-showfoto.png #property svn:mime-type
   + application/octet-stream
** trunk/extragear/graphics/digikam/showfoto/pics/hi16-app-showfoto.png #property svn:mime-type
   + application/octet-stream
** trunk/extragear/graphics/digikam/showfoto/pics/hi22-app-showfoto.png #property svn:mime-type
   + application/octet-stream
** trunk/extragear/graphics/digikam/showfoto/pics/hi32-action-flip.png #property svn:mime-type
   + application/octet-stream
** trunk/extragear/graphics/digikam/showfoto/pics/hi32-action-histogram.png #property svn:mime-type
   + application/octet-stream
** trunk/extragear/graphics/digikam/showfoto/pics/hi32-action-resize_image.png #property svn:mime-type
   + application/octet-stream
** trunk/extragear/graphics/digikam/showfoto/pics/hi32-action-slideshow.png #property svn:mime-type
   + application/octet-stream
** trunk/extragear/graphics/digikam/showfoto/pics/hi32-app-showfoto.png #property svn:mime-type
   + application/octet-stream
** trunk/extragear/graphics/digikam/showfoto/pics/hi48-app-showfoto.png #property svn:mime-type
   + application/octet-stream
** trunk/extragear/graphics/digikam/showfoto/pics/hi64-app-showfoto.png #property svn:mime-type
   + application/octet-stream
** trunk/extragear/graphics/digikam/showfoto/pics/showfoto-splash.png #property svn:mime-type
   + application/octet-stream
--- trunk/extragear/graphics/digikam/utilities/imageeditor/Makefile.am #476073:476074
@@ -1,3 +1,5 @@
+SUBDIRS = pics
+
 METASOURCES = AUTO
 
 noinst_LTLIBRARIES = libimageeditor.la libimagecanvas.la libshowfoto.la 
@@ -32,12 +34,9 @@
 
 digikamincludedir = $(includedir)/digikam
 
-digikamimageeditoricondir = $(kde_datadir)/digikam/icons
-digikamimageeditoricon_ICON = AUTO
-
 rcdir = $(kde_datadir)/digikam
 rc_DATA = digikamimagewindowui.rc
 
 kde_servicetypes_DATA = digikamimageplugin.desktop
 
-KDE_OPTIONS=nofinal
+KDE_OPTIONS = nofinal
** trunk/extragear/graphics/digikam/utilities/imageeditor/pics/hi32-action-flip.png #property svn:mime-type
   + application/octet-stream
** trunk/extragear/graphics/digikam/utilities/imageeditor/pics/hi32-action-histogram.png #property svn:mime-type
   + application/octet-stream
** trunk/extragear/graphics/digikam/utilities/imageeditor/pics/hi32-action-resize_image.png #property svn:mime-type
   + application/octet-stream