digiKam

CVS commit by pahlibar: 


CCMAIL: Ralf Hoelzer <ralf@...>, digikam-devel@...
more subdued highlighting for thumbnails. 
load the metainfo only if its requested (showing the initial screen with
filenames and empty thumbnails should be much faster now if file comments
and/or resolution is not requested). fix memory leak if file metainfo is
requested multiple times.
in setup warn users that above two makes things slower.


  M +95 -73    digikam/albumiconitem.cpp   1.18
  M +11 -7     digikam/albumiconview.cpp   1.22
  M +14 -23    interfaces/thumbnailjob.cpp   1.3
  M +2 -2      utilities/setup/setupgeneral.cpp   1.16

Renchi

This may be just because I have broken something but ...

I have libexif-0.6.9 installed. The latest CVS builds fine, but when I run the 
executable it is still looking for libexif.so.9. I get this error:

rjt@... kdeextragear-3 $ digikam/digikam/digikam
/home/rjt/devel/digikam/kdeextragear-3/digikam/digikam/.libs/lt-digikam: error 
while loading shared libraries: libexif.so.9: cannot open shared object file: 
No such file or directory

I am not sure whether this is a problem with my setup or the configure stuff.

Regards

Richard

On Wednesday 02 June 2004 23:08, Renchi Raju wrote:
> CVS commit by pahlibar:
>
>
> CCMAIL: Ralf Hoelzer <ralf@...>, digikam-devel@...
>
> added checks for getting the version of libexif and do conditional
> compiling for kexifentry. hopefully should work both with 0.6.9 and
> 0.5.12 versions of libexif. can anyone with libexif >= 0.6.9 confirm
> that. additionally the configure script should not barf if
> libexif can't be found
>
> renchi


-- 
You can normally find me on Jabber as RichardTaylor@...

On Thu, 3 Jun 2004, Richard Taylor wrote:

> Renchi
>
> This may be just because I have broken something but ...
>
> I have libexif-0.6.9 installed. The latest CVS builds fine, but when I run the
> executable it is still looking for libexif.so.9. I get this error:
>
> rjt@... kdeextragear-3 $ digikam/digikam/digikam
> /home/rjt/devel/digikam/kdeextragear-3/digikam/digikam/.libs/lt-digikam: error
> while loading shared libraries: libexif.so.9: cannot open shared object file:
> No such file or directory
>
> I am not sure whether this is a problem with my setup or the configure stuff.

are both 0.5.12 and 0.6.9 installed? try running a make distclean and
recompiling from scratch.

renchi

On Thursday 03 June 2004 14:49, Renchi Raju wrote:
> On Thu, 3 Jun 2004, Richard Taylor wrote:
> > Renchi
> >
> > This may be just because I have broken something but ...
> >
> > I have libexif-0.6.9 installed. The latest CVS builds fine, but when I
> > run the executable it is still looking for libexif.so.9. I get this
> > error:
> >
> > rjt@... kdeextragear-3 $ digikam/digikam/digikam
> > /home/rjt/devel/digikam/kdeextragear-3/digikam/digikam/.libs/lt-digikam:
> > error while loading shared libraries: libexif.so.9: cannot open shared
> > object file: No such file or directory
> >
> > I am not sure whether this is a problem with my setup or the configure
> > stuff.
>
> are both 0.5.12 and 0.6.9 installed? try running a make distclean and
> recompiling from scratch.
>

I have only 0.6.9 installed. I have tried:

	make distclean && make -f Makefile.cvs && ./configure && make

and I have tried:

	for i in `find . -name ".libs" -type d -print`; do rm -r $i ; done
	make distclean && make -f Makefile.cvs && ./configure && make

Just to make sure.

I still get the error. Could it be because another library is still expected 
to find 0.5.12? Should I just go back to 0.5.12 for now?

Richard

PS. I have a patch that converts digikam to using KDockWindows. Unfortunately 
I can't test it against the current CVS code because of the libexif problem. 
It worked before the libexif change. 



-- 
You can normally find me on Jabber as RichardTaylor@...

On Thu, 3 Jun 2004 18:29:42 +0100
Richard Taylor <rjt-digikam-devel@...> wrote:

> On Thursday 03 June 2004 14:49, Renchi Raju wrote:
>
> > are both 0.5.12 and 0.6.9 installed? try running a make distclean
> > and recompiling from scratch.
> >
> 
> I have only 0.6.9 installed. I have tried:
> 
> 	make distclean && make -f Makefile.cvs && ./configure && make
> 
> and I have tried:
> 
> 	for i in `find . -name ".libs" -type d -print`; do rm -r $i ;
> 	done make distclean && make -f Makefile.cvs && ./configure &&
> 	make
> 
> Just to make sure.
> 
> I still get the error. Could it be because another library is still
> expected to find 0.5.12? Should I just go back to 0.5.12 for now?

configure should not pick up 0.5.12 is 0.5.12 is not installed. you
might want to check if you have stale pkg-config files hanging around.

> PS. I have a patch that converts digikam to using KDockWindows.
> Unfortunately I can't test it against the current CVS code because
> of the libexif problem. It worked before the libexif change. 

no dockwindows. the layout is messy with dockwindows and it flickers
too much. there are only two windows currently in digikam and it will
continue to be that way. i don't see any need for dockwindows.

renchi

CVS commit by cgilles: 

CCMAIL: digikam-devel@...
Enable kipi plugins support on configure script by default.


  M +2 -2      configure.in.in   1.5


--- kdeextragear-3/digikam/configure.in.in  #1.4:1.5
@@ -36,5 +36,5 @@
 AC_MSG_CHECKING(if Digikam should be compiled with KIPI support)
 AC_ARG_ENABLE(kipi,
-[  --enable-kipi           Use KIPI instead DigikamPlugins, 'KDE Image Plugin Interface'],
+[  --enable-kipi           Use KIPI instead DigikamPlugins, 'KDE Image Plugin Interface' (default=yes)],
 [if test "$enableval" = yes; then
   AC_MSG_RESULT(yes)
@@ -42,5 +42,5 @@
 else
   AC_MSG_RESULT(no)
-fi], [AC_MSG_RESULT(no); want_kipi="no"])
+fi], [AC_MSG_RESULT(yes); want_kipi="yes"])
 
 if test "$want_kipi" = "yes"; then

CVS commit by rhoezler: 

- Check for and use Libkexif from kdeextra-libs-1 now for Digikam. Building
digikam/utilities/kexif is disabled, but I won't remove the files until
we're sure it doesn't cause any problems.

CCMAIL: digikam-devel@...


  M +3 -3      configure.in.bot   1.4
  M +12 -0     configure.in.in   1.6
  M +1 -1      utilities/Makefile.am   1.2


--- kdeextragear-3/digikam/configure.in.bot  #1.3:1.4
@@ -16,8 +16,8 @@
 fi
 
-if test "$NO_LIBEXIF" = "yes"; then
+if test "$have_kexif" = "no"; then
   echo ""
-  echo "DigiKam needs libexif. You need to install libexif, e.g. from"
-  echo "http://libexif.sourceforge.net"
+  echo "DigiKam needs libkexif. You need to install libexif from the"
+  echo "kdeextragear-libs-1 package first."
   echo ""
 fi

--- kdeextragear-3/digikam/configure.in.in  #1.5:1.6
@@ -57,2 +57,14 @@
   fi
 fi
+
+#------------------------------------------------------------------
+# Check for Libkexif
+#------------------------------------------------------------------
+
+KDE_CHECK_HEADER(libkexif/kexif.h, have_kexif=yes, have_kexif=no)
+
+if test "$have_kexif" = "no"; then
+  AC_WARN([Can't find Libkexif headers, Digikam won't be compiled.])
+  DO_NOT_COMPILE="digikam $DO_NOT_COMPILE"
+fi
+

--- kdeextragear-3/digikam/utilities/Makefile.am  #1.1:1.2
@@ -1 +1 @@
-SUBDIRS = kexif imageviewer splashscreen setup 
+SUBDIRS = imageviewer splashscreen setup

CVS commit by pahlibar: 


CCMAIL: digikam-devel@...

new imageeditor merge. old imageviewer still retained (not compiled though,
till all the functions are ported).
New features:
1) ported to imlib2
2) new gui - based on qmainwindow with menubar and toolbar
3) plugin interface so that image editor plugins can be written externally
4) native dynamic gui builder instead of xmlgui for performance reasons.
5) new selection method
6) new resize image option

caveats:
1) save and save as functions not yet implemented (not necessarily bad, as user 
can fool around with the imageeditor without risk of losing anything)
2) exif restorer needs to be added (linked to 1 above)
3) varuous minor functions still need to be ported from the old imageviewer


  A            utilities/imageeditor/.cvsignore   1.1
  A            utilities/imageeditor/Makefile.am   1.1
  A            utilities/imageeditor/canvas.cpp   1.1 [GPL]
  A            utilities/imageeditor/canvas.h   1.1 [GPL]
  A            utilities/imageeditor/digikamimageplugin.desktop   1.1
  A            utilities/imageeditor/guiclient.cpp   1.1 [GPL]
  A            utilities/imageeditor/guiclient.h   1.1 [GPL]
  A            utilities/imageeditor/guifactory.cpp   1.1 [GPL]
  A            utilities/imageeditor/guifactory.h   1.1 [GPL]
  A            utilities/imageeditor/imageguiclient.cpp   1.1 [GPL]
  A            utilities/imageeditor/imageguiclient.h   1.1 [GPL]
  A            utilities/imageeditor/imageiface.cpp   1.1 [GPL]
  A            utilities/imageeditor/imageiface.h   1.1 [GPL]
  A            utilities/imageeditor/imageplugin.cpp   1.1 [GPL]
  A            utilities/imageeditor/imageplugin.h   1.1 [GPL]
  A            utilities/imageeditor/imagepluginloader.cpp   1.1 [GPL]
  A            utilities/imageeditor/imagepluginloader.h   1.1 [GPL]
  A            utilities/imageeditor/imageresizedlg.cpp   1.1 [GPL]
  A            utilities/imageeditor/imageresizedlg.h   1.1 [GPL]
  A            utilities/imageeditor/imagewidget.cpp   1.1 [GPL]
  A            utilities/imageeditor/imagewidget.h   1.1 [GPL]
  A            utilities/imageeditor/imagewindow.cpp   1.1 [GPL]
  A            utilities/imageeditor/imagewindow.h   1.1 [GPL]
  A            utilities/imageeditor/imlibinterface.cpp   1.1 [GPL]
  A            utilities/imageeditor/imlibinterface.h   1.1 [GPL]
  M +3 -3      digikam/Makefile.am   1.8
  M +28 -16    digikam/albumiconview.cpp   1.26
  M +17 -14    digikam/digikamapp.cpp   1.18
  M +1 -1      digikamcameraclient/cameraui/Makefile.am   1.4
  M +12 -3     digikamcameraclient/cameraui/camerauiview.cpp   1.7
  M +1 -1      utilities/Makefile.am   1.3

CVS commit by pahlibar: 


CCMAIL: digikam-devel@...

first set of digikam imageeditor plugins:
1) adjust brightness/contrast/gamma
2) convert to black & white
3) convert to sepia (too strong a sepia cast now. need to fix this)
4) solarizing plugin
5) redeye correction plugin.


  A            imageplugins/.cvsignore   1.1
  A            imageplugins/Makefile.am   1.1
  A            imageplugins/digikamimageplugin_core.desktop   1.1
  A            imageplugins/imageeffect_bcg.cpp   1.1 [GPL]
  A            imageplugins/imageeffect_bwsepia.cpp   1.1 [GPL]
  A            imageplugins/imageeffect_redeye.cpp   1.1 [GPL]
  A            imageplugins/imageeffect_solarize.cpp   1.1 [GPL]
  A            imageplugins/imageguiclient_core.cpp   1.1 [GPL]
  A            imageplugins/imageplugin_core.cpp   1.1 [GPL]
  M +1 -1      Makefile.am   1.4


--- kdeextragear-3/digikam/Makefile.am  #1.3:1.4
@@ -1,3 +1,3 @@
-SUBDIRS = interfaces kioslave utilities digikam digikamcameraclient
+SUBDIRS = interfaces kioslave utilities digikam digikamcameraclient imageplugins
 
 EXTRA_DIST = Digikam.kdevelop AUTHORS COPYING ChangeLog INSTALL README TODO digikam.lsm

On Monday 07 June 2004 08:52 pm, Renchi Raju wrote:
> first set of digikam imageeditor plugins:
> 1) adjust brightness/contrast/gamma
> 2) convert to black & white
> 3) convert to sepia (too strong a sepia cast now. need to fix this)
> 4) solarizing plugin
> 5) redeye correction plugin.

The new imageviewer is great. I really like the red-eye reduction plugin. 

It would be great if the imageviewer would auto-rotate according to the EXIF 
orientation tag. If you want, I can work on that. The thumbnails are already 
rotated automatically.

I would also like to implement resetting the EXIF orientation tag after 
rotating/flipping the image. I just implemented that in the Jpeglossless 
plugin. If that's not done, the image data is inconsistent and many viewers 
diesplay the image in a wrong orientation.

The only problem I see with the imageviewer is that many people may not be 
aware that even just rotating the image would cause the JPEG image to be 
recompressed, which could cause the image to get much larger or smaller than 
before. I wish there would be a way to figure out which quality setting the 
image was saved as, but I can't think of a good way of doing that.

Ralf

On Mon, 7 Jun 2004 digikam@... wrote:

> It would be great if the imageviewer would auto-rotate according to the EXIF
> orientation tag. If you want, I can work on that. The thumbnails are already
> rotated automatically.
>
> I would also like to implement resetting the EXIF orientation tag after
> rotating/flipping the image. I just implemented that in the Jpeglossless
> plugin. If that's not done, the image data is inconsistent and many viewers
> diesplay the image in a wrong orientation.

this features were already added in the old imageviewer by you, iirc. i
still need to port all those functions. can you check back once i'm done
and see if anything's amiss.

> The only problem I see with the imageviewer is that many people may not be
> aware that even just rotating the image would cause the JPEG image to be
> recompressed, which could cause the image to get much larger or smaller than
> before. I wish there would be a way to figure out which quality setting the
> image was saved as, but I can't think of a good way of doing that.

i don't think there is a universal way of finding the quality of the image
when it was saved. what we can do is check if the image manipulations on a
particular image can be handled by lossless jpeg operations (i.e. if the
user uses only rotate, flip and/or convert to bw on a jpeg image) and use
that to save back the image. that way the image quality is unaffected. i
will put that on the TODO list.

renchi

CVS commit by pahlibar: 


CCMAIL: digikam-devel@...

Cleaned up the imageplugin interface. hopefully should be easier to program for.
enable selection based image plugin actions (eg. redeye) only if a selection 
is made


  M +1 -1      imageplugins/Makefile.am   1.2
  M +66 -7     imageplugins/imageplugin_core.cpp   1.2
  M +16 -8     imageplugins/imageplugin_core.h   1.2
  M +5 -5      utilities/imageeditor/canvas.cpp   1.2
  M +1 -1      utilities/imageeditor/canvas.h   1.2
  M +2 -12     utilities/imageeditor/guiclient.cpp   1.2
  M +0 -4      utilities/imageeditor/guiclient.h   1.2
  M +0 -2      utilities/imageeditor/imageguiclient.cpp   1.2
  M +0 -1      utilities/imageeditor/imageiface.cpp   1.2
  M +2 -2      utilities/imageeditor/imageiface.h   1.2
  M +13 -1     utilities/imageeditor/imageplugin.cpp   1.2
  M +12 -4     utilities/imageeditor/imageplugin.h   1.2
  M +23 -5     utilities/imageeditor/imagewindow.cpp   1.2
  M +1 -1      utilities/imageeditor/imagewindow.h   1.2
  R            imageplugins/imageguiclient_core.cpp   1.1
  R            imageplugins/imageguiclient_core.h   1.1

CVS commit by cgilles: 

Removing all old DigikamPlugins depencies from Digikam core !

CCMAIL: kde-imaging@..., digikam-devel@...


  M +1 -0      ChangeLog   1.25
  M +14 -0     configure.in.bot   1.5
  M +6 -21     configure.in.in   1.8
  M +16 -16    digikam/Makefile.am   1.9
  M +0 -21     digikam/albumiconview.cpp   1.30
  M +0 -45     digikam/digikamapp.cpp   1.20
  M +7 -17     digikam/digikamapp.h   1.10
  M +2 -9      digikam/main.cpp   1.10
  M +1 -1      digikamcameraclient/main.cpp   1.8
  M +3 -8      interfaces/Makefile.am   1.5
  M +1 -3      interfaces/kipiinterface.cpp   1.11
  M +1 -4      interfaces/kipiinterface.h   1.7
  M +0 -50     utilities/setup/setupplugins.cpp   1.10
  M +1 -4      utilities/setup/setupplugins.h   1.5
  R            digikam/digikampluginmanager.cpp   1.5
  R            digikam/digikampluginmanager.h   1.4
  R            interfaces/digikamplugin.desktop   1.8
  R            interfaces/plugin.cpp   1.2
  R            interfaces/plugin.h   1.1

CVS commit by pahlibar: 


CCMAIL: digikam-devel@...

1) Zooming should be much faster (and use considerably less memory at 
large zooms). rendering done in two phases: a sub-super-pixel sampled
scaled one first and with a qtimer timeout an antialiased scaled one.
we take advantage of imlib2 speed (and cache use) and render from image
to pixmap for every repaint. only exposed area is rendered unlike 
previously where the entire image was rendered to a cached pixmap.

2) fix 2 of the bugs reported by  Mikolaj Machowski:
  a) space between resolution and "pixels"
  b) imageviewer being pushed back behind main app when a plugin
     dialog opens


  M +2 -2      imageplugins/imageeffect_bcg.cpp   1.2
  M +1 -1      imageplugins/imageeffect_bcg.h   1.2
  M +2 -2      imageplugins/imageeffect_solarize.cpp   1.2
  M +1 -1      imageplugins/imageeffect_solarize.h   1.2
  M +2 -2      imageplugins/imageplugin_core.cpp   1.3
  M +143 -130  utilities/imageeditor/canvas.cpp   1.3
  M +6 -10     utilities/imageeditor/canvas.h   1.3
  M +12 -1     utilities/imageeditor/imageplugin.cpp   1.3
  M +5 -0      utilities/imageeditor/imageplugin.h   1.3
  M +3 -0      utilities/imageeditor/imagewindow.cpp   1.3
  M +53 -49    utilities/imageeditor/imlibinterface.cpp   1.3
  M +5 -6      utilities/imageeditor/imlibinterface.h   1.2

CVS commit by cgilles: 

Fixed KIPI plugins dynamic loading/unloading -> Work fine now.
Removed BatchProcess KIPI plugins toolbar -> Not really suitable (must be improved -> perhaps in the future...)

CCMAIL: digikam-devel@...


  M +2 -3      ChangeLog   1.26
  M +3 -1      digikam/digikamapp.cpp   1.22
  M +0 -4      digikam/digikamui.rc   1.7
  M +8 -7      utilities/setup/setupplugins.cpp   1.11
  M +9 -2      utilities/setup/setupplugins.h   1.6


--- kdeextragear-3/digikam/ChangeLog  #1.25:1.26
@@ -6,5 +6,5 @@
           images resolution of Album items (using imlib2).
         * <Gilles Caulier> Added Exif actions settings tabs in Settings dialog.
-        * <Gilles Caulier> Added a new option in .configure for KIPI support.
+        * <Gilles Caulier> KIPI plugins can be loaded/unloaded dynamicly.
         * <Ralf Holzer> Moved KExif into a separate library in kextragear-libs-1
         * <Ralf Holzer> Added rotation of thumbnails according to EXIF Orientation 
@@ -15,6 +15,5 @@
           Settings tabs in Settings dialog.
         * <Gilles Caulier> New Settings dialog based on QFrame widget (KDE standard).
-        * <Gilles Caulier> Added plugins management settings 
-          (loaded/unloaded plugins).
+        * <Gilles Caulier> Added plugins management settings.
         * <Gilles Caulier> Added Full Mime type support for images, movies, 
           audio, and RAW files.

--- kdeextragear-3/digikam/digikam/digikamapp.cpp  #1.21:1.22
@@ -435,4 +435,6 @@ void DigikamApp::slotSetup()
             this,  SLOT(slotSetupChanged()));
     
+    // For to show the number of KIPI plugins in the setup dialog.
+                
     KIPI::PluginLoader::PluginList list = KipiPluginLoader_->pluginList();
     m_setup->pluginsPage_->initPlugins((int)list.count());
@@ -443,5 +445,5 @@ void DigikamApp::slotSetup()
 void DigikamApp::slotSetupChanged()
 {
-    KipiPluginLoader_->loadPlugins();  
+    m_setup->pluginsPage_->applyPlugins();
     mView->applySettings(mAlbumSettings);
     mAlbumManager->setLibraryPath(mAlbumSettings->getAlbumLibraryPath());

--- kdeextragear-3/digikam/digikam/digikamui.rc  #1.6:1.7
@@ -87,8 +87,4 @@
   <Action name="full_screen" />
  </ToolBar>
-  <ToolBar noMerge="1" name="KIPIBatchProcessesBar" >
-  <text>KIPI Batch Processes Toolbar</text>
-  <ActionList name="batch_actions"/>
- </ToolBar>
  <ActionProperties/>
 </kpartgui>

--- kdeextragear-3/digikam/utilities/setup/setupplugins.cpp  #1.10:1.11
@@ -40,8 +40,4 @@
 #include <klistview.h>
 
-// Includes files for plugins support.
-
-#include <libkipi/pluginloader.h>
-
 // Local includes.
 
@@ -60,7 +56,7 @@ SetupPlugins::SetupPlugins(QWidget* pare
                                   "loaded or unloaded from the current Digikam instance.");
 
-   KIPI::ConfigWidget* Kipiconfig = KIPI::PluginLoader::instance()->configWidget( parent );
-   QWhatsThis::add( Kipiconfig, pluginsListHelp);
-   layout->addWidget( Kipiconfig );
+   m_Kipiconfig = KIPI::PluginLoader::instance()->configWidget( parent );
+   QWhatsThis::add( m_Kipiconfig, pluginsListHelp);
+   layout->addWidget( m_Kipiconfig );
 }
 
@@ -74,4 +70,9 @@ void SetupPlugins::initPlugins(int kipiP
 }
 
+void SetupPlugins::applyPlugins()
+{
+    m_Kipiconfig->apply();
+}
+
 
 #include "setupplugins.moc"

--- kdeextragear-3/digikam/utilities/setup/setupplugins.h  #1.5:1.6
@@ -28,4 +28,8 @@
 #include <qwidget.h>
 
+// Includes files for plugins support.
+
+#include <libkipi/pluginloader.h>
+
 class KListView;
 class QLabel;
@@ -41,4 +45,5 @@ public:
 
     void initPlugins(int kipiPluginsNumber);
+    void applyPlugins();
 
 private:
@@ -46,4 +51,5 @@ private:
     QLabel*    m_pluginsNumber;
     KListView* m_pluginList;
+    KIPI::ConfigWidget* m_Kipiconfig;
 };

CVS commit by cgilles: 

Added missing signal and slot connection between AlbumManager and KIPIinterface when
a items selection have changed in the current Album.
CCMAIL: digikam-devel@...


  M +3 -0      digikam/digikamapp.cpp   1.26
  M +6 -0      interfaces/kipiinterface.cpp   1.17
  M +5 -2      interfaces/kipiinterface.h   1.10


--- kdeextragear-3/digikam/digikam/digikamapp.cpp  #1.25:1.26
@@ -513,4 +513,7 @@ void DigikamApp::loadPlugins()
     KipiInterface_ = new DigikamKipiInterface( this, "Digikam_KIPI_interface" );
     
+    connect( mAlbumManager, SIGNAL( signalAlbumItemsSelected( bool ) ),
+             KipiInterface_, SLOT( slotSelectionChanged( bool ) ) );
+    
     ignores << QString::fromLatin1( "HelloWorld" );    
     KipiPluginLoader_ = new KIPI::PluginLoader( ignores, KipiInterface_ );

--- kdeextragear-3/digikam/interfaces/kipiinterface.cpp  #1.16:1.17
@@ -459,4 +459,10 @@ void DigikamKipiInterface::delImage( con
 }
 
+void DigikamKipiInterface::slotSelectionChanged( bool b )
+{
+    emit selectionChanged( b );
+}
+
+
 #include "kipiinterface.moc"
 

--- kdeextragear-3/digikam/interfaces/kipiinterface.h  #1.9:1.10
@@ -144,4 +144,7 @@ protected slots:
     void slot_onAddImageFinished(KIO::Job* job);
     
+public slots:
+    void slotSelectionChanged( bool );    
+
 protected:
     QString askForCategory();

CVS commit by cgilles: 

Added missig signals and slots connexions between kipiinterface and digikam albummanager
CCMAIL: digikam-devel@...


  M +4 -1      digikam/digikamapp.cpp   1.27
  M +12 -0     interfaces/kipiinterface.cpp   1.19
  M +3 -2      interfaces/kipiinterface.h   1.12


--- kdeextragear-3/digikam/digikam/digikamapp.cpp  #1.26:1.27
@@ -516,4 +516,7 @@ void DigikamApp::loadPlugins()
              KipiInterface_, SLOT( slotSelectionChanged( bool ) ) );
     
+    connect( mAlbumManager, SIGNAL( signalAlbumCurrentChanged( Digikam::AlbumInfo * ) ),
+             KipiInterface_, SLOT( slotCurrentAlbumChanged( Digikam::AlbumInfo * ) ) );
+                 
     ignores << QString::fromLatin1( "HelloWorld" );    
     KipiPluginLoader_ = new KIPI::PluginLoader( ignores, KipiInterface_ );

--- kdeextragear-3/digikam/interfaces/kipiinterface.cpp  #1.18:1.19
@@ -478,4 +478,16 @@ void DigikamKipiInterface::slotSelection
 {
     emit selectionChanged( b );
+    emit currentScopeChanged( b );
+}
+
+void DigikamKipiInterface::slotCurrentAlbumChanged( Digikam::AlbumInfo *album )
+{
+    bool b = false;
+    
+    if ( album )
+       b = true;
+    
+    emit currentAlbumChanged( b );
+    emit currentScopeChanged( b );
 }
 

--- kdeextragear-3/digikam/interfaces/kipiinterface.h  #1.11:1.12
@@ -146,5 +146,6 @@ protected slots:
 
 public slots:
-    void slotSelectionChanged( bool );    
+    void slotSelectionChanged( bool b );
+    void slotCurrentAlbumChanged( Digikam::AlbumInfo *album );
 
 protected:

CVS commit by cgilles: 

Reactivate KIPI interface.
There are some 'PENDING' comments in kipiinterface.cpp. please checked that !!!
Nota : PAlbum::getSelectedItemsPath() method is missing ? 
CCMAIL: digikam-devel@..., renchi@..., rholzer@...  


  M +10 -17    digikam/digikamapp.cpp   1.34
  M +114 -106  digikam/kipiinterface.cpp   1.2
  M +25 -25    digikam/kipiinterface.h   1.3
  M +0 -2      utilities/setup/setup.cpp   1.14

CVS commit by pahlibar: 


Make recursive retrieval a setup option

CCMAIL: digikam-devel@...


  M +5 -4      digikam/albumlister.cpp   1.4
  M +23 -7     digikam/albumsettings.cpp   1.15
  M +6 -3      digikam/albumsettings.h   1.10
  M +15 -0     utilities/setup/setupgeneral.cpp   1.19
  M +2 -0      utilities/setup/setupgeneral.h   1.9

CVS commit by pahlibar: 


* emit a signal when a file has been added. tag albums don't update
  automatically
* copy all the metadata when using saveas not just the comments
* removed unnecessary double loading of image

CCMAIL: digikam-devel@...


  M +2 -0      digikam/albumiconview.cpp   1.44
  M +44 -22    utilities/imageeditor/imagewindow.cpp   1.16
  M +5 -2      utilities/imageeditor/imagewindow.h   1.11

CVS commit by pahlibar: 


Enable i18ning of gui building. note to developers: if you are adding
a new menu/toolbar/... gui item which does not come from a KAction 
and _will_ be visible in the gui, add i18n strings to the code.
CCMAIL: digikam-devel@...


  M +5 -0      imageplugins/imageplugin_core.cpp   1.8
  M +12 -2     utilities/imageeditor/guifactory.cpp   1.2
  M +9 -0      utilities/imageeditor/imageguiclient.cpp   1.14


--- kdeextragear-3/digikam/imageplugins/imageplugin_core.cpp  #1.7:1.8
@@ -103,4 +103,9 @@ QStringList ImagePlugin_Core::guiDefinit
     guiDef.append("MenuBar/Menu/Fi&x/Fix/Action/implugcore_redeye/ ");
 
+    // enable i18n
+
+    i18n( "&Filters" );
+    i18n( "Fi&x" );
+    
     return guiDef;
 }

--- kdeextragear-3/digikam/utilities/imageeditor/guifactory.cpp  #1.1:1.2
@@ -23,4 +23,6 @@
 #include <qmainwindow.h>
 #include <qpopupmenu.h>
+#include <qstring.h>
+#include <qcstring.h>
 
 #include <kaction.h>
@@ -28,4 +30,5 @@
 #include <kmenubar.h>
 #include <kdebug.h>
+#include <klocale.h>
 
 #include "guiclient.h"
@@ -321,4 +324,11 @@ void GUIFactory::buildGUI(GUIElement *g,
         next = gui->m_next;
 
+        QString i18nText;
+        QCString text = gui->m_text.utf8();
+        if (!text.isEmpty())
+            i18nText = i18n( text );
+        else
+            i18nText = i18n( "No text!" );
+        
         if (gui->m_type == GUIElement::Action) {
             if (gui->m_action)
@@ -329,10 +339,10 @@ void GUIFactory::buildGUI(GUIElement *g,
             if (widget->inherits("QMenuBar")) {
                 QMenuBar *mb = static_cast<QMenuBar*>(widget);
-                mb->insertItem(gui->m_text, popMenu);
+                mb->insertItem(i18nText, popMenu);
                 buildGUI(gui->m_firstChild, popMenu);
             }
             else if (widget->inherits("QPopupMenu")) {
                 QPopupMenu *pm = static_cast<QPopupMenu*>(widget);
-                pm->insertItem(gui->m_text, popMenu);
+                pm->insertItem(i18nText, popMenu);
                 buildGUI(gui->m_firstChild, popMenu);
             }

--- kdeextragear-3/digikam/utilities/imageeditor/imageguiclient.cpp  #1.13:1.14
@@ -226,4 +226,13 @@ QStringList ImageGUIClient::guiDefinitio
     guiDef.append("PopupMenu/Action/imageview_crop/ ");
 
+    // enable i18n
+
+    i18n( "&File" );
+    i18n( "Fi&x" );
+    i18n( "&Transform" );
+    i18n( "&View" );
+    i18n( "&Help" );
+    
+    
     return guiDef;
 }

CVS commit by pahlibar: 


* initial version cameragui
* merged back into main application
* interface for interacting with digikamcamera kioslave in a 
  connection oriented mode
* only download implemented currently
* dirselectdialog (modified from kdirselectdialog) for 
  selecting/creating target album
* quick hack - use with care.

CCMAIL: digikam-devel@...


  A            utilities/cameragui/.cvsignore   1.1
  A            utilities/cameragui/Makefile.am   1.1
  A            utilities/cameragui/cameracontroller.cpp   1.1 [GPL]
  A            utilities/cameragui/cameracontroller.h   1.1 [GPL]
  A            utilities/cameragui/cameradownloaddlg.cpp   1.1 [GPL]
  A            utilities/cameragui/cameradownloaddlg.h   1.1 [GPL]
  A            utilities/cameragui/cameraguiclient.cpp   1.1 [GPL]
  A            utilities/cameragui/cameraguiclient.h   1.1 [GPL]
  A            utilities/cameragui/cameraiconitem.cpp   1.1 [GPL]
  A            utilities/cameragui/cameraiconitem.h   1.1 [GPL]
  A            utilities/cameragui/cameraiconview.cpp   1.1 [GPL]
  A            utilities/cameragui/cameraiconview.h   1.1 [GPL]
  A            utilities/cameragui/camerathumbjob.cpp   1.1 [GPL]
  A            utilities/cameragui/camerathumbjob.h   1.1 [GPL]
  A            utilities/cameragui/cameraui.cpp   1.1 [GPL]
  A            utilities/cameragui/cameraui.h   1.1 [GPL]
  A            utilities/cameragui/dirselectdialog.cpp   1.1 [GPL]
  A            utilities/cameragui/dirselectdialog.h   1.1 [GPL]
  A            utilities/cameragui/hi32-action-cameradownload.png   1.1
  M +3 -1      digikam/Makefile.am   1.11
  M +10 -7     digikam/digikamapp.cpp   1.42
  M +1 -1      utilities/Makefile.am   1.4


--- kdeextragear-3/digikam/digikam/Makefile.am  #1.10:1.11
@@ -6,4 +6,5 @@
 INCLUDES = \
         -I$(top_srcdir)/digikam/sqlite \
+        -I$(top_srcdir)/digikam/utilities/cameragui \
         -I$(top_srcdir)/digikam/utilities/imageeditor \
         -I$(top_srcdir)/digikam/utilities/splashscreen \
@@ -29,7 +30,8 @@
                         $(LIBSOCKET) $(LIB_KFILE) $(LIB_KEXIF) \
                         $(top_builddir)/digikam/sqlite/libsqlite.la \
+                        $(top_builddir)/digikam/utilities/cameragui/libcameragui.la \
                         $(top_builddir)/digikam/utilities/imageeditor/libimageeditor.la \
                         $(top_builddir)/digikam/utilities/splashscreen/libsplashscreen.la \
-                        $(top_builddir)/digikam/utilities/setup/libsetup.la 
+                        $(top_builddir)/digikam/utilities/setup/libsetup.la
 
 libdigikam_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) \

--- kdeextragear-3/digikam/digikam/digikamapp.cpp  #1.41:1.42
@@ -39,5 +39,4 @@
 #include <kstdaction.h>
 #include <kstdaccel.h>
-#include <dcopclient.h>
 #include <kkeydialog.h>
 #include <kedittoolbar.h>
@@ -56,9 +55,9 @@
 #include "cameralist.h"
 #include "cameratype.h"
+#include "cameraui.h"
 #include "albumsettings.h"
 #include "setup.h"
 #include "setupplugins.h"
 #include "digikamview.h"
-#include "digikamcameraprocess.h"
 #include "imagepluginloader.h"
 #include "digikamapp.h"
@@ -97,9 +96,4 @@ DigikamApp::DigikamApp() : KMainWindow( 
         
     loadPlugins();
-              
-    // Start the camera process
-    // todo:
-    //DigikamCameraProcess *process = new DigikamCameraProcess(this);
-    //process->start();
 }
 
@@ -424,4 +418,13 @@ void DigikamApp::slot_exit()
 void DigikamApp::slotCameraConnect()
 {
+    CameraType* ctype = mCameraList->find(QString::fromUtf8(sender()->name()));
+    
+    if (ctype) 
+    {
+        CameraUI* cgui = new CameraUI(this, ctype->model(), ctype->port(),
+                                      ctype->path());
+        cgui->show();
+    }
+    
     /* todo:
      *

--- kdeextragear-3/digikam/utilities/Makefile.am  #1.3:1.4
@@ -1 +1 @@
-SUBDIRS = imageeditor splashscreen setup 
+SUBDIRS = imageeditor splashscreen setup cameragui

CVS commit by pahlibar: 


Reorganization of cvs.
* digikam/libs digikam/libs/guibuilder digikam/libs/histogram added
* guibuilder code moved to digikam/libs/guibuilder
CCMAIL: digikam-devel@...


  A            libs/.cvsignore   1.1
  A            libs/Makefile.am   1.1
  A            libs/guibuilder/.cvsignore   1.1
  A            libs/guibuilder/Makefile.am   1.1
  A            libs/guibuilder/guiclient.cpp   1.1 [GPL]
  A            libs/guibuilder/guiclient.h   1.1 [GPL]
  A            libs/guibuilder/guifactory.cpp   1.1 [GPL]
  A            libs/guibuilder/guifactory.h   1.1 [GPL]
  A            libs/histogram/.cvsignore   1.1
  M +1 -1      Makefile.am   1.6
  M +1 -0      digikam/Makefile.am   1.14
  M +1 -0      utilities/cameragui/Makefile.am   1.4
  M +2 -3      utilities/imageeditor/Makefile.am   1.6
  R            utilities/imageeditor/guiclient.cpp   1.2
  R            utilities/imageeditor/guiclient.h   1.2
  R            utilities/imageeditor/guifactory.cpp   1.3
  R            utilities/imageeditor/guifactory.h   1.1


--- kdeextragear-3/digikam/Makefile.am  #1.5:1.6
@@ -1,3 +1,3 @@
-SUBDIRS = sqlite utilities digikam kioslave imageplugins #digikamcameraclient 
+SUBDIRS = sqlite libs utilities digikam kioslave imageplugins
 
 EXTRA_DIST = Digikam.kdevelop AUTHORS COPYING ChangeLog INSTALL README TODO digikam.lsm 

--- kdeextragear-3/digikam/digikam/Makefile.am  #1.13:1.14
@@ -31,4 +31,5 @@
                         $(LIBSOCKET) $(LIB_KFILE) $(LIB_KEXIF) $(LIB_GDBM) \
                         $(top_builddir)/digikam/sqlite/libsqlite.la \
+                        $(top_builddir)/digikam/libs/guibuilder/libguibuilder.la \
                         $(top_builddir)/digikam/utilities/cameragui/libcameragui.la \
                         $(top_builddir)/digikam/utilities/imageeditor/libimageeditor.la \

--- kdeextragear-3/digikam/utilities/cameragui/Makefile.am  #1.3:1.4
@@ -12,4 +12,5 @@
 
 INCLUDES= -I$(top_srcdir)/digikam/digikam \
+        -I$(top_srcdir)/digikam/libs/guibuilder \
         -I$(top_srcdir)/digikam/utilities/imageeditor \
         $(all_includes) 

--- kdeextragear-3/digikam/utilities/imageeditor/Makefile.am  #1.5:1.6
@@ -3,6 +3,5 @@
 noinst_LTLIBRARIES = libimageeditor.la
 
-libimageeditor_la_SOURCES = guiclient.cpp  guifactory.cpp \
-                            imlibinterface.cpp imageiface.cpp \
+libimageeditor_la_SOURCES = imlibinterface.cpp imageiface.cpp \
                             imagewidget.cpp imageplugin.cpp \
                             imagepluginloader.cpp \
@@ -15,5 +14,5 @@
 
 INCLUDES= -I$(top_srcdir)/digikam/digikam \
-          -I$(top_srcdir)/digikam/interfaces \
+          -I$(top_srcdir)/digikam/libs/guibuilder \
           -I$(top_srcdir)/digikam/utilities/kexif \
           $(IMLIB2_CFLAGS) $(all_includes)

OK. tomorrow morning, i will add the HistogramViewer in CVS in according wi=
th=20
this new folders.

Gilles

Le mardi 27 Juillet 2004 19:28, Renchi Raju a =C3=A9crit=C2=A0:
> CVS commit by pahlibar:
>
>
> Reorganization of cvs.
> * digikam/libs digikam/libs/guibuilder digikam/libs/histogram added
> * guibuilder code moved to digikam/libs/guibuilder
> CCMAIL: digikam-devel@...
>
>
>   A            libs/.cvsignore   1.1
>   A            libs/Makefile.am   1.1
>   A            libs/guibuilder/.cvsignore   1.1
>   A            libs/guibuilder/Makefile.am   1.1
>   A            libs/guibuilder/guiclient.cpp   1.1 [GPL]
>   A            libs/guibuilder/guiclient.h   1.1 [GPL]
>   A            libs/guibuilder/guifactory.cpp   1.1 [GPL]
>   A            libs/guibuilder/guifactory.h   1.1 [GPL]
>   A            libs/histogram/.cvsignore   1.1
>   M +1 -1      Makefile.am   1.6
>   M +1 -0      digikam/Makefile.am   1.14
>   M +1 -0      utilities/cameragui/Makefile.am   1.4
>   M +2 -3      utilities/imageeditor/Makefile.am   1.6
>   R            utilities/imageeditor/guiclient.cpp   1.2
>   R            utilities/imageeditor/guiclient.h   1.2
>   R            utilities/imageeditor/guifactory.cpp   1.3
>   R            utilities/imageeditor/guifactory.h   1.1
>
>
> --- kdeextragear-3/digikam/Makefile.am  #1.5:1.6
> @@ -1,3 +1,3 @@
> -SUBDIRS =3D sqlite utilities digikam kioslave imageplugins
> #digikamcameraclient +SUBDIRS =3D sqlite libs utilities digikam kioslave
> imageplugins
>
>  EXTRA_DIST =3D Digikam.kdevelop AUTHORS COPYING ChangeLog INSTALL README
> TODO digikam.lsm
>
> --- kdeextragear-3/digikam/digikam/Makefile.am  #1.13:1.14
> @@ -31,4 +31,5 @@
>                          $(LIBSOCKET) $(LIB_KFILE) $(LIB_KEXIF) $(LIB_GDB=
M)
> \ $(top_builddir)/digikam/sqlite/libsqlite.la \ +                      =20
> $(top_builddir)/digikam/libs/guibuilder/libguibuilder.la \
> $(top_builddir)/digikam/utilities/cameragui/libcameragui.la \
> $(top_builddir)/digikam/utilities/imageeditor/libimageeditor.la \
>
> --- kdeextragear-3/digikam/utilities/cameragui/Makefile.am  #1.3:1.4
> @@ -12,4 +12,5 @@
>
>  INCLUDES=3D -I$(top_srcdir)/digikam/digikam \
> +        -I$(top_srcdir)/digikam/libs/guibuilder \
>          -I$(top_srcdir)/digikam/utilities/imageeditor \
>          $(all_includes)
>
> --- kdeextragear-3/digikam/utilities/imageeditor/Makefile.am  #1.5:1.6
> @@ -3,6 +3,5 @@
>  noinst_LTLIBRARIES =3D libimageeditor.la
>
> -libimageeditor_la_SOURCES =3D guiclient.cpp  guifactory.cpp \
> -                            imlibinterface.cpp imageiface.cpp \
> +libimageeditor_la_SOURCES =3D imlibinterface.cpp imageiface.cpp \
>                              imagewidget.cpp imageplugin.cpp \
>                              imagepluginloader.cpp \
> @@ -15,5 +14,5 @@
>
>  INCLUDES=3D -I$(top_srcdir)/digikam/digikam \
> -          -I$(top_srcdir)/digikam/interfaces \
> +          -I$(top_srcdir)/digikam/libs/guibuilder \
>            -I$(top_srcdir)/digikam/utilities/kexif \
>            $(IMLIB2_CFLAGS) $(all_includes)
>
>
>
>
> -------------------------------------------------------
> This SF.Net email is sponsored by BEA Weblogic Workshop
> FREE Java Enterprise J2EE developer tools!
> Get your free copy of BEA WebLogic Workshop 8.1 today.
> http://ads.osdn.com/?ad_id=3D4721&alloc_id=3D10040&op=3Dclick
> _______________________________________________
> Digikam-devel mailing list
> Digikam-devel@...
> https://lists.sourceforge.net/lists/listinfo/digikam-devel

CVS commit by cgilles: 

Fixed menu in ImageEditor : Added 'Image' entry.
CCMAIL: digikam-devel@...


  M +8 -7      imageplugins/imageplugin_core.cpp   1.17
  M +7 -6      utilities/imageeditor/imageguiclient.cpp   1.17


--- kdeextragear-3/digikam/imageplugins/imageplugin_core.cpp  #1.16:1.17
@@ -99,10 +99,7 @@ ImagePlugin_Core::ImagePlugin_Core(QObje
                 actionCollection(), "implugcore_equalize") );                
     
-    m_colorsAction->insert(new KActionSeparator());  
-    
-    m_colorsAction->insert(
-                new KAction(i18n("Histogram viewer..."), 0, 
+    new KAction(i18n("Histogram..."), 0, 
                 this, SLOT(slotHistogramViewer()),
-                actionCollection(), "implugcore_histogramviewer") );                
+                actionCollection(), "implugcore_histogramviewer");
     
     //-------------------------------                
@@ -139,4 +136,6 @@ QStringList ImagePlugin_Core::guiDefinit
     QStringList guiDef;
 
+    guiDef.append("MenuBar/Menu/&Image/Image/Action/implugcore_histogramviewer/ ");
+
     guiDef.append("MenuBar/Menu/Fi&x/Fix/Action/implugcore_colors/ ");
     guiDef.append("MenuBar/Menu/Fi&x/Fix/Separator/ / ");
@@ -155,6 +154,7 @@ QStringList ImagePlugin_Core::guiDefinit
     // enable i18n
 
-    i18n( "&Filters" );
+    i18n( "&Image" );
     i18n( "Fi&x" );
+    i18n( "&Filters" );
     
     return guiDef;
@@ -216,4 +216,5 @@ void ImagePlugin_Core::slotHistogramView
     HistogramViewer dlg(parentWidget(), data, w, h);
     dlg.exec();
+    delete [] data;
 }
 

--- kdeextragear-3/digikam/utilities/imageeditor/imageguiclient.cpp  #1.16:1.17
@@ -192,10 +192,11 @@ QStringList ImageGUIClient::guiDefinitio
     guiDef.append("MenuBar/Menu/&File/ /Action/file_print/ ");        
     guiDef.append("MenuBar/Menu/&File/ /Separator/ / ");
-    guiDef.append("MenuBar/Menu/&File/ /Action/comments_edit/ ");
-    guiDef.append("MenuBar/Menu/&File/ /Action/exif_info/ ");
-    guiDef.append("MenuBar/Menu/&File/ /Action/file_properties/ ");
-    guiDef.append("MenuBar/Menu/&File/ /Separator/ / ");
     guiDef.append("MenuBar/Menu/&File/ /Action/imageview_exit/ ");
     
+    guiDef.append("MenuBar/Menu/&Image/ /Action/comments_edit/ ");
+    guiDef.append("MenuBar/Menu/&Image/ /Action/exif_info/ ");
+    guiDef.append("MenuBar/Menu/&Image/ /Action/file_properties/ ");
+    guiDef.append("MenuBar/Menu/&Image/ /Separator/ / ");
+    
     guiDef.append("MenuBar/Menu/Fi&x/ /DefineGroup/Fix/ ");
     
@@ -241,4 +242,5 @@ QStringList ImageGUIClient::guiDefinitio
 
     i18n( "&File" );
+    i18n( "&Image" );
     i18n( "Fi&x" );
     i18n( "&Transform" );
@@ -246,5 +248,4 @@ QStringList ImageGUIClient::guiDefinitio
     i18n( "&Help" );
     
-    
     return guiDef;
 }

CVS commit by cgilles: 

Added new common ColorGrdientWidget for HistogramViewer in ImageEditor and 
File properties dialog. Source code more simply...
CCMAIL: digikam-devel@...


  A            libs/histogram/colorgradientwidget.cpp   1.1 [GPL]
  A            libs/histogram/colorgradientwidget.h   1.1 [GPL]
  M +2 -23     digikam/histogrampropsplugin.cpp   1.2
  M +14 -20    digikam/histogrampropsplugin.h   1.2
  M +2 -18     imageplugins/histogramviewer.cpp   1.3
  M +14 -16    imageplugins/histogramviewer.h   1.3
  M +1 -1      libs/histogram/Makefile.am   1.2

CVS commit by cgilles: 

Histogram viewer: added drawing all color channels (RGB) at the same time capability.
CCMAIL: digikam-devel@...


  M +39 -17    digikam/histogrampropsplugin.cpp   1.8
  M +39 -17    imageplugins/histogramviewer.cpp   1.9
  M +130 -33   libs/histogram/histogramwidget.cpp   1.8
  M +7 -6      libs/histogram/histogramwidget.h   1.3

CVS commit by pahlibar: 


* digikam gets theming support
* fluxbox style themes (texture renderer fudged from fluxbox code)
* themes can be installed at system level $PREFIX/share/apps/digikam/themes
  or in user home directory in ~/.kde/share/apps/digikam/themes
* sample theme ("Dreary") included

CCMAIL: digikam-devel@...


  A            libs/themeengine/.cvsignore   1.1
  A            libs/themeengine/Makefile.am   1.1
  A            libs/themeengine/texture.cpp   1.1 [X11 (BSD like)]
  A            libs/themeengine/texture.h   1.1 [X11 (BSD like)]
  A            libs/themeengine/theme.cpp   1.1 [GPL]
  A            libs/themeengine/theme.h   1.1 [GPL]
  A            libs/themeengine/themeengine.cpp   1.1 [GPL]
  A            libs/themeengine/themeengine.h   1.1 [GPL]
  A            themes/.cvsignore   1.1
  A            themes/Dreary   1.1
  A            themes/Makefile.am   1.1
  M +1 -1      Makefile.am   1.7
  M +3 -1      digikam/Makefile.am   1.20
  M +5 -2      digikam/albumfolderitem.cpp   1.4
  M +38 -12    digikam/albumfolderview.cpp   1.17
  M +9 -2      digikam/albumfolderview.h   1.5
  M +6 -4      digikam/albumiconitem.cpp   1.23
  M +40 -52    digikam/albumiconview.cpp   1.56
  M +4 -3      digikam/albumiconview.h   1.15
  M +18 -1     digikam/albumsettings.cpp   1.17
  M +3 -0      digikam/albumsettings.h   1.12
  M +33 -35    digikam/digikamapp.cpp   1.45
  M +7 -2      digikam/digikamapp.h   1.15
  M +2 -0      digikam/digikamui.rc   1.16
  M +29 -18    digikam/listview.cpp   1.4
  M +5 -3      digikam/listview.h   1.2
  M +1 -1      libs/Makefile.am   1.4
  R            digikam/texture.cpp   1.1
  R            digikam/texture.h   1.1

Le mercredi 4 Ao=C3=BBt 2004 20:14, Renchi Raju a =C3=A9crit=C2=A0:
> CVS commit by pahlibar:
>
>
> * digikam gets theming support
> * fluxbox style themes (texture renderer fudged from fluxbox code)
> * themes can be installed at system level $PREFIX/share/apps/digikam/them=
es
>   or in user home directory in ~/.kde/share/apps/digikam/themes
> * sample theme ("Dreary") included
>
> CCMAIL: digikam-devel@...
>
>
>   A            libs/themeengine/.cvsignore   1.1
>   A            libs/themeengine/Makefile.am   1.1
>   A            libs/themeengine/texture.cpp   1.1 [X11 (BSD like)]
>   A            libs/themeengine/texture.h   1.1 [X11 (BSD like)]
>   A            libs/themeengine/theme.cpp   1.1 [GPL]
>   A            libs/themeengine/theme.h   1.1 [GPL]
>   A            libs/themeengine/themeengine.cpp   1.1 [GPL]
>   A            libs/themeengine/themeengine.h   1.1 [GPL]
>   A            themes/.cvsignore   1.1
>   A            themes/Dreary   1.1
>   A            themes/Makefile.am   1.1
>   M +1 -1      Makefile.am   1.7
>   M +3 -1      digikam/Makefile.am   1.20
>   M +5 -2      digikam/albumfolderitem.cpp   1.4
>   M +38 -12    digikam/albumfolderview.cpp   1.17
>   M +9 -2      digikam/albumfolderview.h   1.5
>   M +6 -4      digikam/albumiconitem.cpp   1.23
>   M +40 -52    digikam/albumiconview.cpp   1.56
>   M +4 -3      digikam/albumiconview.h   1.15
>   M +18 -1     digikam/albumsettings.cpp   1.17
>   M +3 -0      digikam/albumsettings.h   1.12
>   M +33 -35    digikam/digikamapp.cpp   1.45
>   M +7 -2      digikam/digikamapp.h   1.15
>   M +2 -0      digikam/digikamui.rc   1.16
>   M +29 -18    digikam/listview.cpp   1.4
>   M +5 -3      digikam/listview.h   1.2
>   M +1 -1      libs/Makefile.am   1.4
>   R            digikam/texture.cpp   1.1
>   R            digikam/texture.h   1.1
>
Renchi, before this commits, i have tested Digikam in valgrind and i have=20
found some memory leak in texture.cpp. I can provide to you a trace if you=
=20
want...

Gilles

On Wed, 4 Aug 2004, Caulier Gilles wrote:

> Le mercredi 4 Ao=C3=BBt 2004 20:14, Renchi Raju a =C3=A9crit=C2=A0:
> >   R            digikam/texture.h   1.1
> >
> Renchi, before this commits, i have tested Digikam in valgrind and i have
> found some memory leak in texture.cpp. I can provide to you a trace if yo=
u
> want...

sure.

renchi

Le mercredi 4 Ao=C3=BBt 2004 21:34, Renchi Raju a =C3=A9crit=C2=A0:
> On Wed, 4 Aug 2004, Caulier Gilles wrote:
> > Le mercredi 4 Ao=C3=BBt 2004 20:14, Renchi Raju a =C3=A9crit=C2=A0:
> > >   R            digikam/texture.h   1.1
> >
> > Renchi, before this commits, i have tested Digikam in valgrind and i ha=
ve
> > found some memory leak in texture.cpp. I can provide to you a trace if
> > you want...
>
> sure.
>
> renchi
>
Actually i'm busy. I will provide that tomorrow morning at work....

Gilles

On Wednesday 04 August 2004 20:14, Renchi Raju wrote:
> CVS commit by pahlibar:
>
>
> * digikam gets theming support
> * fluxbox style themes (texture renderer fudged from fluxbox code)
> * themes can be installed at system level $PREFIX/share/apps/digikam/them=
es
>   or in user home directory in ~/.kde/share/apps/digikam/themes
> * sample theme ("Dreary") included

Great work ! Now it is needed a website where users can upload their themes=
 :)

=2E.. J=C3=B6rn

On Wed, 4 Aug 2004, Joern Ahrens wrote:

> On Wednesday 04 August 2004 20:14, Renchi Raju wrote:
> > CVS commit by pahlibar:
> >
> >
> > * digikam gets theming support
> > * fluxbox style themes (texture renderer fudged from fluxbox code)
> > * themes can be installed at system level $PREFIX/share/apps/digikam/themes
> >   or in user home directory in ~/.kde/share/apps/digikam/themes
> > * sample theme ("Dreary") included
>
> Great work ! Now it is needed a website where users can upload their themes :)
>

i'm writing a themeing guide which i will put at the website and then i
can invite users to develop themes of their own.

renchi

Le mercredi 4 Ao=FBt 2004 22:34, Renchi Raju a =E9crit=A0:
> On Wed, 4 Aug 2004, Joern Ahrens wrote:
> > On Wednesday 04 August 2004 20:14, Renchi Raju wrote:
> > > CVS commit by pahlibar:
> > >
> > >
> > > * digikam gets theming support
> > > * fluxbox style themes (texture renderer fudged from fluxbox code)
> > > * themes can be installed at system level
> > > $PREFIX/share/apps/digikam/themes or in user home directory in
> > > ~/.kde/share/apps/digikam/themes * sample theme ("Dreary") included
> >
> > Great work ! Now it is needed a website where users can upload their
> > themes :)
>
> i'm writing a themeing guide which i will put at the website and then i
> can invite users to develop themes of their own.
>
> renchi

I can add a new setup tab for theme selection if you want ?

Gilles

On Wed, 4 Aug 2004, Caulier Gilles wrote:

> Le mercredi 4 Ao=FBt 2004 22:34, Renchi Raju a =E9crit=A0:
> > On Wed, 4 Aug 2004, Joern Ahrens wrote:
> > > On Wednesday 04 August 2004 20:14, Renchi Raju wrote:
> > > > CVS commit by pahlibar:
> > > >
> > > >
> > > > * digikam gets theming support
> > > > * fluxbox style themes (texture renderer fudged from fluxbox code)
> > > > * themes can be installed at system level
> > > > $PREFIX/share/apps/digikam/themes or in user home directory in
> > > > ~/.kde/share/apps/digikam/themes * sample theme ("Dreary") included
> > >
> > > Great work ! Now it is needed a website where users can upload their
> > > themes :)
> >
> > i'm writing a themeing guide which i will put at the website and then i
> > can invite users to develop themes of their own.
> >
> > renchi
>
> I can add a new setup tab for theme selection if you want ?

no need for a setup option. the theme selection is to be done on the fly
from the menus.

renchi

Dnia środa, 4 sierpnia 2004 20:14, Renchi Raju napisał:
> CVS commit by pahlibar:
>
>
> * digikam gets theming support
> * fluxbox style themes (texture renderer fudged from fluxbox code)
> * themes can be installed at system level
> $PREFIX/share/apps/digikam/themes or in user home directory in
> ~/.kde/share/apps/digikam/themes * sample theme ("Dreary") included
>
Just updated CVS.

I see only black border and white background on thumbnail tiles.
No color. Dreary file is in proper directory. Don't see any
configuration option?

Started from Konsole there is no output.

m.

ps. About user config files: a bit of documentation or heavily commented
theme file would be nice.

-- 
LaTeX + Vim = http://vim-latex.sourceforge.net/
Vim HTML Templates http://www.vim.org/scripts/script.php?script_id=988
vim.pl - http://skawina.eu.org/mikolaj
CLEWN - http://clewn.sf.net

On Thu, 5 Aug 2004, Mikolaj Machowski wrote:

> Just updated CVS.
>
> I see only black border and white background on thumbnail tiles.
> No color. Dreary file is in proper directory. Don't see any
> configuration option?

there should be "Theme" menu in the mainwindow. maybe your local
(user level) version of digikamui.rc is overriding the system version. i
bumped up the version on the digikamui.rc in cvs. update and install

> ps. About user config files: a bit of documentation or heavily commented
> theme file would be nice.

http://digikam.sourceforge.net/themeguide.html

renchi

Le jeudi 5 Ao=FBt 2004 16:55, Renchi Raju a =E9crit=A0:
> On Thu, 5 Aug 2004, Mikolaj Machowski wrote:
> > Just updated CVS.
> >
> > I see only black border and white background on thumbnail tiles.
> > No color. Dreary file is in proper directory. Don't see any
> > configuration option?
>
> there should be "Theme" menu in the mainwindow. maybe your local
> (user level) version of digikamui.rc is overriding the system version. i
> bumped up the version on the digikamui.rc in cvs. update and install

I think that a menu option for to choise a theme isn't a good idea. A theme=
=20
will ne be changed frenquently by the user. It's a specific GUI option. I=20
think that  will going to  the config setup dialog (like others major KDE=20
applications, K3b for example)

Regards

Gilles

On Thursday 05 August 2004 22:01, Caulier Gilles wrote:
> Le jeudi 5 Ao=FBt 2004 16:55, Renchi Raju a =E9crit=A0:
> > there should be "Theme" menu in the mainwindow. maybe your local
> > (user level) version of digikamui.rc is overriding the system version. i
> > bumped up the version on the digikamui.rc in cvs. update and install
>
> I think that a menu option for to choise a theme isn't a good idea. A the=
me
> will ne be changed frenquently by the user. It's a specific GUI option. I
> think that  will going to  the config setup dialog (like others major KDE
> applications, K3b for example)

I think Gilles is right, the theme configurations isn't changed frequently =
by=20
the user and therefor it should not have it's own menu but should be=20
configured in the setup dialog. It makes the digikam menu more complex for=
=20
new users as well.

kde theming itself is configured in this way.

=2E.. J=F6rn

Dnia czwartek, 5 sierpnia 2004 16:55, Renchi Raju napisał:
> On Thu, 5 Aug 2004, Mikolaj Machowski wrote:
> > Just updated CVS.
> >
> > I see only black border and white background on thumbnail tiles.
> > No color. Dreary file is in proper directory. Don't see any
> > configuration option?
>
> there should be "Theme" menu in the mainwindow. maybe your local
> (user level) version of digikamui.rc is overriding the system version. i
> bumped up the version on the digikamui.rc in cvs. update and install

Removed personal digikamui.rc and everything works perfectly. Almost :)

Previously there was a nice effect when changing focus from listview to
thumbnail view. Now it has gone :(

> > ps. About user config files: a bit of documentation or heavily
> > commented theme file would be nice.
>
> http://digikam.sourceforge.net/themeguide.html
>
Thanks!

m.

-- 
LaTeX + Vim = http://vim-latex.sourceforge.net/
Vim HTML Templates http://www.vim.org/scripts/script.php?script_id=988
vim.pl - http://skawina.eu.org/mikolaj
CLEWN - http://clewn.sf.net

Dnia czwartek, 5 sierpnia 2004 22:40, Joern Ahrens napisał:
>
> I think Gilles is right, the theme configurations isn't changed
> frequently by the user and therefor it should not have it's own menu but
> should be configured in the setup dialog. It makes the digikam menu more
> complex for new users as well.
>
Maybe preview of themes colors in config :)

m.

-- 
LaTeX + Vim = http://vim-latex.sourceforge.net/
Vim HTML Templates http://www.vim.org/scripts/script.php?script_id=988
vim.pl - http://skawina.eu.org/mikolaj
CLEWN - http://clewn.sf.net

On Friday 06 August 2004 00:50, Mikolaj Machowski wrote:
>
> Previously there was a nice effect when changing focus from listview to
> thumbnail view. Now it has gone :(
>

I'm really happy, that is irritating effect is gone ;-)

=2E.. J=F6rn

Le jeudi 5 Ao=FBt 2004 22:40, Joern Ahrens a =E9crit :
> On Thursday 05 August 2004 22:01, Caulier Gilles wrote:
> > Le jeudi 5 Ao=FBt 2004 16:55, Renchi Raju a =E9crit=A0:
> > > there should be "Theme" menu in the mainwindow. maybe your local
> > > (user level) version of digikamui.rc is overriding the system version.
> > > i bumped up the version on the digikamui.rc in cvs. update and install
> >
> > I think that a menu option for to choise a theme isn't a good idea. A
> > theme will ne be changed frenquently by the user. It's a specific GUI
> > option. I think that  will going to  the config setup dialog (like othe=
rs
> > major KDE applications, K3b for example)
>
> I think Gilles is right, the theme configurations isn't changed frequently
> by the user and therefor it should not have it's own menu but should be
> configured in the setup dialog. It makes the digikam menu more complex for
> new users as well.
>
> kde theming itself is configured in this way.

Absolutly (:=3D)))...

=2D-=20
Gilles Caulier

On Thu, 5 Aug 2004, Joern Ahrens wrote:

> On Thursday 05 August 2004 22:01, Caulier Gilles wrote:
> > Le jeudi 5 Ao=FBt 2004 16:55, Renchi Raju a =E9crit=A0:
> > > there should be "Theme" menu in the mainwindow. maybe your local
> > > (user level) version of digikamui.rc is overriding the system version=
=2E i
> > > bumped up the version on the digikamui.rc in cvs. update and install
> >
> > I think that a menu option for to choise a theme isn't a good idea. A t=
heme
> > will ne be changed frenquently by the user. It's a specific GUI option.=
 I
> > think that  will going to  the config setup dialog (like others major K=
DE
> > applications, K3b for example)
>
> I think Gilles is right, the theme configurations isn't changed frequentl=
y by
> the user and therefor it should not have it's own menu but should be
> configured in the setup dialog. It makes the digikam menu more complex fo=
r
> new users as well.
>
> kde theming itself is configured in this way.

i will have to disagree with both of you. here are my reasons:

a) i don't see how providing a separate menu for themes is more more
complex than adding additional pages to the setup dialog.

b) some users like to change themes frequently (i do. i change my
fluxbox themes at least twice a day). ability to change themes on the fly
without going through the setup dialog is nice. This is usually not
provided by other applications, as it can be slow. but for us changing
themes is fast and we can afford the luxury of providing this option
directly. also easier for theme developers to modify themes and see the
results immediately.

c) with on the fly theme changing its not necessary for us to go through
the hassle of adding preview effects in the setup dialog, where it becomes
difficult to show how image thumbnails will look with the preview. also,
for the user changing themes in the setup dialog would never give the full
idea as to how digikam will look with the new theme.

ok, enough of my rant. i will let the users decide as to where the theme
changer should go. lets have a user poll and let them decide.

renchi

On Fri, 6 Aug 2004, Joern Ahrens wrote:

> On Friday 06 August 2004 00:50, Mikolaj Machowski wrote:
> >
> > Previously there was a nice effect when changing focus from listview to
> > thumbnail view. Now it has gone :(
> >
>
> I'm really happy, that is irritating effect is gone ;-)
>
> ... J=F6rn

i agree. the effect was kind of irritating. we have to think of a
better way of providing focus indication. i'm welcome to any ideas.

renchi

On Thu, 5 Aug 2004, Joern Ahrens wrote:

> ....
>
> kde theming itself is configured in this way.
>
> ... J=F6rn

oh, btw talking of kde theming. i don't agree with kde standards all the
time. there are quite a few ways where we deviate from kde
specifications/usage:

eg:
- double click vs single click. i hate the way kde does single click -
executes by default. it makes selection unnecessarily difficult
- no central place for theme/color/style selection. though, this is being
rectified with the new kde theme selector
- selection of items in an iconview. in kde if you select an item and then
shift select item, the selection is done on a rectangle bounding the two
items, which i think is really wierd. in digikam, we use a rowwise
selection mode, i.e. all items are laid out in rowwise fashion and shift
selecting will select rows starting from first selected item to last
selected item.

renchi

Le vendredi 6 Ao=FBt 2004 16:56, Renchi Raju a =E9crit=A0:
> On Fri, 6 Aug 2004, Joern Ahrens wrote:
> > On Friday 06 August 2004 00:50, Mikolaj Machowski wrote:
> > > Previously there was a nice effect when changing focus from listview =
to
> > > thumbnail view. Now it has gone :(
> >
> > I'm really happy, that is irritating effect is gone ;-)
> >
> > ... J=F6rn
>
> i agree. the effect was kind of irritating. we have to think of a
> better way of providing focus indication. i'm welcome to any ideas.

Heu, i love this focus effect ! (:=3D)) Also the colors and the blending=20
thumbnails effect provide by the old embedded theme !

Gilles

CVS commit by jahrens: 

Added drag and drop for tags.
- Tags can be moved and dropped on another tag inside the album folderview,
  so it is possible to rearrange the tag hierarchy. 
- When a tag is moved to another parent its children are moved as well.

Not implemented yet
* TagDrag can be used to attach a tag to a picture in albumiconview.

CCMAIL: digikam-devel@...


  M +11 -11    Digikam.kdevelop   1.16
  M +40 -0     digikam/album.cpp   1.5
  M +3 -1      digikam/album.h   1.6
  M +7 -0      digikam/albumdb.cpp   1.5
  M +2 -1      digikam/albumdb.h   1.3
  M +135 -37   digikam/albumfolderview.cpp   1.21
  M +7 -1      digikam/albumfolderview.h   1.8
  M +22 -0     digikam/albummanager.cpp   1.5
  M +1 -0      digikam/albummanager.h   1.4
  M +33 -0     digikam/dragobjects.cpp   1.2
  M +22 -0     digikam/dragobjects.h   1.2
  M +12 -0     digikam/listitem.cpp   1.2
  M +2 -1      digikam/listitem.h   1.2

On Wed, 18 Aug 2004, [utf-8] J=C3=B6rn Ahrens wrote:

> CVS commit by jahrens:
> Added drag and drop for tags.
> - Tags can be moved and dropped on another tag inside the album foldervie=
w,
>   so it is possible to rearrange the tag hierarchy.
> - When a tag is moved to another parent its children are moved as well.

good stuff, joern. going through your changes now.

>   M +40 -0     digikam/album.cpp   1.5
>   M +3 -1      digikam/album.h   1.6

Album::hasDescendant() and Album::isAncestorOf() serve exactly the same
purpose. remove one.

renchi

On Wed, 18 Aug 2004, [utf-8] J=C3=B6rn Ahrens wrote:

>   M +22 -0     digikam/albummanager.cpp   1.5
>   M +1 -0      digikam/albummanager.h   1.4

AlbumManager::moveTAlbum(TAlbum* album, TAlbum* parent, QString errMsg)

should be

AlbumManager::moveTAlbum(TAlbum* album, TAlbum* parent, QString& errMsg)

On Wednesday 18 August 2004 23:15, Renchi Raju wrote:
> On Wed, 18 Aug 2004, [utf-8] J=C3=B6rn Ahrens wrote:
> >   M +22 -0     digikam/albummanager.cpp   1.5
> >   M +1 -0      digikam/albummanager.h   1.4
>
> AlbumManager::moveTAlbum(TAlbum* album, TAlbum* parent, QString errMsg)
>
> should be
>
> AlbumManager::moveTAlbum(TAlbum* album, TAlbum* parent, QString& errMsg)
Sure !=20

=2D-=20
=2E.. J=F6rn

On Wednesday 18 August 2004 23:07, Renchi Raju wrote:
> On Wed, 18 Aug 2004, [utf-8] J=C3=B6rn Ahrens wrote:
> > CVS commit by jahrens:
> > Added drag and drop for tags.
> > - Tags can be moved and dropped on another tag inside the album
> > folderview, so it is possible to rearrange the tag hierarchy.
> > - When a tag is moved to another parent its children are moved as well.
>
> good stuff, joern. going through your changes now.
>
> >   M +40 -0     digikam/album.cpp   1.5
> >   M +3 -1      digikam/album.h   1.6
>
> Album::hasDescendant() and Album::isAncestorOf() serve exactly the same
> purpose. remove one.

Album::hasDescendant() is gone ...

=2E.. J=F6rn

CVS commit by cgilles: 

Setup : fixed kipi plugins icon setup.
ImagePreviewWidget : Added moved action between Pan icon widget
and Image region widget when the selection focus have changed (thanks to Joern
for this idea). The Image Region is updated but not the preview effect during the
selection mouvement (only when the mouse is released). This way improveme the region 
selection choise in the original image.
CCMAIL: digikam-devel@...


  M +18 -14    libs/widgets/imagepaniconwidget.cpp   1.3
  M +5 -1      libs/widgets/imagepaniconwidget.h   1.3
  M +5 -5      libs/widgets/imagepreviewwidget.cpp   1.3
  M +1 -1      libs/widgets/imagepreviewwidget.h   1.2
  M +5 -10     libs/widgets/imageregionwidget.cpp   1.3
  M +1 -4      libs/widgets/imageregionwidget.h   1.3
  M +1 -1      utilities/setup/setup.cpp   1.19

CVS commit by cgilles: 

Added KDE bugs reports url and notice !
CCMAIL: digikam-devel@...


  M +13 -2     README   1.7


--- kdeextragear-3/digikam/README  #1.6:1.7
@@ -19,10 +19,21 @@
 Contact :
 -----------------------------------------------------------------------
-If you have questions, comments, suggestions, requests, bug reports to
-make do email at :
+If you have questions, comments, suggestions to make do email at :
 
 digikam-users@...
 
 
+IMPORTANT : since the bugreports and wishlist are hosted by the KDE bugs report 
+system who can be contacted by the standard Kde help menu of Digikam. 
+A mail will be automaticly sent to the digikam development mailing list.
+There is no need to contact directly the digikam mailing list for a bug report 
+or a devel wish.
+
+The current Digikam bugs and devel wish reported to the Kde bugs report can be see 
+at this url :
+
+http://bugs.kde.org/buglist.cgi?product=digikam&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED
+
+
 Dependencies :
 -----------------------------------------------------------------------

CVS commit by cgilles: 

Added ImagePlugins setup for Digikam ImageEditor :
- The ImageEditor setup tabs provide now a list of all ImagePlugins available on the system.
- The ImagePlugins can be enable/disable by this way.
- The ImagePlugins lists enable are saved in the digikam config file.
CCMAIL: digikam-devel@...


  M +3 -1      ChangeLog   1.37
  M +3 -1      digikam/digikamapp.cpp   1.52
  M +3 -0      digikam/digikamapp.h   1.20
  M +77 -15    utilities/imageeditor/imagepluginloader.cpp   1.2
  M +11 -2     utilities/imageeditor/imagepluginloader.h   1.2
  M +3 -3      utilities/setup/setup.h   1.10
  M +81 -5     utilities/setup/setupeditor.cpp   1.2
  M +18 -2     utilities/setup/setupeditor.h   1.2

CVS commit by pahlibar: 


* move the deleting files from database code from the main app to kioslave,
  this makes the deleting file operations appear much lesser non-blocking
* added code for showing the tag albums in the kipiplugins, but disabled it
  till issues with the imagegallery are resolved.
CCMAIL: digikam-devel@...


  M +25 -17    digikam/albumiconview.cpp   1.78
  M +2 -0      digikam/albumiconview.h   1.24
  M +28 -6     digikam/kipiinterface.cpp   1.10
  M +112 -0    kioslave/digikamio.cpp   1.3
  M +2 -0      kioslave/digikamio.h   1.2
  M +2 -2      kioslave/digikamio.protocol   1.2

CVS commit by pahlibar: 


deleting items will either move-to-trash (default) or actually delete,
depending on user settings.
CCMAIL: digikam-devel@...


  A            digikam/syncjob.cpp   1.1 [GPL]
  A            digikam/syncjob.h   1.1 [GPL]
  M +2 -1      digikam/Makefile.am   1.26
  M +27 -13    digikam/albumiconview.cpp   1.82
  M +0 -2      digikam/albumiconview.h   1.27
  M +3 -6      digikam/albummanager.cpp   1.9
  M +17 -0     digikam/albumsettings.cpp   1.20
  M +3 -0      digikam/albumsettings.h   1.15
  M +3 -6      utilities/imageeditor/imagewindow.cpp   1.41
  M +10 -0     utilities/setup/setupmisc.cpp   1.2
  M +1 -0      utilities/setup/setupmisc.h   1.2

CVS commit by pahlibar: 


configure.in tests revamped:
* merge multiple configure.ins into one
* use pkg-config for libkipi and libkexif
* output clearly at the end as to the status of each of the configure tests
CCMAIL: digikam-devel@...


  M +32 -18    configure.in.bot   1.7
  M +164 -17   configure.in.in   1.14
  M +5 -4      digikam/Makefile.am   1.27
  M +2 -2      utilities/cameragui/Makefile.am   1.8
  M +3 -2      utilities/imageeditor/Makefile.am   1.9
  R            utilities/configure.in.in   1.6

CVS commit by pahlibar: 


added option to not ask for confirmation before moving items to trash
(off by default).
CCMAIL: digikam-devel@...


  M +40 -33    digikam/albumiconview.cpp   1.85
  M +18 -0     digikam/albumsettings.cpp   1.21
  M +3 -0      digikam/albumsettings.h   1.16
  M +14 -8     utilities/imageeditor/imagewindow.cpp   1.42
  M +36 -6     utilities/setup/setupmisc.cpp   1.3
  M +7 -0      utilities/setup/setupmisc.h   1.3

CVS commit by cgilles: 

HistogramViewer and HistogramPropPlugin:
- Fixed alignment of calculated values (reported by Achim Bohnet in the past (:=)))
- Improved all 'Colors' at the same time mode rendering : added top value gray drawing for each color channels.
CCMAIL: digikam-devel@...


  M +7 -7      digikam/histogrampropsplugin.cpp   1.13
  M +7 -7      imageplugins/histogramviewer.cpp   1.15
  M +9 -1      libs/widgets/histogramwidget.cpp   1.3

CVS commit by pahlibar: 


* qt <= 3.1.2 compatiblity fix. QDeepCopy is not a friend of QStringList.
  hack it by using QValueList<QString>
* imlib2_cflags was missing from some makefiles. added
CCMAIL: digikam-devel@...


  M +1 -1      imageplugins/Makefile.am   1.14
  M +2 -2      kioslave/Makefile.am   1.9
  M +17 -3     utilities/cameragui/cameracontroller.cpp   1.14


--- kdeextragear-3/digikam/imageplugins/Makefile.am  #1.13:1.14
@@ -5,5 +5,5 @@
         -I$(top_srcdir)/digikam/libs/levels \
         -I$(top_srcdir)/digikam/libs/widgets \
-        $(all_includes)
+        $(all_includes) $(IMLIB2_CFLAGS)
 
 # Install this plugin in the KDE modules directory

--- kdeextragear-3/digikam/kioslave/Makefile.am  #1.8:1.9
@@ -1,3 +1,3 @@
-INCLUDES    = -I$(top_srcdir)/digikam/sqlite $(all_includes) 
+INCLUDES    = $(IMLIB2_CFLAGS) -I$(top_srcdir)/digikam/sqlite $(all_includes) 
 METASOURCES = AUTO  
 
@@ -6,5 +6,5 @@
 
 kio_digikamthumbnail_la_SOURCES = digikamthumbnail.cpp
-kio_digikamthumbnail_la_LIBADD = $(LIB_KIO) -ljpeg
+kio_digikamthumbnail_la_LIBADD = $(LIB_KIO) -ljpeg 
 kio_digikamthumbnail_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_PLUGIN) $(LIB_IMLIB2)
 

--- kdeextragear-3/digikam/utilities/cameragui/cameracontroller.cpp  #1.13:1.14
@@ -198,6 +198,10 @@ void CameraThread::run()
             d->camera->getAllFolders(d->camera->path(), folderList);
 
+            /* TODO: ugly hack since qt <= 3.1.2 does not define
+               QStringList with QDeepCopy as a friend. */
+            QValueList<QString> flist(folderList);
+            
             CameraEvent* event = new CameraEvent(CameraEvent::gp_listedfolders);
-            event->map.insert("folders", QVariant(folderList));
+            event->map.insert("folders", QVariant(flist));
             QApplication::postEvent(parent, event);
         
@@ -623,6 +627,16 @@ void CameraController::customEvent(QCust
     case (CameraEvent::gp_listedfolders) :
     {
-        QStringList folderList =
-            QDeepCopy<QStringList>(event->map["folders"].asStringList());
+        /* TODO: ugly hack since qt <= 3.1.2 does not define
+           QStringList with QDeepCopy as a friend. */
+        QValueList<QVariant> flist =
+            QDeepCopy< QValueList<QVariant> >(event->map["folders"].toList());
+
+        QStringList folderList;
+        QValueList<QVariant>::Iterator it;
+        for (it = flist.begin(); it != flist.end(); ++it )
+        {
+            folderList.append(QDeepCopy<QString>((*it).asString()));
+        }
+        
         emit signalFolderList(folderList);
         break;

CVS commit by cgilles: 

Digikam BUG 91828 : Added more tests if target album database path haven't write access in
Digikam first run and general setup.
General setup now check the path QEdit widget like in Digikam first run and 
toogle the OK dialog button in according.
CCMAIL: digikam-devel@..., mail-kdebugs@...


  M +64 -22    digikam/digikamfirstrun.cpp   1.7
  M +25 -0     digikam/digikamfirstrun.h   1.2
  M +1 -1      utilities/setup/setup.cpp   1.22
  M +53 -25    utilities/setup/setupgeneral.cpp   1.23
  M +29 -23    utilities/setup/setupgeneral.h   1.11

CVS commit by pahlibar: 


libtiff configure test added
CCMAIL: digikam-devel@...


  M +9 -0      configure.in.bot   1.8
  M +21 -0     configure.in.in   1.15
  M +1 -1      utilities/imageeditor/Makefile.am   1.10


--- kdeextragear-3/digikam/configure.in.bot  #1.7:1.8
@@ -55,3 +55,12 @@
 fi
 
+if test "x$have_tiff" != "xyes"; then
+  echo "-- libtiff found.................. NO"
+  echo ""
+  echo "digiKam needs libtiff. You need to install the libtiff development package."
+  echo ""
+else
+  echo "-- libtiff found.................. YES"
+fi
+
 echo "------------------------------------------------"

--- kdeextragear-3/digikam/configure.in.in  #1.14:1.15
@@ -223,2 +223,23 @@
 fi
 
+#------------------------------------------------------------------
+# Check for libtiff
+#------------------------------------------------------------------
+
+have_tiff=no
+AC_CHECK_LIB(tiff, TIFFWriteScanline,
+  have_tiff=yes,
+  AC_MSG_WARN([TIFF library not found]), 
+  -lz -lm)
+
+if test "x$have_tiff" = "xyes"; then
+  KDE_CHECK_HEADER(tiffio.h, have_tiff=yes, have_tiff=no)
+fi
+
+if test "x$have_tiff" != "xyes"; then
+  AC_WARN([TIFF library not found, digiKam will not be compiled.])
+  DO_NOT_COMPILE="digikam $DO_NOT_COMPILE"
+else
+  LIB_TIFF="-ltiff"
+  AC_SUBST(LIB_TIFF)
+fi

--- kdeextragear-3/digikam/utilities/imageeditor/Makefile.am  #1.9:1.10
@@ -12,5 +12,5 @@
 
 libimageeditor_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_KDEPRINT) \
-                            $(LIB_IMLIB2) $(LIBKEXIF_LIBS) -ltiff
+                            $(LIB_IMLIB2) $(LIBKEXIF_LIBS) $(LIB_TIFF)
 
 INCLUDES= -I$(top_srcdir)/digikam/digikam \

CVS commit by cgilles: 

Fixed last commit by aaron.
- No need numerical digiKam version.
- Refixed Digikam to digiKam.
- Fixed release version test for firstrun.
- Added writable test to album database path and display warning message
CCMAIL: digikam-devel@...


  M +1 -1      Digikam.kdevelop   1.20
  M +0 -1      version.h   1.6
  M +2 -2      digikam/digikam.desktop   1.16
  M +8 -1      digikam/digikamfirstrun.cpp   1.11
  M +6 -3      digikam/main.cpp   1.30
  M +3 -5      utilities/setup/setupgeneral.cpp   1.26


--- kdeextragear-3/digikam/Digikam.kdevelop  #1.19:1.20
@@ -33,5 +33,5 @@
     </groups>
     <tree>
-      <hidepatterns></hidepatterns>
+      <hidepatterns/>
       <hidenonprojectfiles>false</hidenonprojectfiles>
       <showvcsfields>true</showvcsfields>

--- kdeextragear-3/digikam/version.h  #1.5:1.6
@@ -25,5 +25,4 @@
 
 static const char * const digikam_version = "0.7-beta1";
-static double digikam_numeric_version = 0.7;
 
 #endif // DIGIKAM_VERSION_H

--- kdeextragear-3/digikam/digikam/digikam.desktop  #1.15:1.16
@@ -6,7 +6,7 @@
 Icon=digikam.png
 DocPath=digikam/index.html
-Name=Digikam
+Name=digikam
 Name[ta]=டிஜிகேம்
-Name[xx]=xxDigikamxx
+Name[xx]=xxdigikamxx
 Comment=KDE Photo Management
 Comment[bg]=Управление на снимки

--- kdeextragear-3/digikam/digikam/digikamfirstrun.cpp  #1.10:1.11
@@ -137,6 +137,13 @@ void DigikamFirstRun::slotOk()
     }
 
+    QFileInfo path(albumLibraryFolder);
+    if (!path.isWritable()) {
+        KMessageBox::information(0, i18n("No write access for this path.\n"
+                                         "Warning: the comments and tag features will not work!"));
+        return;
+    }
+
     config_->setGroup("General Settings");
-    config_->writeEntry("Version", digikam_numeric_version);
+    config_->writeEntry("Version", digikam_version);
 
     config_->setGroup("Album Settings");

--- kdeextragear-3/digikam/digikam/main.cpp  #1.29:1.30
@@ -67,5 +67,5 @@ int main(int argc, char *argv[])
     
     KAboutData aboutData( "digikam", 
-                          I18N_NOOP("Digikam"),
+                          I18N_NOOP("digiKam"),
                           digikam_version,        // Release number available in version.h to the top source dir.
                           Description.latin1(),
@@ -191,5 +191,5 @@ int main(int argc, char *argv[])
     KConfig* config = KGlobal::config();
     config->setGroup("General Settings");
-    double version = config->readDoubleNumEntry("Version");
+    QString version = config->readEntry("Version");
 
     bool showSplash = config->readBoolEntry("Show Splash", true);
@@ -201,5 +201,8 @@ int main(int argc, char *argv[])
     // version 0.6 was the version when the new Albums Library
     // storage was implemented
-    if (version < 0.6 || !dirInfo.exists() || !dirInfo.isDir())
+    
+    if (version.startsWith("0.5") ||
+        !dirInfo.exists() || 
+        !dirInfo.isDir())
     {
         // Run the first run

--- kdeextragear-3/digikam/utilities/setup/setupgeneral.cpp  #1.25:1.26
@@ -252,7 +252,6 @@ void SetupGeneral::slotChangeAlbumPath()
     QFileInfo targetPath(result);
     if (!targetPath.isWritable()) {
-        KMessageBox::sorry(0, i18n("No write access for this path.\n"
-                                   "Please select another path or change write access."));
-        return;
+        KMessageBox::information(0, i18n("No write access for this path.\n"
+                                         "Warning: the comments and tag features will not work!"));
     }
     
@@ -276,6 +275,5 @@ void SetupGeneral::slotPathEdited(const 
     QDir dir(newPath);
     mainDialog_->enableButtonOK(dir.exists() && 
-                                dir != QDir(QDir::homeDirPath ()) &&
-                                targetPath.isWritable());
+                                dir != QDir(QDir::homeDirPath ()));
 }

CVS commit by cgilles: 

Digikam ImageEditor : Added missing "whatsThis" Help menu option (reported by some users).
Fixed RedEyes Correction menu entry QToolTip to QWhatsThis.
Note : i18n unchanged !
CCMAIL: digikam-devel@...


  M +2 -2      imageplugins/imageplugin_core.cpp   1.28
  M +28 -4     utilities/imageeditor/imageguiclient.cpp   1.26
  M +2 -1      utilities/imageeditor/imageguiclient.h   1.13


--- kdeextragear-3/digikam/imageplugins/imageplugin_core.cpp  #1.27:1.28
@@ -66,5 +66,5 @@ ImagePlugin_Core::ImagePlugin_Core(QObje
                                  actionCollection(), "implugcore_redeye");
     m_redeyeAction->setEnabled(false);
-    m_redeyeAction->setToolTip( i18n( "This filter can be used to correct red eyes in a photo. "
+    m_redeyeAction->setWhatsThis( i18n( "This filter can be used to correct red eyes in a photo. "
                                       "Select a region including the eyes to enable this action.") );
 

--- kdeextragear-3/digikam/utilities/imageeditor/imageguiclient.cpp  #1.25:1.26
@@ -21,4 +21,12 @@
  * ============================================================ */
 
+// Qt includes.
+
+#include <qwhatsthis.h>
+
+#if defined Q_WS_X11 && ! defined K_WS_QTONLY
+#include <qxembed.h>
+#endif
+
 // KDE includes.
 
@@ -177,4 +185,6 @@ ImageGUIClient::ImageGUIClient(QWidget *
                                         "imageview_helpimageplugins");
                          
+    KStdAction::whatsThis(this, SLOT(slotContextHelpActivated()), actionCollection(),
+                         "imageview_contexthelp");             
     KStdAction::reportBug(this, SLOT(slotBugReport()), actionCollection(),
                          "imageview_reportbug");
@@ -225,4 +235,5 @@ QStringList ImageGUIClient::guiDefinitio
 
     guiDef.append("MenuBar/Menu/&Help/ /Action/imageview_help/ ");
+    guiDef.append("MenuBar/Menu/&Help/ /Action/imageview_contexthelp/ ");
     guiDef.append("MenuBar/Menu/&Help/ /Separator/ / ");
     guiDef.append("MenuBar/Menu/&Help/ /Action/imageview_helpimageplugins/ ");
@@ -270,7 +281,20 @@ void ImageGUIClient::slotHelp()
 }
 
+void ImageGUIClient::slotContextHelpActivated()
+{
+    QWhatsThis::enterWhatsThisMode();
+    QWidget* w = QApplication::widgetAt( QCursor::pos(), true );
+    while ( w && !w->isTopLevel() && !w->inherits("QXEmbed")  )
+        w = w->parentWidget();
+#if defined Q_WS_X11 && ! defined K_WS_QTONLY
+     if ( w && w->inherits("QXEmbed") )
+        (( QXEmbed*) w )->enterWhatsThisMode();
+#endif
+
+}
+
 void ImageGUIClient::slotBugReport()
 {
-    KBugReport dlg(kapp->activeWindow());//, bool modal=true, const KAboutData *aboutData=0L)
+    KBugReport dlg(kapp->activeWindow());
     dlg.exec();
 }

--- kdeextragear-3/digikam/utilities/imageeditor/imageguiclient.h  #1.12:1.13
@@ -80,6 +80,7 @@ signals:
 private slots:
 
-    void slotBugReport();
     void slotHelp();
+    void slotContextHelpActivated();
+    void slotBugReport();
     void slotAboutApp();
     void slotAboutKDE();

CVS commit by cgilles: 

Digikam Histogram Viewer : add new option for choise the foreground histogram color (Red or Green or Blue) used in 'All Colors mode'.
CCMAIL: digikam-devel@...


  M +52 -6     digikam/histogrampropsplugin.cpp   1.15
  M +3 -1      digikam/histogrampropsplugin.h   1.3
  M +53 -6     imageplugins/histogramviewer.cpp   1.18
  M +2 -0      imageplugins/histogramviewer.h   1.4
  M +119 -27   libs/widgets/histogramwidget.cpp   1.4
  M +5 -1      libs/widgets/histogramwidget.h   1.3

CVS commit by cgilles: 

Digikam Histogram Viewer:

New option for rendering histogram with the full image or current image selection [like in photoshop CS (tm) !!!]. 

Note for Digikam users : this option is only available with the Image Editor Histogram plugin, not with the image properties extension because none image selection can be done with this way...

CCMAIL: digikam-devel@...,  digikam-users@...


  M +102 -17   imageplugins/histogramviewer.cpp   1.19
  M +9 -2      imageplugins/histogramviewer.h   1.5
  M +26 -8     imageplugins/imageplugin_core.cpp   1.29
  M +62 -21    libs/widgets/histogramwidget.cpp   1.5
  M +18 -7     libs/widgets/histogramwidget.h   1.4

CVS commit by cgilles: 

Histogram Viewer : since we can choose the main color in 'All color mode', 
we can displayed the stat in this color with the current histogram selection.
CCMAIL: digikam-devel@...


  M +17 -25    digikam/histogrampropsplugin.cpp   1.16
  M +33 -41    imageplugins/histogramviewer.cpp   1.21
  M +6 -6      libs/widgets/histogramwidget.cpp   1.7

CVS commit by ach: 

Add libjpeg62 README and a note to README
as required by libjpeg distribution

CCMAIL: digikam-devel@...


  A            utilities/cameragui/libjpeg62.README   1.1
  M +2 -0      README   1.14


--- kdeextragear-3/digikam/README  #1.13:1.14
@@ -16,4 +16,6 @@
 to autodetect the camera connected to the computer.
 
+digikam is based in part on the work of the Independent JPEG Group.
+
 
 Contact :

CVS commit by cgilles: 

- Histogram lib and histogram widget : capability to update the image data !!! 
- Image properties dialog : 
  * New design without std KDE file properties tabs. 
  * Next  and Prev image selection 
  * Histogram and Exif tab : capabilty to update the view when a new image is selected with Prev and Next buttons. 
  * Histogram tab : using kio digikam thumbnail (this way don't bloc GUI) 
 
==> TODO : 
- Added new file properties tab. 
- Polish Exif tab. 
- Added standalone image mode for Image Editor. 
- Source code polish. 
 
CCMAIL: digikam-devel@...    


  M +82 -45    digikam/imageproperties.cpp   1.6
  M +5 -1      digikam/imageproperties.h   1.6
  M +4 -1      libs/histogram/imagehistogram.cpp   1.5
  M +23 -0     libs/widgets/histogramwidget.cpp   1.9
  M +4 -0      libs/widgets/histogramwidget.h   1.5

CVS commit by cgilles: 

Digikam image properties dialog :
- Polish code stage 2.
- new histogram contructor with no image data (nedded to use updateData after instance creation)

CCMAIL: digikam-devel@...


  M +17 -117   digikam/imageproperties.cpp   1.12
  M +1 -1      digikam/imageproperties.h   1.11
  M +23 -0     libs/widgets/histogramwidget.cpp   1.10
  M +9 -0      libs/widgets/histogramwidget.h   1.6

CVS commit by cgilles: 

Digikam image properties dialog : save current tab selected who will be restored at the next session.
CCMAIL: digikam-devel@...


  M +7 -4      digikam/imageproperties.cpp   1.13
  M +1 -1      digikam/imageproperties.h   1.12
  M +5 -1      libs/widgets/histogramwidget.cpp   1.12


--- kdeextragear-3/digikam/digikam/imageproperties.cpp  #1.12:1.13
@@ -99,5 +99,5 @@ ImageProperties::ImageProperties(AlbumIc
     //General tab init.
     
-    setupGeneralTab(fileURL.path());
+    setupGeneralTab();
     
     // Exif Viewer init.
@@ -118,4 +118,7 @@ ImageProperties::ImageProperties(AlbumIc
     slotItemChanged();
        
+    kapp->config()->setGroup("Image Properties Dialog");
+    showPage(kapp->config()->readNumEntry("Tab Actived", 0));
+
     parentWidget()->setCursor( KCursor::arrowCursor() );       
 }
@@ -125,5 +128,5 @@ ImageProperties::~ImageProperties()
    
     kapp->config()->setGroup("Image Properties Dialog");
-//    kapp->config()->writeEntry("Auto Save", m_autoSaveBox->isChecked());
+    kapp->config()->writeEntry("Tab Actived", activePageIndex());
 
     saveDialogSize("Image Properties Dialog");
@@ -657,5 +660,5 @@ void ImageProperties::setupExifViewer(vo
 // General Tab implementation methods
 
-void ImageProperties::setupGeneralTab(KURL fileURL)
+void ImageProperties::setupGeneralTab()
 {
     QFrame *page = addPage( i18n("General") );

--- kdeextragear-3/digikam/digikam/imageproperties.h  #1.11:1.12
@@ -102,5 +102,5 @@ private:
     QGuardedPtr<ThumbnailJob>     m_generalThumbJob;
         
-    void setupGeneralTab(KURL fileURL);
+    void setupGeneralTab(void);
 
     // For Exif viever.

--- kdeextragear-3/digikam/libs/widgets/histogramwidget.cpp  #1.11:1.12
@@ -150,7 +149,12 @@ void HistogramWidget::updateData(uint *i
     // Send signal to refresh information if necessary.
     if ( m_xmax == 0 && m_xmin == 0)
+       {
        emit signalMouseReleased( 255 );      // No current selection.
+       }
     else
+       {
+       emit signalMousePressed( m_xmin );
        emit signalMouseReleased( m_xmax );   // Current selection available.
+       }
     
 }

CVS commit by pahlibar: 


* fix issue with selection being painted offset from the actual selection
  in case of autozoom
* remove dependency of imlibinterface.cpp on albumsettings.
  IMPORTANT: developers, canvas.cpp/h,
  imlibinterface.cpp/h, exifrestorer.cpp/h should not depend on any of
  the rest of digikam. this is to make sure that we can separate out a
  canvas library for making a standalone imageviewer
CCMAIL: digikam-devel@...


  M +1 -0      digikam/Makefile.am   1.32
  M +11 -6     utilities/imageeditor/Makefile.am   1.12
  M +9 -2      utilities/imageeditor/canvas.cpp   1.26
  M +1 -0      utilities/imageeditor/canvas.h   1.16
  M +2 -0      utilities/imageeditor/imagewindow.cpp   1.56
  M +9 -3      utilities/imageeditor/imlibinterface.cpp   1.33
  M +1 -0      utilities/imageeditor/imlibinterface.h   1.17

CVS commit by pahlibar: 


digiKam has a new baby: "showfoto", a standalone imageviewer.
still in very rudimentary stage, just some navigation, opening files
and zooming in
CCMAIL: digikam-devel@...


  A            showfoto/.cvsignore   1.1
  A            showfoto/Makefile.am   1.1
  A            showfoto/main.cpp   1.1 [GPL]
  A            showfoto/showfoto.cpp   1.1 [GPL]
  A            showfoto/showfoto.h   1.1 [GPL]
  A            showfoto/showfotoui.rc   1.1
  M +1 -1      Makefile.am   1.8


--- kdeextragear-3/digikam/Makefile.am  #1.7:1.8
@@ -1,3 +1,3 @@
-SUBDIRS = sqlite libs utilities digikam kioslave imageplugins themes
+SUBDIRS = sqlite libs utilities digikam kioslave imageplugins themes showfoto
 
 EXTRA_DIST = Digikam.kdevelop AUTHORS COPYING ChangeLog INSTALL README TODO digikam.lsm

Le lundi 22 Novembre 2004 10:29 AM, Renchi Raju a =C3=A9crit :
> CVS commit by pahlibar:
>
>
> * fix issue with selection being painted offset from the actual selection
>   in case of autozoom
> * remove dependency of imlibinterface.cpp on albumsettings.
>   IMPORTANT: developers, canvas.cpp/h,
>   imlibinterface.cpp/h, exifrestorer.cpp/h should not depend on any of
>   the rest of digikam. this is to make sure that we can separate out a
>   canvas library for making a standalone imageviewer

Ok, i will take a care for this point...

Gilles

CVS commit by cgilles: 

Digikam image properties : remember histogram dialog options.
CCMAIL: digikam-devel@...


  M +22 -7     digikam/imageproperties.cpp   1.24
  M +1 -0      digikam/imageproperties.h   1.20
  M +3 -0      libs/widgets/histogramwidget.cpp   1.17
  M +2 -0      libs/widgets/histogramwidget.h   1.10

CVS commit by pahlibar: 


added save/saveas to showFoto. with this showFoto is feature complete for
release with digiKam 0.7.1
CCMAIL: digikam-devel@...


  M +261 -6    showfoto/showfoto.cpp   1.18
  M +10 -0     showfoto/showfoto.h   1.13
  M +7 -2      showfoto/showfotoui.rc   1.9
  M +41 -0     showfoto/thumbbar.cpp   1.3
  M +5 -0      showfoto/thumbbar.h   1.2
  M +18 -1     utilities/imageeditor/imlibinterface.cpp   1.38

CVS commit by cgilles: 

Ratio-Crop tool update :
- implementation 90 % complete. Nedd to polish some points.
- Draging selection by corners done.
CCMAIL: digikam-devel@...


  M +3 -2      imageplugins/imageeffect_ratiocrop.cpp   1.9
  M +193 -75   libs/widgets/imageselectionwidget.cpp   1.2
  M +23 -6     libs/widgets/imageselectionwidget.h   1.2

CVS commit by cgilles: 

Ratio-crop tool :
-Added custom ratio settings.
-Added none ratio setting.
-Make fade selection and border like in ImageEditor.
CCMAIL: digikam-devel@...


  M +85 -13    imageplugins/imageeffect_ratiocrop.cpp   1.10
  M +13 -0     imageplugins/imageeffect_ratiocrop.h   1.7
  M +115 -129  libs/widgets/imageselectionwidget.cpp   1.4
  M +29 -20    libs/widgets/imageselectionwidget.h   1.4

CVS commit by pahlibar: 


Hacking file has been added to cvs. Developers take heed
CCMAIL: digikam-devel@...


  A            HACKING   1.1

CVS commit by pahlibar: 


* imageproperties has been split into four classes: three for individual pages
  and one for the wrapper to build the dialog
* code cleanup galore
* use the new embeddable exif widget to build the exif page. 
* exif thumbnail option removed
* exif list can be shown in two modes (simple - only the EXIF ifd and full -
  all the EXIF ifds)
* imageproperties dialog works in two modes, one activated from the albumiconview,
  allows user to traverse through the items, second activated from the imageviewer,
  a single item view (need to add a third option to run it with supplied image data
  to show the correct histogram for the updated image in the imageviewer)
* regression checks requested.
CCMAIL: digikam-devel@...


  A            digikam/imagepropertiesexif.cpp   1.1 [GPL]
  A            digikam/imagepropertiesexif.h   1.1 [GPL]
  A            digikam/imagepropertiesgeneral.cpp   1.1 [GPL]
  A            digikam/imagepropertiesgeneral.h   1.1 [GPL]
  A            digikam/imagepropertieshistogram.cpp   1.1 [GPL]
  A            digikam/imagepropertieshistogram.h   1.1 [GPL]
  M +2 -0      digikam/Makefile.am   1.35
  M +1 -2      digikam/albumiconview.cpp   1.105
  M +68 -1089  digikam/imageproperties.cpp   1.39
  M +21 -197   digikam/imageproperties.h   1.30
  M +0 -1      showfoto/showfoto.cpp   1.20
  M +2 -2      utilities/cameragui/cameracontroller.cpp   1.18
  M +5 -36     utilities/imageeditor/imagewindow.cpp   1.65
  M +2 -3      utilities/imageeditor/imagewindow.h   1.31

CVS commit by cgilles: 

Aspect Ratio Crop tool digiKam image editor: added 'Rule Third Lines' guides for to help users to compose a photograph.

'Rule Third Lines' guides are based on the 'golden rule' therory used by the most popular photographers (this theory is based on the Fibonacci works).

If you want more informations about to use 'Rule Third Lines', please read at this url : http://www.megapixel.net/html/issueindex.php?lang=en

CCMAIL: digikam-devel@...


  M +22 -3     imageplugins/imageeffect_ratiocrop.cpp   1.17
  M +3 -0      imageplugins/imageeffect_ratiocrop.h   1.9
  M +39 -3     libs/widgets/imageselectionwidget.cpp   1.7
  M +8 -2      libs/widgets/imageselectionwidget.h   1.6

CVS commit by cgilles: 

digiKam Aspect Ratio Crop tool : remember X/Y position and width/height selection
CCMAIL: digikam-devel@...


  M +27 -6     imageplugins/imageeffect_ratiocrop.cpp   1.21
  M +4 -4      libs/widgets/imageselectionwidget.cpp   1.10


--- kdeextragear-3/digikam/imageplugins/imageeffect_ratiocrop.cpp  #1.20:1.21
@@ -36,5 +36,4 @@
 #include <qlabel.h>
 #include <qwhatsthis.h>
-#include <qtimer.h>
 #include <qcombobox.h>
 #include <qcheckbox.h>
@@ -196,5 +195,4 @@ ImageEffect_RatioCrop::ImageEffect_Ratio
                 
     readSettings();             
-    QTimer::singleShot(0, this, SLOT(slotUser1()));
     adjustSize();
     disableResize();     
@@ -210,12 +208,29 @@ void ImageEffect_RatioCrop::readSettings
     KConfig *config = kapp->config();
     config->setGroup("ImageViewer Settings");
-    m_ratioCB->setCurrentItem( config->readNumEntry("Aspect Ratio", 1) );
-    m_orientCB->setCurrentItem( config->readNumEntry("Aspect Ratio Orientation", 0) );
+    
+    m_xInput->setValue( config->readNumEntry("Custom Aspect Ratio Xpos", 50) );
+    m_yInput->setValue( config->readNumEntry("Custom Aspect Ratio Ypos", 50) );
+    
+    m_ratioCB->setCurrentItem( config->readNumEntry("Aspect Ratio", 3) );                 // 3:4 per default.
     m_customRatioNInput->setValue( config->readNumEntry("Custom Aspect Ratio Num", 1) );
     m_customRatioDInput->setValue( config->readNumEntry("Custom Aspect Ratio Den", 1) );
-    m_useRuleThirdLines->setChecked( config->readBoolEntry("Use Rule Third Lines", false) );
-
     slotRatioChanged(m_ratioCB->currentItem());
+
+    m_orientCB->setCurrentItem( config->readNumEntry("Aspect Ratio Orientation", 0) );    // Paysage per default.
+    
+    if ( m_orientCB->currentItem() == Digikam::ImageSelectionWidget::Paysage )
+       {
+       m_widthInput->setValue( config->readNumEntry("Custom Aspect Ratio Width", 800) );
+       m_heightInput->setValue( 1 );
+       }
+    else       
+       {
+       m_widthInput->setValue( 1 );
+       m_heightInput->setValue( config->readNumEntry("Custom Aspect Ratio Height", 600) );
+       }
+    
     slotOrientChanged(m_orientCB->currentItem());
+    
+    m_useRuleThirdLines->setChecked( config->readBoolEntry("Use Rule Third Lines", false) );
 }
     
@@ -228,4 +243,10 @@ void ImageEffect_RatioCrop::writeSetting
     config->writeEntry( "Custom Aspect Ratio Num", m_customRatioNInput->value() );
     config->writeEntry( "Custom Aspect Ratio Den", m_customRatioDInput->value() );
+    
+    config->writeEntry( "Custom Aspect Ratio Xpos", m_xInput->value() );
+    config->writeEntry( "Custom Aspect Ratio Ypos", m_yInput->value() );
+    config->writeEntry( "Custom Aspect Ratio Width", m_widthInput->value() );
+    config->writeEntry( "Custom Aspect Ratio Height", m_heightInput->value() );
+    
     config->writeEntry( "Use Rule Third Lines", m_useRuleThirdLines->isChecked() );
     config->sync();

CVS commit by cgilles: 

digiKam Aspect Ratio Crop tool : Added a new option for to set the selection area to the max. size accordinly with the current aspect ratio.
CCMAIL: digikam-devel@...


  M +10 -3     imageplugins/imageeffect_ratiocrop.cpp   1.22
  M +2 -0      imageplugins/imageeffect_ratiocrop.h   1.11
  M +32 -0     libs/widgets/imageselectionwidget.cpp   1.12
  M +1 -0      libs/widgets/imageselectionwidget.h   1.8


--- kdeextragear-3/digikam/imageplugins/imageeffect_ratiocrop.cpp  #1.21:1.22
@@ -58,11 +58,12 @@
 ImageEffect_RatioCrop::ImageEffect_RatioCrop(QWidget* parent)
                      : KDialogBase(Plain, i18n("Aspect Ratio Crop"),
-                                   Help|User1|Ok|Cancel, Ok,
+                                   Help|User1|User2|Ok|Cancel, Ok,
                                    parent, 0, true, true, 
-                                   i18n("&Reset Values")),
+                                   i18n("&Reset Values"), i18n("&Max. Aspect")),
                        m_parent(parent)
 {
     setHelp("ratiocroptool.anchor", "digikam");
-    setButtonWhatsThis ( User1, i18n("<p>Reset all parameters to the default values.") );     
+    setButtonWhatsThis ( User1, i18n("<p>Reset selection area to the image center.") );     
+    setButtonWhatsThis ( User2, i18n("<p>Set selection area to the maximum size accordinly with the current ratio.") );     
     
     // -------------------------------------------------------------
@@ -258,4 +259,10 @@ void ImageEffect_RatioCrop::slotUser1()
 } 
 
+
+void ImageEffect_RatioCrop::slotUser2()
+{
+    m_imageSelectionWidget->maxAspectSelection();
+} 
+
 void ImageEffect_RatioCrop::slotSelectionChanged(QRect rect)
 {

--- kdeextragear-3/digikam/imageplugins/imageeffect_ratiocrop.h  #1.10:1.11
@@ -75,5 +75,7 @@ private slots:
 
     void slotUser1();
+    void slotUser2();
     void slotOk();
+    
     void slotXChanged(int x);
     void slotYChanged(int y);

--- kdeextragear-3/digikam/libs/widgets/imageselectionwidget.cpp  #1.11:1.12
@@ -116,4 +116,36 @@ void ImageSelectionWidget::resetSelectio
 }
 
+void ImageSelectionWidget::maxAspectSelection(void)
+{
+    m_localRegionSelection.setX(0);
+    m_localRegionSelection.setY(0);
+    
+    if ( !m_currentOrientation )   // Landscape
+       {
+       m_localRegionSelection.setWidth(m_w);
+       applyAspectRatio(false, false);
+       
+       if ( m_localRegionSelection.height() > m_h )
+          {
+          m_localRegionSelection.setHeight(m_h);
+          applyAspectRatio(true, false);
+          }
+       }
+    else                          // Portrait
+       {
+       m_localRegionSelection.setHeight(m_h);
+       applyAspectRatio(true, false);
+       
+       if ( m_localRegionSelection.width() > m_w )
+          {
+          m_localRegionSelection.setWidth(m_w);
+          applyAspectRatio(false, false);
+          }
+       }
+
+    updatePixmap();
+    repaint(false);
+}
+
 void ImageSelectionWidget::slotRuleThirdLines(bool ruleThirdLines)
 {

--- kdeextragear-3/digikam/libs/widgets/imageselectionwidget.h  #1.7:1.8
@@ -77,4 +77,5 @@ public:
     
     void  resetSelection(void);
+    void  maxAspectSelection(void);
 
 public slots:

CVS commit by cgilles: 

Aspect ratio crop digiKam tool : 
-fix minimum selection area to a visible size (50x50).
-auto-correction of selection area width/height when mouse resize event
CCMAIL: digikam-devel@...


  M +2 -2      imageplugins/imageeffect_ratiocrop.cpp   1.25
  M +35 -9     libs/widgets/imageselectionwidget.cpp   1.14


--- kdeextragear-3/digikam/imageplugins/imageeffect_ratiocrop.cpp  #1.24:1.25
@@ -137,5 +137,5 @@ ImageEffect_RatioCrop::ImageEffect_Ratio
     m_widthInput->setLabel(i18n("Width:"), AlignLeft|AlignVCenter);
     QWhatsThis::add( m_widthInput, i18n("<p>Set here the width selection for cropping."));
-    m_widthInput->setRange(100, m_imageSelectionWidget->getOriginalImageWidth(), 1, true);
+    m_widthInput->setRange(50, m_imageSelectionWidget->getOriginalImageWidth(), 1, true);
     topLayout->addMultiCellWidget(m_xInput, 3, 3, 0, 1);
     topLayout->addMultiCellWidget(m_widthInput, 3, 3, 3, 4);
@@ -148,5 +148,5 @@ ImageEffect_RatioCrop::ImageEffect_Ratio
     m_heightInput->setLabel(i18n("Height:"), AlignLeft|AlignVCenter);
     QWhatsThis::add( m_heightInput, i18n("<p>Set here the height selection for cropping."));
-    m_heightInput->setRange(100, m_imageSelectionWidget->getOriginalImageHeight(), 1, true);
+    m_heightInput->setRange(50, m_imageSelectionWidget->getOriginalImageHeight(), 1, true);
     topLayout->addMultiCellWidget(m_yInput, 4, 4, 0, 1);
     topLayout->addMultiCellWidget(m_heightInput, 4, 4, 3, 4);

--- kdeextragear-3/digikam/libs/widgets/imageselectionwidget.cpp  #1.13:1.14
@@ -374,4 +374,28 @@ void ImageSelectionWidget::regionSelecti
 void ImageSelectionWidget::regionSelectionChanged(bool targetDone)
 {
+    if (targetDone)
+       {
+       if (m_localRegionSelection.left() < 0) 
+          {
+          m_localRegionSelection.setLeft(0);
+          applyAspectRatio(false);
+          }
+       if (m_localRegionSelection.top() < 0) 
+          {
+          m_localRegionSelection.setTop(0);
+          applyAspectRatio(true);
+          }
+       if (m_localRegionSelection.right() > m_rect.width())
+          {
+          m_localRegionSelection.setRight(m_rect.width());
+          applyAspectRatio(false);
+          }
+       if (m_localRegionSelection.bottom() > m_rect.height()) 
+          {
+          m_localRegionSelection.setBottom(m_rect.height());
+          applyAspectRatio(true);
+          }
+       }
+    
     localToRealRegion();
 
@@ -541,22 +565,24 @@ void ImageSelectionWidget::mouseMoveEven
           
           if ( m_currentResizing == ResizingTopLeft &&
-               pm.x() < m_localRegionSelection.right() - 8 &&
-               pm.y() < m_localRegionSelection.bottom() - 8 )
+               pm.x() < m_localRegionSelection.right() - 50 &&
+               pm.y() < m_localRegionSelection.bottom() - 50 )
               m_localRegionSelection.setTopLeft(pm);             
              
           else if ( m_currentResizing == ResizingTopRight  &&
-               pm.x() > m_localRegionSelection.left() + 8 &&
-               pm.y() < m_localRegionSelection.bottom() - 8 )
+               pm.x() > m_localRegionSelection.left() + 50 &&
+               pm.y() < m_localRegionSelection.bottom() - 50 )
              m_localRegionSelection.setTopRight(pm);
           
           else if ( m_currentResizing == ResizingBottomLeft  &&
-               pm.x() < m_localRegionSelection.right() - 8 &&
-               pm.y() > m_localRegionSelection.top() + 8 )
+               pm.x() < m_localRegionSelection.right() - 50 &&
+               pm.y() > m_localRegionSelection.top() + 50 )
              m_localRegionSelection.setBottomLeft(pm);
              
           else if ( m_currentResizing == ResizingBottomRight  &&
-               pm.x() > m_localRegionSelection.left() + 8 &&
-               pm.y() > m_localRegionSelection.top() + 8 )
+               pm.x() > m_localRegionSelection.left() + 50 &&
+               pm.y() > m_localRegionSelection.top() + 50 )
              m_localRegionSelection.setBottomRight(pm);
+          else 
+             return;
           
           applyAspectRatio(false, false);

CVS commit by jahrens: 

Display status messages on the splash screen while initializing digikam.

CCMAIL: digikam-devel@..., joern.ahrens@...


  M +30 -5     digikam/digikamapp.cpp   1.83
  M +5 -0      digikam/digikamapp.h   1.31
  M +0 -12     digikam/main.cpp   1.39
  M +34 -0     utilities/splashscreen/splashscreen.cpp   1.6
  M +8 -3      utilities/splashscreen/splashscreen.h   1.4

Le dimanche 30 Janvier 2005 01:53, J=C3=B6rn Ahrens a =C3=A9crit=C2=A0:
> CVS commit by jahrens:
>
> Display status messages on the splash screen while initializing digikam.
>
> CCMAIL: digikam-devel@..., joern.ahrens@...
>
>
>   M +30 -5     digikam/digikamapp.cpp   1.83
>   M +5 -0      digikam/digikamapp.h   1.31
>   M +0 -12     digikam/main.cpp   1.39
>   M +34 -0     utilities/splashscreen/splashscreen.cpp   1.6
>   M +8 -3      utilities/splashscreen/splashscreen.h   1.4

Cool

Thanks for this feature Jahrens !

Gilles

CVS commit by cgilles: 

Launching loading ImagePlugins progress in Splashcreen like kipi-plugins.
CCMAIL: digikam-devel@...


  M +5 -3      digikam/digikamapp.cpp   1.85
  M +2 -2      digikam/digikamapp.h   1.32
  M +1 -0      utilities/imageeditor/Makefile.am   1.16
  M +17 -1     utilities/imageeditor/imagepluginloader.cpp   1.9
  M +7 -4      utilities/imageeditor/imagepluginloader.h   1.5


--- kdeextragear-3/digikam/digikam/digikamapp.cpp  #1.84:1.85
@@ -3,5 +3,5 @@
 //    DIGIKAMAPP.CPP
 //
-//    Copyright (C) 2002-2004 Renchi Raju <renchi at pooh.tam.uiuc.edu>
+//    Copyright (C) 2002-2005 Renchi Raju <renchi at pooh.tam.uiuc.edu>
 //                            Gilles Caulier <caulier dot gilles at free.fr>
 //
@@ -84,4 +84,5 @@ DigikamApp::DigikamApp(bool detectCamera
     bool showSplash = m_config->readBoolEntry("Show Splash", true);
     mSplash = 0;
+    
     if(showSplash)
         mSplash = new SplashScreen();
@@ -864,5 +865,5 @@ void DigikamApp::loadPlugins()
     KipiPluginLoader_->loadPlugins();
 
-    m_ImagePluginsLoader = new ImagePluginLoader(this);
+    m_ImagePluginsLoader = new ImagePluginLoader(this, mSplash);
 }
 
@@ -935,4 +936,5 @@ void DigikamApp::slotKipiPluginPlug()
     if(mSplash)
         mSplash->message(i18n("%1 Kipi Plugins loaded").arg(list.count()));
+    
     // Create GUI menu in according with plugins.
 

--- kdeextragear-3/digikam/digikam/digikamapp.h  #1.31:1.32
@@ -3,5 +3,5 @@
 //    DIGIKAMAPP.H
 //
-//    Copyright (C) 2002-2004 Renchi Raju <renchi at pooh.tam.uiuc.edu>
+//    Copyright (C) 2002-2005 Renchi Raju <renchi at pooh.tam.uiuc.edu>
 //                            Gilles Caulier <caulier dot gilles at free.fr>
 //

--- kdeextragear-3/digikam/utilities/imageeditor/Makefile.am  #1.15:1.16
@@ -21,4 +21,5 @@
           -I$(top_srcdir)/digikam/libs/guibuilder \
           -I$(top_srcdir)/digikam/libs/widgets \
+          -I$(top_srcdir)/digikam/utilities/splashscreen \          
           $(IMLIB2_CFLAGS) $(LIBKEXIF_CFLAGS) $(all_includes) 
 

--- kdeextragear-3/digikam/utilities/imageeditor/imagepluginloader.cpp  #1.8:1.9
@@ -28,15 +28,18 @@
 #include <kconfig.h>
 #include <kapplication.h>
+#include <klocale.h>
 
 // Local includes.
 
 #include "imagepluginloader.h"
+#include "splashscreen.h"
 
 ImagePluginLoader* ImagePluginLoader::m_instance=0;
 
-ImagePluginLoader::ImagePluginLoader(QObject *parent)
+ImagePluginLoader::ImagePluginLoader(QObject *parent, SplashScreen *splash)
                  : QObject(parent)
 {
     m_instance = this;
+    m_splash   = splash;
     
     QStringList imagePluginsList2Load;
@@ -87,4 +90,7 @@ void ImagePluginLoader::loadPluginsFromL
                 
                  kdDebug() << "ImagePluginLoader: Loaded plugin " << plugin->name() << endl;
+                 
+                 if (m_splash)      
+                    m_splash->message(i18n("Loading: %1").arg(plugin->name()));
                  }
                                 
@@ -120,8 +126,18 @@ void ImagePluginLoader::loadPluginsFromL
                 
                 kdDebug() << "ImagePluginLoader: Loaded plugin " << plugin->name() << endl;
+                
+                if (m_splash)      
+                   m_splash->message(i18n("Loading: %1").arg(plugin->name()));
                 }
              }
           }
        }
+
+    if (m_splash)      
+       m_splash->message(i18n("%1 Image Plugins loaded").arg(offers.count()));    
+
+    m_splash = 0;        // Splashcreen is only lanched at the first time.
+                         // If user change plugins list to use in setup, don't try to 
+                         // use the old splashscreen instance.
 }
 

--- kdeextragear-3/digikam/utilities/imageeditor/imagepluginloader.h  #1.4:1.5
@@ -33,4 +33,6 @@
 #include "imageplugin.h"
 
+class SplashScreen;
+
 class ImagePluginLoader : public QObject
 {
@@ -38,5 +40,5 @@ class ImagePluginLoader : public QObject
 public:
 
-    ImagePluginLoader(QObject *parent);
+    ImagePluginLoader(QObject *parent, SplashScreen *splash=0);
     ~ImagePluginLoader();
 
@@ -48,5 +50,6 @@ public:
 private:
 
-    static ImagePluginLoader*      m_instance;
+    SplashScreen                   *m_splash;
+    static ImagePluginLoader       *m_instance;
     QPtrList<Digikam::ImagePlugin> m_pluginList;

CVS commit by cgilles: 

Showing the real plugins number loaded at starting time to the splashcreen (plugins list set in setup dialog) 
CCMAIL: digikam-devel@...


  M +5 -1      digikam/digikamapp.cpp   1.86
  M +7 -1      utilities/imageeditor/imagepluginloader.cpp   1.10


--- kdeextragear-3/digikam/digikam/digikamapp.cpp  #1.85:1.86
@@ -886,4 +886,6 @@ void DigikamApp::slotKipiPluginPlug()
     KIPI::PluginLoader::PluginList list = KipiPluginLoader_->pluginList();
 
+    int cpt = 0;
+
     for( KIPI::PluginLoader::PluginList::Iterator it = list.begin() ; it != list.end() ; ++it )
     {
@@ -893,4 +895,6 @@ void DigikamApp::slotKipiPluginPlug()
             continue;
 
+        ++cpt;
+        
         if(mSplash)
             mSplash->message(i18n("Loading: %1").arg((*it)->name()));
@@ -935,5 +939,5 @@ void DigikamApp::slotKipiPluginPlug()
     
     if(mSplash)
-        mSplash->message(i18n("%1 Kipi Plugins loaded").arg(list.count()));
+        mSplash->message(i18n("%1 Kipi Plugins loaded").arg(cpt));
     
     // Create GUI menu in according with plugins.

--- kdeextragear-3/digikam/utilities/imageeditor/imagepluginloader.cpp  #1.9:1.10
@@ -69,4 +69,6 @@ void ImagePluginLoader::loadPluginsFromL
     KTrader::OfferList::ConstIterator iter;
     
+    int cpt = 0;
+    
     // Load plugin core at the first time.
 
@@ -93,4 +95,6 @@ void ImagePluginLoader::loadPluginsFromL
                  if (m_splash)      
                     m_splash->message(i18n("Loading: %1").arg(plugin->name()));
+                    
+                 ++cpt;
                  }
                                 
@@ -129,4 +133,6 @@ void ImagePluginLoader::loadPluginsFromL
                 if (m_splash)      
                    m_splash->message(i18n("Loading: %1").arg(plugin->name()));
+                
+                ++cpt;
                 }
              }
@@ -135,5 +141,5 @@ void ImagePluginLoader::loadPluginsFromL
 
     if (m_splash)      
-       m_splash->message(i18n("%1 Image Plugins loaded").arg(offers.count()));    
+       m_splash->message(i18n("%1 Image Plugins loaded").arg(cpt));    
 
     m_splash = 0;        // Splashcreen is only lanched at the first time.

CVS commit by pahlibar: 


* Add changing brightness, contrast, gamma (used in showfoto) also as reversible
actions. 
* Add undo capability for showfoto
CCMAIL: digikam-devel@...


  M +6 -0      showfoto/showfoto.cpp   1.21
  M +1 -0      showfoto/showfoto.h   1.14
  M +2 -1      showfoto/showfotoui.rc   1.10
  M +31 -0     utilities/imageeditor/imlibinterface.cpp   1.43
  M +1 -0      utilities/imageeditor/imlibinterface.h   1.22
  M +19 -0     utilities/imageeditor/undoaction.cpp   1.2
  M +18 -0     utilities/imageeditor/undoaction.h   1.2

CVS commit by pahlibar: 


in retrospect, storing the undolevels in a gdbm database was a bad idea. by 
storing the individual undo levels in plain binary cache files, a 10x speedup
in saving/restoring undo level is gained
CCMAIL: digikam-devel@...


  M +1 -2      showfoto/Makefile.am   1.7
  M +47 -92    utilities/imageeditor/undocache.cpp   1.3

CVS commit by ach: 

you were not that lazy this year ;)

CCMAIL: digikam-devel@...


  M +1 -1      digikam/main.cpp   1.41
  M +1 -1      showfoto/main.cpp   1.3


--- kdeextragear-3/digikam/digikam/main.cpp  #1.40:1.41
@@ -74,5 +74,5 @@ int main(int argc, char *argv[])
                           Description.latin1(),
                           KAboutData::License_GPL,
-                          I18N_NOOP("(c) 2002-2004, Digikam developers team"),
+                          I18N_NOOP("(c) 2002-2005, Digikam developers team"),
                           0,
                           "http://digikam.sourceforge.net");

--- kdeextragear-3/digikam/showfoto/main.cpp  #1.2:1.3
@@ -51,5 +51,5 @@ int main(int argc, char *argv[])
                           Description.latin1(),
                           KAboutData::License_GPL,
-                          I18N_NOOP("(c) 2004, digiKam developers team"),
+                          I18N_NOOP("(c) 2004-2005 digiKam developers team"),
                           0,
                           "http://digikam.sourceforge.net");

CVS commit by ach: 

oh,oh msg freeze. revert

CCMAIL: digikam-devel@...


  M +1 -1      digikam/main.cpp   1.42
  M +1 -1      showfoto/main.cpp   1.4


