Ctrl+Shift+click should have the same effect as Shift+click

[dolphin.git] / src / dolphincontextmenu.cpp

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index 539c280353a193f104a67980b5e158a6b5496b2b..e1913a82fe3a6e9d08ac6fa06037b18d357179a7 100644 (file)
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -295,8 +295,8 @@ void DolphinContextMenu::openItemContextMenu()
             const KUrl selectedUrl(m_fileInfo.url());
             if (selectedUrl.isValid()) {
                 PlacesItemModel model;
-                PlacesItem* item = model.createPlacesItem(placesName(selectedUrl),
-                                                          selectedUrl);
+                const QString text = m_mainWindow->activeViewContainer()->placesText();
+                PlacesItem* item = model.createPlacesItem(text, selectedUrl);
                 model.appendItemToGroup(item);
             }
         } else if (activatedAction == openParentInNewWindowAction) {
@@ -355,10 +355,11 @@ void DolphinContextMenu::openViewportContextMenu()
 
     QAction* action = m_popup->exec(m_pos);
     if (addToPlacesAction && (action == addToPlacesAction)) {
-        const KUrl url = m_mainWindow->activeViewContainer()->url();
-        if (url.isValid()) {
+        const DolphinViewContainer* container =  m_mainWindow->activeViewContainer();
+        if (container->url().isValid()) {
             PlacesItemModel model;
-            PlacesItem* item = model.createPlacesItem(placesName(url), url);
+            PlacesItem* item = model.createPlacesItem(container->placesText(),
+                                                      container->url());
             model.appendItemToGroup(item);
         }
     }
@@ -399,15 +400,6 @@ void DolphinContextMenu::addShowMenuBarAction()
     }
 }
 
-QString DolphinContextMenu::placesName(const KUrl& url) const
-{
-    QString name = url.fileName();
-    if (name.isEmpty()) {
-        name = url.host();
-    }
-    return name;
-}
-
 bool DolphinContextMenu::placeExists(const KUrl& url) const
 {
     PlacesItemModel model;