Let the places-item determine the group itself

Related improvements: When loading the bookmarks assure in any
case that items having the same group are inserted as one single
group.

1 files changed, 27 insertions, 2 deletions

diff --git a/src/panels/places/placesitem.cpp b/src/panels/places/placesitem.cpp
index 1fbc12a7d..436d69668 100644
--- a/src/panels/places/placesitem.cpp
+++ b/src/panels/places/placesitem.cpp
@@ -124,10 +124,18 @@ void PlacesItem::setBookmark(const KBookmark& bookmark)
         setText(bookmark.description());
         setUrl(bookmark.url());
         setDataValue("address", bookmark.address());
-        setGroup(i18nc("@item", "Places"));
     } else {
         initializeDevice(udi);
     }
+
+    switch (groupType()) {
+    case PlacesType:           setGroup(i18nc("@item", "Places")); break;
+    case RecentlyAccessedType: setGroup(i18nc("@item", "Recently Accessed")); break;
+    case SearchForType:        setGroup(i18nc("@item", "Search For")); break;
+    case DevicesType:          setGroup(i18nc("@item", "Devices")); break;
+    default:                   Q_ASSERT(false); break;
+    }
+
     setHidden(bookmark.metaDataItem("IsHidden") == QLatin1String("true"));
 }
 
@@ -136,6 +144,24 @@ KBookmark PlacesItem::bookmark() const
     return m_bookmark;
 }
 
+PlacesItem::GroupType PlacesItem::groupType() const
+{
+    if (udi().isEmpty()) {
+        const QString protocol = url().protocol();
+        if (protocol == QLatin1String("timeline")) {
+            return RecentlyAccessedType;
+        }
+
+        if (protocol == QLatin1String("search")) {
+            return SearchForType;
+        }
+
+        return PlacesType;
+    }
+
+    return DevicesType;
+}
+
 KBookmark PlacesItem::createBookmark(KBookmarkManager* manager,
                                      const QString& text,
                                      const KUrl& url,
@@ -208,7 +234,6 @@ void PlacesItem::initializeDevice(const QString& udi)
     setIcon(m_device.icon());
     setIconOverlays(m_device.emblems());
     setUdi(udi);
-    setGroup(i18nc("@item", "Devices"));
 
     if (m_access) {
         setUrl(m_access->filePath());