[Digikam-devel] [digikam] [Bug 307330] digicam does not connect to the album folder automatically unless it has been preselected in my folders

[Gilles Caulier]

https://bugs.kde.org/show_bug.cgi?id=307330

Gilles Caulier <caulier.gilles at gmail.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
   Version Fixed In|                            |4.0.0
         Resolution|DUPLICATE                   |FIXED
      Latest Commit|                            |http://commits.kde.org/digi
                   |                            |kam/7aa8ffde3f05c36857ee0e3
                   |                            |6d0131be0affa9b54

--- Comment #3 from Gilles Caulier <caulier.gilles at gmail.com> ---
Git commit 7aa8ffde3f05c36857ee0e36d0131be0affa9b54 by Veaceslav Munteanu.
Committed on 10/12/2013 at 00:59.
Pushed by munteanu into branch 'master'.

Fix wrong album selected when restoring selection on start-up

M  +1    -5    digikam/album/albumtreeview.cpp
M  +5    -1    digikam/date/datefolderview.cpp

http://commits.kde.org/digikam/7aa8ffde3f05c36857ee0e36d0131be0affa9b54

diff --git a/digikam/album/albumtreeview.cpp b/digikam/album/albumtreeview.cpp
index 6504743..ba882dd 100644
--- a/digikam/album/albumtreeview.cpp
+++ b/digikam/album/albumtreeview.cpp
@@ -542,9 +542,9 @@ void AbstractAlbumTreeView::slotCurrentChanged()
 {
     QList<Album*> selected = selectedAlbums<Album>(selectionModel(),
                                                    m_albumFilterModel);
+
     if(selected.isEmpty())
         return;
-
     emit currentAlbumChanged(selected.first());
 }

@@ -951,10 +951,6 @@ void AbstractAlbumTreeView::doSaveState()
         currentIndex = QString::number(selectedAlbum->id());
     }

-    //    kDebug() << "selection: " << selection;
-    //    kDebug() << "expansion: " << expansion;
-    //    kDebug() << "currentIndex: " << currentIndex;
-
     configGroup.writeEntry(entryName(d->configSelectionEntry), selection);
     configGroup.writeEntry(entryName(d->configExpansionEntry), expansion);
     configGroup.writeEntry(entryName(d->configCurrentIndexEntry),
currentIndex);
diff --git a/digikam/date/datefolderview.cpp b/digikam/date/datefolderview.cpp
index f5e40d4..02486c2 100644
--- a/digikam/date/datefolderview.cpp
+++ b/digikam/date/datefolderview.cpp
@@ -84,7 +84,6 @@ DateFolderView::DateFolderView(QWidget* const parent,
DateAlbumModel* const date

     d->dateTreeView = new DateAlbumTreeView(this);
     d->dateTreeView->setAlbumModel(dateAlbumModel);
-    d->dateTreeView->setSelectAlbumOnClick(true);
     d->dateTreeView->setAlbumManagerCurrentAlbum(true);
     d->monthview    = new MonthWidget(this);

@@ -156,6 +155,11 @@ void DateFolderView::slotSelectionChanged(Album*
selectedAlbum)
         d->monthview->setActive(true);
         d->monthview->setYearMonth(date.year(), date.month());
     }
+
+    if (d->active)
+    {
+        AlbumManager::instance()->setCurrentAlbums(QList<Album*>() << dalbum);
+    }
 }

 void DateFolderView::slotAllAlbumsLoaded()

-- 
You are receiving this mail because:
You are the assignee for the bug.