mirror of
https://invent.kde.org/system/dolphin
synced 2024-09-17 15:31:20 +00:00
Rename "Recently Accessed" to "Recently Saved"
In dolphin the Section that leads you to timeline claims to show "Recently Accessed", which is not true, it shows "Recently Saved" instead. BUG: 304854 REVIEW: 119986
This commit is contained in:
parent
773028f270
commit
c98e014d2a
|
@ -144,20 +144,20 @@ void PlacesItem::setBookmark(const KBookmark& bookmark)
|
||||||
const GroupType type = groupType();
|
const GroupType type = groupType();
|
||||||
if (icon().isEmpty()) {
|
if (icon().isEmpty()) {
|
||||||
switch (type) {
|
switch (type) {
|
||||||
case RecentlyAccessedType: setIcon("chronometer"); break;
|
case RecentlySavedType: setIcon("chronometer"); break;
|
||||||
case SearchForType: setIcon("nepomuk"); break;
|
case SearchForType: setIcon("nepomuk"); break;
|
||||||
case PlacesType:
|
case PlacesType:
|
||||||
default: setIcon("folder");
|
default: setIcon("folder");
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (type) {
|
switch (type) {
|
||||||
case PlacesType: setGroup(i18nc("@item", "Places")); break;
|
case PlacesType: setGroup(i18nc("@item", "Places")); break;
|
||||||
case RecentlyAccessedType: setGroup(i18nc("@item", "Recently Accessed")); break;
|
case RecentlySavedType: setGroup(i18nc("@item", "Recently Saved")); break;
|
||||||
case SearchForType: setGroup(i18nc("@item", "Search For")); break;
|
case SearchForType: setGroup(i18nc("@item", "Search For")); break;
|
||||||
case DevicesType: setGroup(i18nc("@item", "Devices")); break;
|
case DevicesType: setGroup(i18nc("@item", "Devices")); break;
|
||||||
default: Q_ASSERT(false); break;
|
default: Q_ASSERT(false); break;
|
||||||
}
|
}
|
||||||
|
|
||||||
setHidden(bookmark.metaDataItem("IsHidden") == QLatin1String("true"));
|
setHidden(bookmark.metaDataItem("IsHidden") == QLatin1String("true"));
|
||||||
|
@ -173,7 +173,7 @@ PlacesItem::GroupType PlacesItem::groupType() const
|
||||||
if (udi().isEmpty()) {
|
if (udi().isEmpty()) {
|
||||||
const QString protocol = url().protocol();
|
const QString protocol = url().protocol();
|
||||||
if (protocol == QLatin1String("timeline")) {
|
if (protocol == QLatin1String("timeline")) {
|
||||||
return RecentlyAccessedType;
|
return RecentlySavedType;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (protocol.contains(QLatin1String("search"))) {
|
if (protocol.contains(QLatin1String("search"))) {
|
||||||
|
|
|
@ -44,7 +44,7 @@ public:
|
||||||
{
|
{
|
||||||
PlacesType,
|
PlacesType,
|
||||||
SearchForType,
|
SearchForType,
|
||||||
RecentlyAccessedType,
|
RecentlySavedType,
|
||||||
DevicesType
|
DevicesType
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -58,7 +58,7 @@
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
// As long as KFilePlacesView from kdelibs is available in parallel, the
|
// 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
|
// 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
|
// URLs needs to get translated to a Baloo-search-URL on-the-fly to
|
||||||
// be independent from changes in the Baloo-search-URL-syntax.
|
// be independent from changes in the Baloo-search-URL-syntax.
|
||||||
|
@ -741,7 +741,7 @@ void PlacesItemModel::loadBookmarks()
|
||||||
// items should always be collected in one group so the items are collected first
|
// items should always be collected in one group so the items are collected first
|
||||||
// in separate lists before inserting them.
|
// in separate lists before inserting them.
|
||||||
QList<PlacesItem*> placesItems;
|
QList<PlacesItem*> placesItems;
|
||||||
QList<PlacesItem*> recentlyAccessedItems;
|
QList<PlacesItem*> recentlySavedItems;
|
||||||
QList<PlacesItem*> searchForItems;
|
QList<PlacesItem*> searchForItems;
|
||||||
QList<PlacesItem*> devicesItems;
|
QList<PlacesItem*> devicesItems;
|
||||||
|
|
||||||
|
@ -766,11 +766,11 @@ void PlacesItemModel::loadBookmarks()
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (item->groupType()) {
|
switch (item->groupType()) {
|
||||||
case PlacesItem::PlacesType: placesItems.append(item); break;
|
case PlacesItem::PlacesType: placesItems.append(item); break;
|
||||||
case PlacesItem::RecentlyAccessedType: recentlyAccessedItems.append(item); break;
|
case PlacesItem::RecentlySavedType: recentlySavedItems.append(item); break;
|
||||||
case PlacesItem::SearchForType: searchForItems.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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -785,11 +785,11 @@ void PlacesItemModel::loadBookmarks()
|
||||||
if (missingSystemBookmarks.contains(data.url)) {
|
if (missingSystemBookmarks.contains(data.url)) {
|
||||||
PlacesItem* item = createSystemPlacesItem(data);
|
PlacesItem* item = createSystemPlacesItem(data);
|
||||||
switch (item->groupType()) {
|
switch (item->groupType()) {
|
||||||
case PlacesItem::PlacesType: placesItems.append(item); break;
|
case PlacesItem::PlacesType: placesItems.append(item); break;
|
||||||
case PlacesItem::RecentlyAccessedType: recentlyAccessedItems.append(item); break;
|
case PlacesItem::RecentlySavedType: recentlySavedItems.append(item); break;
|
||||||
case PlacesItem::SearchForType: searchForItems.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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -803,7 +803,7 @@ void PlacesItemModel::loadBookmarks()
|
||||||
|
|
||||||
QList<PlacesItem*> items;
|
QList<PlacesItem*> items;
|
||||||
items.append(placesItems);
|
items.append(placesItems);
|
||||||
items.append(recentlyAccessedItems);
|
items.append(recentlySavedItems);
|
||||||
items.append(searchForItems);
|
items.append(searchForItems);
|
||||||
items.append(devicesItems);
|
items.append(devicesItems);
|
||||||
|
|
||||||
|
@ -848,7 +848,7 @@ PlacesItem* PlacesItemModel::createSystemPlacesItem(const SystemBookmarkData& da
|
||||||
const QString protocol = data.url.protocol();
|
const QString protocol = data.url.protocol();
|
||||||
if (protocol == QLatin1String("timeline") || protocol == QLatin1String("search")) {
|
if (protocol == QLatin1String("timeline") || protocol == QLatin1String("search")) {
|
||||||
// As long as the KFilePlacesView from kdelibs is available, the system-bookmarks
|
// 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).
|
// in the Places Panel (see description of AppNamePrefix for more details).
|
||||||
const QString appName = KGlobal::mainComponent().componentName() + AppNamePrefix;
|
const QString appName = KGlobal::mainComponent().componentName() + AppNamePrefix;
|
||||||
bookmark.setMetaDataItem("OnlyInApp", appName);
|
bookmark.setMetaDataItem("OnlyInApp", appName);
|
||||||
|
@ -857,11 +857,11 @@ PlacesItem* PlacesItemModel::createSystemPlacesItem(const SystemBookmarkData& da
|
||||||
PlacesItem* item = new PlacesItem(bookmark);
|
PlacesItem* item = new PlacesItem(bookmark);
|
||||||
item->setSystemItem(true);
|
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
|
// in case if the user has not already created custom view-properties for a corresponding
|
||||||
// query yet.
|
// query yet.
|
||||||
const bool createDefaultViewProperties = (item->groupType() == PlacesItem::SearchForType ||
|
const bool createDefaultViewProperties = (item->groupType() == PlacesItem::SearchForType ||
|
||||||
item->groupType() == PlacesItem::RecentlyAccessedType) &&
|
item->groupType() == PlacesItem::RecentlySavedType) &&
|
||||||
!GeneralSettings::self()->globalViewProps();
|
!GeneralSettings::self()->globalViewProps();
|
||||||
if (createDefaultViewProperties) {
|
if (createDefaultViewProperties) {
|
||||||
ViewProperties props(convertedUrl(data.url));
|
ViewProperties props(convertedUrl(data.url));
|
||||||
|
|
|
@ -335,7 +335,7 @@ void PlacesPanel::slotItemDropEvent(int index, QGraphicsSceneDragDropEvent* even
|
||||||
|
|
||||||
const PlacesItem* destItem = m_model->placesItem(index);
|
const PlacesItem* destItem = m_model->placesItem(index);
|
||||||
const PlacesItem::GroupType group = destItem->groupType();
|
const PlacesItem::GroupType group = destItem->groupType();
|
||||||
if (group == PlacesItem::SearchForType || group == PlacesItem::RecentlyAccessedType) {
|
if (group == PlacesItem::SearchForType || group == PlacesItem::RecentlySavedType) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue