Summary: | digicam does not connect to the album folder automatically unless it has been preselected in my folders | ||
---|---|---|---|
Product: | [Applications] digikam | Reporter: | Toelle <reblaeufer> |
Component: | Albums-MainView | Assignee: | Digikam Developers <digikam-bugs-null> |
Status: | RESOLVED FIXED | ||
Severity: | normal | CC: | caulier.gilles |
Priority: | NOR | ||
Version: | 2.5.0 | ||
Target Milestone: | --- | ||
Platform: | Ubuntu | ||
OS: | Linux | ||
Latest Commit: | http://commits.kde.org/digikam/7aa8ffde3f05c36857ee0e36d0131be0affa9b54 | Version Fixed In: | 4.0.0 |
Sentry Crash Report: |
Description
Toelle
2012-09-24 17:10:41 UTC
Please check if problem still reproducible with last 2.9.0 release. Gilles Caulier *** This bug has been marked as a duplicate of bug 287102 *** 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() |