Warning, /graphics/digikam/project/patches/Hide_People_top_node_from_views.patch is written in an unsupported language. File is not indexed.
0001 diff --git a/core/app/filters/filtersidebarwidget.cpp b/core/app/filters/filtersidebarwidget.cpp 0002 index 035b4ba76d..a61481f0b5 100644 0003 --- a/core/app/filters/filtersidebarwidget.cpp 0004 +++ b/core/app/filters/filtersidebarwidget.cpp 0005 @@ -298,12 +298,6 @@ FilterSideBarWidget::FilterSideBarWidget(QWidget* const parent, TagModel* const 0006 0007 connect(d->ratingFilter, SIGNAL(signalRatingFilterChanged(int,ItemFilterSettings::RatingCondition,bool)), 0008 this, SIGNAL(signalRatingFilterChanged(int,ItemFilterSettings::RatingCondition,bool))); 0009 - 0010 - connect(AlbumManager::instance(), SIGNAL(signalAllAlbumsLoaded()), d->faceFilterView, SLOT(setPeopleAsRoot())); 0011 - 0012 - //Have to do like this 0013 - //Something strange is happening when trying to access filteredModel()->filterChanged() signal 0014 - connect(d->faceFilterSearchBar, &SearchTextBar::signalSearchTextSettings, d->faceFilterView, &TagFolderView::setPeopleAsRoot); 0015 } 0016 0017 FilterSideBarWidget::~FilterSideBarWidget() 0018 diff --git a/core/app/views/sidebar/leftsidebarwidgets.cpp b/core/app/views/sidebar/leftsidebarwidgets.cpp 0019 index 5ca67f3a36..7cde5ba733 100644 0020 --- a/core/app/views/sidebar/leftsidebarwidgets.cpp 0021 +++ b/core/app/views/sidebar/leftsidebarwidgets.cpp 0022 @@ -69,7 +69,6 @@ 0023 #include "labelstreeview.h" 0024 #include "coredb.h" 0025 #include "dexpanderbox.h" 0026 -#include "facetags.h" 0027 0028 namespace Digikam 0029 { 0030 @@ -1468,12 +1467,6 @@ PeopleSideBarWidget::PeopleSideBarWidget(QWidget* const parent, 0031 0032 connect(d->rescanButton, SIGNAL(pressed()), 0033 this, SLOT(slotScanForFaces()) ); 0034 - 0035 - connect(AlbumManager::instance(), SIGNAL(signalAllAlbumsLoaded()), d->tagFolderView, SLOT(setPeopleAsRoot())); 0036 - 0037 - //Have to do like this 0038 - //Something strange is happening when trying to access filteredModel()->filterChanged() signal 0039 - connect(d->tagSearchBar, &SearchTextBar::signalSearchTextSettings, d->tagFolderView, &TagFolderView::setPeopleAsRoot); 0040 } 0041 0042 PeopleSideBarWidget::~PeopleSideBarWidget() 0043 diff --git a/core/libs/album/treeview/tagtreeview.cpp b/core/libs/album/treeview/tagtreeview.cpp 0044 index a214aab395..1a1edef562 100644 0045 --- a/core/libs/album/treeview/tagtreeview.cpp 0046 +++ b/core/libs/album/treeview/tagtreeview.cpp 0047 @@ -149,24 +149,4 @@ void TagTreeView::setCurrentAlbum(int albumId, bool selectInAlbumManager) 0048 setCurrentAlbums(QList<Album*>() << album, selectInAlbumManager); 0049 } 0050 0051 -void TagTreeView::setPeopleAsRoot() 0052 -{ 0053 - 0054 - //Unfortunately the only way to set new Root Index is to use QAbstractItemModel directly 0055 - //Indexes from our filterModel or TagModel don't work here 0056 - static int i = 0; 0057 - for(int i = 0; ;++i) 0058 - { 0059 - if (!model()->hasIndex(i, 0)) 0060 - break; 0061 - QModelIndex ind = model()->index(i, 0); 0062 - if (model()->data(ind, TagModel::AlbumIdRole) == 0063 - FaceTags::personParentTag()) 0064 - { 0065 - setRootIndex(ind); 0066 - break; 0067 - } 0068 - } 0069 -} 0070 - 0071 } // namespace Digikam 0072 diff --git a/core/libs/album/treeview/tagtreeview.h b/core/libs/album/treeview/tagtreeview.h 0073 index 5c66f27555..6f32ef3da9 100644 0074 --- a/core/libs/album/treeview/tagtreeview.h 0075 +++ b/core/libs/album/treeview/tagtreeview.h 0076 @@ -29,7 +29,6 @@ 0077 // Local includes 0078 0079 #include "abstractcheckablealbumtreeview.h" 0080 -#include "facetags.h" 0081 0082 namespace Digikam 0083 { 0084 @@ -73,9 +72,6 @@ public Q_SLOTS: 0085 void setCurrentAlbums(const QList<Album*>& tags, bool selectInAlbumManager = true); 0086 void setCurrentAlbum(int tagId, bool selectInAlbumManager = true); 0087 0088 - ///For face tags 0089 - void setPeopleAsRoot(); 0090 - 0091 Q_SIGNALS: 0092 0093 void assignTags(int tagId, const QList<int>& imageIDs);