Merge branch 'KDE/4.14'

[dolphin.git] / src / panels / places / placesitemmodel.cpp

diff --git a/src/panels/places/placesitemmodel.cpp b/src/panels/places/placesitemmodel.cpp
index baa770dfdb8d1b2fc79ec313c10fbb5bc38fbd79..d906118f2a836cfa787a877af1361383946533b2 100644 (file)
--- a/src/panels/places/placesitemmodel.cpp
+++ b/src/panels/places/placesitemmodel.cpp
@@ -58,7 +58,7 @@
 
 namespace {
     // As long as KFilePlacesView from kdelibs is available in parallel, the
 
 namespace {
     // As long as KFilePlacesView from kdelibs is available in parallel, the

-    // system-bookmarks for "Recently Accessed" and "Search For" should be
+    // system-bookmarks for "Recently Saved" and "Search For" should be

     // shown only inside the Places Panel. This is necessary as the stored
     // URLs needs to get translated to a Baloo-search-URL on-the-fly to
     // be independent from changes in the Baloo-search-URL-syntax.
     // shown only inside the Places Panel. This is necessary as the stored
     // URLs needs to get translated to a Baloo-search-URL on-the-fly to
     // be independent from changes in the Baloo-search-URL-syntax.


@@ -313,7 +313,8 @@ void PlacesItemModel::requestEject(int index)
         Solid::OpticalDrive* drive = item->device().parent().as<Solid::OpticalDrive>();
         if (drive) {
             connect(drive, SIGNAL(ejectDone(Solid::ErrorType,QVariant,QString)),
         Solid::OpticalDrive* drive = item->device().parent().as<Solid::OpticalDrive>();
         if (drive) {
             connect(drive, SIGNAL(ejectDone(Solid::ErrorType,QVariant,QString)),

-                    this, SLOT(slotStorageTeardownDone(Solid::ErrorType,QVariant)));
+                    this, SLOT(slotStorageTeardownDone(Solid::ErrorType,QVariant)),
+                    Qt::UniqueConnection);

             drive->eject();
         } else {
             const QString label = item->text();
             drive->eject();
         } else {
             const QString label = item->text();


@@ -330,7 +331,8 @@ void PlacesItemModel::requestTeardown(int index)
         Solid::StorageAccess* access = item->device().as<Solid::StorageAccess>();
         if (access) {
             connect(access, SIGNAL(teardownDone(Solid::ErrorType,QVariant,QString)),
         Solid::StorageAccess* access = item->device().as<Solid::StorageAccess>();
         if (access) {
             connect(access, SIGNAL(teardownDone(Solid::ErrorType,QVariant,QString)),

-                    this, SLOT(slotStorageTeardownDone(Solid::ErrorType,QVariant)));
+                    this, SLOT(slotStorageTeardownDone(Solid::ErrorType,QVariant)),
+                    Qt::UniqueConnection);

             access->teardown();
         }
     }
             access->teardown();
         }
     }


@@ -359,7 +361,8 @@ void PlacesItemModel::requestStorageSetup(int index)
         m_storageSetupInProgress[access] = index;
 
         connect(access, SIGNAL(setupDone(Solid::ErrorType,QVariant,QString)),
         m_storageSetupInProgress[access] = index;
 
         connect(access, SIGNAL(setupDone(Solid::ErrorType,QVariant,QString)),

-                this, SLOT(slotStorageSetupDone(Solid::ErrorType,QVariant,QString)));
+                this, SLOT(slotStorageSetupDone(Solid::ErrorType,QVariant,QString)),
+                Qt::UniqueConnection);

 
         access->setup();
     }
 
         access->setup();
     }


@@ -598,6 +601,7 @@ void PlacesItemModel::slotStorageSetupDone(Solid::ErrorType error,
 {
     Q_UNUSED(udi);
 
 {
     Q_UNUSED(udi);
 

+    Q_ASSERT(!m_storageSetupInProgress.isEmpty());

     const int index = m_storageSetupInProgress.take(sender());
     const PlacesItem*  item = placesItem(index);
     if (!item) {
     const int index = m_storageSetupInProgress.take(sender());
     const PlacesItem*  item = placesItem(index);
     if (!item) {


@@ -650,6 +654,7 @@ void PlacesItemModel::updateBookmarks()
                     found = true;
                     if (newBookmark.metaDataItem("UDI").isEmpty()) {
                         item->setBookmark(newBookmark);
                     found = true;
                     if (newBookmark.metaDataItem("UDI").isEmpty()) {
                         item->setBookmark(newBookmark);

+                        item->setText(i18nc("KFile System Bookmarks", newBookmark.text().toUtf8().data()));

                     }
                     break;
                 }
                     }
                     break;
                 }


@@ -736,7 +741,7 @@ void PlacesItemModel::loadBookmarks()
     // items should always be collected in one group so the items are collected first
     // in separate lists before inserting them.
     QList<PlacesItem*> placesItems;
     // items should always be collected in one group so the items are collected first
     // in separate lists before inserting them.
     QList<PlacesItem*> placesItems;

-    QList<PlacesItem*> recentlyAccessedItems;
+    QList<PlacesItem*> recentlySavedItems;

     QList<PlacesItem*> searchForItems;
     QList<PlacesItem*> devicesItems;
 
     QList<PlacesItem*> searchForItems;
     QList<PlacesItem*> devicesItems;
 


@@ -761,11 +766,11 @@ void PlacesItemModel::loadBookmarks()
                 }
 
                 switch (item->groupType()) {
                 }
 
                 switch (item->groupType()) {

-                case PlacesItem::PlacesType:           placesItems.append(item); break;
-                case PlacesItem::RecentlyAccessedType: recentlyAccessedItems.append(item); break;
-                case PlacesItem::SearchForType:        searchForItems.append(item); break;
+                case PlacesItem::PlacesType:        placesItems.append(item); break;
+                case PlacesItem::RecentlySavedType: recentlySavedItems.append(item); break;
+                case PlacesItem::SearchForType:     searchForItems.append(item); break;

                 case PlacesItem::DevicesType:
                 case PlacesItem::DevicesType:

-                default:                               Q_ASSERT(false); break;
+                default:                            Q_ASSERT(false); break;

                 }
             }
         }
                 }
             }
         }


