Commit 3623e198 authored by Marcel Wiesweg's avatar Marcel Wiesweg
Browse files

Do not filter out grouped images in the filter model of the lighttable thumbbar

BUG: 308948
parent f8345978
...@@ -141,5 +141,8 @@ BUGFIXES FROM KDE BUGZILLA (alias B.K.O | http://bugs.kde.org): ...@@ -141,5 +141,8 @@ BUGFIXES FROM KDE BUGZILLA (alias B.K.O | http://bugs.kde.org):
100 ==> 312848 - digiKam 3.0.0-rc win32 installer. 100 ==> 312848 - digiKam 3.0.0-rc win32 installer.
101 ==> 307750 - No path to mysqld set in server configuration [patch]. 101 ==> 307750 - No path to mysqld set in server configuration [patch].
102 ==> 312892 - digiKam crashed while scanning big collection on external UAB HDD. 102 ==> 312892 - digiKam crashed while scanning big collection on external UAB HDD.
103 ==> 103 ==> 308948 - Pictures belonging to a group can't be displayed in the light table window.
104 ==> 307053 - Images sorted incorrectly.
105 ==>
...@@ -190,6 +190,7 @@ LightTableThumbBar::LightTableThumbBar(QWidget* parent) ...@@ -190,6 +190,7 @@ LightTableThumbBar::LightTableThumbBar(QWidget* parent)
d->imageFilterModel->setCategorizationMode(ImageSortSettings::NoCategories); d->imageFilterModel->setCategorizationMode(ImageSortSettings::NoCategories);
d->imageFilterModel->setSortRole((ImageSortSettings::SortRole)AlbumSettings::instance()->getImageSortOrder()); d->imageFilterModel->setSortRole((ImageSortSettings::SortRole)AlbumSettings::instance()->getImageSortOrder());
d->imageFilterModel->setSortOrder((ImageSortSettings::SortOrder)AlbumSettings::instance()->getImageSorting()); d->imageFilterModel->setSortOrder((ImageSortSettings::SortOrder)AlbumSettings::instance()->getImageSorting());
d->imageFilterModel->setAllGroupsOpen(true); // disable filtering out by group, see bug #308948
d->imageFilterModel->sort(0); // an initial sorting is necessary d->imageFilterModel->sort(0); // an initial sorting is necessary
d->dragDropHandler = new ImageDragDropHandler(d->imageInfoModel); d->dragDropHandler = new ImageDragDropHandler(d->imageInfoModel);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment