digiKam

CVS commit by cgilles: 

Updated the menu and popup menu in according with KIPI plugins actions. Added 'album_action' collection.
CCMAIL: digikam-devel@...


  M +24 -6     albumfolderview.cpp   1.11
  M +1 -1      albumiconview.cpp   1.34
  M +11 -0     digikamapp.cpp   1.23
  M +4 -0      digikamapp.h   1.11
  M +1 -3      digikamui.rc   1.8

CVS commit by cgilles: 

Fix KIPI plugins category indentification in according with last libKIPI changes.
CCMAIL: digikam-devel@...


  M +21 -66    digikamapp.cpp   1.25
  M +45 -29    digikamui.rc   1.9

CVS commit by cgilles: 

Added menu option for KIPI plugin handbooks.
CCMAIL: digikam-devel@...


  M +15 -1     digikamapp.cpp   1.35
  M +4 -2      digikamapp.h   1.13
  M +1 -0      digikamui.rc   1.12


--- kdeextragear-3/digikam/digikam/digikamapp.cpp  #1.34:1.35
@@ -341,4 +341,12 @@ void DigikamApp::setupActions()
                                    "app_exit");
 
+    mKipiHelpAction = new KAction(i18n("Plugins help"),
+                                   "kipi",
+                                   0,
+                                   this,
+                                   SLOT(slotShowKipiHelp()),
+                                   actionCollection(),
+                                   "help_kipi");
+
     mTipAction = KStdAction::tipOfDay(this,
                                    SLOT(slotShowTip()),
@@ -346,4 +354,5 @@ void DigikamApp::setupActions()
                                    "help_tipofday");
     
+                                       
     createGUI(QString::fromLatin1( "digikamui.rc" ), false);                                   
     
@@ -537,4 +546,9 @@ void DigikamApp::slotShowTip()
 }
 
+void DigikamApp::slotShowKipiHelp()
+{
+    KApplication::kApplication()->invokeHelp( QString::null, "kipi-plugins" ); 
+}
+
 void DigikamApp::loadPlugins()
 {

--- kdeextragear-3/digikam/digikam/digikamapp.h  #1.12:1.13
@@ -150,6 +150,7 @@ private:
 
     // Application Actions
-    KAction* mQuitAction;
-    KAction* mTipAction;
+    KAction *mQuitAction;
+    KAction *mTipAction;
+    KAction *mKipiHelpAction;
 
 private slots:
@@ -159,4 +160,5 @@ private slots:
     void slot_exit();
     void slotShowTip();
+    void slotShowKipiHelp();
     
     void slotSetup();

--- kdeextragear-3/digikam/digikam/digikamui.rc  #1.11:1.12
@@ -70,4 +70,5 @@
   
   <Menu name="help"><Text>&amp;Help</Text>
+    <Action name="help_kipi"/>
     <Action name="help_tipofday"/>
   </Menu>

CVS commit by cgilles: 

- BugFix about the crash during KeyBinding config lauch...
- Fix a bad slot connect between kipiinterface and albummanager.
Nota: Renchi, take you sure if you have also fixed this bugs in your local 
implementation when you will fix kipiinterface in CVS...
CCMAIL: digikam-devel@..., renchi@...


  M +8 -7      digikamapp.cpp   1.36
  M +2 -4      kipiinterface.cpp   1.3
  M +1 -1      kipiinterface.h   1.4


--- kdeextragear-3/digikam/digikam/digikamapp.cpp  #1.35:1.36
@@ -341,5 +341,5 @@ void DigikamApp::setupActions()
                                    "app_exit");
 
-    mKipiHelpAction = new KAction(i18n("Plugins help"),
+    mKipiHelpAction = new KAction(i18n("Plugins handbooks"),
                                    "kipi",
                                    0,
@@ -500,4 +500,6 @@ void DigikamApp::slotEditKeys()
     {
         KIPI::Plugin* plugin = (*it)->plugin;
+        
+        if ( plugin )
         dialog->insert( plugin->actionCollection(), (*it)->comment );
     }
@@ -559,6 +560,6 @@ void DigikamApp::loadPlugins()
              KipiInterface_, SLOT( slotSelectionChanged( bool ) ) );
 
-    connect( mAlbumManager, SIGNAL( signalAlbumCurrentChanged( AlbumInfo * ) ),
-             KipiInterface_, SLOT( slotCurrentAlbumChanged( AlbumInfo * ) ) );
+    connect( mAlbumManager, SIGNAL( signalAlbumCurrentChanged( Album * ) ),
+             KipiInterface_, SLOT( slotCurrentAlbumChanged( Album * ) ) );
                  
     ignores << QString::fromLatin1( "HelloWorld" );    

--- kdeextragear-3/digikam/digikam/kipiinterface.cpp  #1.2:1.3
@@ -262,6 +262,4 @@ QString DigikamImageCollection::name()
     if (palbum_) 
         {
-        // PENDING : Renchi, Why the GetTitle() method isn't available in PAlbum ?
-        
         QString title = palbum_->getTitle();    
         return (title);    
@@ -607,9 +605,9 @@ void DigikamKipiInterface::slotSelection
 }
 
-void DigikamKipiInterface::slotCurrentAlbumChanged( PAlbum *palbum )
+void DigikamKipiInterface::slotCurrentAlbumChanged( Album *album )
 {
     bool b = false;
     
-    if ( palbum )
+    if ( album )
        b = true;
     

--- kdeextragear-3/digikam/digikam/kipiinterface.h  #1.3:1.4
@@ -160,5 +160,5 @@ protected slots:
 public slots:
     void slotSelectionChanged( bool b );
-    void slotCurrentAlbumChanged( PAlbum *palbum );
+    void slotCurrentAlbumChanged( Album *palbum );

CVS commit by pahlibar: 


CCMAIL: digikam-devel@...

various fixes and optimizations in the kipiinterface
testing requested


  M +2 -1      albumiconview.cpp   1.39
  M +0 -8      digikamapp.cpp   1.38
  M +298 -294  kipiinterface.cpp   1.4
  M +25 -25    kipiinterface.h   1.5

Dnia piątek, 9 lipca 2004 15:36, Renchi Raju napisał:
> CVS commit by pahlibar:
>
>
> CCMAIL: digikam-devel@...
>
> various fixes and optimizations in the kipiinterface
> testing requested
>
>
What should be tested and what is still disabled?

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
VimGDB - http://skawina.eu.org/mikolaj/vimgdb

On Fri, 9 Jul 2004, Mikolaj Machowski wrote:

> Dnia pi=C4=85tek, 9 lipca 2004 15:36, Renchi Raju napisa=C5=82:
> > various fixes and optimizations in the kipiinterface
> > testing requested
> >
> What should be tested and what is still disabled?

add image is disabled. i have tested the new interface with only the
slideshow plugin. so it would be nice if you can test it with plugins and
see if everything works as expected.

renchi

CVS commit by pahlibar: 



* reimplement the item lister using pure kdirlister and use the new
  digikamtags protocol
* non-blocking listing of items in Tag Albums from database.
* Currently recursive retrieval is hard coded in by default. 
  need to make this selectable in the setup dialog
* use updatedirectory instead of reloading the items from tag in case
  of modifications. (more work might be needed here. maybe a kdirwatch
  to watch the items in the tag, as kdirlister doesn't do it for us
  thinking its a non-local protocol)

CCMAIL: digikam-devel@...


  M +22 -0     album.cpp   1.2
  M +1 -0      album.h   1.2
  M +17 -10    albumiconview.cpp   1.41
  M +84 -51    albumlister.cpp   1.2
  M +3 -1      albumlister.h   1.2

CVS commit by pahlibar: 


Sort Images by Name, Path, Date, File Size
CCMAIL: digikam-devel@...


  M +43 -0     albumiconitem.cpp   1.21
  M +2 -1      albumiconitem.h   1.6
  M +23 -4     albumsettings.cpp   1.16
  M +12 -1     albumsettings.h   1.11
  M +18 -0     digikamapp.cpp   1.41
  M +1 -0      digikamapp.h   1.14
  M +3 -0      digikamui.rc   1.13
  M +9 -0      digikamview.cpp   1.9
  M +1 -0      digikamview.h   1.6

CVS commit by pahlibar: 


getURL should be getKURL
CCMAIL: digikam-devel@..., kde@...


  M +1 -1      albumiconview.cpp   1.48


--- kdeextragear-3/digikam/digikam/albumiconview.cpp  #1.47:1.48
@@ -1138,5 +1138,5 @@ void AlbumIconView::contentsDropEvent(QD
     if (QUriDrag::canDecode(event)) {
 
-        KURL destURL(d->currentAlbum->getURL());
+        KURL destURL(d->currentAlbum->getKURL());
 
         KURL::List srcURLs;

CVS commit by pahlibar: 


added texture building routines (fudged from fluxbox). this will form the 
basis of theming support for digikam (around v0.8). use the texture routines 
to build base pixmaps for thumbnail items. currently hard-coded colors.
CCMAIL: digikam-devel@...


  A            texture.cpp   1.1 [X11 (BSD like)]
  A            texture.h   1.1 [X11 (BSD like)]
  M +1 -1      Makefile.am   1.13
  M +22 -23    albumiconview.cpp   1.49


--- kdeextragear-3/digikam/digikam/Makefile.am  #1.12:1.13
@@ -26,5 +26,5 @@
                         digikamcameraprocess.cpp digikamfirstrun.cpp \
                         kipiinterface.cpp tagcreatedlg.cpp \
-                        thumbdb.cpp
+                        thumbdb.cpp texture.cpp
 
 libdigikam_la_LIBADD  = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)  \

--- kdeextragear-3/digikam/digikam/albumiconview.cpp  #1.48:1.49
@@ -97,4 +97,5 @@
 #include "dragobjects.h"
 
+#include "texture.h"
 #include "albumiconitem.h"
 #include "digikamapp.h"
@@ -1129,7 +1130,8 @@ void AlbumIconView::contentsDropEvent(QD
 {
     
-    if (!d->currentAlbum || (!QUriDrag::canDecode(event) &&
-                             !CameraDragObject::canDecode(event))
-        || event->source() == this) {
+    if (!d->currentAlbum || d->currentAlbum->type() != Album::PHYSICAL
+        || (!QUriDrag::canDecode(event) && !CameraDragObject::canDecode(event))
+        || event->source() == this)
+    {
         event->ignore();
         return;
@@ -1138,5 +1140,6 @@ void AlbumIconView::contentsDropEvent(QD
     if (QUriDrag::canDecode(event)) {
 
-        KURL destURL(d->currentAlbum->getKURL());
+        PAlbum* palbum = (PAlbum*)d->currentAlbum;
+        KURL destURL(palbum->getKURL());
 
         KURL::List srcURLs;
@@ -1591,5 +1594,5 @@ void AlbumIconView::updateItemRectsPixma
     }
 
-    int margin  = 2;
+    int margin  = 5;
     int w = QMAX(d->thumbSize.size(), 100) + 2*margin;
 
@@ -1659,29 +1662,25 @@ void AlbumIconView::updateItemRectsPixma
     d->itemRegPixmap.fill(Qt::white);
 
-    QRegion reg(d->itemRect);
-    reg -= d->itemPixmapRect;
-
     {
+        d->itemRegPixmap.resize(d->itemRect.width(), d->itemRect.height());
+        Texture tex(d->itemRect.width()-2, d->itemRect.height()-2,
+                    QColor("#efefef"), QColor("#e0e0e0"));
+        QPixmap pix = tex.renderPixmap();
         QPainter p(&d->itemRegPixmap);
-        p.setClipRegion(reg);
-        p.fillRect(d->itemRect, QColor("#ededed"));
-        p.setPen(QColor("#fdfdfd"));
-        p.drawLine(0,0,0,d->itemRect.height()-1);
-        p.drawLine(0,0,d->itemRect.width()-1,0);
-        p.setPen(QColor("#adadad"));
-        p.drawLine(0,d->itemRect.height()-1,d->itemRect.width()-1,d->itemRect.height()-1);
-        p.drawLine(d->itemRect.width()-1,0,d->itemRect.width()-1,d->itemRect.height()-1);
+        p.setPen(Qt::black);
+        p.drawPixmap(1, 1, pix);
+        p.drawRect(0, 0, d->itemRect.width(), d->itemRect.height());
         p.end();
     }
 
-    d->itemSelPixmap.resize(d->itemRect.width(), d->itemRect.height());
-    d->itemSelPixmap.fill(Qt::white);
-
     {
+        d->itemSelPixmap.resize(d->itemRect.width(), d->itemRect.height());
+        Texture tex(d->itemRect.width()-2, d->itemRect.height()-2,
+                    colorGroup().highlight().light(120), colorGroup().highlight());
+        QPixmap pix = tex.renderPixmap();
         QPainter p(&d->itemSelPixmap);
-        p.setClipRegion(reg);
-        p.fillRect(d->itemRect, colorGroup().highlight());
-        p.setPen(QColor("#666666"));
-        p.drawRect(d->itemRect);
+        p.setPen(Qt::black);
+        p.drawPixmap(1, 1, pix);
+        p.drawRect(0, 0, d->itemRect.width(), d->itemRect.height());
         p.end();
     }

CVS commit by jahrens: 

Added drag'n'drop from external sources to AlbumFolderView
CCMAIL: digikam-devel@...


  M +25 -1     albumfolderview.cpp   1.14


--- kdeextragear-3/digikam/digikam/albumfolderview.cpp  #1.13:1.14
@@ -1125,4 +1125,28 @@ void AlbumFolderView::phyAlbumDropEvent(
         // DnD from an external source
             
+        PAlbum *destAlbum = album;
+        KURL destURL(destAlbum->getKURL());
+        
+        KURL::List srcURLs;
+        KURLDrag::decode(event, srcURLs);
+        
+        QPopupMenu popMenu(this);
+        popMenu.insertItem( i18n("&Copy"), 10 );
+        popMenu.insertItem( i18n("&Move"), 11 );
+
+        popMenu.setMouseTracking(true);
+        int id = popMenu.exec(QCursor::pos());
+        switch(id) {
+        case 10: {
+            KIO::copy(srcURLs,destURL,true);
+            break;
+        }
+        case 11: {
+            KIO::move(srcURLs,destURL,true);
+            break;
+        }
+        default:
+            break;
+        }        
     }
     else if (CameraDragObject::canDecode(event))

CVS commit by jahrens: 

Changed drag'n'drop popup menues to make them look like other kde applications
CCMAIL: digikam-devel@...


  M +14 -10    albumfolderview.cpp   1.15
  M +6 -4      albumiconview.cpp   1.53


--- kdeextragear-3/digikam/digikam/albumfolderview.cpp  #1.14:1.15
@@ -1088,6 +1088,8 @@ void AlbumFolderView::phyAlbumDropEvent(
         
         QPopupMenu popMenu(this);
-        popMenu.insertItem( i18n("&Copy"), 10 );
-        popMenu.insertItem( i18n("&Move"), 11 );
+        popMenu.insertItem( SmallIcon("goto"), i18n("&Move Here"), 10 );
+        popMenu.insertItem( SmallIcon("editcopy"), i18n("&Copy Here"), 11 );
+        popMenu.insertSeparator(-1);
+        popMenu.insertItem( SmallIcon("cancel"), i18n("C&ancel") );
 
         popMenu.setMouseTracking(true);
@@ -1103,5 +1105,5 @@ void AlbumFolderView::phyAlbumDropEvent(
                 
             AlbumFileCopyMove* io = new AlbumFileCopyMove(srcAlbum, destAlbum,
-                                                          fileList, false);
+                                                          fileList, true);
             break;
         }
@@ -1114,5 +1116,5 @@ void AlbumFolderView::phyAlbumDropEvent(
                 
             AlbumFileCopyMove* io = new AlbumFileCopyMove(srcAlbum, destAlbum,
-                                                          fileList, true);
+                                                          fileList, false);
             break;
         }
@@ -1132,6 +1134,8 @@ void AlbumFolderView::phyAlbumDropEvent(
         
         QPopupMenu popMenu(this);
-        popMenu.insertItem( i18n("&Copy"), 10 );
-        popMenu.insertItem( i18n("&Move"), 11 );
+        popMenu.insertItem( SmallIcon("goto"), i18n("&Move Here"), 10 );
+        popMenu.insertItem( SmallIcon("editcopy"), i18n("&Copy Here"), 11 );
+        popMenu.insertSeparator(-1);
+        popMenu.insertItem( SmallIcon("cancel"), i18n("C&ancel") );
 
         popMenu.setMouseTracking(true);
@@ -1139,9 +1143,9 @@ void AlbumFolderView::phyAlbumDropEvent(
         switch(id) {
         case 10: {
-            KIO::copy(srcURLs,destURL,true);
+            KIO::move(srcURLs,destURL,true);
             break;
         }
         case 11: {
-            KIO::move(srcURLs,destURL,true);
+            KIO::copy(srcURLs,destURL,true);
             break;
         }

--- kdeextragear-3/digikam/digikam/albumiconview.cpp  #1.52:1.53
@@ -1151,6 +1151,8 @@ void AlbumIconView::contentsDropEvent(QD
         
         QPopupMenu popMenu(this);
-        popMenu.insertItem( i18n("&Copy"), 10 );
-        popMenu.insertItem( i18n("&Move"), 11 );
+        popMenu.insertItem( SmallIcon("goto"), i18n("&Move Here"), 10 );
+        popMenu.insertItem( SmallIcon("editcopy"), i18n("&Copy Here"), 11 );
+        popMenu.insertSeparator(-1);
+        popMenu.insertItem( SmallIcon("cancel"), i18n("C&ancel") );
 
         popMenu.setMouseTracking(true);
@@ -1158,9 +1160,9 @@ void AlbumIconView::contentsDropEvent(QD
         switch(id) {
         case 10: {
-            KIO::copy(srcURLs,destURL,true);
+            KIO::move(srcURLs,destURL,true);
             break;
         }
         case 11: {
-            KIO::move(srcURLs,destURL,true);
+            KIO::copy(srcURLs,destURL,true);
             break;
         }

CVS commit by pahlibar: 


Give an example for the new album iterator

CCMAIL: digikam-devel@...


  M +13 -1     album.h   1.4


--- kdeextragear-3/digikam/digikam/album.h  #1.3:1.4
@@ -148,5 +148,17 @@ private:
 
 /* Iterate over all children of this Album.
-   Note: It doesn't include the specified album */
+   Note: It doesn't include the specified album
+
+   Example usage:
+   
+   AlbumIterator it(album);
+   while ( it.current() )
+   {
+      kdDebug() << "Album: " << it.current() ->getTitle() << endl;
+      ++it;
+   }
+
+   Do not delete albums using this iterator.
+*/
 
 class AlbumIterator

CVS commit by jahrens: 

Added a context menu to comments/tags dialog (ImageDescEdit) to add/delete tags.
"Edit" is still unavailable, because changes made to tags in this dialog are not forwarded to the albumiconview. So I have disabled edit until I found a solution.
CCMAIL: digikam-devel@...


  M +138 -0    imagedescedit.cpp   1.10
  M +5 -0      imagedescedit.h   1.6

CVS commit by pahlibar: 


* dump and restore album tree state
* remember last album opened (only physical albums, not tags - as listing
  files in tags requires that the corresponding physical albums have been
  loaded already and because of kio loading of albums, this is not 
  guaranteed)
CCMAIL: digikam-devel@...


  M +101 -5    albumfolderview.cpp   1.18
  M +7 -0      albumfolderview.h   1.6

Le samedi 14 Ao=C3=BBt 2004 19:11, Renchi Raju a =C3=A9crit=C2=A0:
> CVS commit by pahlibar:
>
>
> * dump and restore album tree state
> * remember last album opened (only physical albums, not tags - as listing
>   files in tags requires that the corresponding physical albums have been
>   loaded already and because of kio loading of albums, this is not
>   guaranteed)
> CCMAIL: digikam-devel@...
>
>
>   M +101 -5    albumfolderview.cpp   1.18
>   M +7 -0      albumfolderview.h   1.6
>

Hum. There are some problems... looking :

[gilles@... Documents]$ digikam
digikam: WARNING: [void AlbumFolderView::loadAlbumState()] Failed to open=20
albumtreestate.bin
QFile::readBlock: File not open
QFile::readBlock: File not open
QFile::readBlock: File not open
QFile::readBlock: File not open
QFile::atEnd: File is not open
QFile::readBlock: File not open
QFile::readBlock: File not open
QFile::atEnd: File is not open
QFile::readBlock: File not open
QFile::readBlock: File not open
QFile::atEnd: File is not open
QFile::readBlock: File not open
QFile::readBlock: File not open
QFile::atEnd: File is not open
QFile::readBlock: File not open
QFile::readBlock: File not open
QFile::atEnd: File is not open
QFile::readBlock: File not open
QFile::readBlock: File not open
QFile::atEnd: File is not open
QFile::readBlock: File not open
QFile::readBlock: File not open
QFile::atEnd: File is not open
QFile::readBlock: File not open
=2E..

It's the same things with ~/.kde/share/config/digikamrc file removed, and=20
Albums library path reconfigured...

regards

Gilles

On Sat, 14 Aug 2004, Caulier Gilles wrote:

> Hum. There are some problems... looking :
>
> [gilles@... Documents]$ digikam
> digikam: WARNING: [void AlbumFolderView::loadAlbumState()] Failed to open
> albumtreestate.bin

that is normal. the first time you run digikam its going to look for a
file to restore the album tree state, but since the file does not exist
its going to complain. when you close digikam the album tree state is
dumped and next time you load digikam this file is used to restore the
tree state.

> QFile::readBlock: File not open
> ...

this was my stupidity. i forgot to return from the function if it couldn't
open the file. fixed.

renchi

Le samedi 14 Ao=FBt 2004 23:59, Renchi Raju a =E9crit=A0:
> On Sat, 14 Aug 2004, Caulier Gilles wrote:
> > Hum. There are some problems... looking :
> >
> > [gilles@... Documents]$ digikam
> > digikam: WARNING: [void AlbumFolderView::loadAlbumState()] Failed to op=
en
> > albumtreestate.bin
>
> that is normal. the first time you run digikam its going to look for a
> file to restore the album tree state, but since the file does not exist
> its going to complain. when you close digikam the album tree state is
> dumped and next time you load digikam this file is used to restore the
> tree state.
>
> > QFile::readBlock: File not open
> > ...
>
> this was my stupidity. i forgot to return from the function if it couldn't
> open the file. fixed.
>
> renchi
>
Work fine now. Thanks...

Gilles

CVS commit by pahlibar: 


* do the initial selection of albums/tags only after all albums have been
  loaded
* last selected tag can also be remembered now.

CCMAIL: digikam-devel@...


  M +37 -7     albumfolderview.cpp   1.20
  M +1 -0      albumfolderview.h   1.7
  M +10 -0     albummanager.cpp   1.4
  M +1 -0      albummanager.h   1.3


--- kdeextragear-3/digikam/digikam/albumfolderview.cpp  #1.19:1.20
@@ -113,4 +113,6 @@ AlbumFolderView::AlbumFolderView(QWidget
     connect(albumMan_, SIGNAL(signalAlbumsCleared()),
             this, SLOT(slotAlbumsCleared()));
+    connect(albumMan_, SIGNAL(signalAllAlbumsLoaded()),
+            this, SLOT(slotAllAlbumsLoaded()));
 
     connect(ThemeEngine::instance(), SIGNAL(signalThemeChanged()),
@@ -445,11 +447,4 @@ void AlbumFolderView::slotAlbumAdded(Alb
             album->setViewItem(folderItem);
         }
-
-        if (album->type() == Album::PHYSICAL &&
-            fakeID == stateAlbumSel_)
-        {
-            setSelected(folderItem);
-            ensureItemVisible(folderItem);
-        }
     }
 }
@@ -484,4 +479,37 @@ void AlbumFolderView::slotAlbumsCleared(
 }
 
+void AlbumFolderView::slotAllAlbumsLoaded()
+{
+    AlbumFolderItem* folderItem = 0;
+
+    if (stateAlbumSel_ >= 100000 &&
+        stateAlbumSel_ <  200000)
+    {
+        // last selected album was a PAlbum
+        int id = stateAlbumSel_ - 100000;
+        PAlbum* album = albumMan_->findPAlbum(id);
+        if (album && album->getViewItem())
+        {
+            folderItem = static_cast<AlbumFolderItem*>(album->getViewItem());
+        }
+    }
+    else if (stateAlbumSel_ >= 200000)
+    {
+        // last selected album was a TAlbum
+        int id = stateAlbumSel_ - 200000;
+        TAlbum* album = albumMan_->findTAlbum(id);
+        if (album && album->getViewItem())
+        {
+            folderItem = static_cast<AlbumFolderItem*>(album->getViewItem());
+        }
+    }
+
+    if (!folderItem)
+        return;
+
+    setSelected(folderItem);
+    ensureItemVisible(folderItem);
+}
+
 void AlbumFolderView::albumNew()
 {
@@ -790,4 +818,6 @@ void AlbumFolderView::tagEdit(TAlbum* al
 void AlbumFolderView::slotSelectionChanged(ListItem* item)
 {
+    stateAlbumSel_ = 0;
+    
     if (!item)
     {

--- kdeextragear-3/digikam/digikam/albumfolderview.h  #1.6:1.7
@@ -150,4 +150,5 @@ private slots:
     void slotAlbumDeleted(Album *album);
     void slotAlbumsCleared();
+    void slotAllAlbumsLoaded();
 
     void slotGotThumbnail(const KFileItem* fileItem, const QPixmap& thumbnail,

--- kdeextragear-3/digikam/digikam/albummanager.cpp  #1.3:1.4
@@ -70,4 +70,5 @@ public:
     
     KURL::List        urlsToOpen;
+    bool              initialLoad;
 };
     
@@ -95,4 +96,6 @@ AlbumManager::AlbumManager()
 
     d->albumLister  = 0;
+    
+    d->initialLoad  = true;
 }
 
@@ -600,5 +603,12 @@ void AlbumManager::slotCompleted()
 {
     if (d->urlsToOpen.isEmpty())
+    {
+        if (d->initialLoad)
+        {
+            d->initialLoad = false;
+            emit signalAllAlbumsLoaded();
+        }
         return;
+    }
 
     KURL url(d->urlsToOpen.first());

--- kdeextragear-3/digikam/digikam/albummanager.h  #1.2:1.3
@@ -114,4 +114,5 @@ signals:
     void signalAlbumsCleared();
     void signalAlbumCurrentChanged(Album* album);
+    void signalAllAlbumsLoaded();
 };

CVS commit by pahlibar: 


* assign/remove tags in bulk using right click menu
* not completely happy with the solution, will wait for user complaints
CCMAIL: digikam-devel@...


  M +10 -2     albumdb.cpp   1.6
  M +2 -1      albumdb.h   1.4
  M +102 -2    albumiconview.cpp   1.64
  M +2 -0      albumiconview.h   1.17
  M +1 -1      imagedescedit.cpp   1.19

On Thursday 19 August 2004 02:39, Renchi Raju wrote:
> CVS commit by pahlibar:
>
>
> * assign/remove tags in bulk using right click menu
> * not completely happy with the solution, will wait for user complaints

I missed this menu and wanted to code it today :) But if you delete a tag w=
ith=20
attached descendant tags the user should be informed these tags are deleted=
=20
as well.

=2D Info in the delete message box or
=2D do not allow delete tags with descendants until the descandants are del=
eted=20
or
=2D add a checkbox to the delete messagebox "[ ] delete desendants"

=2E.. J=C3=B6rn

On Thu, 19 Aug 2004, Joern Ahrens wrote:

> On Thursday 19 August 2004 02:39, Renchi Raju wrote:
> > CVS commit by pahlibar:
> >
> >
> > * assign/remove tags in bulk using right click menu
> > * not completely happy with the solution, will wait for user complaints
>
> I missed this menu and wanted to code it today :) But if you delete a tag with
> attached descendant tags the user should be informed these tags are deleted
> as well.
>
> - Info in the delete message box or
> - do not allow delete tags with descendants until the descandants are deleted
> or
> - add a checkbox to the delete messagebox "[ ] delete desendants"

this is not for deleting tags, but for assigning/removing tags from
albumiconview items by right clicking on them. this is in response to
users asking for a way to untag multiple items together.

renchi

Dnia czwartek, 19 sierpnia 2004 07:50, Joern Ahrens napisał:
> On Thursday 19 August 2004 02:39, Renchi Raju wrote:
> > CVS commit by pahlibar:
> >
> >
> > * assign/remove tags in bulk using right click menu
> > * not completely happy with the solution, will wait for user
> > complaints
>
> I missed this menu and wanted to code it today :) But if you delete a
> tag with attached descendant tags the user should be informed these tags
> are deleted as well.
>
> - Info in the delete message box or
> - do not allow delete tags with descendants until the descandants are
> deleted or

I'd prefer this solution. The same as in Korganizer. IMO it is sensible
to keep similar behaviours across many apps.

> - add a checkbox to the delete messagebox "[ ] delete desendants"
>
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 Thu, 19 Aug 2004, Mikolaj Machowski wrote:

> Dnia czwartek, 19 sierpnia 2004 07:50, Joern Ahrens napisa=C5=82:
> > On Thursday 19 August 2004 02:39, Renchi Raju wrote:
> > > CVS commit by pahlibar:
> > >
> > >
> > > * assign/remove tags in bulk using right click menu
> > > * not completely happy with the solution, will wait for user
> > > complaints
> >
> > I missed this menu and wanted to code it today :) But if you delete a
> > tag with attached descendant tags the user should be informed these tag=
s
> > are deleted as well.
> >
> > - Info in the delete message box or
> > - do not allow delete tags with descendants until the descandants are
> > deleted or
>
> I'd prefer this solution. The same as in Korganizer. IMO it is sensible
> to keep similar behaviours across many apps.

ummm... does konqueror prevent you from deleting a folder if it has
subfolders?

renchi

On Thursday 19 August 2004 17:23, Renchi Raju wrote:
> On Thu, 19 Aug 2004, Mikolaj Machowski wrote:
> > Dnia czwartek, 19 sierpnia 2004 07:50, Joern Ahrens napisa=C5=82:
> > > On Thursday 19 August 2004 02:39, Renchi Raju wrote:
> > > > CVS commit by pahlibar:
> > > >
> > > >
> > > > * assign/remove tags in bulk using right click menu
> > > > * not completely happy with the solution, will wait for user
> > > > complaints
> > >
> > > I missed this menu and wanted to code it today :) But if you delete a
> > > tag with attached descendant tags the user should be informed these
> > > tags are deleted as well.
> > >
> > > - Info in the delete message box or
> > > - do not allow delete tags with descendants until the descandants are
> > > deleted or
> >
> > I'd prefer this solution. The same as in Korganizer. IMO it is sensible
> > to keep similar behaviours across many apps.
>
> ummm... does konqueror prevent you from deleting a folder if it has
> subfolders?
>

No,  but that doesn't make it right here not to inform the user.

=2E.. J=C3=B6rn

On Thu, 19 Aug 2004, Joern Ahrens wrote:

> On Thursday 19 August 2004 17:23, Renchi Raju wrote:
> > On Thu, 19 Aug 2004, Mikolaj Machowski wrote:
> > > Dnia czwartek, 19 sierpnia 2004 07:50, Joern Ahrens napisa=C5=82:
> > > > On Thursday 19 August 2004 02:39, Renchi Raju wrote:
> > > > > CVS commit by pahlibar:
> > > > >
> > > > >
> > > > > * assign/remove tags in bulk using right click menu
> > > > > * not completely happy with the solution, will wait for user
> > > > > complaints
> > > >
> > > > I missed this menu and wanted to code it today :) But if you delete=
 a
> > > > tag with attached descendant tags the user should be informed these
> > > > tags are deleted as well.
> > > >
> > > > - Info in the delete message box or
> > > > - do not allow delete tags with descendants until the descandants a=
re
> > > > deleted or
> > >
> > > I'd prefer this solution. The same as in Korganizer. IMO it is sensib=
le
> > > to keep similar behaviours across many apps.
> >
> > ummm... does konqueror prevent you from deleting a folder if it has
> > subfolders?
> >
>
> No,  but that doesn't make it right here not to inform the user.

that is true. we should add a warning to the "delete tag confirmation"
messagebox, that subtags will be deleted.

renchi

On Thursday 19 August 2004 11:16, Renchi Raju wrote:
> On Thu, 19 Aug 2004, Joern Ahrens wrote:
> > On Thursday 19 August 2004 02:39, Renchi Raju wrote:
> > > CVS commit by pahlibar:
> > deleted or
> > - add a checkbox to the delete messagebox "[ ] delete desendants"
>
> this is not for deleting tags, but for assigning/removing tags from
> albumiconview items by right clicking on them. this is in response to
> users asking for a way to untag multiple items together.

I wrote the mail in a hurry just before leaving for work. When I was at wor=
k I=20
realized that I missunderstood your mail.

Do you know imatch (http://www.photools.com/) ? It's a nice image managemen=
t=20
tool for windows. There you can open a window with the tag structure and yo=
u=20
can assign and reassign tags (in imatch tags are called category) through=20
checkboxes.

http://www.majid.info/mylos/stories/2002/06/29/imageCategoryManagementWithI=
match.html

http://www.photools.com/imfs_0003.php

=2E.. J=F6rn

On Thu, 19 Aug 2004, Joern Ahrens wrote:

> On Thursday 19 August 2004 11:16, Renchi Raju wrote:
> > On Thu, 19 Aug 2004, Joern Ahrens wrote:
> > > On Thursday 19 August 2004 02:39, Renchi Raju wrote:
> > > > CVS commit by pahlibar:
> > > deleted or
> > > - add a checkbox to the delete messagebox "[ ] delete desendants"
> >
> > this is not for deleting tags, but for assigning/removing tags from
> > albumiconview items by right clicking on them. this is in response to
> > users asking for a way to untag multiple items together.
>
> I wrote the mail in a hurry just before leaving for work. When I was at work I
> realized that I missunderstood your mail.
>
> Do you know imatch (http://www.photools.com/) ? It's a nice image management
> tool for windows. There you can open a window with the tag structure and you
> can assign and reassign tags (in imatch tags are called category) through
> checkboxes.
>
> http://www.majid.info/mylos/stories/2002/06/29/imageCategoryManagementWithImatch.html
>
> http://www.photools.com/imfs_0003.php

looks like we do pretty much what they have (except for the search
functionality, which is a target goal for 0.8). imho, its much simpler to
drag and drop images on tags to assign them, than to have a separate
window open (which will block part of your view) to assign tags.

renchi

On Thursday 19 August 2004 20:34, Renchi Raju wrote:
> > Do you know imatch (http://www.photools.com/) ? It's a nice image
> > management tool for windows. There you can open a window with the tag
> > structure and you can assign and reassign tags (in imatch tags are call=
ed
> > category) through checkboxes.
> >
> > http://www.majid.info/mylos/stories/2002/06/29/imageCategoryManagementW=
it
> >hImatch.html
> >
> > http://www.photools.com/imfs_0003.php
>
> looks like we do pretty much what they have (except for the search
> functionality, which is a target goal for 0.8). imho, its much simpler to
> drag and drop images on tags to assign them, than to have a separate
> window open (which will block part of your view) to assign tags.

Sure drag and drop images on tags is simpler. I would only show you an=20
alternative to your implementation, because you're not completely happy wit=
h=20
it. Actually I have no better idea...

Btw. I would improve dragitem to be able to be dropped on images to assign =
it.=20
Any objections ?

Renchi, are you working on album drag and drop or is it free ? Having said=
=20
that, I have to complete my album import as well.

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

On Thu, 19 Aug 2004, Joern Ahrens wrote:

> On Thursday 19 August 2004 20:34, Renchi Raju wrote:
> > > Do you know imatch (http://www.photools.com/) ? It's a nice image
> > > ...
> >
> > looks like we do pretty much what they have (except for the search
> > functionality, which is a target goal for 0.8). imho, its much simpler to
> > drag and drop images on tags to assign them, than to have a separate
> > window open (which will block part of your view) to assign tags.
>
> Sure drag and drop images on tags is simpler. I would only show you an
> alternative to your implementation, because you're not completely happy with
> it. Actually I have no better idea...

the reason why i don't like my current solution is that the tag assign and
remove works only if the tags doesn't have subtags (limitation of
qpopupmenu). that was one of the reasons which prompted to send out the
email regarding the design flaw in tag implementation.

> Btw. I would improve dragitem to be able to be dropped on images to assign it.
> Any objections ?

that will be nice.

> Renchi, are you working on album drag and drop or is it free ? Having said
> that, I have to complete my album import as well.

no, i'm not working on it. go ahead.

renchi

CVS commit by jahrens: 

Tags can be dropped on images to assign the tag

CCMAIL: digikam-devel@...


  M +7 -3      albumfolderview.cpp   1.25
  M +82 -8     albumiconview.cpp   1.67
  M +1 -0      albumiconview.h   1.19

CVS commit by pahlibar: 


warn users on an attempt to delete an album or a tag, if there are sub 
albums and tags. also show the number of sub albums and tags.

CCMAIL: digikam-devel@...


  M +80 -14    albumfolderview.cpp   1.27


--- kdeextragear-3/digikam/digikam/albumfolderview.cpp  #1.26:1.27
@@ -623,4 +623,36 @@ void AlbumFolderView::albumDelete(PAlbum
         return;
 
+    // find number of subalbums
+
+    int children = 0;
+    AlbumIterator it(album);
+    while ( it.current() )
+    {
+        children++;
+        ++it;
+    }
+
+    if (children)
+    {
+        int result =
+            KMessageBox::warningYesNo(this, i18n("Album '%1' has %2 subalbum(s). "
+                                                 "Deleting this will also delete "
+                                                 "the subalbum(s). "
+                                                 "Are you sure you want to continue?")
+                                      .arg(album->getTitle())
+                                      .arg(children));
+
+        if (result == KMessageBox::Yes)
+        {
+            QString errMsg;
+            if (!albumMan_->deletePAlbum(album, errMsg))
+            {
+                KMessageBox::error(0, errMsg);
+            }
+        }
+
+    }
+    else
+    {
     int result =
         KMessageBox::questionYesNo(0, i18n("Delete '%1' Album from HardDisk")
@@ -635,4 +667,5 @@ void AlbumFolderView::albumDelete(PAlbum
         }
     }
+    }
 }
 
@@ -760,4 +793,36 @@ void AlbumFolderView::tagDelete(TAlbum *
         return;
 
+    // find number of subtags
+
+    int children = 0;
+    AlbumIterator it(album);
+    while ( it.current() )
+    {
+        children++;
+        ++it;
+    }
+
+    if (children)
+    {
+        int result =
+            KMessageBox::warningYesNo(this, i18n("Tag '%1' has %2 subtag(s). "
+                                                 "Deleting this will also delete "
+                                                 "the subtag(s). "
+                                                 "Are you sure you want to continue?")
+                                      .arg(album->getTitle())
+                                      .arg(children));
+
+        if (result == KMessageBox::Yes)
+        {
+            QString errMsg;
+            if (!albumMan_->deleteTAlbum(album, errMsg))
+            {
+                KMessageBox::error(0, errMsg);
+            }
+        }
+
+    }
+    else
+    {
     int result =
         KMessageBox::questionYesNo(0, i18n("Delete '%1' Tag")
@@ -770,4 +835,5 @@ void AlbumFolderView::tagDelete(TAlbum *
             KMessageBox::error(0, errMsg);
     }
+    }
 }

CVS commit by jahrens: 

Dragging an object in the albumiconview can continuously produce new drag
objects.
1. Select an image in the albumiconview
2. drop it on the albumfolderview or at the window title, so the drag object
   is destroyed
3. don't press the mouse button and leave the mouse over the albumiconview,
   but not over an image. the image is still selected.
4. switch to another desktop by a shortcut and switch back to the desktop
   that displays digikam
5. a new QMouseEvent is generated. Since the mouse isn't positioned over an
   image a new drag object for the previously selected image is created -> bug!

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


  M +1 -1      thumbview.cpp   1.17


--- kdeextragear-3/digikam/digikam/thumbview.cpp  #1.16:1.17
@@ -754,5 +754,5 @@ void ThumbView::contentsMouseMoveEvent(Q
     
     // Dragging ?
-    if (d->startDragItem) {
+    if (e->state() == LeftButton && d->startDragItem) {
 
         if ( (d->dragStartPos - e->pos() ).manhattanLength()

CVS commit by pahlibar: 


as joern pointed out the drag was being called out multiple times. i turned
on the contents mouse tracking for implementing the tooltips which led to this 
breakage.
this commit will set startDragItem to zero once mouse leaves the widget
 (just added safety check)
CCMAIL: digikam-devel@...


  M +5 -0      thumbview.cpp   1.18


--- kdeextragear-3/digikam/digikam/thumbview.cpp  #1.17:1.18
@@ -569,4 +569,9 @@ void ThumbView::leaveEvent(QEvent *e)
     slotToolTip();
     
+    // nullify the d->startDragItem if the mouse
+    // leaves the widget
+    
+    d->startDragItem = 0;
+    
     QScrollView::leaveEvent(e);
 }

CVS commit by pahlibar: 


* if drag moves over an unacceptable position, remove the old droptarget 
  and set it to zero. prevents surprises in case of dropevents. 
* need to find out why setting event->ignore() does not change the cursor
  everytime
CCMAIL: digikam-devel@...


  M +15 -4     albumfolderview.cpp   1.29
  M +2 -1      albumfolderview.h   1.9


--- kdeextragear-3/digikam/digikam/albumfolderview.cpp  #1.28:1.29
@@ -1142,6 +1142,6 @@ void AlbumFolderView::contentsDragMoveEv
         !TagDrag::canDecode(event))
     {
+        clearDropTarget();
         event->ignore();
-
         return;
     }
@@ -1153,4 +1153,5 @@ void AlbumFolderView::contentsDragMoveEv
         !newDropTarget->album())
     {
+        clearDropTarget();
         event->ignore();
         return;
@@ -1161,4 +1162,5 @@ void AlbumFolderView::contentsDragMoveEv
        (QUriDrag::canDecode(event) || CameraDragObject::canDecode(event)))
     {
+        clearDropTarget();
         event->ignore();
         return;
@@ -1170,4 +1172,5 @@ void AlbumFolderView::contentsDragMoveEv
         if (TagItemsDrag::canDecode(event) || TagDrag::canDecode(event))
         {
+            clearDropTarget();
             event->ignore();
             return;
@@ -1180,4 +1183,5 @@ void AlbumFolderView::contentsDragMoveEv
         (!folderItem || folderItem->album()->isAncestorOf(newDropTarget->album())))
     {
+        clearDropTarget();
         event->ignore();
         return;
@@ -1193,4 +1197,5 @@ void AlbumFolderView::contentsDragMoveEv
               TagDrag::canDecode(event)))
         {
+            clearDropTarget();
             event->ignore();
             return;
@@ -1200,4 +1205,5 @@ void AlbumFolderView::contentsDragMoveEv
     event->accept();
     if (dropTarget_ == newDropTarget) {
+        qWarning("Accepted: %s",dropTarget_->text().latin1());
         return;
     }
@@ -1212,7 +1218,5 @@ void AlbumFolderView::contentsDragMoveEv
 void AlbumFolderView::contentsDragLeaveEvent(QDragLeaveEvent *)
 {
-    if (dropTarget_)
-        dropTarget_->removeDropHighlight();
-    dropTarget_ = 0;
+    clearDropTarget();
 }
 
@@ -1448,4 +1452,11 @@ void AlbumFolderView::tagAlbumDropEvent(
 }
 
+void AlbumFolderView::clearDropTarget()
+{
+    if (dropTarget_)
+        dropTarget_->removeDropHighlight();
+    dropTarget_ = 0;    
+}
+
 void AlbumFolderView::slotGotThumbnail(const KFileItem* fileItem,
                                        const QPixmap& thumbnail,

--- kdeextragear-3/digikam/digikam/albumfolderview.h  #1.8:1.9
@@ -103,4 +103,5 @@ private:
     void phyAlbumDropEvent(QDropEvent* e, PAlbum *album);
     void tagAlbumDropEvent(QDropEvent* e, TAlbum *album);
+    void clearDropTarget();
 
     void loadAlbumState();

CVS commit by rhoezler: 

- "Correct EXIF orientation tag" now works on all selected images, not just the first one

CCMAIL: digikam-devel@..., 88170-done@...


  M +25 -9     albumiconview.cpp   1.69
  M +1 -1      albumiconview.h   1.20
  M +1 -6      digikamview.cpp   1.12


--- kdeextragear-3/digikam/digikam/albumiconview.cpp  #1.68:1.69
@@ -1596,18 +1596,34 @@ void AlbumIconView::slotSelectionChanged
 }
 
-void AlbumIconView::slotSetExifOrientation( AlbumIconItem *item, int orientation )
+void AlbumIconView::slotSetExifOrientation( int orientation )
 {
+    KURL::List urlList;
+
+    for (ThumbItem *it = firstItem(); it; it=it->nextItem()) {
+        if (it->isSelected()) {
+            AlbumIconItem *iconItem = static_cast<AlbumIconItem *>(it);
+            urlList.append(iconItem->fileItem()->url());
+        }
+    }
+
+    if (urlList.count() <= 0) return;
+
+    KURL::List::Iterator it;
+    
+    for( it = urlList.begin(); it != urlList.end(); ++it ) 
+    {
     kdDebug() << "Setting Exif Orientation to " << orientation << endl;
 
     KExifData::ImageOrientation o = (KExifData::ImageOrientation)orientation;
 
-    if (!KExifUtils::writeOrientation(item->fileItem()->url().path(), o))
+        if (!KExifUtils::writeOrientation((*it).path(), o))
     {
         KMessageBox::sorry(0, i18n("Failed to correct EXIF orientation for file %1")
-                           .arg(item->text()));
+                    .arg((*it).filename()));
         return;
     }
 
-    refreshItems(item->fileItem()->url().path()); 
+        refreshItems((*it).path()); 
+    }
 }
 

--- kdeextragear-3/digikam/digikam/albumiconview.h  #1.19:1.20
@@ -162,5 +162,5 @@ public slots:
     void slotEditImageComments(AlbumIconItem* item);
     void slotShowExifInfo(AlbumIconItem* item);
-    void slotSetExifOrientation(AlbumIconItem* item, int orientation);
+    void slotSetExifOrientation(int orientation);
     void slotRename(AlbumIconItem* item);
     void slotDeleteSelectedItems();

--- kdeextragear-3/digikam/digikam/digikamview.cpp  #1.11:1.12
@@ -371,10 +371,5 @@ void DigikamView::slot_imageExifInfo(Alb
 void DigikamView::slot_imageExifOrientation(int orientation)
 {
-    AlbumIconItem *item;
-
-    item = mIconView->firstSelectedItem();
-    if (!item) return;
-
-    mIconView->slotSetExifOrientation(item, orientation);
+    mIconView->slotSetExifOrientation(orientation);
 }

On Fri, 27 Aug 2004, Ralf Hoelzer wrote:

> CVS commit by rhoezler:
>
> - "Correct EXIF orientation tag" now works on all selected images, not just the first one
>
> +    for (ThumbItem *it = firstItem(); it; it=it->nextItem()) {
> +        if (it->isSelected()) {
> +            AlbumIconItem *iconItem = static_cast<AlbumIconItem *>(it);
> +            urlList.append(iconItem->fileItem()->url());
> +        }
> +    }
> +
> +    if (urlList.count() <= 0) return;
> +
> +    KURL::List::Iterator it;
> +
> +    for( it = urlList.begin(); it != urlList.end(); ++it )
> +    {
>      kdDebug() << "Setting Exif Orientation to " << orientation << endl;
>
>      KExifData::ImageOrientation o = (KExifData::ImageOrientation)orientation;
>
> -    if (!KExifUtils::writeOrientation(item->fileItem()->url().path(), o))
> +        if (!KExifUtils::writeOrientation((*it).path(), o))
>      {
>          KMessageBox::sorry(0, i18n("Failed to correct EXIF orientation for file %1")
> -                           .arg(item->text()));
> +                    .arg((*it).filename()));
>          return;
>      }
>
> -    refreshItems(item->fileItem()->url().path());
> +        refreshItems((*it).path());
> +    }
>  }

this is not a good solution. you are doing heavy file IO in a loop. this
is going to block the UI completely and the application will be
unresponsive for that period. the correct solution would be to implement
this in a separate thread or kioslave. please revert this.

renchi

On Thursday 26 August 2004 06:07 pm, Renchi Raju wrote:
> this is not a good solution. you are doing heavy file IO in a loop. this
> is going to block the UI completely and the application will be
> unresponsive for that period. the correct solution would be to implement
> this in a separate thread or kioslave. please revert this.

Just tried it with 170 images and it works fine. The UI is not blocked at all
and I can even go to different albums, while the images are modified. 

I could duplicate the progress dialog and action thread code from the 
jpeglossless plugin, but that doesn't look like a very clean solution to me 
either.

Ralf

On Thursday 26 August 2004 06:33 pm, Ralf Holzer wrote:
> On Thursday 26 August 2004 06:07 pm, Renchi Raju wrote:
> > this is not a good solution. you are doing heavy file IO in a loop. this
> > is going to block the UI completely and the application will be
> > unresponsive for that period. the correct solution would be to implement
> > this in a separate thread or kioslave. please revert this.
>
> Just tried it with 170 images and it works fine. The UI is not blocked at
> all and I can even go to different albums, while the images are modified.

Just checked. The actual writing of the new tag takes less than 1 second on 
all170 images. What takes time is the refreshing of the thumbnails, but that 
is a different thread anyway.

Ralf

On Thu, 26 Aug 2004, Ralf Holzer wrote:

> On Thursday 26 August 2004 06:33 pm, Ralf Holzer wrote:
> > On Thursday 26 August 2004 06:07 pm, Renchi Raju wrote:
> > > this is not a good solution. you are doing heavy file IO in a loop. this
> > > is going to block the UI completely and the application will be
> > > unresponsive for that period. the correct solution would be to implement
> > > this in a separate thread or kioslave. please revert this.
> >
> > Just tried it with 170 images and it works fine. The UI is not blocked at
> > all and I can even go to different albums, while the images are modified.
>
> Just checked. The actual writing of the new tag takes less than 1 second on
> all170 images. What takes time is the refreshing of the thumbnails, but that
> is a different thread anyway.

i am away from my system right now. i will check later and let you know.


renchi

On Thu, 26 Aug 2004, Renchi Raju wrote:

>
>
> On Thu, 26 Aug 2004, Ralf Holzer wrote:
>
> > On Thursday 26 August 2004 06:33 pm, Ralf Holzer wrote:
> > > On Thursday 26 August 2004 06:07 pm, Renchi Raju wrote:
> > > > this is not a good solution. you are doing heavy file IO in a loop. this
> > > > is going to block the UI completely and the application will be
> > > > unresponsive for that period. the correct solution would be to implement
> > > > this in a separate thread or kioslave. please revert this.
> > >
> > > Just tried it with 170 images and it works fine. The UI is not blocked at
> > > all and I can even go to different albums, while the images are modified.
> >
> > Just checked. The actual writing of the new tag takes less than 1 second on
> > all170 images. What takes time is the refreshing of the thumbnails, but that
> > is a different thread anyway.
>
> i am away from my system right now. i will check later and let you know.

ok, i will have to take back what i said. i ran some tests and its pretty
fast to correct the exif orientation. i was under the impression that the
file is being written out to a temporary buffer and once modified renamed
back to the original file. i looked at the code and see that original
image itself is being modified. there is a slight risk of file being
corrupted if the operation fails for some reason. but if you trust the
code, then its ok with me.

renchi

CVS commit by jahrens: 

Added an import option to import image folders as digikam albums

* select the parent album in the folder view (if no album is selected root will be the parent)
* Album->Import->Import Folders...
* select the folders in the appearing file select dialog

todo: expand the folder view after import

CCMAIL: digikam-devel@...


  M +48 -0     albumfolderview.cpp   1.31
  M +3 -1      albumfolderview.h   1.10
  M +9 -0      digikamapp.cpp   1.51
  M +2 -1      digikamapp.h   1.19
  M +1 -0      digikamui.rc   1.19
  M +5 -0      digikamview.cpp   1.13
  M +1 -0      digikamview.h   1.9


--- kdeextragear-3/digikam/digikam/albumfolderview.cpp  #1.30:1.31
@@ -53,4 +53,5 @@
 #include <kaction.h>
 #include <kstandarddirs.h>
+#include <kurl.h>
 
 #include <kdeversion.h>
@@ -746,4 +747,51 @@ void AlbumFolderView::albumHighlight(PAl
 }
 
+void AlbumFolderView::albumImportFolder()
+{
+    AlbumSettings* settings = AlbumSettings::instance();
+    QDir libraryDir(settings->getAlbumLibraryPath());
+    if(!libraryDir.exists()) 
+    {
+        KMessageBox::error(0,
+                           i18n("Album Library has not been set correctly\n"
+                                "Please run Setup"));
+        return;
+    }
+    
+    PAlbum* parent = 0;
+    if(getSelected())
+    {
+        AlbumFolderItem *folderItem =
+            dynamic_cast<AlbumFolderItem*>(getSelected());
+        Album *a = folderItem->album();
+        if (a && a->type() == Album::PHYSICAL)
+        {
+            parent = dynamic_cast<PAlbum*>(a);
+        }
+    }
+    if(!parent)
+        parent = dynamic_cast<PAlbum*>(phyRootItem_->album());
+
+    QString libraryPath = parent->getKURL().path();
+    
+    KFileDialog dlg(QString::null, "inode/directory", this, "importFolder", true);
+    dlg.setMode(KFile::Directory | KFile::ExistingOnly |  KFile::Files);
+    if(dlg.exec() != QDialog::Accepted)
+        return;
+    
+    KURL::List urls = dlg.selectedURLs();
+    if(urls.empty())
+        return;
+
+    KIO::CopyJob* job = KIO::copy(urls, parent->getKURL(), true);
+    connect(job, SIGNAL(result(KIO::Job *)),
+            this, SLOT(slotAlbumImportResult(KIO::Job *)));
+}
+
+void AlbumFolderView::slotAlbumImportResult(KIO::Job* job)
+{
+    if (job->error())
+        job->showErrorDialog(this);
+}
 
 void AlbumFolderView::tagNew()

--- kdeextragear-3/digikam/digikam/albumfolderview.h  #1.9:1.10
@@ -75,4 +75,5 @@ public:
     void albumEdit(PAlbum* album);
     void albumHighlight(PAlbum* album);
+    void albumImportFolder();
     
     void tagNew();
@@ -158,4 +159,5 @@ private slots:
     void slotAlbumsCleared();
     void slotAllAlbumsLoaded();
+    void slotAlbumImportResult(KIO::Job* job);
 
     void slotGotThumbnail(const KFileItem* fileItem, const QPixmap& thumbnail,

--- kdeextragear-3/digikam/digikam/digikamapp.cpp  #1.50:1.51
@@ -217,4 +217,13 @@ void DigikamApp::setupActions()
                                     "album_addImages");
 
+    mAlbumImportAction = new KAction( i18n("Import Folders..."),
+                                      "fileopen",
+                                      0,
+                                      mView,
+                                      SLOT(slotAlbumImportFolder()),
+                                      actionCollection(),
+                                      "album_importFolder");                            
+
+                                    
     mPropsEditAction = new KAction( i18n("Edit Album Properties"),
                                     "albumfoldercomment",

--- kdeextragear-3/digikam/digikam/digikamapp.h  #1.18:1.19
@@ -129,4 +129,5 @@ private:
     KAction *mAddImagesAction;
     KAction *mPropsEditAction;
+    KAction *mAlbumImportAction;
 
     // Tag Actions

--- kdeextragear-3/digikam/digikam/digikamui.rc  #1.18:1.19
@@ -16,4 +16,5 @@
       <Menu name="Import"><text>&amp;Import</text>
          <Action name="album_addImages" />
+         <Action name="album_importFolder" />
          <ActionList name="file_actions_import"/>
       </Menu>

--- kdeextragear-3/digikam/digikam/digikamview.cpp  #1.12:1.13
@@ -307,4 +307,9 @@ void DigikamView::slot_albumAddImages()
 }
 
+void DigikamView::slotAlbumImportFolder()
+{
+    mFolderView->albumImportFolder();
+}
+
 void DigikamView::slot_albumHighlight()
 {

--- kdeextragear-3/digikam/digikam/digikamview.h  #1.8:1.9
@@ -79,4 +79,5 @@ public slots:
     void slot_albumPropsEdit();
     void slot_albumAddImages();
+    void slotAlbumImportFolder();
 
     // Tag action slots

CVS commit by jahrens: 

Drag and drop impovement:
An album is opened and displays its children when the mouse pointer pauses over the album during drag and drop.

CCMAIL: digikam-devel@...


  M +17 -1     albumfolderview.cpp   1.32
  M +7 -2      albumfolderview.h   1.11


--- kdeextragear-3/digikam/digikam/albumfolderview.cpp  #1.31:1.32
@@ -37,4 +37,5 @@
 #include <qfile.h>
 #include <qdatastream.h>
+#include <qtimer.h>
 
 // KDE includes.
@@ -117,4 +118,7 @@ AlbumFolderView::AlbumFolderView(QWidget
             this, SLOT(slotAllAlbumsLoaded()));
 
+    connect(&openAlbumTimer_, SIGNAL(timeout()),
+            this, SLOT(slotOpenAlbum()));
+            
     connect(ThemeEngine::instance(), SIGNAL(signalThemeChanged()),
             SLOT(slotThemeChanged()));
@@ -1251,4 +1255,6 @@ void AlbumFolderView::contentsDragMoveEv
     }
 
+    openAlbumTimer_.start(750, true);
+    
     event->accept();
     if (dropTarget_ == newDropTarget) {
@@ -1270,4 +1276,6 @@ void AlbumFolderView::contentsDragLeaveE
 void AlbumFolderView::contentsDropEvent(QDropEvent* event)
 {
+    openAlbumTimer_.stop();
+    
     if (!dropTarget_||  dropTarget_->isGroupItem())
         return;
@@ -1504,4 +1512,12 @@ void AlbumFolderView::clearDropTarget()
         dropTarget_->removeDropHighlight();
     dropTarget_ = 0;    
+    openAlbumTimer_.stop();
+}
+
+void AlbumFolderView::slotOpenAlbum()
+{
+    openAlbumTimer_.stop();
+    if(dropTarget_ && !dropTarget_->isOpen())
+        dropTarget_->setOpen(true);
 }
 

--- kdeextragear-3/digikam/digikam/albumfolderview.h  #1.10:1.11
@@ -33,4 +33,5 @@
 #include <qpixmap.h>
 #include <qmap.h>
+#include <qtimer.h>
 
 // KDE includes.
@@ -140,4 +141,6 @@ private:
     QPoint                             dragStartPos_;
     ListItem                           *dragItem_;
+    QTimer                             openAlbumTimer_;    
+    
     QMap<int,int>                      stateAlbumOpen_;
     int                                stateAlbumSel_;
@@ -161,4 +164,6 @@ private slots:
     void slotAlbumImportResult(KIO::Job* job);
     
+    void slotOpenAlbum();
+        
     void slotGotThumbnail(const KFileItem* fileItem, const QPixmap& thumbnail,
                           const KFileMetaInfo*);

CVS commit by pahlibar: 


* app interface for digikamio kioslave: uses digikamio kioslave for 
  file/folder copy/move within the album library and KIO::copyjob for
  external file/folder copy/move.
* busyprogressbar: a progressbar which shows a busy indicator when the
  total and current progress is not (the progress bar shuttles from
  left to right). used within the digikamio app interface. can be used
  elsewhere
CCMAIL: digikam-devel@...


  A            busyprogressbar.cpp   1.1 [GPL]
  A            busyprogressbar.h   1.1 [GPL]
  A            digikamio.cpp   1.1 [GPL]
  A            digikamio.h   1.1 [GPL]
  M +2 -1      Makefile.am   1.23


--- kdeextragear-3/digikam/digikam/Makefile.am  #1.22:1.23
@@ -31,5 +31,6 @@
                         digikamfirstrun.cpp \
                         kipiinterface.cpp tagcreatedlg.cpp \
-                        thumbdb.cpp albumfiletip.cpp
+                        thumbdb.cpp albumfiletip.cpp digikamio.cpp \
+                        busyprogressbar.cpp
 
 libdigikam_la_LIBADD  = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)  \

CVS commit by pahlibar: 


use digikamio for copying/moving files/albums.
CCMAIL: digikam-devel@...


  M +23 -26    albumfolderview.cpp   1.34
  M +2 -0      digikamio.h   1.2


--- kdeextragear-3/digikam/digikam/albumfolderview.cpp  #1.33:1.34
@@ -70,5 +70,5 @@
 #include "albumdb.h"
 #include "thumbnailjob.h"
-#include "albumfilecopymove.h"
+#include "digikamio.h"
 #include "digikamapp.h"
 
@@ -1171,9 +1171,17 @@ void AlbumFolderView::startDrag()
         return;
 
-    if (folderItem->album()->type() == Album::PHYSICAL)
-        return;
+    Album* album = folderItem->album();
         
+    if (album->type() == Album::PHYSICAL)
+    {
+        PAlbum* palbum = dynamic_cast<PAlbum*>(album);
+        KURLDrag* kdrag = new KURLDrag(palbum->getKURL(), this);
+        kdrag->setPixmap(*folderItem->pixmap());
+        kdrag->drag();
+    }
+    else if (album->type() == Album::TAG)
+    {
     // Start dragging a tag        
-    TagDrag *tagDrag = new TagDrag(folderItem->album()->getID(), 
+        TagDrag *tagDrag = new TagDrag(album->getID(), 
                                    this);
     if(tagDrag) {
@@ -1181,4 +1189,5 @@ void AlbumFolderView::startDrag()
         tagDrag->drag();
     }
+    }
 }
 
@@ -1347,22 +1356,10 @@ void AlbumFolderView::phyAlbumDropEvent(
         case 10:
         {
-            QStringList fileList;
-            KURL::List::iterator it;
-            for ( it = urls.begin(); it != urls.end(); ++it )
-                fileList.append((*it).filename());
-                
-            new AlbumFileCopyMove(srcAlbum, destAlbum,
-                                  fileList, true);
+            new DigikamIO(urls, destAlbum->getKURL(), true);
             break;
         }
         case 11:
         {
-            QStringList fileList;
-            KURL::List::iterator it;
-            for ( it = urls.begin(); it != urls.end(); ++it )
-                fileList.append((*it).filename());
-                
-            new AlbumFileCopyMove(srcAlbum, destAlbum,
-                                  fileList, false);
+            new DigikamIO(urls, destAlbum->getKURL(), false);
             break;
         }
@@ -1391,9 +1388,9 @@ void AlbumFolderView::phyAlbumDropEvent(
         switch(id) {
         case 10: {
-            KIO::move(srcURLs,destURL,true);
+            new DigikamIO(srcURLs, destAlbum->getKURL(), true);
             break;
         }
         case 11: {
-            KIO::copy(srcURLs,destURL,true);
+            new DigikamIO(srcURLs, destAlbum->getKURL(), false);
             break;
         }

--- kdeextragear-3/digikam/digikam/digikamio.h  #1.1:1.2
@@ -26,4 +26,6 @@
 #include <kurl.h>
 
+class QProgressDialog;
+
 class DigikamIO : public KIO::Job
 {

CVS commit by pahlibar: 


forgot to make use of digikamio in albumiconview also
CCMAIL: digikam-devel@...


  M +3 -2      albumiconview.cpp   1.71


--- kdeextragear-3/digikam/digikam/albumiconview.cpp  #1.70:1.71
@@ -86,4 +86,5 @@
 #include "thumbnailjob.h"
 #include "albumfilecopymove.h"
+#include "digikamio.h"
 #include "albumlister.h"
 #include "albumfiletip.h"
@@ -1268,9 +1269,9 @@ void AlbumIconView::contentsDropEvent(QD
         switch(id) {
         case 10: {
-            KIO::move(srcURLs,destURL,true);
+            new DigikamIO(srcURLs, destURL, true);
             break;
         }
         case 11: {
-            KIO::copy(srcURLs,destURL,true);
+            new DigikamIO(srcURLs, destURL, false);
             break;
         }

CVS commit by jahrens: 


* album drag and drop
  - albums can be moved/copied in the album folder view through drag and drop.
    So albums can be rearranged.
  - albums can be dropped on a collection to assign it to the collection

* Completely rewrite of AlbumFolderView::contentsDragMoveEvent()

Todo: add highlightning for collections while dragging

CCMAIL: digikam-devel@...


  M +146 -66   albumfolderview.cpp   1.36
  M +5 -3      albumiconview.cpp   1.72
  M +62 -0     dragobjects.cpp   1.5
  M +25 -2     dragobjects.h   1.3

CVS commit by pahlibar: 


finally.... proper indication of which of the left and right view have
the focus in the mainwindow. the view which has the focus is shown
raised and the other one is shown sunken
CCMAIL: digikam-devel@...


  M +12 -0     listview.cpp   1.7
  M +1 -0      listview.h   1.3
  M +12 -0     thumbview.cpp   1.19
  M +2 -1      thumbview.h   1.7


--- kdeextragear-3/digikam/digikam/listview.cpp  #1.6:1.7
@@ -33,4 +33,5 @@
 #include <qtimer.h>
 #include <qtooltip.h>
+#include <qdrawutil.h>
 
 #include "listitem.h"
@@ -320,4 +321,15 @@ void ListView::drawArrow(QPainter* p, co
 }
 
+void ListView::drawFrame(QPainter *p)
+{
+    QRect       r      = frameRect();
+    int         lwidth = lineWidth();
+
+    const QColorGroup & g = colorGroup();
+
+    qDrawShadeRect( p, r, g, !hasFocus(), lwidth,
+                    midLineWidth() );
+}
+
 void ListView::contentsMousePressEvent(QMouseEvent *e)
 {

--- kdeextragear-3/digikam/digikam/listview.h  #1.2:1.3
@@ -62,4 +62,5 @@ protected:
     void contentsMouseDoubleClickEvent(QMouseEvent *e);
     void keyPressEvent(QKeyEvent *e);
+    void drawFrame(QPainter *p);
 
     virtual void paintItemBase(QPainter* p, const QColorGroup& group,

--- kdeextragear-3/digikam/digikam/thumbview.cpp  #1.18:1.19
@@ -13,4 +13,5 @@
 #include <qstrlist.h>
 #include <qapplication.h>
+#include <qdrawutil.h>
 
 #include <kiconloader.h>
@@ -588,4 +589,15 @@ void ThumbView::focusOutEvent(QFocusEven
 }
 
+void ThumbView::drawFrame(QPainter* p)
+{
+    QRect       r      = frameRect();
+    int         lwidth = lineWidth();
+
+    const QColorGroup & g = colorGroup();
+
+    qDrawShadeRect( p, r, g, !hasFocus(), lwidth,
+                    midLineWidth() );
+}
+
 void ThumbView::contentsMousePressEvent(QMouseEvent *e)
 {

--- kdeextragear-3/digikam/digikam/thumbview.h  #1.6:1.7
@@ -61,4 +61,5 @@ protected:
     virtual void leaveEvent(QEvent *e);
     virtual void focusOutEvent(QFocusEvent *e);
+    virtual void drawFrame(QPainter* p);
 
     virtual void contentsMousePressEvent(QMouseEvent *e);

CVS commit by pahlibar: 


following a suggestion from mornfall, its now possible to assign/remove tags
which have subtags from the context menu, without causing too much confusion

CCMAIL: digikam-devel@...


  M +10 -3     albumiconview.cpp   1.73


--- kdeextragear-3/digikam/digikam/albumiconview.cpp  #1.72:1.73
@@ -1905,4 +1905,12 @@ QPopupMenu* AlbumIconView::getTagsPopup(
     
     QPopupMenu* popup = new QPopupMenu(parent);
+
+    if (!album->isRoot())
+    {
+        QPixmap pix(iconLoader->loadIcon(album->getIcon(),KIcon::Small));
+        popup->insertItem(pix, album->getTitle(), addToID + album->getID());
+        popup->insertSeparator();
+    }
+    
     for (Album* a = album->firstChild(); a; a = a->next())
     {
@@ -1915,6 +1923,5 @@ QPopupMenu* AlbumIconView::getTagsPopup(
         else
         {
-            popup->insertItem(pix, a->getTitle(),
-                              addToID+a->getID());
+            popup->insertItem(pix, a->getTitle(), addToID+a->getID());
         }
     }

CVS commit by pahlibar: 


* moved out context assign/remove tags menu into separate class
* now remove tags menu will show only those tags which have been
  assigned to at least one item
* testing requested
CCMAIL: digikam-devel@...


  A            tagspopupmenu.cpp   1.1 [GPL]
  A            tagspopupmenu.h   1.1 [GPL]
  M +1 -1      Makefile.am   1.24
  M +42 -0     albumdb.cpp   1.7
  M +2 -0      albumdb.h   1.5
  M +61 -88    albumiconview.cpp   1.74
  M +3 -2      albumiconview.h   1.21

CVS commit by pahlibar: 


polishing... one of the two views (left - tree, right - thumbnail) will
have the appearance of focus. this prevent ugly focus outs when for eg,
a context menu is requested on a view.
CCMAIL: digikam-devel@...


  M +20 -0     albumfolderview.cpp   1.38
  M +7 -0      albumfolderview.h   1.15
  M +22 -0     albumiconview.cpp   1.75
  M +7 -1      albumiconview.h   1.22
  M +21 -0     digikamview.cpp   1.14
  M +3 -0      digikamview.h   1.10
  M +14 -3     listview.cpp   1.8
  M +2 -1      listview.h   1.4
  M +13 -2     thumbview.cpp   1.20
  M +2 -1      thumbview.h   1.8

CVS commit by pahlibar: 


* Fixed crash when deleting files (this should fix the rename batchprocess plugin
crash reported by gilles also). thumbnailjob was referencing a kfileitem 
which got deleted by kdirlister. couldn't find the exact place of the 
problem, so reverted back to using kurls in the thumbnailjob. 
* removed imlib2 loading of thumbnails, as some tests indicated that faster
loading of thumbnails can be doing a png load directly into a qimage. code for
that coming soon.
CCMAIL: digikam-devel@...


  M +10 -9     albumfolderview.cpp   1.40
  M +1 -1      albumfolderview.h   1.17
  M +28 -30    albumiconview.cpp   1.79
  M +2 -2      albumiconview.h   1.25
  M +6 -6      imagedescedit.cpp   1.21
  M +1 -1      imagedescedit.h   1.8
  M +81 -149   thumbnailjob.cpp   1.5
  M +11 -11    thumbnailjob.h   1.2

CVS commit by pahlibar: 


use ktempfile to save the generated thumbnail (fudged from kio::previewjob) 
so that race conditions with other apps is prevented and also files are 
saved with 0600 permissions (closer adherence to fd.o stds)
CCMAIL: digikam-devel@...


  M +9 -2      thumbnailjob.cpp   1.6


--- kdeextragear-3/digikam/digikam/thumbnailjob.cpp  #1.5:1.6
@@ -35,4 +35,5 @@
 #include <kfilemetainfo.h>
 #include <kdebug.h>
+#include <ktempfile.h>
 
 #include "thumbdb.h"
@@ -415,5 +416,11 @@ void ThumbnailJob::slotThumbData(KIO::Jo
     }
         
-    thumb.save(d->thumbRoot + d->curr_thumb, "PNG", 0);
+    KTempFile temp(d->thumbRoot + "digikam-tmp-", ".png");
+    if (temp.status() == 0)
+    {
+        thumb.save(temp.name(), "PNG", 0);
+        ::rename(QFile::encodeName(temp.name()),
+                 QFile::encodeName(d->thumbRoot + d->curr_thumb));
+    }
 
     ThumbDB::instance()->putThumb( d->curr_url.path(1), thumb );

CVS commit by jahrens: 

Changed the drag'n'drop behavior when objects are dropped, so we have
standard drag'n'drop behavior in digikam when the shift or ctrl key is
pressed.

* dropping images on a tag with ctrl key pressed
  The tag is assigned to the images without displaying a popup menu
  which asks if that really should be done (bugzilla #89007)

* dropping images on an album
  (a) ctrl key pressed: the images are copied to the album
  (b) shift key pressed: the images are moved to the album
  (c) no key pressed: popup menu is shown, whichs asks what to do

* dropping an album on another album
  (a) ctrl key pressed: the album is copied to the other album
  (b) shift key pressed: the album is moved to the other album
  (c) no key pressed: popup menu is shown, whichs asks what to do

CCMAIL: digikam-devel@..., 89007-done@...


  M +98 -27    albumfolderview.cpp   1.42
  M +15 -12    thumbview.cpp   1.22

CVS commit by jahrens: 

The album thumbnails are stored with a relative path in the db
now. So the album thumbnail will be kept if the album is 
moved to another parent.

CCMAIL: digikam-devel@...


  M +8 -0      album.cpp   1.8
  M +2 -1      album.h   1.9
  M +18 -6     albumfolderview.cpp   1.44
  M +5 -4      albumiconview.cpp   1.83


--- kdeextragear-3/digikam/digikam/album.cpp  #1.7:1.8
@@ -340,4 +340,12 @@ KFileItem* PAlbum::fileItem() const
 }
 
+QString PAlbum::getIconAbsolute() const
+{
+    KURL u(getKURL());
+    u.addPath(m_icon);
+    
+    return u.prettyURL();
+}
+
 // --------------------------------------------------------------------------
 

--- kdeextragear-3/digikam/digikam/album.h  #1.8:1.9
@@ -122,4 +122,5 @@ public:
     KURL       getKURL() const;
     KFileItem* fileItem() const;
+    QString    getIconAbsolute() const;
 
 private:

--- kdeextragear-3/digikam/digikam/albumfolderview.cpp  #1.43:1.44
@@ -766,7 +766,19 @@ void AlbumFolderView::albumHighlight(PAl
     if(!album->getIcon().isEmpty())
     {
+        if(!KURL::isRelativeURL(album->getIcon()))
+        {        
+            // An older version saved the icon paths with an absolute path to the
+            // db. This caused trouble if the album was moved to another parent.
+            // Here is the absolute path  changed into an relative path 
+            // in the album folder
+            QString errMsg;
+            KURL iconURL(album->getIcon());
+            albumMan_->updatePAlbumIcon(album, 
+                                        iconURL.filename(false), false, errMsg);
+        }
+        
         if (iconThumbJob_.isNull())
         {
-            iconThumbJob_ = new Digikam::ThumbnailJob(album->getIcon(),
+            iconThumbJob_ = new Digikam::ThumbnailJob(album->getIconAbsolute(),
                                                 (int)ThumbnailSize::Tiny,
                                                 false);
@@ -786,5 +798,5 @@ void AlbumFolderView::albumHighlight(PAl
         else
         {
-             iconThumbJob_->addItem(album->getIcon());
+             iconThumbJob_->addItem(album->getIconAbsolute());
         }    
     }

--- kdeextragear-3/digikam/digikam/albumiconview.cpp  #1.82:1.83
@@ -415,5 +415,6 @@ void AlbumIconView::slotImageListerDelet
     {
         PAlbum *album = dynamic_cast<PAlbum*>(d->currentAlbum);
-        if(album && (album->getIcon() == iconItem->fileItem()->url().prettyURL()))
+        if(album && (album->getIconAbsolute() == 
+                     iconItem->fileItem()->url().prettyURL()))
         {
             QString err;
@@ -661,5 +662,5 @@ void AlbumIconView::slotSetAlbumThumbnai
         QString err;
         AlbumManager::instance()->updatePAlbumIcon( album, 
-            iconItem->fileItem()->url().prettyURL(), true, err );
+                iconItem->fileItem()->url().filename(false), true, err );
     }
 }
@@ -742,5 +743,5 @@ void AlbumIconView::slotRename(AlbumIcon
         QString err;
         AlbumManager::instance()->updatePAlbumIcon( album,  
-            item->fileItem()->url().prettyURL(), false, err );        
+            item->fileItem()->url().filename(false), false, err );                
     }       
 }
@@ -1571,5 +1572,5 @@ void AlbumIconView::slotGotThumbnail(con
         PAlbum *album = static_cast<PAlbum*>(d->currentAlbum);
         AlbumManager::instance()->updatePAlbumIcon( album,
-            iconItem->fileItem()->url().prettyURL(), true, err );
+            iconItem->fileItem()->url().filename(false), true, err );
     }
 }

CVS commit by jahrens: 

Especially for you, Albert :)

* Setting album thumbnail through drag and drop
  Setting the dropped image as the album thumbnail. If the ctrl key 
  is pressed, when dropping the image, the thumbnail is set without 
  a popup menu. Otherwise it is shown a popup menu.
  
CCMAIL: tomalbers@..., digikam-devel@...


  M +32 -5     albumfolderview.cpp   1.46


--- kdeextragear-3/digikam/digikam/albumfolderview.cpp  #1.45:1.46
@@ -1543,7 +1543,4 @@ void AlbumFolderView::phyAlbumDropEvent(
         }
 
-        if (srcAlbum == destAlbum)
-            return;
-
         char keys_return[32];
         XQueryKeymap(x11Display(), keys_return);
@@ -1554,4 +1550,35 @@ void AlbumFolderView::phyAlbumDropEvent(
         int key_3 = XKeysymToKeycode(x11Display(), 0xFFE1);
         int key_4 = XKeysymToKeycode(x11Display(), 0xFFE2);
+
+        if(srcAlbum == destAlbum)
+        {
+            // Setting the dropped image as the album thumbnail
+            // If the ctrl key is pressing when dropping the image the
+            // thumbnail is set without a popup menu
+            if ( ( (keys_return[key_1 / 8]) && (1 << (key_1 % 8)) ) ||
+                 ( (keys_return[key_2 / 8]) && (1 << (key_2 % 8)) ))
+            {
+                id = 12;
+            }
+            else 
+            {
+                QPopupMenu popMenu(this);
+                popMenu.insertItem(i18n("Set as Album Thumbnail"), 12);
+                popMenu.insertSeparator(-1);
+                popMenu.insertItem( SmallIcon("cancel"), i18n("C&ancel") );
+                
+                popMenu.setMouseTracking(true);
+                id = popMenu.exec(QCursor::pos());
+            }
+            
+            if(id == 12)
+            {
+                QString errMsg;
+                AlbumManager::instance()->updatePAlbumIcon(destAlbum, 
+                    urls.first().url(), true, errMsg);
+            }
+            return;
+        }
+
         // If shift key is pressed while dragging, move the drag object without
         // displaying popup menu -> move

On Tuesday 05 October 2004 22:56, J=C3=B6rn Ahrens wrote:
> CVS commit by jahrens:
>
> Especially for you, Albert :)

SorrySorrySorry Tom, I guess I have to go to bed now !

=2E.. J=C3=B6rn

CVS commit by cgilles: 

Added 'Open in Konqueror' menu option (DirOperations kipi-plugin have been removed!)
CCMAIL: digikam-devel@...


  M +15 -7     digikamapp.cpp   1.60
  M +4 -3      digikamapp.h   1.22
  M +1 -0      digikamui.rc   1.20
  M +11 -0     digikamview.cpp   1.19
  M +1 -0      digikamview.h   1.12


--- kdeextragear-3/digikam/digikam/digikamapp.cpp  #1.59:1.60
@@ -237,4 +237,12 @@ void DigikamApp::setupActions()
                                     "album_propsEdit");
 
+    mOpenInKonquiAction = new KAction( i18n("Open in Konqueror"),
+                                    "konqueror",
+                                    0,
+                                    mView,
+                                    SLOT(slot_albumOpenInKonqui()),
+                                    actionCollection(),
+                                    "album_openinkonqui");
+                                    
     // -----------------------------------------------------------
 

--- kdeextragear-3/digikam/digikam/digikamapp.h  #1.21:1.22
@@ -133,4 +133,5 @@ private:
     KAction *mPropsEditAction;
     KAction *mAlbumImportAction;
+    KAction       *mOpenInKonquiAction;
     
     // Tag Actions

--- kdeextragear-3/digikam/digikam/digikamui.rc  #1.19:1.20
@@ -11,4 +11,5 @@
    <Separator/>
      <Action name="album_propsEdit" />
+     <Action name="album_openinkonqui" />
    <Separator/>
       <ActionList name="album_actions"/>

--- kdeextragear-3/digikam/digikam/digikamview.cpp  #1.18:1.19
@@ -41,4 +41,5 @@
 #include <kconfig.h>
 #include <kdebug.h>
+#include <krun.h>
 
 // Local includes.
@@ -197,4 +198,14 @@ void DigikamView::slot_albumSelected(Alb
 }
 
+void DigikamView::slot_albumOpenInKonqui()
+{
+    Album *album = mAlbumMan->currentAlbum();
+    if (!album || album->type() != Album::PHYSICAL)
+        return;
+
+    PAlbum* palbum = dynamic_cast<PAlbum*>(album);
+       
+    new KRun(palbum->getKURL()); // KRun will delete itself.
+}
 
 void DigikamView::slot_imageSelected()

--- kdeextragear-3/digikam/digikam/digikamview.h  #1.11:1.12
@@ -79,4 +79,5 @@ public slots:
     void slot_albumPropsEdit();
     void slot_albumAddImages();
+    void slot_albumOpenInKonqui();
     void slotAlbumImportFolder();

CVS commit by cgilles: 

Added 'Gamma Adjustment' menu option (GammaCalibration kipi plugin removed).
CCMAIL: digikam-devel@...


  M +32 -6     digikamapp.cpp   1.61
  M +2 -0      digikamapp.h   1.23
  M +1 -0      digikamui.rc   1.21


--- kdeextragear-3/digikam/digikam/digikamapp.cpp  #1.60:1.61
@@ -45,4 +45,6 @@
 #include <kpopupmenu.h>
 #include <kdeversion.h>
+#include <kapplication.h>
+#include <kmessagebox.h>
 
 // Includes files for plugins support.
@@ -340,7 +342,9 @@ void DigikamApp::setupActions()
     mImageSetExifOrientation3Action = new KAction(i18n("Rotated 180 degrees"),0,actionCollection());
     mImageSetExifOrientation4Action = new KAction(i18n("Flipped vertically"),0,actionCollection());
-    mImageSetExifOrientation5Action = new KAction(i18n("Rotated 90 degrees / horiz. flipped"),0,actionCollection());
+    mImageSetExifOrientation5Action = new KAction(i18n("Rotated 90 degrees / horiz. flipped"),
+                                                       0, actionCollection());
     mImageSetExifOrientation6Action = new KAction(i18n("Rotated 90 degrees"),0,actionCollection());
-    mImageSetExifOrientation7Action = new KAction(i18n("Rotated 90 degrees / vert. flipped"),0,actionCollection());
+    mImageSetExifOrientation7Action = new KAction(i18n("Rotated 90 degrees / vert. flipped"),
+                                                       0, actionCollection());
     mImageSetExifOrientation8Action = new KAction(i18n("Rotated 270 degrees"),0,actionCollection());
 
@@ -448,4 +452,12 @@ void DigikamApp::setupActions()
                                    "help_tipofday");
 
+    mGammaAdjustmentAction = new KAction(i18n("Gamma Adjustment..."),
+                                   "kgamma",
+                                   0,
+                                   this,
+                                   SLOT(slot_gammaAdjustment()),
+                                   actionCollection(),
+                                   "gamma_adjustment");
+                                   
     // Provides a menu entry that allows showing/hiding the toolbar(s)
     setStandardToolBarMenuEnabled(true);
@@ -507,4 +519,18 @@ void DigikamApp::slot_imageSelected(bool
 }
 
+void DigikamApp::slot_gammaAdjustment()
+{
+   QStringList args;
+   QString *perror = 0;
+   int *ppid = 0;
+
+   args << "kgamma";
+   int ValRet = KApplication::kdeinitExec(QString::fromLatin1("kcmshell"), args, perror, ppid);
+
+   if ( ValRet != 0 )
+      KMessageBox::error(0, i18n("Cannot start \"KGamma\" extension from KDE control center;\n"
+                                 "please check your installation."));
+}
+
 void DigikamApp::slot_exit()
 {

--- kdeextragear-3/digikam/digikam/digikamapp.h  #1.22:1.23
@@ -172,4 +172,5 @@ private:
     KAction *mTipAction;
     KAction *mKipiHelpAction;
+    KAction *mGammaAdjustmentAction;
 
 private slots:
@@ -181,4 +182,5 @@ private slots:
     void slotShowTip();
     void slotShowKipiHelp();
+    void slot_gammaAdjustment();
     
     void slotSetup();

--- kdeextragear-3/digikam/digikam/digikamui.rc  #1.20:1.21
@@ -67,4 +67,5 @@
   
   <Menu name="Tools"><text>Too&amp;ls</text>
+    <Action name="gamma_adjustment" />
     <ActionList name="tool_actions"/>
     <Menu name="BatchProcesses"><text>&amp;Batch processes</text>

CVS commit by jahrens: 


Setting an image as tag icon

* When the user is in a tag album and right clicks on an image
  he is able to set this image as the tag icon ("Set as Tag Icon")

* Drag'n'drop: dropping an image on the current tag album sets 
  that image as the tag icon
  - if the ctrl key is pressed when dropping the image the image
    is set as icon without showing a popup menu. Without pressing the
	ctrl key a popup menu is shown, which lets the user set the icon
	or cancel the operation.

CCMAIL: digikam-devel@...


  M +91 -20    albumfolderview.cpp   1.49
  M +2 -0      albumfolderview.h   1.19
  M +11 -1     albumiconview.cpp   1.86
  M +4 -1      albummanager.cpp   1.10
  M +3 -1      albummanager.h   1.7

CVS commit by jahrens: 

Album icon update function deleted.. it shouldn't be available in 0.7.

CCMAIL: digikam-devel@...


  M +0 -12     albumfolderview.cpp   1.58


--- kdeextragear-3/digikam/digikam/albumfolderview.cpp  #1.57:1.58
@@ -789,16 +789,4 @@ void AlbumFolderView::albumHighlight(PAl
     if(!album->getIcon().isEmpty())
     {
-        KURL iconURL(album->getIcon());
-        if(iconURL.path().startsWith("/"))
-        {
-            // An older version saved the icon paths with an absolute path to the
-            // db. This caused trouble if the album was moved to another parent.
-            // Here is the absolute path  changed into an relative path
-            // in the album folder
-            QString errMsg;
-            albumMan_->updatePAlbumIcon(album, iconURL.filename(),
-                                        false, errMsg);
-        }
-
         if (iconThumbJob_.isNull())
         {

CVS commit by pahlibar: 


* creating a new album will popup the album properties editor directly, 
instead of asking for the name first and then popping up the editor.
* this also puts into place code for easy implementation of 
auto-folder-creation during camera downloads
CCMAIL: digikam-devel@...


  M +11 -0     albumdb.cpp   1.12
  M +2 -0      albumdb.h   1.7
  M +23 -27    albumfolderview.cpp   1.60
  M +32 -7     albummanager.cpp   1.11
  M +6 -1      albummanager.h   1.8
  M +45 -8     albumpropsedit.cpp   1.16
  M +8 -1      albumpropsedit.h   1.6

CVS commit by cgilles: 

Update Image Properties dialog : Exif tab polishing !!! 
TODO : file properties tab. 
 
CCMAIL: digikam-devel@... 
 


  M +21 -29    imageproperties.cpp   1.7
  M +9 -7      imageproperties.h   1.7

On Thursday 18 November 2004 11:52, Gilles Caulier wrote:
> CVS commit by cgilles: 
> 
> Update Image Properties dialog : Exif tab polishing !!! 
> TODO : file properties tab. 

First time tried it.  Forw/next is great!!!!  That's definitely
a big step in the right direction!  Her more polishing suggestions
to make it luminous ;)

Because you are working on it I'll just summarize
them instead of opening several bug (let me know what items
should go to b.k.o)

 o remove 'meta data' from menu text. for users they
   are all just properties
 o filename not shown anywhere (important IMHO if
   you use forw. back and there no embeded thumbnail,
   e.g. video, png...)
 o no tooltip or whatsthis to explain an exif item
 o wish: selection in albumview move to next/prev image
      on forw/backward (at least on dialog exit set
  selection to last image and make it visible)
 o on forw/next when the file has no embeded thumbnail
   (e.g. vidio) the thumbnail of the last picture is
   not cleared
 o tree is always collapsed on forw/next.  Please
   keep it open (even after 'crossing' a file without
   exif info)
 o many embeded thumbnail are not rotated. How about
   a rotate RMB menu that allows to rotate the embeded
   thumbnail?
 o there also a bug report in debian.b.o about
   rotate does not rotate embeded thumbnail
 o pressing return starts kdehelp instead of
   close
 o bind alt-left,right to back/forw like in
   the albumview
 
  o histogramm changing range values via inc/dec
   buttons (this only works after range was once
   selected with the mouse)

Achim

-- 
  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 jeudi 18 Novembre 2004 14:13, Achim Bohnet a =C3=A9crit :
> On Thursday 18 November 2004 11:52, Gilles Caulier wrote:
> > CVS commit by cgilles:
> >
> > Update Image Properties dialog : Exif tab polishing !!!
> > TODO : file properties tab.
>
> First time tried it.  Forw/next is great!!!!  That's definitely
> a big step in the right direction!  Her more polishing suggestions
> to make it luminous ;)
>
> Because you are working on it I'll just summarize
> them instead of opening several bug (let me know what items
> should go to b.k.o)
>
>  o remove 'meta data' from menu text. for users they
>    are all just properties

Why ? Are you sure ? ANy viewpoint from another users ?

>  o filename not shown anywhere (important IMHO if
>    you use forw. back and there no embeded thumbnail,
>    e.g. video, png...)

Hum i'm currently to finish the General page like this :

http://pooh.tam.uiuc.edu/filepropsdlg.png

If you wait 30 minutes, i will finish this page and you can test in live (:=
=3D))

>  o no tooltip or whatsthis to explain an exif item

this feature is come from Renchi. Also, i think it's a good idea. Any=20
viewpoints from another users ?

>  o wish: selection in albumview move to next/prev image
>       on forw/backward (at least on dialog exit set
>   selection to last image and make it visible)

I must add 2 new bottons for that. It will provide a large dialog. Are you=
=20
sure ?

>  o on forw/next when the file has no embeded thumbnail
>    (e.g. vidio) the thumbnail of the last picture is
>    not cleared

Yes. I will fixed that.

>  o tree is always collapsed on forw/next.  Please
>    keep it open (even after 'crossing' a file without
>    exif info)

I will check that.

>  o many embeded thumbnail are not rotated. How about
>    a rotate RMB menu that allows to rotate the embeded
>    thumbnail?

I will try to provide later if i have more time. If i will forget this poin=
t,=20
please opening a whish in bko.

>  o there also a bug report in debian.b.o about
>    rotate does not rotate embeded thumbnail

Ah ! who fix that ? Not me, i haven't more free time to fix that !

>  o pressing return starts kdehelp instead of
>    close

Damned (:=3D)))

>  o bind alt-left,right to back/forw like in
>    the albumview

Later !

>
>   o histogramm changing range values via inc/dec
>    buttons (this only works after range was once
>    selected with the mouse)

All work fine for me. Give me more informations...

=2D-=20
Gilles

CVS commit by cgilles: 

Digikam Image properties dialog : updated General tab (not finished!)
CCMAIL: digikam-devel@...


  M +164 -21   imageproperties.cpp   1.8
  M +31 -5     imageproperties.h   1.8

CVS commit by cgilles: 

Digikam image properties : updated General tab (not finished)
TODO: updated General tab informations when Prev/next item selected
CCMAIL: digikam-devel@...


  M +49 -42    imageproperties.cpp   1.9
  M +3 -0      imageproperties.h   1.9

CVS commit by cgilles: 

Digikam image properties dialog : General tabs complete.
TODO: 
   - polish source code.
   - added stand alone mode for image editor.

CCMAIL: digikam-devel@...


  M +65 -44    imageproperties.cpp   1.10

CVS commit by cgilles: 

Digikam image properties dialog :
- polish source code (stage 1).
- Added image dimenssions in General tab.
- Fix some problems reported by Achim Bohnet.
CCMAIL: digikam-devel@...


  M +128 -55   imageproperties.cpp   1.11
  M +1 -0      imageproperties.h   1.10

Dnia czwartek, 18 listopada 2004 14:33, Gilles Caulier napisał:
> >
> >  o remove 'meta data' from menu text. for users they
> >    are all just properties
>
> Why ? Are you sure ? ANy viewpoint from another users ?

Agree with Achim. Additionally 'meta data' is long text in some
translations and it will make wide menu - which should be avoided.

> >  o wish: selection in albumview move to next/prev image
> >       on forw/backward (at least on dialog exit set
> >   selection to last image and make it visible)
>
> I must add 2 new bottons for that. It will provide a large dialog. Are
> you sure ?

Here I am not sure. Too big dialog isn't good. But feature itself is
nice - maybe 'hide' it and switch with keyboard shortcuts?

m.

-- 
LaTeX + Vim = http://vim-latex.sourceforge.net/
Vim Universal Templates 
	http://www.vim.org/scripts/script.php?script_id=1078
CLEWN - http://clewn.sf.net

On Thursday 18 November 2004 14:33, Gilles Caulier wrote:
> Le jeudi 18 Novembre 2004 14:13, Achim Bohnet a =C3=A9crit :
> > On Thursday 18 November 2004 11:52, Gilles Caulier wrote:
> > > CVS commit by cgilles:
> > >
> > > Update Image Properties dialog : Exif tab polishing !!!
> > > TODO : file properties tab.
> >
> > First time tried it.  Forw/next is great!!!!  That's definitely
> > a big step in the right direction!  Her more polishing suggestions
> > to make it luminous ;)
> >
> > Because you are working on it I'll just summarize
> > them instead of opening several bug (let me know what items
> > should go to b.k.o)
> >
> >  o remove 'meta data' from menu text. for users they
> >    are all just properties
>=20
> Why ? Are you sure ? ANy viewpoint from another users ?

Yes, they are properties.  Meta data is just a technical
term.

> >  o filename not shown anywhere (important IMHO if
> >    you use forw. back and there no embeded thumbnail,
> >    e.g. video, png...)
>=20
> Hum i'm currently to finish the General page like this :
>=20
> http://pooh.tam.uiuc.edu/filepropsdlg.png
>=20
> If you wait 30 minutes, i will finish this page and you can test in live =
(:=3D))

Yeah, better than the orignal property dialog.   Some more suggestions:

 o location as is is useless because it's too long for the standard
   dialog size.  I see  my home dir '...' and file name.  HOME I know
   and file name was read 2 lines about ;)

   I would suggest to move album up to replace the location. file
   name is already given two rows up.   To compenstate some may add
   the location as a tool tip to the filename

 o Owner and permission are boring.  (Maybe only display them
   if file is not writable? kde-usage?)

 o x y pixel size are definitly missing (add above Type:)

My prefered order would be

1st stuff user added

 file
 album
 comment
 tags
2nd image properties
 dim X x Y|     (du -h $file size + tooltip with bytes)
      or
 lenght  N min

 type JPG|PNG|VIDEO + tooltip with mimetype

3rd file properties
 creation date
 mod dat
 size

goody for b.k.o:  add a green dot at the edge of the orientation exif tag
 if 'rotate image and thumbnail according to exif tag' is
 selected
>=20
> >  o no tooltip or whatsthis to explain an exif item
>=20
> this feature is come from Renchi. Also, i think it's a good idea. Any=20
> viewpoints from another users ?
>=20
> >  o wish: selection in albumview move to next/prev image
> >       on forw/backward (at least on dialog exit set
> >   selection to last image and make it visible)
>=20
> I must add 2 new bottons for that. It will provide a large dialog. Are yo=
u=20
> sure ?

No. Let me try again:  Click next show properties of next image/video/...
_and_ additionally move the selection to the next thumbnail in the album
view.

If this sounds not very usable at least on dialog close the last shown image
in the dialog should be made the active and _visible_ one in the ablumview).
E.g. scanning properties (many of them), oh that wrong lets edit it. Close
dialog.  Uh, now you have to search the thumbnails in the album view before
you can rightclick and work on the image.

>=20
> >  o on forw/next when the file has no embeded thumbnail
> >    (e.g. vidio) the thumbnail of the last picture is
> >    not cleared
>=20
> Yes. I will fixed that.
>=20
> >  o tree is always collapsed on forw/next.  Please
> >    keep it open (even after 'crossing' a file without
> >    exif info)
>=20
> I will check that.
>=20
> >  o many embeded thumbnail are not rotated. How about
> >    a rotate RMB menu that allows to rotate the embeded
> >    thumbnail?
>=20
> I will try to provide later if i have more time. If i will forget this po=
int,=20
> please opening a whish in bko.

okay!
>=20
> >  o there also a bug report in debian.b.o about
> >    rotate does not rotate embeded thumbnail
>=20
> Ah ! who fix that ? Not me, i haven't more free time to fix that !
>=20
> >  o pressing return starts kdehelp instead of
> >    close
>=20
> Damned (:=3D)))
>=20
> >  o bind alt-left,right to back/forw like in
> >    the albumview
>=20
> Later !

=2D> okay b.k.o ;)
>=20
> >
> >   o histogramm changing range values via inc/dec
> >    buttons (this only works after range was once
> >    selected with the mouse)
>=20
> All work fine for me. Give me more informations...

 Start digikam
 open new properties
 click on up/down arrows to change range
 --> nothing happens

 click in histogram
 click on up/down arrow
 --> now selection is visually shows

Achim
>=20
> --=20
> Gilles
=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 jeudi 18 Novembre 2004 14:13, Achim Bohnet a =C3=A9crit :
> On Thursday 18 November 2004 11:52, Gilles Caulier wrote:
> > CVS commit by cgilles:
> >
> > Update Image Properties dialog : Exif tab polishing !!!
> > TODO : file properties tab.
>
> First time tried it.  Forw/next is great!!!!  That's definitely
> a big step in the right direction!  Her more polishing suggestions
> to make it luminous ;)
>
> Because you are working on it I'll just summarize
> them instead of opening several bug (let me know what items
> should go to b.k.o)
>
>  o remove 'meta data' from menu text. for users they
>    are all just properties

See message to Mikolaj Machowski

>  o filename not shown anywhere (important IMHO if
>    you use forw. back and there no embeded thumbnail,
>    e.g. video, png...)
>  o no tooltip or whatsthis to explain an exif item

Only whatis enable ?

>  o wish: selection in albumview move to next/prev image
>       on forw/backward (at least on dialog exit set
>   selection to last image and make it visible)

via shorcuts ?

>  o on forw/next when the file has no embeded thumbnail
>    (e.g. vidio) the thumbnail of the last picture is
>    not cleared

=46ixed !

>  o tree is always collapsed on forw/next.  Please
>    keep it open (even after 'crossing' a file without
>    exif info)
>  o many embeded thumbnail are not rotated. How about
>    a rotate RMB menu that allows to rotate the embeded
>    thumbnail?
>  o there also a bug report in debian.b.o about
>    rotate does not rotate embeded thumbnail
>  o pressing return starts kdehelp instead of
>    close

=46ixed !
>  o bind alt-left,right to back/forw like in
>    the albumview
>
>   o histogramm changing range values via inc/dec
>    buttons (this only works after range was once
>    selected with the mouse)
>
I can reproduce. I will fix it...

> Achim

=2D-=20
Gilles Caulier

Le vendredi 19 Novembre 2004 10:28, Mikolaj Machowski a =C3=A9crit :
> Dnia czwartek, 18 listopada 2004 14:33, Gilles Caulier napisa=C5=82:
> > >  o remove 'meta data' from menu text. for users they
> > >    are all just properties
> >
> > Why ? Are you sure ? ANy viewpoint from another users ?
>
> Agree with Achim. Additionally 'meta data' is long text in some
> translations and it will make wide menu - which should be avoided.

Hum, i have removed the 'Image/Exif informations' menu entry avail in 0.7.0=
=20
release. For 0.7.1, the users can be confuse if no menu entry relevant of=20
meta-data isn't available...

>
> > >  o wish: selection in albumview move to next/prev image
> > >       on forw/backward (at least on dialog exit set
> > >   selection to last image and make it visible)
> >
> > I must add 2 new bottons for that. It will provide a large dialog. Are
> > you sure ?
>
> Here I am not sure. Too big dialog isn't good. But feature itself is
> nice - maybe 'hide' it and switch with keyboard shortcuts?
>

Perhaps... I want more viewpoints. Renchi, Yves, etc...

> m.

=2D-=20
Gilles Caulier

>
> >   o histogramm changing range values via inc/dec
> >    buttons (this only works after range was once
> >    selected with the mouse)
>

Fixed in cvs.
-- 
Gilles Caulier

Le vendredi 19 Novembre 2004 10:50, Achim Bohnet a =C3=A9crit :
> On Thursday 18 November 2004 14:33, Gilles Caulier wrote:
> > Le jeudi 18 Novembre 2004 14:13, Achim Bohnet a =C3=A9crit :
> > > On Thursday 18 November 2004 11:52, Gilles Caulier wrote:
> > > > CVS commit by cgilles:
> > > >
> > > > Update Image Properties dialog : Exif tab polishing !!!
> > > > TODO : file properties tab.
> > >
> > > First time tried it.  Forw/next is great!!!!  That's definitely
> > > a big step in the right direction!  Her more polishing suggestions
> > > to make it luminous ;)
> > >
> > > Because you are working on it I'll just summarize
> > > them instead of opening several bug (let me know what items
> > > should go to b.k.o)
> > >
> > >  o remove 'meta data' from menu text. for users they
> > >    are all just properties
> >
> > Why ? Are you sure ? ANy viewpoint from another users ?
>
> Yes, they are properties.  Meta data is just a technical
> term.
>
> > >  o filename not shown anywhere (important IMHO if
> > >    you use forw. back and there no embeded thumbnail,
> > >    e.g. video, png...)
> >
> > Hum i'm currently to finish the General page like this :
> >
> > http://pooh.tam.uiuc.edu/filepropsdlg.png
> >
> > If you wait 30 minutes, i will finish this page and you can test in live
> > (:=3D))
>
> Yeah, better than the orignal property dialog.   Some more suggestions:
>
>  o location as is is useless because it's too long for the standard
>    dialog size.  I see  my home dir '...' and file name.  HOME I know
>    and file name was read 2 lines about ;)
>
>    I would suggest to move album up to replace the location. file
>    name is already given two rows up.   To compenstate some may add
>    the location as a tool tip to the filename
>
>  o Owner and permission are boring.  (Maybe only display them
>    if file is not writable? kde-usage?)

Hum, it's used like this in item tips !

>
>  o x y pixel size are definitly missing (add above Type:)
>
> My prefered order would be
>
> 1st stuff user added
>
>  file
>  album
>  comment
>  tags
> 2nd image properties
>  dim X x Y|     (du -h $file size + tooltip with bytes)
>       or
>  lenght  N min
>
>  type JPG|PNG|VIDEO + tooltip with mimetype
>
> 3rd file properties
>  creation date
>  mod dat
>  size
>

Do not mix the Digikam and file propeties informations. Actually these=20
infomations are separed !

> goody for b.k.o:  add a green dot at the edge of the orientation exif tag
>  if 'rotate image and thumbnail according to exif tag' is
>  selected
>
> > >  o no tooltip or whatsthis to explain an exif item
> >
> > this feature is come from Renchi. Also, i think it's a good idea. Any
> > viewpoints from another users ?
> >
> > >  o wish: selection in albumview move to next/prev image
> > >       on forw/backward (at least on dialog exit set
> > >   selection to last image and make it visible)
> >
> > I must add 2 new bottons for that. It will provide a large dialog. Are
> > you sure ?
>
> No. Let me try again:  Click next show properties of next image/video/...
> _and_ additionally move the selection to the next thumbnail in the album
> view.
>
> If this sounds not very usable at least on dialog close the last shown
> image in the dialog should be made the active and _visible_ one in the
> ablumview). E.g. scanning properties (many of them), oh that wrong lets
> edit it. Close dialog.  Uh, now you have to search the thumbnails in the
> album view before you can rightclick and work on the image.
>
> > >  o on forw/next when the file has no embeded thumbnail
> > >    (e.g. vidio) the thumbnail of the last picture is
> > >    not cleared
> >
> > Yes. I will fixed that.
> >
> > >  o tree is always collapsed on forw/next.  Please
> > >    keep it open (even after 'crossing' a file without
> > >    exif info)
> >
> > I will check that.
> >
> > >  o many embeded thumbnail are not rotated. How about
> > >    a rotate RMB menu that allows to rotate the embeded
> > >    thumbnail?
> >
> > I will try to provide later if i have more time. If i will forget this
> > point, please opening a whish in bko.
>
> okay!
>
> > >  o there also a bug report in debian.b.o about
> > >    rotate does not rotate embeded thumbnail
> >
> > Ah ! who fix that ? Not me, i haven't more free time to fix that !
> >
> > >  o pressing return starts kdehelp instead of
> > >    close
> >
> > Damned (:=3D)))
> >
> > >  o bind alt-left,right to back/forw like in
> > >    the albumview
> >
> > Later !
>
> -> okay b.k.o ;)
>
> > >   o histogramm changing range values via inc/dec
> > >    buttons (this only works after range was once
> > >    selected with the mouse)
> >
> > All work fine for me. Give me more informations...
>
>  Start digikam
>  open new properties
>  click on up/down arrows to change range
>  --> nothing happens
>
>  click in histogram
>  click on up/down arrow
>  --> now selection is visually shows
>
> Achim
>
> > --
> > Gilles

=2D-=20
Gilles Caulier

On Friday 19 November 2004 11:14, Gilles Caulier wrote:
> 
> >
> > >   o histogramm changing range values via inc/dec
> > >    buttons (this only works after range was once
> > >    selected with the mouse)
> >
> 
> Fixed in cvs.

Only half.

Starting properties dialog und incr lowerlimit
does not trigger visual selection in histogramm here.

Close/reopen property dialog and decr upperlimit trigger
now the visual selection.

thx (half) a lot! ;)

Achim
> -- 
> Gilles Caulier
> 
> 
> -------------------------------------------------------
> This SF.Net email is sponsored by: InterSystems CACHE
> FREE OODBMS DOWNLOAD - A multidimensional database that combines
> robust object and relational technologies, making it a perfect match
> for Java, C++,COM, XML, ODBC and JDBC. http://www.intersystems.com/match8
> _______________________________________________
> Digikam-devel mailing list
> Digikam-devel@...
> https://lists.sourceforge.net/lists/listinfo/digikam-devel
> 
> 
> 

-- 
  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@...

On Friday 19 November 2004 11:17, Gilles Caulier wrote:
> Le vendredi 19 Novembre 2004 10:50, Achim Bohnet a =C3=A9crit :
> > On Thursday 18 November 2004 14:33, Gilles Caulier wrote:
> > > Le jeudi 18 Novembre 2004 14:13, Achim Bohnet a =C3=A9crit :
> > > > On Thursday 18 November 2004 11:52, Gilles Caulier wrote:
[...]
> > > Hum i'm currently to finish the General page like this :
> > >
> > > http://pooh.tam.uiuc.edu/filepropsdlg.png
> > >
> > > If you wait 30 minutes, i will finish this page and you can test in l=
ive
> > > (:=3D))
> >
> > Yeah, better than the orignal property dialog.   Some more suggestions:
> >
> >  o location as is is useless because it's too long for the standard
> >    dialog size.  I see  my home dir '...' and file name.  HOME I know
> >    and file name was read 2 lines about ;)
> >
> >    I would suggest to move album up to replace the location. file
> >    name is already given two rows up.   To compenstate some may add
> >    the location as a tool tip to the filename
> >
> >  o Owner and permission are boring.  (Maybe only display them
> >    if file is not writable? kde-usage?)
>=20
> Hum, it's used like this in item tips !

Pardon?
>=20
> >
> >  o x y pixel size are definitly missing (add above Type:)
> >
> > My prefered order would be
> >
> > 1st stuff user added
> >
> >  file
> >  album
> >  comment
> >  tags
> > 2nd image properties
> >  dim X x Y|     (du -h $file size + tooltip with bytes)
> >       or
> >  lenght  N min
> >
> >  type JPG|PNG|VIDEO + tooltip with mimetype
> >
> > 3rd file properties
> >  creation date
> >  mod dat
> >  size
> >
>=20
> Do not mix the Digikam and file propeties informations. Actually these=20
> infomations are separed !

I see the 'general' tab as 'general info about an image in digikam'
So most important stuff there regardless if they are metadata stored
in digikam, exif info or file attributes.   But maybe I got wrong
what general should be used for.

Achim
=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 vendredi 19 Novembre 2004 11:53, Achim Bohnet a =C3=A9crit :
> On Friday 19 November 2004 11:17, Gilles Caulier wrote:
> > Le vendredi 19 Novembre 2004 10:50, Achim Bohnet a =C3=A9crit :
> > > On Thursday 18 November 2004 14:33, Gilles Caulier wrote:
> > > > Le jeudi 18 Novembre 2004 14:13, Achim Bohnet a =C3=A9crit :
> > > > > On Thursday 18 November 2004 11:52, Gilles Caulier wrote:
>
> [...]
>
> > > > Hum i'm currently to finish the General page like this :
> > > >
> > > > http://pooh.tam.uiuc.edu/filepropsdlg.png
> > > >
> > > > If you wait 30 minutes, i will finish this page and you can test in
> > > > live (:=3D))
> > >
> > > Yeah, better than the orignal property dialog.   Some more suggestion=
s:
> > >
> > >  o location as is is useless because it's too long for the standard
> > >    dialog size.  I see  my home dir '...' and file name.  HOME I know
> > >    and file name was read 2 lines about ;)
> > >
> > >    I would suggest to move album up to replace the location. file
> > >    name is already given two rows up.   To compenstate some may add
> > >    the location as a tool tip to the filename
> > >
> > >  o Owner and permission are boring.  (Maybe only display them
> > >    if file is not writable? kde-usage?)
> >
> > Hum, it's used like this in item tips !
>
> Pardon?

