[Kde-imaging] kdeextragear-libs-1

[Gilles Caulier]

CVS commit by cgilles: 

Added basic kipi icon. Change about plugins part in according.
CCMAIL: kde-imaging at kde.org


  A            libkipi/libkipi/hi32-app-kipi.png   1.1
  M +2 -2      kipi-plugins/acquireimages/acquireimagedialog.cpp   1.16
  M +2 -2      kipi-plugins/cdarchiving/cdarchivingdialog.cpp   1.11
  M +1 -1      kipi-plugins/imagesgallery/imgallerydialog.cpp   1.7
  M +1 -1      kipi-plugins/rawconverter/batchdialog.cpp   1.8
  M +1 -1      kipi-plugins/rawconverter/singledialog.cpp   1.4
  M +2 -2      kipi-plugins/timeadjust/timeadjustdialog.cpp   1.3
  M +9 -0      libkipi/libkipi/Makefile.am   1.11


--- kdeextragear-libs-1/kipi-plugins/acquireimages/acquireimagedialog.cpp  #1.15:1.16
@@ -399,6 +399,6 @@ void AcquireImageDialog::setupAlbumsList
 void AcquireImageDialog::aboutPage(void)
 {
-    page_about = addPage( i18n("About"), i18n("About Digikam acquire images"),
-                          BarIcon("digikam", KIcon::SizeMedium ) );
+    page_about = addPage( i18n("About"), i18n("About KIPI acquire images"),
+                          BarIcon("kipi", KIcon::SizeMedium ) );
 
     QVBoxLayout *vlay = new QVBoxLayout( page_about, 0, spacingHint() );

--- kdeextragear-libs-1/kipi-plugins/cdarchiving/cdarchivingdialog.cpp  #1.10:1.11
@@ -676,6 +676,6 @@ void CDArchivingDialog::setupBurning(voi
 void CDArchivingDialog::aboutPage(void)
 {
-    page_about = addPage( i18n("About"), i18n("About Albums CD Archiving"),
-                          BarIcon("digikam", KIcon::SizeMedium ) );
+    page_about = addPage( i18n("About"), i18n("About KIPI Albums CD Archiving"),
+                          BarIcon("kipi", KIcon::SizeMedium ) );
 
     QVBoxLayout *vlay = new QVBoxLayout( page_about, 0, spacingHint() );

--- kdeextragear-libs-1/kipi-plugins/imagesgallery/imgallerydialog.cpp  #1.6:1.7
@@ -738,5 +738,5 @@ void KIGPDialog::aboutPage(void)
 {
     page_about = addPage( i18n("About"), i18n("About Image Gallery"),
-                          BarIcon("digikam", KIcon::SizeMedium ) );
+                          BarIcon("kipi", KIcon::SizeMedium ) );
 
     QVBoxLayout *vlay = new QVBoxLayout( page_about, 0, spacingHint() );

--- kdeextragear-libs-1/kipi-plugins/rawconverter/batchdialog.cpp  #1.7:1.8
@@ -392,5 +392,5 @@ void BatchDialog::slotHelp()
 {
     KApplication::kApplication()->invokeHelp("plugin-rawconverter.anchor",
-                                             "digikam");
+                                             "kipi");
 }
 

--- kdeextragear-libs-1/kipi-plugins/rawconverter/singledialog.cpp  #1.3:1.4
@@ -348,5 +348,5 @@ void SingleDialog::slotHelp()
 {
     KApplication::kApplication()->invokeHelp("plugin-rawconverter.anchor",
-                                             "digikam");
+                                             "kipi");
 }
 

--- kdeextragear-libs-1/kipi-plugins/timeadjust/timeadjustdialog.cpp  #1.2:1.3
@@ -53,6 +53,6 @@ void TimeAdjustDialog::setImages( const 
 void TimeAdjustDialog::addAboutPage()
 {
-    QWidget* pageAbout = addPage( i18n("About"), i18n("About Plugin"),
-                                  BarIcon("messagebox_info", KIcon::SizeMedium ) );
+    QWidget* pageAbout = addPage( i18n("About"), i18n("About KIPI Plugin"),
+                                  BarIcon("kipi", KIcon::SizeMedium ) );
     QVBoxLayout *vlay = new QVBoxLayout( pageAbout, 6 );
 

--- kdeextragear-libs-1/libkipi/libkipi/Makefile.am  #1.10:1.11
@@ -2,4 +2,6 @@
 INCLUDES=  -I$(top_srcdir)/libkipi $(all_includes)
 
+EXTRA_DIST = hi32-app-kipi.png
+
 lib_LTLIBRARIES = libkipi.la
 
@@ -25,2 +27,9 @@
 messages: rc.cpp
         $(XGETTEXT) *.cpp *.h -o $(podir)/libkipi.pot
+
+install-data-local:
+        $(mkinstalldirs) $(kde_icondir)/hicolor/32x32/apps/
+        $(INSTALL_DATA) $(srcdir)/hi32-app-kipi.png $(kde_icondir)/hicolor/32x32/apps/kipi.png
+
+uninstall-local:
+        -rm -f $(kde_icondir)/hicolor/32x32/apps/hi32-app-kipi.png