--- kdeextragear-3/digikam/digikam/main.cpp  #1.41:1.42
@@ -74,5 +74,5 @@ int main(int argc, char *argv[])
                           Description.latin1(),
                           KAboutData::License_GPL,
-                          I18N_NOOP("(c) 2002-2005, Digikam developers team"),
+                          I18N_NOOP("(c) 2002-2004, Digikam developers team"),
                           0,
                           "http://digikam.sourceforge.net");

--- kdeextragear-3/digikam/showfoto/main.cpp  #1.3:1.4
@@ -51,5 +51,5 @@ int main(int argc, char *argv[])
                           Description.latin1(),
                           KAboutData::License_GPL,
-                          I18N_NOOP("(c) 2004-2005 digiKam developers team"),
+                          I18N_NOOP("(c) 2004, digiKam developers team"),
                           0,
                           "http://digikam.sourceforge.net");

Le mardi 15 F=C3=A9vrier 2005 11:28 PM, Achim Bohnet a =C3=A9crit :
> CVS commit by ach:
>
> oh,oh msg freeze. revert
>
> CCMAIL: digikam-devel@...
>
>
>   M +1 -1      digikam/main.cpp   1.42
>   M +1 -1      showfoto/main.cpp   1.4
>
>
> --- kdeextragear-3/digikam/digikam/main.cpp  #1.41:1.42
> @@ -74,5 +74,5 @@ int main(int argc, char *argv[])
>                            Description.latin1(),
>                            KAboutData::License_GPL,
> -                          I18N_NOOP("(c) 2002-2005, Digikam developers
> team"), +                          I18N_NOOP("(c) 2002-2004, Digikam
> developers team"), 0,
>                            "http://digikam.sourceforge.net");
>
> --- kdeextragear-3/digikam/showfoto/main.cpp  #1.3:1.4
> @@ -51,5 +51,5 @@ int main(int argc, char *argv[])
>                            Description.latin1(),
>                            KAboutData::License_GPL,
> -                          I18N_NOOP("(c) 2004-2005 digiKam developers
> team"), +                          I18N_NOOP("(c) 2004, digiKam developers
> team"), 0,
>                            "http://digikam.sourceforge.net");
>
>
>
>
> -------------------------------------------------------
> SF email is sponsored by - The IT Product Guide
> Read honest & candid reviews on hundreds of IT Products from real users.
> Discover which products truly live up to the hype. Start reading now.
> http://ads.osdn.com/?ad_id=3D6595&alloc_id=3D14396&op=3Dclick
> _______________________________________________
> Digikam-devel mailing list
> Digikam-devel@...
> https://lists.sourceforge.net/lists/listinfo/digikam-devel

Thanks (:=3D))


=2D-=20
Gilles Caulier

Le mardi 15 F=C3=A9vrier 2005 11:28 PM, Achim Bohnet a =C3=A9crit :
> CVS commit by ach:
>
> oh,oh msg freeze. revert
>
> CCMAIL: digikam-devel@...
>
>
>   M +1 -1      digikam/main.cpp   1.42
>   M +1 -1      showfoto/main.cpp   1.4
>
>
> --- kdeextragear-3/digikam/digikam/main.cpp  #1.41:1.42
> @@ -74,5 +74,5 @@ int main(int argc, char *argv[])
>                            Description.latin1(),
>                            KAboutData::License_GPL,
> -                          I18N_NOOP("(c) 2002-2005, Digikam developers
> team"), +                          I18N_NOOP("(c) 2002-2004, Digikam
> developers team"), 0,
>                            "http://digikam.sourceforge.net");
>
> --- kdeextragear-3/digikam/showfoto/main.cpp  #1.3:1.4
> @@ -51,5 +51,5 @@ int main(int argc, char *argv[])
>                            Description.latin1(),
>                            KAboutData::License_GPL,
> -                          I18N_NOOP("(c) 2004-2005 digiKam developers
> team"), +                          I18N_NOOP("(c) 2004, digiKam developers
> team"), 0,
>                            "http://digikam.sourceforge.net");
>
>

Achim, digikam CVS is tagged for 0.7.2. You can fix i18n now (:=3D)

Gilles

On Wednesday 02 March 2005 07:58, Gilles Caulier wrote:
> Le mardi 15 F=C3=A9vrier 2005 11:28 PM, Achim Bohnet a =C3=A9crit :
> Achim, digikam CVS is tagged for 0.7.2. You can fix i18n now (:=3D)

Done.

Achim
>=20
> Gilles
>=20
>=20
> -------------------------------------------------------
> SF email is sponsored by - The IT Product Guide
> Read honest & candid reviews on hundreds of IT Products from real users.
> Discover which products truly live up to the hype. Start reading now.
> http://ads.osdn.com/?ad_ide95&alloc_id=14396&op=3DClick
> _______________________________________________
> Digikam-devel mailing list
> Digikam-devel@...
> https://lists.sourceforge.net/lists/listinfo/digikam-devel
>=20
>=20

=2D-=20
  To me vi is Zen.  To use vi is to practice zen. Every command is
  a koan. Profound to the user, unintelligible to the uninitiated.
  You discover truth everytime you use it.
                                      -- reddy@...

Le mercredi 02 Mars 2005 09:26 AM, Achim Bohnet a =C3=A9crit :
> On Wednesday 02 March 2005 07:58, Gilles Caulier wrote:
> > Le mardi 15 F=C3=A9vrier 2005 11:28 PM, Achim Bohnet a =C3=A9crit :
> > Achim, digikam CVS is tagged for 0.7.2. You can fix i18n now (:=3D)
>
> Done.
>
> Achim
>
> > Gilles
> >
Thanks
=2D-=20
Gilles Caulier

CVS commit by cgilles: 

New digiKam image editor plugin for black and white conversion :

- Since digikam include colors channel mixer, using this one for BW conversion. Give best results than old implementation. BW conversion are based on gimpguru.org tutorial (http://www.gimpguru.org/Tutorials/Color2BW).

- This plugin have a dialog with preview effect. Look the screenshot at this url : 
http://digikam3rdparty.free.fr/digikamimageplugins-2005/blackandwhiteconverter.png

- Provide BW filters are : 
  * Neutral BW,
  * BW with Green filter(NEW), 
  * BW with Orange filter(NEW), 
  * BW with Red filter(NEW), 
  * BW with Yellow filter(NEW), 
  * Sepia,
  * Brown,
  * Cold,
  * Selenium,
  * Platinum.

CCMAIL: digikam-devel@...


  A            imageplugins/pics/Makefile.am   1.1
  A            imageplugins/pics/browntone.png   1.1
  A            imageplugins/pics/bwgreen.png   1.1
  A            imageplugins/pics/bworange.png   1.1
  A            imageplugins/pics/bwred.png   1.1
  A            imageplugins/pics/bwyellow.png   1.1
  A            imageplugins/pics/coldtone.png   1.1
  A            imageplugins/pics/neutralbw.png   1.1
  A            imageplugins/pics/platinum.png   1.1
  A            imageplugins/pics/selenium.png   1.1
  A            imageplugins/pics/sepia.png   1.1
  M +2 -0      imageplugins/Makefile.am   1.20
  M +208 -77   imageplugins/imageeffect_bwsepia.cpp   1.7
  M +63 -8     imageplugins/imageeffect_bwsepia.h   1.5
  M +6 -67     imageplugins/imageplugin_core.cpp   1.53
  M +0 -5      imageplugins/imageplugin_core.h   1.24
  M +4 -4      libs/filters/Makefile.am   1.2
  M +57 -0     libs/filters/imagefilters.cpp   1.10
  M +2 -1      libs/filters/imagefilters.h   1.7

CVS commit by cgilles: 

Patch from Alfons Hoogervorst <alfons.hoogervorst@...> about histogram visible while viewing photo in digiKam image editor using blending.
CCBUGS: 98706
CCMAIL: digikam-devel@...


  M +3 -2      showfoto/Makefile.am   1.8
  M +40 -0     showfoto/showfoto.cpp   1.23
  M +3 -0      showfoto/showfoto.h   1.16
  M +1 -0      showfoto/showfotoui.rc   1.12
  M +1 -0      utilities/imageeditor/Makefile.am   1.20
  M +519 -5    utilities/imageeditor/canvas.cpp   1.36
  M +20 -0     utilities/imageeditor/canvas.h   1.24
  M +2 -1      utilities/imageeditor/digikamimagewindowui.rc   1.8
  M +42 -0     utilities/imageeditor/imagewindow.cpp   1.91
  M +3 -0      utilities/imageeditor/imagewindow.h   1.38

CVS commit by cgilles: 

Showfoto now support digiKam image editor plugins (digiKAm plugin core + DigikamImagePlugins)
Showfoto Menu Fixed.

Note : showfoto is a standalone digiKam image editor program !

TODO :
- disable plugin menu entries if no current image.
- writing hanbook based on digiKam handbook image editor part.
- add showfoto icon.
- implemented Redo/Undo features
- disable Fix-Incease/Decrease BCG if core plugin is available.
- add Edit menu entries like in digiKam image editor.
- add shofoto settings dialog.
- disable thumbbar in full screen mode.

CCMAIL: digikam-devel@...
CCBUGS: 102195


  M +11 -11    digikam.kdevelop   1.2
  M +1 -0      showfoto/Makefile.am   1.13
  M +25 -0     showfoto/showfoto.cpp   1.25
  M +23 -17    showfoto/showfotoui.rc   1.13
  M +3 -3      utilities/imageeditor/Makefile.am   1.21
  M +17 -2     utilities/imageeditor/imagepluginloader.cpp   1.13

CVS commit by cgilles: 

For testing : non-ignore *.ui files from digiKam project for strings extraction (inspired from koffice).
CCMAIL: digikam-devel@...


  M +1 -0      Makefile.am   1.11


--- kdeextragear-3/digikam/Makefile.am  #1.10:1.11
@@ -13,4 +13,5 @@
 
 messages: rc.cpp
+        $(EXTRACTRC) `find . -name "*.ui"` >> rc.cpp
         $(EXTRACTRC) `find . -name "*.rc"` >> rc.cpp
         $(PREPARETIPS) > tips.cpp