well album item tips like this :

http://docs.kde.org/en/HEAD/kdeextragear-3/digikam/mainwindow.png

>
=2D-=20
Gilles Caulier

On Friday 19 November 2004 10:46, Gilles Caulier wrote:
> Le jeudi 18 Novembre 2004 14:13, Achim Bohnet a =C3=A9crit :
> > On Thursday 18 November 2004 11:52, Gilles Caulier wrote:
> > > CVS commit by cgilles:
> > >
> > > Update Image Properties dialog : Exif tab polishing !!!
> > > TODO : file properties tab.
> >
> > First time tried it.  Forw/next is great!!!!  That's definitely
> > a big step in the right direction!  Her more polishing suggestions
> > to make it luminous ;)
> >
> > Because you are working on it I'll just summarize
> > them instead of opening several bug (let me know what items
> > should go to b.k.o)
> >
> >  o remove 'meta data' from menu text. for users they
> >    are all just properties
>=20
> See message to Mikolaj Machowski

'Old' users will quickly get used to 'only properties' menu item
and when they see your new dialog they will not miss the old meta
data stuff.

>=20
> >  o filename not shown anywhere (important IMHO if
> >    you use forw. back and there no embeded thumbnail,
> >    e.g. video, png...)
> >  o no tooltip or whatsthis to explain an exif item
>=20
> Only whatis enable ?

Long description should go to whatis.  AFAIR there was
also a short desc. -> tooltip.

I'm not sure if too many tooltips are not too to distrubing.
We'll should have a one global digikam option to turn all
tooltips of.
>=20
> >  o wish: selection in albumview move to next/prev image
> >       on forw/backward (at least on dialog exit set
> >   selection to last image and make it visible)
>=20
> via shorcuts ?

No. Via same forw/back buttons.  Because this thread gets
huge I quote me from earlier msg:
=2D----------
No. Let me try again:  Click next show properties of next image/video/...
_and_ additionally move the selection to the next thumbnail in the album
view.

If this sounds not very usable at least on dialog close the last shown image
in the dialog should be made the active and _visible_ one in the ablumview).
E.g. scanning properties (many of them), oh that wrong lets edit it. Close
dialog.  Uh, now you have to search the thumbnails in the album view before
you can rightclick and work on the image.
=2D-----------
>=20
> >  o on forw/next when the file has no embeded thumbnail
> >    (e.g. vidio) the thumbnail of the last picture is
> >    not cleared
>=20
> Fixed !

thx

>=20
> >  o tree is always collapsed on forw/next.  Please
> >    keep it open (even after 'crossing' a file without
> >    exif info)
> >  o many embeded thumbnail are not rotated. How about
> >    a rotate RMB menu that allows to rotate the embeded
> >    thumbnail?
> >  o there also a bug report in debian.b.o about
> >    rotate does not rotate embeded thumbnail
> >  o pressing return starts kdehelp instead of
> >    close
>=20
> Fixed !

