Icon naming spec compliance (code changes):

bookmark-folder -> folder-bookmarks
goto-page -> go-jump
www -> insert-link (doesn't yet exist in Oxygen)

svn path=/trunk/KDE/kdebase/apps/; revision=730639

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index 60af9923f6b7c59a8cfc6c18eaaeda1132c2034e..388819eecc2cd7ed5391e13c70b44076f23c7beb 100644 (file)
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -160,7 +160,7 @@ void DolphinContextMenu::openItemContextMenu()
     // insert 'Bookmark This Folder' entry if exactly one item is selected
     QAction* addToPlacesAction = 0;
     if (m_fileInfo.isDir() && (m_selectedUrls.count() == 1)) {
     // insert 'Bookmark This Folder' entry if exactly one item is selected
     QAction* addToPlacesAction = 0;
     if (m_fileInfo.isDir() && (m_selectedUrls.count() == 1)) {

-        addToPlacesAction = popup->addAction(KIcon("bookmark-folder"),
+        addToPlacesAction = popup->addAction(KIcon("folder-bookmarks"),

                                              i18nc("@action:inmenu Add selected folder to places", "Add to Places"));
     }
 
                                              i18nc("@action:inmenu Add selected folder to places", "Add to Places"));
     }
 


@@ -236,7 +236,7 @@ void DolphinContextMenu::openViewportContextMenu()
 
     popup->addSeparator();
 
 
     popup->addSeparator();
 

-    QAction* addToPlacesAction = popup->addAction(KIcon("bookmark-folder"),
+    QAction* addToPlacesAction = popup->addAction(KIcon("folder-bookmarks"),

                                                   i18nc("@action:inmenu Add current folder to places", "Add to Places"));
     popup->addSeparator();
 
                                                   i18nc("@action:inmenu Add current folder to places", "Add to Places"));
     popup->addSeparator();
 

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index f4f45ad709f9aaeeea07c6da59ed54becaa93fcd..e46bf8742b77f9831b33431440fa339dd5571c16 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -178,7 +178,7 @@ void DolphinMainWindow::dropUrls(const KUrl::List& urls,
 
         QString seq = QKeySequence(Qt::ShiftModifier).toString();
         seq.chop(1); // chop superfluous '+'
 
         QString seq = QKeySequence(Qt::ShiftModifier).toString();
         seq.chop(1); // chop superfluous '+'

-        QAction* moveAction = popup.addAction(KIcon("goto-page"),
+        QAction* moveAction = popup.addAction(KIcon("go-jump"),

                                               i18nc("@action:inmenu",
                                                     "&Move Here\t<shortcut>%1</shortcut>", seq));
 
                                               i18nc("@action:inmenu",
                                                     "&Move Here\t<shortcut>%1</shortcut>", seq));
 


@@ -190,7 +190,7 @@ void DolphinMainWindow::dropUrls(const KUrl::List& urls,
 
         seq = QKeySequence(Qt::ControlModifier + Qt::ShiftModifier).toString();
         seq.chop(1);
 
         seq = QKeySequence(Qt::ControlModifier + Qt::ShiftModifier).toString();
         seq.chop(1);

-        QAction* linkAction = popup.addAction(KIcon("www"),
+        QAction* linkAction = popup.addAction(KIcon("insert-link"),

                                               i18nc("@action:inmenu",
                                                     "&Link Here\t<shortcut>%1</shortcut>", seq));
 
                                               i18nc("@action:inmenu",
                                                     "&Link Here\t<shortcut>%1</shortcut>", seq));