diff options
| -rw-r--r-- | src/dolphincontextmenu.cpp | 13 | ||||
| -rw-r--r-- | src/dolphincontextmenu.h | 5 |
2 files changed, 16 insertions, 2 deletions
diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp index d7953df4f..601e5f141 100644 --- a/src/dolphincontextmenu.cpp +++ b/src/dolphincontextmenu.cpp @@ -198,7 +198,7 @@ void DolphinContextMenu::openItemContextMenu() if ((addToPlacesAction != 0) && (activatedAction == addToPlacesAction)) { const KUrl selectedUrl(m_fileInfo.url()); if (selectedUrl.isValid()) { - DolphinSettings::instance().placesModel()->addPlace(selectedUrl.fileName(), + DolphinSettings::instance().placesModel()->addPlace(placesName(selectedUrl), selectedUrl); } } else if (openWithActions.contains(activatedAction)) { @@ -266,7 +266,7 @@ void DolphinContextMenu::openViewportContextMenu() } else if (action == addToPlacesAction) { const KUrl& url = m_mainWindow->activeViewContainer()->url(); if (url.isValid()) { - DolphinSettings::instance().placesModel()->addPlace(url.fileName(), url); + DolphinSettings::instance().placesModel()->addPlace(placesName(url), url); } } @@ -406,4 +406,13 @@ void DolphinContextMenu::addShowMenubarAction(KMenu* menu) } } +QString DolphinContextMenu::placesName(const KUrl& url) const +{ + QString name = url.fileName(); + if (name.isEmpty()) { + name = url.host(); + } + return name; +} + #include "dolphincontextmenu.moc" diff --git a/src/dolphincontextmenu.h b/src/dolphincontextmenu.h index c90999252..a7cd9c01d 100644 --- a/src/dolphincontextmenu.h +++ b/src/dolphincontextmenu.h @@ -103,6 +103,11 @@ private: */ void addShowMenubarAction(KMenu* menu); + /** + * Returns a name for adding the URL \a url to the Places panel. + */ + QString placesName(const KUrl& url) const; + private: struct Entry { |