thx!

> >  o bind alt-left,right to back/forw like in
> >    the albumview
> >
> >   o histogramm changing range values via inc/dec
> >    buttons (this only works after range was once
> >    selected with the mouse)
> >
> I can reproduce. I will fix it...

thx in advance.

Achim
>=20
> > Achim
>=20
> --=20
> Gilles Caulier

=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@...

On Friday 19 November 2004 11:55, Gilles Caulier wrote:
> Le vendredi 19 Novembre 2004 11:53, Achim Bohnet a =C3=A9crit :
> > On Friday 19 November 2004 11:17, Gilles Caulier wrote:
> > > Le vendredi 19 Novembre 2004 10:50, Achim Bohnet a =C3=A9crit :
> > > > On Thursday 18 November 2004 14:33, Gilles Caulier wrote:
> > > > > Le jeudi 18 Novembre 2004 14:13, Achim Bohnet a =C3=A9crit :
> > > > > > On Thursday 18 November 2004 11:52, Gilles Caulier wrote:
> >
> > [...]
> >
> > > > > Hum i'm currently to finish the General page like this :
> > > > >
> > > > > http://pooh.tam.uiuc.edu/filepropsdlg.png
> > > > >
> > > > > If you wait 30 minutes, i will finish this page and you can test =
in
> > > > > live (:=3D))
> > > >
> > > > Yeah, better than the orignal property dialog.   Some more suggesti=
ons:
> > > >
> > > >  o location as is is useless because it's too long for the standard
> > > >    dialog size.  I see  my home dir '...' and file name.  HOME I kn=
ow
> > > >    and file name was read 2 lines about ;)
> > > >
> > > >    I would suggest to move album up to replace the location. file
> > > >    name is already given two rows up.   To compenstate some may add
> > > >    the location as a tool tip to the filename
> > > >
> > > >  o Owner and permission are boring.  (Maybe only display them
> > > >    if file is not writable? kde-usage?)
> > >
> > > Hum, it's used like this in item tips !
> >
> > Pardon?
>=20
> well album item tips like this :
>=20
> http://docs.kde.org/en/HEAD/kdeextragear-3/digikam/mainwindow.png