@@ -780,11 +785,11 @@ void PlacesItemModel::loadBookmarks()
             if (missingSystemBookmarks.contains(data.url)) {
                 PlacesItem* item = createSystemPlacesItem(data);
                 switch (item->groupType()) {
             if (missingSystemBookmarks.contains(data.url)) {
                 PlacesItem* item = createSystemPlacesItem(data);
                 switch (item->groupType()) {

-                case PlacesItem::PlacesType:           placesItems.append(item); break;
-                case PlacesItem::RecentlyAccessedType: recentlyAccessedItems.append(item); break;
-                case PlacesItem::SearchForType:        searchForItems.append(item); break;
+                case PlacesItem::PlacesType:        placesItems.append(item); break;
+                case PlacesItem::RecentlySavedType: recentlySavedItems.append(item); break;
+                case PlacesItem::SearchForType:     searchForItems.append(item); break;

                 case PlacesItem::DevicesType:
                 case PlacesItem::DevicesType:

-                default:                               Q_ASSERT(false); break;
+                default:                            Q_ASSERT(false); break;

                 }
             }
         }
                 }
             }
         }


@@ -798,7 +803,7 @@ void PlacesItemModel::loadBookmarks()
 
     QList<PlacesItem*> items;
     items.append(placesItems);
 
     QList<PlacesItem*> items;
     items.append(placesItems);

-    items.append(recentlyAccessedItems);
+    items.append(recentlySavedItems);

     items.append(searchForItems);
     items.append(devicesItems);
 
     items.append(searchForItems);
     items.append(devicesItems);
 


@@ -843,7 +848,7 @@ PlacesItem* PlacesItemModel::createSystemPlacesItem(const SystemBookmarkData& da
     const QString protocol = data.url.protocol();
     if (protocol == QLatin1String("timeline") || protocol == QLatin1String("search")) {
         // As long as the KFilePlacesView from kdelibs is available, the system-bookmarks
     const QString protocol = data.url.protocol();
     if (protocol == QLatin1String("timeline") || protocol == QLatin1String("search")) {
         // As long as the KFilePlacesView from kdelibs is available, the system-bookmarks

-        // for "Recently Accessed" and "Search For" should be a setting available only
+        // for "Recently Saved" and "Search For" should be a setting available only

         // in the Places Panel (see description of AppNamePrefix for more details).
         const QString appName = KGlobal::mainComponent().componentName() + AppNamePrefix;
         bookmark.setMetaDataItem("OnlyInApp", appName);
         // in the Places Panel (see description of AppNamePrefix for more details).
         const QString appName = KGlobal::mainComponent().componentName() + AppNamePrefix;
         bookmark.setMetaDataItem("OnlyInApp", appName);


@@ -852,11 +857,11 @@ PlacesItem* PlacesItemModel::createSystemPlacesItem(const SystemBookmarkData& da
     PlacesItem* item = new PlacesItem(bookmark);
     item->setSystemItem(true);
 
     PlacesItem* item = new PlacesItem(bookmark);
     item->setSystemItem(true);
 

-    // Create default view-properties for all "Search For" and "Recently Accessed" bookmarks
+    // Create default view-properties for all "Search For" and "Recently Saved" bookmarks

     // in case if the user has not already created custom view-properties for a corresponding
     // query yet.
     const bool createDefaultViewProperties = (item->groupType() == PlacesItem::SearchForType ||
     // in case if the user has not already created custom view-properties for a corresponding
     // query yet.
     const bool createDefaultViewProperties = (item->groupType() == PlacesItem::SearchForType ||

-                                              item->groupType() == PlacesItem::RecentlyAccessedType) &&
+                                              item->groupType() == PlacesItem::RecentlySavedType) &&

                                               !GeneralSettings::self()->globalViewProps();
     if (createDefaultViewProperties) {
         ViewProperties props(convertedUrl(data.url));
                                               !GeneralSettings::self()->globalViewProps();
     if (createDefaultViewProperties) {
         ViewProperties props(convertedUrl(data.url));