Hmm ... no.  We are already in a dialog.  Huge tooltips with lots
of info are better implemented in a seperate tab.

The longer I think about it I would simply remove owner and protection
If there are more 'maybe sometimes interesting info' one can create
a new 'misc' tab.

Achim
>=20
> >
> --=20
> Gilles Caulier

=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 vendredi 19 Novembre 2004 12:25, Achim Bohnet a =C3=A9crit :
> Long description should go to whatis. =C2=A0AFAIR there was
> also a short desc. -> tooltip.
>
> I'm not sure if too many tooltips are not too to distrubing.
> We'll should have a one global digikam option to turn all
> tooltips of.

Whatis and tooltips run both actually. I will remove tooltips.

=2D-=20
Gilles Caulier

Le vendredi 19 Novembre 2004 12:36, Gilles Caulier a =C3=A9crit :
> Le vendredi 19 Novembre 2004 12:25, Achim Bohnet a =C3=A9crit :
> > Long description should go to whatis. =C2=A0AFAIR there was
> > also a short desc. -> tooltip.
> >
> > I'm not sure if too many tooltips are not too to distrubing.
> > We'll should have a one global digikam option to turn all
> > tooltips of.
>
> Whatis and tooltips run both actually. I will remove tooltips.

Done in CVS
=2D-=20
Gilles Caulier

Dnia piątek, 19 listopada 2004 10:52, Gilles Caulier napisał:
> Le vendredi 19 Novembre 2004 10:28, Mikolaj Machowski a écrit :
> > Dnia czwartek, 18 listopada 2004 14:33, Gilles Caulier napisał:
> > > >  o remove 'meta data' from menu text. for users they
> > > >    are all just properties
> > >
> > > Why ? Are you sure ? ANy viewpoint from another users ?
> >
> > Agree with Achim. Additionally 'meta data' is long text in some
> > translations and it will make wide menu - which should be avoided.
>
> Hum, i have removed the 'Image/Exif informations' menu entry avail in
> 0.7.0 release. For 0.7.1, the users can be confuse if no menu entry
> relevant of meta-data isn't available...
>
> > > >  o wish: selection in albumview move to next/prev image
> > > >       on forw/backward (at least on dialog exit set
> > > >   selection to last image and make it visible)
> > >
> > > I must add 2 new bottons for that. It will provide a large dialog.
> > > Are you sure ?
> >
> > Here I am not sure. Too big dialog isn't good. But feature itself is
> > nice - maybe 'hide' it and switch with keyboard shortcuts?
>
> Perhaps... I want more viewpoints. Renchi, Yves, etc...
>
Ah. I used new version and back and forward buttons are really useful.
They don't increase size of dialog.

Some additional remarks:

- Type: shouldn't be plain mime type, convert

image/jpg   -> JPG (image)

- Owner/permissions. Move them to separate tab like in all other KDE
  properties dialog?

- Location. Hmm. Digikam tries to separate user from files location
  (albums, tags). This information should be somewhere but not
  necessarily in front tab (Misc.?). Replace that with dimensions.

- Modification date. Should be 'Creation date', if modified somewhere
  else should be info (another case for Misc)

- Resizing. Now you can resize properties dialog - resize also thumbnail
  (the same argument as for comments/tags dialog - there is already
  biggest thumbnail). Maybe not for full screen but at least the biggest
  size of thumbnail from main view.
  Another solution is just remove possibility to resize this dialog.


Sorry if I am repeating someone else arguments or already implemented
functions.

m.
-- 
LaTeX + Vim = http://vim-latex.sourceforge.net/
Vim Universal Templates 
	http://www.vim.org/scripts/script.php?script_id=1078
CLEWN - http://clewn.sf.net

Dnia piątek, 19 listopada 2004 14:04, Mikolaj Machowski napisał:

Updated to the last CVS - 19th Nov, 19.00

and new comments.
>
> Some additional remarks:
>
> - Type: shouldn't be plain mime type, convert
>
> image/jpg   -> JPG (image)

Why make custom strings and not use KDE ones?
KDE has nice MIME service.

> - Owner/permissions. Move them to separate tab like in all other KDE
>   properties dialog?
>
> - Location. Hmm. Digikam tries to separate user from files location
>   (albums, tags). This information should be somewhere but not
>   necessarily in front tab (Misc.?). Replace that with dimensions.

Thanks for dimensions :)

Another issue:

In Exif are two fields: list and thumbnail. Should be in different
order: thumbnail, list. If possible thumbnail should be centered.

m.

-- 
LaTeX + Vim = http://vim-latex.sourceforge.net/
Vim Universal Templates 
	http://www.vim.org/scripts/script.php?script_id=1078
CLEWN - http://clewn.sf.net

CVS commit by cgilles: 

Digikam image properties dialog : added pop-up menu under Exif thumbnail for to correct Exif orientation tag.
CCMAIL: digikam-devel@...


  M +103 -3    imageproperties.cpp   1.16
  M +26 -3     imageproperties.h   1.13

Le jeudi 18 Novembre 2004 14:13, Achim Bohnet a =C3=A9crit=C2=A0:
> =C2=A0o many embeded thumbnail are not rotated. How about
> =C2=A0 =C2=A0a rotate RMB menu that allows to rotate the embeded
> =C2=A0 =C2=A0thumbnail?

The thumbnail cannot be rotated (and it's not a good idea to do it!!!)

=2E..but the exif orientation tag can be set by the user ! this way is done=
 in=20
CVS. You have now a pop-up menu under exif thumbnail. Right click by mouse=
=20
and set like you want.

Gilles

Le jeudi 18 Novembre 2004 14:13, Achim Bohnet a =C3=A9crit=C2=A0:
> =C2=A0o filename not shown anywhere (important IMHO if
> =C2=A0 =C2=A0you use forw. back and there no embeded thumbnail,
> =C2=A0 =C2=A0e.g. video, png...)

=46ixed in cvs. Current file name is in the dialog caption now !

Gilles

CVS commit by cgilles: 

Digikam image properties dialog:
- Add current file name in dialog caption.
- Add message when general thumbnail failed.
TODO: threaded histogram calculation (no freeze GUI!)
CCMAIL: digikam-devel@...


  M +36 -15    imageproperties.cpp   1.18
  M +3 -0      imageproperties.h   1.15


--- kdeextragear-3/digikam/digikam/imageproperties.cpp  #1.17:1.18
@@ -177,5 +177,5 @@ void ExifThumbLabel::mousePressEvent( QM
 
 ImageProperties::ImageProperties(AlbumIconView* view, AlbumIconItem* currItem)
-               : KDialogBase(Tabbed, i18n("Image Properties and Meta-Data"), 
+               : KDialogBase(Tabbed, QString::null, 
                              Help|User1|User2|Stretch|Close,
                              Close, view, 0, true, true, 
@@ -267,6 +267,4 @@ void ImageProperties::slotItemChanged()
         return;
 
-    setCursor( KCursor::waitCursor() );
-            
     if (!m_HistogramThumbJob.isNull())
     {
@@ -290,4 +288,5 @@ void ImageProperties::slotItemChanged()
 
     KURL fileURL(m_currItem->fileItem()->url());    
+    setCaption(i18n("Properties and Meta-Data - %1").arg(fileURL.fileName()));
  
     // Update General tab.
@@ -315,4 +314,8 @@ void ImageProperties::slotItemChanged()
                                          const KFileMetaInfo*)));
 
+    connect(m_generalThumbJob,
+            SIGNAL(signalFailed(const KURL&)),
+            SLOT(slotFailedGeneralThumbnail(const KURL&)));       
+
     const KFileItem* fi = m_currItem->fileItem();    
     m_filename->setText( fileURL.fileName() );
@@ -412,8 +415,11 @@ void ImageProperties::slotItemChanged()
                                            const KFileMetaInfo*)));
     
+    connect(m_HistogramThumbJob,
+            SIGNAL(signalFailed(const KURL&)),
+            SLOT(slotFailedHistogramThumbnail(const KURL&)));     
+                                                       
+    m_image.reset();                                            
     m_image.load(fileURL.path());
     
-    if (m_image.isNull() == false)
-       {
        if(m_image.depth() < 32)                 // we works always with 32bpp.
           m_image = m_image.convertDepth(32);
@@ -421,5 +427,4 @@ void ImageProperties::slotItemChanged()
        m_image.setAlphaBuffer(true);
        m_histogramWidget->updateData((uint *)m_image.bits(), m_image.width(), m_image.height());
-       }
                
     // Setup buttons.
@@ -427,5 +432,4 @@ void ImageProperties::slotItemChanged()
     enableButton(User1, m_currItem->nextItem() != 0);
     enableButton(User2, m_currItem->prevItem() != 0);
-    setCursor( KCursor::arrowCursor() );       
 }
 
@@ -738,7 +742,15 @@ void ImageProperties::slotGotHistogramTh
                                                 const KFileMetaInfo*)
 {
+    m_histogramThumb->clear();
+    
+    if (!pix.isNull())
     m_histogramThumb->setPixmap(pix);
 }
 
+void ImageProperties::slotFailedHistogramThumbnail(const KURL&)
+{
+    m_histogramThumb->clear();
+}
+
 //-----------------------------------------------------------------------------------------------------------
 // Exif Viewer implementation methods
@@ -864,7 +876,16 @@ void ImageProperties::slotGotGeneralThum
                                               const KFileMetaInfo*)
 {
+    m_generalThumb->clear();
+
+    if (!pix.isNull())
     m_generalThumb->setPixmap(pix);
 }
 
+void ImageProperties::slotFailedGeneralThumbnail(const KURL&)
+{
+    m_generalThumb->clear();
+    m_generalThumb->setText(i18n("Thumnail unavailable"));
+}
+
 #include "imageproperties.moc"
 

--- kdeextragear-3/digikam/digikam/imageproperties.h  #1.14:1.15
@@ -178,4 +178,6 @@ private slots:
                                  const KFileMetaInfo*);  
 
+    void slotFailedGeneralThumbnail(const KURL&);
+
     // For histogram viever.
     
@@ -186,4 +188,5 @@ private slots:
     void slotGotHistogramThumbnail(const KURL&, const QPixmap& pix,
                                    const KFileMetaInfo*);  
+    void slotFailedHistogramThumbnail(const KURL&);
   
 };

CVS commit by cgilles: 

Digikam image properties dialog : new option for toogle exif thumbnail.
CCMAIL: digikam-devel@...


  M +29 -4     imageproperties.cpp   1.25
  M +6 -0      imageproperties.h   1.21

CVS commit by cgilles: 

Need to test the AlbumSettings validity instance when ThumbnailJob is used out of 
Digikam like when Image Properties dialog is used in Showfoto.

CCMAIL: digikam-devel@...


  M +7 -0      thumbnailjob.cpp   1.14


--- kdeextragear-3/digikam/digikam/thumbnailjob.cpp  #1.13:1.14
@@ -186,8 +186,15 @@ void ThumbnailJob::processNext()
     job->addMetaData("size", QString::number(d->size));
     createShmSeg();
+    
     if (d->shmid != -1)
         job->addMetaData("shmid", QString::number(d->shmid));
+    
+    // Need to test the AlbumSettings validity instance when ThumbnailJob is used out of 
+    // Digikam like when Image Properties dialog is used in Showfoto.
+    if (AlbumSettings::instance())       
+    {
     if (AlbumSettings::instance()->getExifRotate())
         job->addMetaData("exif", "yes");
+    }
     
     connect(job, SIGNAL(data(KIO::Job *, const QByteArray &)),

CVS commit by cgilles: 

Digikam Image Properties and Album Item Tips dialogs : using MimeType comment instead MimeType type !
CCMAIL: digikam-devel@...


  M +12 -2     albumfiletip.cpp   1.19
  M +2 -0      albumfiletip.h   1.7
  M +1 -1      imageproperties.cpp   1.34


--- kdeextragear-3/digikam/digikam/albumfiletip.cpp  #1.18:1.19
@@ -22,4 +22,6 @@
  * ============================================================ */
 
+// Qt includes. 
+ 
 #include <qtooltip.h>
 #include <qlabel.h>
@@ -30,11 +32,16 @@
 #include <qapplication.h>
 
+// KDE includes.
+
 #include <klocale.h>
 #include <kfileitem.h>
 #include <kfilemetainfo.h>
+#include <kmimetype.h>
 #include <kglobalsettings.h>
 #include <kglobal.h>
 #include <kdeversion.h>
 
+// Local includes.
+
 #include "albumiconview.h"
 #include "albumiconitem.h"
@@ -293,4 +300,7 @@ void AlbumFileTip::updateText()
     tip += fi->url().fileName() + cellEnd;
 
+    tip += cellBeg + i18n("Type:") + cellMid;
+    tip += KMimeType::findByURL(fi->url())->comment() + cellEnd;
+
     QDateTime date;
     date.setTime_t(fi->time(KIO::UDS_MODIFICATION_TIME));

--- kdeextragear-3/digikam/digikam/albumfiletip.h  #1.6:1.7
@@ -25,4 +25,6 @@
 #define ALBUMFILETIP_H
 
+// Qt includes.
+
 #include <qframe.h>
 #include <qstring.h>

--- kdeextragear-3/digikam/digikam/imageproperties.cpp  #1.33:1.34
@@ -380,5 +380,5 @@ void ImageProperties::slotItemChanged()
 
     m_filename->setText( m_currfileURL.fileName() );
-    m_filetype->setText( KMimeType::findByURL(m_currfileURL)->name() );
+    m_filetype->setText( KMimeType::findByURL(m_currfileURL)->comment() );
 #if KDE_VERSION >= 0x30200
     KFileMetaInfo meta(m_currfileURL);

CVS commit by cgilles: 

Digikam Image properties dialog :

- Fix Exif current item selected backup.
- Added new horz. bar in General page between image info and file system info.

CCMAIL: digikam-devel@...


  M +38 -27    imageproperties.cpp   1.35
  M +2 -1      imageproperties.h   1.29

CVS commit by jahrens: 

* Added a browser-like navigation history to digikam. 

A back/forward history button was added to the toolbar and the 
album menu. With these buttons (or the shortcuts 
ALT+Key_Left / ALT+Key_Right) the user can browse through the
previous opened albums.

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


  A            albumhistory.cpp   1.1 [GPL]
  A            albumhistory.h   1.1 [GPL]
  M +1 -1      Makefile.am   1.33
  M +76 -1     digikamapp.cpp   1.74
  M +10 -2     digikamapp.h   1.27
  M +5 -0      digikamui.rc   1.27
  M +68 -1     digikamview.cpp   1.23
  M +10 -2     digikamview.h   1.15
  M +5 -4      listitem.cpp   1.5
  M +2 -0      listitem.h   1.5
  M +4 -1      listview.cpp   1.14

CVS commit by jahrens: 


... was in the wrong directory during commit, so here is the rest :)

After closing the cameragui, the last destination is opened in digikam.
Hope you can live with that, Guillaume.

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


  M +2 -0      digikamapp.cpp   1.75
  M +18 -2     digikamview.cpp   1.24
  M +1 -0      digikamview.h   1.16


--- kdeextragear-3/digikam/digikam/digikamapp.cpp  #1.74:1.75
@@ -633,4 +633,6 @@ void DigikamApp::slotCameraConnect()
                                       ctype->port(), ctype->path());
         cgui->show();
+        connect(cgui, SIGNAL(signalLastDestionation(const KURL&)),
+                mView, SLOT(slotSelectAlbum(const KURL&)));
     }
 }

--- kdeextragear-3/digikam/digikam/digikamview.cpp  #1.23:1.24
@@ -234,4 +234,20 @@ void DigikamView::getForwardHistory(QStr
 }
 
+void DigikamView::slotSelectAlbum(const KURL &url)
+{
+    if(url.isEmpty())
+        return;
+    
+    Album *album = mAlbumMan->findPAlbum(url);
+    if(album && album->getViewItem())
+    {
+        AlbumFolderItem *item;
+        item = static_cast<AlbumFolderItem*>(album->getViewItem());
+        mFolderView->setSelected(item);
+        mParent->enableAlbumBackwardHistory(!mAlbumHistory->isBackwardEmpty());
+        mParent->enableAlbumForwardHistory(!mAlbumHistory->isForwardEmpty());
+    }
+}
+
 // ----------------------------------------------------------------
 

--- kdeextragear-3/digikam/digikam/digikamview.h  #1.15:1.16
@@ -87,4 +87,5 @@ public slots:
     void slotAlbumHistoryForward(int steps=1);
     void slotAlbumDeleted(Album *album);
+    void slotSelectAlbum(const KURL &url);
 
     // Tag action slots

CVS commit by pahlibar: 


new commandline option "--detect-camera". if this is supplied, digikam will
try to detect if a camera is connected (works only for gphoto2 supported usb 
cameras) and connects to it. if the camera is not listed in the already setup
list of cameras, it will be added to it.
CCMAIL: digikam-devel@...


  M +30 -0     cameralist.cpp   1.5
  M +1 -0      cameralist.h   1.4
  M +16 -1     digikamapp.cpp   1.77
  M +2 -1      digikamapp.h   1.28
  M +10 -9     main.cpp   1.37


--- kdeextragear-3/digikam/digikam/cameralist.cpp  #1.4:1.5
@@ -24,4 +24,8 @@
 #include <qtextstream.h>
 
+#include <kmessagebox.h>
+#include <klocale.h>
+
+#include "gpiface.h"
 #include "cameratype.h"
 #include "cameralist.h"
@@ -181,4 +185,30 @@ CameraType* CameraList::find(const QStri
 }
 
+CameraType* CameraList::autoDetect()
+{
+    QString model, port;
+    if (GPIface::autoDetect(model, port) != 0)
+    {
+        KMessageBox::error(0, i18n("Failed to auto-detect camera.\n"
+                                   "Please check if your camera is turned on "
+                                   "and retry."));
+        return 0;
+    }
+
+    // check if the camera is already in the list
+    for (CameraType *ctype = d->clist.first(); ctype;
+         ctype = d->clist.next()) {
+        if (ctype->model() == model && ctype->port() == port)
+            return ctype;
+    }
+
+    // looks like a new camera
+
+    CameraType* ctype = new CameraType(model, model, port, "/");
+    insert(ctype);
+
+    return ctype;
+}
+
 void CameraList::clear()
 {

--- kdeextragear-3/digikam/digikam/cameralist.h  #1.3:1.4
@@ -44,4 +44,5 @@ public:
     void remove(CameraType* ctype);
     CameraType* find(const QString& title);
+    CameraType* autoDetect();
     void clear();
 

--- kdeextragear-3/digikam/digikam/digikamapp.cpp  #1.76:1.77
@@ -30,4 +30,5 @@
 #include <qkeysequence.h>
 #include <qsignalmapper.h>
+#include <qtimer.h>
 
 // KDE includes.
@@ -72,5 +73,6 @@
 #include "digikamapp.h"
 
-DigikamApp::DigikamApp() : KMainWindow( 0, "Digikam" )
+DigikamApp::DigikamApp(bool detectCamera)
+    : KMainWindow( 0, "Digikam" )
 {
     m_instance = this;
@@ -110,4 +112,10 @@ DigikamApp::DigikamApp() : KMainWindow( 
     // Load Themes
     populateThemes();
+
+    // Auto-detect camera if requested so
+    if (detectCamera)
+    {
+        QTimer::singleShot(0, this, SLOT(slotCameraAutoDetect()));
+    }
 }
 
@@ -660,4 +668,11 @@ void DigikamApp::slotCameraRemoved(Camer
 }
 
+void DigikamApp::slotCameraAutoDetect()
+{
+    CameraType* ctype = mCameraList->autoDetect();
+    if (ctype)
+        ctype->action()->activate();        
+}
+
 void DigikamApp::slotSetup()
 {

--- kdeextragear-3/digikam/digikam/digikamapp.h  #1.27:1.28
@@ -68,5 +68,5 @@ class DigikamApp : public KMainWindow
 public:
 
-    DigikamApp();
+    DigikamApp(bool detectCamera=false);
     ~DigikamApp();
     
@@ -202,4 +202,5 @@ private slots:
     void slotCameraAdded(CameraType *ctype);
     void slotCameraRemoved(CameraType *ctype);
+    void slotCameraAutoDetect();
     void slotEditKeys();
     void slotConfToolbars();

--- kdeextragear-3/digikam/digikam/main.cpp  #1.36:1.37
@@ -41,5 +41,4 @@
 #include <ktip.h>
 #include <kdeversion.h>
-#include <dcopclient.h>
 
 // KIPI Includes.
@@ -56,6 +55,6 @@
 static KCmdLineOptions options[] =
 {
-  { 0, 0, 0 }
-  // INSERT YOUR COMMANDLINE OPTIONS HERE
+    { "detect-camera", I18N_NOOP("Automatically detect and open camera"), 0 },
+    KCmdLineLastOption
 };
 
@@ -194,8 +193,10 @@ int main(int argc, char *argv[])
     KApplication app;
 
-    // get our DCOP client and attach so that we may use it
-    DCOPClient *client = app.dcopClient();
-    client->attach();
-    app.dcopClient()->registerAs(app.name(), false);
+    bool detectCamera = false;
+    KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
+    if (args && args->isSet("detect-camera"))
+    {
+        detectCamera = true;
+    }
 
     KConfig* config = KGlobal::config();
@@ -232,5 +233,5 @@ int main(int argc, char *argv[])
     }
 
-    DigikamApp *digikam = new DigikamApp();
+    DigikamApp *digikam = new DigikamApp(detectCamera);
 
     app.setMainWidget(digikam);

oliver,

can you check with this new commandline option and see if it meets your
needs for the hotplugging script?

renchi

On Mon, 29 Nov 2004, Renchi Raju wrote:

> CVS commit by pahlibar:
>
>
> new commandline option "--detect-camera". if this is supplied, digikam will
> try to detect if a camera is connected (works only for gphoto2 supported usb
> cameras) and connects to it. if the camera is not listed in the already setup
> list of cameras, it will be added to it.
> CCMAIL: digikam-devel@...

CVS commit by pahlibar: 


fix crash in albumfolderview because of mouse tracking. still not optimal,
you have problems with dragging starting if a tag/folder has been dragged
before and then you press alt/ctrl/shift.

need to talk to joern whether mouse tracking on the treeview is really 
necessary. it makes life more difficult without really adding anything 
much of value
CCMAIL: digikam-devel@...


  M +2 -2      albumfolderview.cpp   1.67


--- kdeextragear-3/digikam/digikam/albumfolderview.cpp  #1.66:1.67
@@ -1308,10 +1308,10 @@ void AlbumFolderView::contentsMouseMoveE
 void AlbumFolderView::contentsMouseReleaseEvent(QMouseEvent *)
 {
-    dragItem_ = 0;
+    //dragItem_ = 0;
 }
 
 void AlbumFolderView::leaveEvent(QEvent*)
 {
-    dragItem_ = 0;    
+    //dragItem_ = 0;    
 }

CVS commit by pahlibar: 


* disable autorename of albums in db as it can cause problems with user
  changing his locale settings
* save the current locale setting and warn the user (with option to bail
  out and correct the locale) if we detect a locale change from previous
  run

CCMAIL: digikam-devel@...


  M +20 -13    albumdb.cpp   1.15
  M +35 -0     main.cpp   1.38


--- kdeextragear-3/digikam/digikam/albumdb.cpp  #1.14:1.15
@@ -259,6 +259,8 @@ void AlbumDB::readPAlbum(PAlbum *album)
     kdDebug() << "Album not in database : " << album->getURL() << endl;
     
-    /* Album not in database. first check if it is an album which was in
-       database, but has been copied/moved/renamed */
+    // Turn of automatic renaming as it can create havoc if user changes locale
+    /* 
+    //  Album not in database. first check if it is an album which was in
+    //  database, but has been copied/moved/renamed 
 
     int id;
@@ -269,7 +271,9 @@ void AlbumDB::readPAlbum(PAlbum *album)
         return;
     }
+    */
+    
+    // Smells like an entirely new album. go ahead and 
+    // and add to database 
 
-    /* Smells like an entirely new album. go ahead and 
-       and add to database */
 
     execSql( QString("INSERT INTO Albums (url, date, caption, collection) "
@@ -280,13 +284,16 @@ void AlbumDB::readPAlbum(PAlbum *album)
              .arg(escapeString(album->getCollection())) );
 
-    /* Write the identifier of the album into the directory */
+    // Write the identifier of the album into the directory 
 
-    id = sqlite_last_insert_rowid(m_db);
-    writeIdentifier(album, id);
+    int id = sqlite_last_insert_rowid(m_db);
     album->setID(id);
     
-    /* try importing any old digikam.xml file */
+    // Turn of automatic renaming as it can create havoc if user changes locale
+    /* writeIdentifier(album, id); */
+
 
+    // try importing any old digikam.xml file 
     importXML(album);
+    
 }
 
@@ -561,5 +568,5 @@ bool AlbumDB::execSql(const QString& sql
     
     //compile SQL program to virtual machine
-    error = sqlite_compile( m_db, sql.local8Bit(), &tail, &vm, &errorStr );
+    error = sqlite_compile( m_db, sql.utf8(), &tail, &vm, &errorStr );
 
     if ( error != SQLITE_OK ) {
@@ -581,5 +588,5 @@ bool AlbumDB::execSql(const QString& sql
         //iterate over columns
         for ( int i = 0; values && i < number; i++ ) {
-            *values << QString::fromLocal8Bit( value [i] );
+            *values << QString::fromUtf8( value [i] );
         }
     }

--- kdeextragear-3/digikam/digikam/main.cpp  #1.37:1.38
@@ -41,4 +41,5 @@
 #include <ktip.h>
 #include <kdeversion.h>
+#include <kmessagebox.h>
 
 // KIPI Includes.
@@ -46,4 +47,9 @@
 #include <libkipi/version.h>
 
+extern "C"
+{
+#include <locale.h>
+}
+
 // Local includes.
 
@@ -224,4 +230,33 @@ int main(int argc, char *argv[])
     }
 
+    // Check the locale setting and see if it has changed
+
+    QString currLocale(setlocale(0,0));
+    
+    config->setGroup("General Settings");
+    if (!config->hasKey("Locale"))
+    {
+        config->writeEntry("Locale", currLocale);
+    }
+    else
+    {
+        QString savedLocale = config->readEntry("Locale");
+        if (savedLocale != currLocale)
+        {
+            int result = KMessageBox::warningYesNo(0,
+                                                   i18n("Your locale has changed from the previous time "
+                                                        "digiKam was run. This can cause unexpected "
+                                                        "problems. If you are sure that you want to "
+                                                        "continue, click on 'Yes' to start digiKam. "
+                                                        "Otherwise, click on 'No' and correct your "
+                                                        "locale setting before restarting digiKam"));
+            if (result != KMessageBox::Yes)
+                return 0;
+
+            config->writeEntry("Locale", currLocale);
+        }
+    }
+    
+    
     // Register image formats (especially for TIFF )
     KImageIO::registerFormats();

On Wednesday 15 December 2004 03:41, Renchi Raju wrote:
> CVS commit by pahlibar: 
> 
> 
> * disable autorename of albums in db as it can cause problems with user
>   changing his locale settings
> * save the current locale setting and warn the user (with option to bail
>   out and correct the locale) if we detect a locale change from previous
>   run

Hi Renchi,

storing it in digikamrc goes not catch the case, that a photo tree
(or a subtree) is copied from host1 to host2 which use
different locales.  The digikam.xml file would be a better place
because it's per directory and can therefore handle the subtree
from a different host case.  Mhmm, AFAIU digikam.xml changes imply
digikam.db changes and are therefore 0.8 material.  b.k.o later

Achim
> 
> CCMAIL: digikam-devel@...
> 
> 
>   M +20 -13    albumdb.cpp   1.15
>   M +35 -0     main.cpp   1.38
> 
> 
> --- kdeextragear-3/digikam/digikam/albumdb.cpp  #1.14:1.15
> @@ -259,6 +259,8 @@ void AlbumDB::readPAlbum(PAlbum *album)
>      kdDebug() << "Album not in database : " << album->getURL() << endl;
>      
> -    /* Album not in database. first check if it is an album which was in
> -       database, but has been copied/moved/renamed */
> +    // Turn of automatic renaming as it can create havoc if user changes locale
> +    /* 
> +    //  Album not in database. first check if it is an album which was in
> +    //  database, but has been copied/moved/renamed 
>  
>      int id;
> @@ -269,7 +271,9 @@ void AlbumDB::readPAlbum(PAlbum *album)
>          return;
>      }
> +    */
> +    
> +    // Smells like an entirely new album. go ahead and 
> +    // and add to database 
>  
> -    /* Smells like an entirely new album. go ahead and 
> -       and add to database */
>  
>      execSql( QString("INSERT INTO Albums (url, date, caption, collection) "
> @@ -280,13 +284,16 @@ void AlbumDB::readPAlbum(PAlbum *album)
>               .arg(escapeString(album->getCollection())) );
>  
> -    /* Write the identifier of the album into the directory */
> +    // Write the identifier of the album into the directory 
>  
> -    id = sqlite_last_insert_rowid(m_db);
> -    writeIdentifier(album, id);
> +    int id = sqlite_last_insert_rowid(m_db);
>      album->setID(id);
>      
> -    /* try importing any old digikam.xml file */
> +    // Turn of automatic renaming as it can create havoc if user changes locale
> +    /* writeIdentifier(album, id); */
> +
>  
> +    // try importing any old digikam.xml file 
>      importXML(album);
> +    
>  }
>  
> @@ -561,5 +568,5 @@ bool AlbumDB::execSql(const QString& sql
>      
>      //compile SQL program to virtual machine
> -    error = sqlite_compile( m_db, sql.local8Bit(), &tail, &vm, &errorStr );
> +    error = sqlite_compile( m_db, sql.utf8(), &tail, &vm, &errorStr );
>  
>      if ( error != SQLITE_OK ) {
> @@ -581,5 +588,5 @@ bool AlbumDB::execSql(const QString& sql
>          //iterate over columns
>          for ( int i = 0; values && i < number; i++ ) {
> -            *values << QString::fromLocal8Bit( value [i] );
> +            *values << QString::fromUtf8( value [i] );
>          }
>      }
> 
> --- kdeextragear-3/digikam/digikam/main.cpp  #1.37:1.38
> @@ -41,4 +41,5 @@
>  #include <ktip.h>
>  #include <kdeversion.h>
> +#include <kmessagebox.h>
>  
>  // KIPI Includes.
> @@ -46,4 +47,9 @@
>  #include <libkipi/version.h>
>  
> +extern "C"
> +{
> +#include <locale.h>
> +}
> +
>  // Local includes.
>  
> @@ -224,4 +230,33 @@ int main(int argc, char *argv[])
>      }
>  
> +    // Check the locale setting and see if it has changed
> +
> +    QString currLocale(setlocale(0,0));
> +    
> +    config->setGroup("General Settings");
> +    if (!config->hasKey("Locale"))
> +    {
> +        config->writeEntry("Locale", currLocale);
> +    }
> +    else
> +    {
> +        QString savedLocale = config->readEntry("Locale");
> +        if (savedLocale != currLocale)
> +        {
> +            int result = KMessageBox::warningYesNo(0,
> +                                                   i18n("Your locale has changed from the previous time "
> +                                                        "digiKam was run. This can cause unexpected "
> +                                                        "problems. If you are sure that you want to "
> +                                                        "continue, click on 'Yes' to start digiKam. "
> +                                                        "Otherwise, click on 'No' and correct your "
> +                                                        "locale setting before restarting digiKam"));
> +            if (result != KMessageBox::Yes)
> +                return 0;
> +
> +            config->writeEntry("Locale", currLocale);
> +        }
> +    }
> +    
> +    
>      // Register image formats (especially for TIFF )
>      KImageIO::registerFormats();
> 
> 
> 
> 

-- 
  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@...

CVS commit by cgilles: 

kexif.h have been changed to kexifwidget.h.
Bug reported by Laurent Montel from MandrakeSoft
CCMAIL: digikam-devel@...


  M +1 -1      imagedescedit.cpp   1.37


--- kdeextragear-3/digikam/digikam/imagedescedit.cpp  #1.36:1.37
@@ -42,5 +42,5 @@
 #include <qcursor.h>
 
-#include <libkexif/kexif.h>
+#include <libkexif/kexifwidget.h>
 #include <libkexif/kexifutils.h>
 #include <libkexif/kexifdata.h>

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op zaterdag 18 december 2004 11:17, schreef Gilles Caulier:
> CVS commit by cgilles:
>
> kexif.h have been changed to kexifwidget.h.
> Bug reported by Laurent Montel from MandrakeSoft
> CCMAIL: digikam-devel@...

Is this change alreadfy in the beta 1 tarballs or is that not necessary? 

Ok, to send announcement out now?

Toma 
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.5 (GNU/Linux)

iD8DBQFBxEoJcgQkT9GFRQ8RAqgTAKCfenb/EyUiYv4JVqbYdfTmkKZfjwCff8T7
hvq4hhk7UMhaWEMuBn94RfU=
=PFcZ
-----END PGP SIGNATURE-----

Le samedi 18 D=C3=A9cembre 2004 16:17, Tom Albers a =C3=A9crit=C2=A0:
> Op zaterdag 18 december 2004 11:17, schreef Gilles Caulier:
> > CVS commit by cgilles:
> >
> > kexif.h have been changed to kexifwidget.h.
> > Bug reported by Laurent Montel from MandrakeSoft
> > CCMAIL: digikam-devel@...
>
> Is this change alreadfy in the beta 1 tarballs or is that not necessary?

No, it's not in the tarball. It's must be fixed. I very busy today. I will =
try=20
to provide a patch tomorrow...

You can send announce tomorrow.

Regards

Gilles

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op zondag 19 december 2004 00:46, schreef Caulier Gilles:
> Le samedi 18 Décembre 2004 16:17, Tom Albers a écrit :
> > Op zaterdag 18 december 2004 11:17, schreef Gilles Caulier:
> > > CVS commit by cgilles:
> > >
> > > kexif.h have been changed to kexifwidget.h.
> > > Bug reported by Laurent Montel from MandrakeSoft
> > > CCMAIL: digikam-devel@...
> >
> > Is this change alreadfy in the beta 1 tarballs or is that not necessary?
>
> No, it's not in the tarball. It's must be fixed. I very busy today. I will
> try to provide a patch tomorrow...
>
> You can send announce tomorrow.

I won't have much time then, but I'll try to get it out before I leave. 

Toma
- -- 
http://www.kde.nl | irc: {toma} | jabber: toma@...
Fingerprint: 0A86 039A 2393 9A86 51DC 2628 7204 244F D185 450F
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.5 (GNU/Linux)

iD8DBQFBxKIkcgQkT9GFRQ8RAsDPAJ97wz77zu8H6ozt3MC8RGIAvdb4IgCgixj+
20Mwlo7Ctv4oe/VmkfLpx4U=
=9MMj
-----END PGP SIGNATURE-----

CVS commit by cgilles: 

Apply patch from Carsten GroB <carsten@...> for fix album icon item date i18n using kde API.
CCMAIL: digikam-devel@...


  M +2 -10     albumiconitem.cpp   1.27


--- kdeextragear-3/digikam/digikam/albumiconitem.cpp  #1.26:1.27
@@ -42,4 +42,5 @@
 #include <kurl.h>
 #include <kio/global.h>
+#include <kglobal.h>
 #include <klocale.h>
 #include <libkexif/kexifdata.h>
@@ -62,14 +63,5 @@
 void dateToString(const QDateTime& datetime, QString& str)
 {
-    int hr = datetime.time().hour();
-    hr = (hr > 12) ? (hr - 12) : hr;
-
-    str.sprintf("%4d/%2.2d/%2.2d, %2.2d:%2.2d%s",
-                datetime.date().year(),
-                datetime.date().month(),
-                datetime.date().day(),
-                hr,
-                datetime.time().minute(),
-                datetime.time() > QTime(12,0) ? "PM" : "AM");
+        str = KGlobal::locale()->formatDateTime(datetime, true, false);
 }

CVS commit by toma: 

- This will plug the import menu in the context menu of an album.
- removes the "add images" from the tools menu which did not belong there.
- fixes a memleak
CCMAIL: digikam-devel@...


  M +29 -18    albumfolderview.cpp   1.72
  M +9 -2      digikamapp.cpp   1.93
  M +2 -0      digikamapp.h   1.33


--- kdeextragear-3/digikam/digikam/albumfolderview.cpp  #1.71:1.72
@@ -1116,4 +1116,6 @@ void AlbumFolderView::contextMenuPAlbum(
 {
     QPopupMenu popmenu(this);
+    KActionMenu menuImport(i18n("Import"));
+    KActionMenu menuKIPIBatch(i18n("Batch Processes"));
 
     popmenu.insertItem(SmallIcon("albumfoldernew"),
@@ -1129,37 +1131,46 @@ void AlbumFolderView::contextMenuPAlbum(
 
         KAction *action;
-        const QPtrList<KAction>& AlbumActions =
+        const QPtrList<KAction>& albumActions =
             DigikamApp::getinstance()->menuAlbumActions();
-        QPtrListIterator<KAction> it(AlbumActions);
+        QPtrListIterator<KAction> it(albumActions);
 
-        int count = 0;
         while ((action = it.current()) != 0)
         {
             action->plug(&popmenu);
             ++it;
-            count++;
+        }
+
+        // Add All Import Actions
+
+        const QPtrList<KAction> importActions =
+                DigikamApp::getinstance()->menuImportActions();
+        if ( !importActions.isEmpty() )
+        {
+            QPtrListIterator<KAction> it3(importActions);
+            while ( (action = it3.current()) != 0 )
+            {
+                menuImport.insert(action);
+                ++it3;
+            }
+            menuImport.plug(&popmenu);
         }
 
         // Add KIPI Batch processes plugins Actions
 
-        KActionMenu* menuKIPIBatch = new KActionMenu(i18n("Batch Processes"));
-        const QPtrList<KAction>& BatchActions =
+        const QPtrList<KAction>& batchActions =
             DigikamApp::getinstance()->menuBatchActions();
-        QPtrListIterator<KAction> it2(BatchActions);
-
-        int kipiCount = 0;
+        if ( !batchActions.isEmpty() )
+        {
+            QPtrListIterator<KAction> it2(batchActions);
         while ( (action = it2.current()) != 0 )
         {
-            menuKIPIBatch->insert(action);
+                menuKIPIBatch.insert(action);
             ++it2;
-            kipiCount++;
         }
-
-        if (kipiCount != 0)
-        {
-            menuKIPIBatch->plug(&popmenu);
+            menuKIPIBatch.plug(&popmenu);
         }
 
-        if (count != 0 || kipiCount != 0)
+        if ( !albumActions.isEmpty() || !batchActions.isEmpty() ||
+             !importActions.isEmpty() )
         {
             popmenu.insertSeparator();

--- kdeextragear-3/digikam/digikam/digikamapp.cpp  #1.92:1.93
@@ -180,4 +180,13 @@ const QPtrList<KAction>& DigikamApp::men
 }
 
+const QPtrList<KAction> DigikamApp::menuImportActions()
+{
+    QPtrList<KAction> importMenu;
+    importMenu = m_kipiFileActionsImport;
+    importMenu.append( mAlbumImportAction );
+    importMenu.append( mAddImagesAction );
+    return importMenu;
+}
+
 bool DigikamApp::queryClose()
 {
@@ -889,6 +898,4 @@ void DigikamApp::slotKipiPluginPlug()
     m_kipiAlbumActions.clear();
 
-    m_kipiAlbumActions.append( mAddImagesAction );
-
     KIPI::PluginLoader::PluginList list = KipiPluginLoader_->pluginList();
     

--- kdeextragear-3/digikam/digikam/digikamapp.h  #1.32:1.33
@@ -80,4 +80,6 @@ public:
     const QPtrList<KAction>& menuAlbumActions();
 
+    const QPtrList<KAction> menuImportActions();
+
     void enableThumbSizePlusAction(bool val);
     void enableThumbSizeMinusAction(bool val);

CVS commit by pahlibar: 



copy digikam.db in albumlibrary path to digikam-testing.db . During the 
initial experimental phase of 0_8 development, this will be the db file 
being used (so that developers can safely work on their main album library
path without risk of clobbering their db)
CCMAIL: digikam-devel@...


  M +2 -1      albummanager.cpp   1.17
  M +55 -4     main.cpp   1.45


--- kdeextragear-3/digikam/digikam/albummanager.cpp  #1.16:1.17
@@ -171,5 +171,6 @@ void AlbumManager::setLibraryPath(const 
     d->libraryPath = path;
 
-    QString dbPath = path + "/digikam.db";
+    //TODO: rename back to digikam.db for production code
+    QString dbPath = path + "/digikam-testing.db";
 
 #ifdef NFS_HACK

--- kdeextragear-3/digikam/digikam/main.cpp  #1.44:1.45
@@ -30,4 +30,5 @@
 #include <qstringlist.h>
 #include <qfileinfo.h>
+#include <qfile.h>
 
 // KDE includes
@@ -58,4 +59,43 @@ extern "C"
 #include "digikamfirstrun.h"
 
+// TODO: Only for testing purposes for 0.8 development. Remove
+// for production version
+static bool copyDBFile(const QString& albumLibraryPath)
+{
+    QFile sFile(albumLibraryPath + "/digikam.db");
+    QFile dFile(albumLibraryPath + "/digikam-testing.db");
+
+    if (!sFile.exists() || dFile.exists())
+        return true;
+
+    if (!sFile.open(IO_ReadOnly))
+        return false;
+    
+    if (!dFile.open(IO_WriteOnly))
+    {
+        sFile.close();
+        return false;
+    }
+
+    const int MAX_IPC_SIZE = (1024*32);
+    char buffer[MAX_IPC_SIZE];
+
+    Q_LONG len;
+    while ((len = sFile.readBlock(buffer, MAX_IPC_SIZE)) != 0)
+    {
+        if (len == -1 || dFile.writeBlock(buffer, (Q_ULONG)len) == -1)
+        {
+            sFile.close();
+            dFile.close();
+            return false;
+        }
+    }
+
+    sFile.close();
+    dFile.close();
+    
+    return true;
+}
+
 static KCmdLineOptions options[] =
 {
@@ -66,11 +106,11 @@ static KCmdLineOptions options[] =
 int main(int argc, char *argv[])
 {
-    QString Description = i18n("A Photo-Management Application for KDE") + "\n" + 
+    QString description = i18n("A Photo-Management Application for KDE") + "\n" + 
                           i18n("Using Kipi library version %1").arg(kipi_version);
     
     KAboutData aboutData( "digikam", 
                           I18N_NOOP("digiKam"),
-                          digikam_version,        // Release number available in version.h to the top source dir.
-                          Description.latin1(),
+                          digikam_version,        
+                          description.latin1(),
                           KAboutData::License_GPL,
                           I18N_NOOP("(c) 2002-2005, Digikam developers team"),
@@ -194,5 +234,5 @@ int main(int argc, char *argv[])
     
     KCmdLineArgs::init( argc, argv, &aboutData );
-    KCmdLineArgs::addCmdLineOptions( options ); // Add our own options.
+    KCmdLineArgs::addCmdLineOptions( options ); 
 
     KApplication app;
@@ -255,4 +295,15 @@ int main(int argc, char *argv[])
     }
     
+    // copy the db to a new temp file. we will use this copied db for testing
+    // purposes in 0.8 development. just a safety precautions for developers
+    // working on their main photo library
+
+    if (!copyDBFile(albumPath))
+    {
+        KMessageBox::error(0, i18n("Failed to copy database file "
+                                   "to temporary one."));
+        return 0;
+    }
+    
     
     // Register image formats (especially for TIFF )