Bring filenew, fileopen, fileprint, filequickprint, filesave, filesaveas, fileclose, editclear, editcopy, editcut, editdelete, editpaste, folder_new, and gohome icons into XDG compliance

8 files changed, 13 insertions, 13 deletions

diff --git a/digikam/digikam/albumfolderview.cpp b/digikam/digikam/albumfolderview.cpp
index cddab03..9d84999 100644
--- a/digikam/digikam/albumfolderview.cpp
+++ b/digikam/digikam/albumfolderview.cpp
@@ -668,7 +668,7 @@ void AlbumFolderView::slotContextMenu(TQListViewItem *listitem, const TQPoint &,
         }
         else
         {
-            popmenu.insertItem(SmallIcon("editdelete"),
+            popmenu.insertItem(SmallIcon("edit-delete"),
                                i18n("Delete Album"), 12);
         }
     }
@@ -1194,7 +1194,7 @@ void AlbumFolderView::contentsDropEvent(TQDropEvent *e)
             TDEPopupMenu popMenu(this);
             popMenu.insertTitle(SmallIcon("digikam"), i18n("My Albums"));
             popMenu.insertItem( SmallIcon("goto"), i18n("&Move Here"), 10 );
-            popMenu.insertItem( SmallIcon("editcopy"), i18n("&Copy Here"), 11 );
+            popMenu.insertItem( SmallIcon("edit-copy"), i18n("&Copy Here"), 11 );
             if (imageIDs.count() == 1)
                 popMenu.insertItem(i18n("Set as Album Thumbnail"), 12);
             popMenu.insertSeparator(-1);
@@ -1322,7 +1322,7 @@ void AlbumFolderView::contentsDropEvent(TQDropEvent *e)
             TDEPopupMenu popMenu(this);
             popMenu.insertTitle(SmallIcon("digikam"), i18n("My Albums"));
             popMenu.insertItem( SmallIcon("goto"), i18n("&Move Here"), 10 );
-            popMenu.insertItem( SmallIcon("editcopy"), i18n("&Copy Here"), 11 );
+            popMenu.insertItem( SmallIcon("edit-copy"), i18n("&Copy Here"), 11 );
             popMenu.insertSeparator(-1);
             popMenu.insertItem( SmallIcon("cancel"), i18n("C&ancel") );
             popMenu.setMouseTracking(true);
diff --git a/digikam/digikam/albumiconview.cpp b/digikam/digikam/albumiconview.cpp
index e5e6dd9..c8ccf53 100644
--- a/digikam/digikam/albumiconview.cpp
+++ b/digikam/digikam/albumiconview.cpp
@@ -1403,7 +1403,7 @@ void AlbumIconView::contentsDropEvent(TQDropEvent *event)
 
             TQPopupMenu popMenu(this);
             popMenu.insertItem( SmallIcon("goto"), i18n("&Move Here"),     10 );
-            popMenu.insertItem( SmallIcon("editcopy"), i18n("&Copy Here"), 11 );
+            popMenu.insertItem( SmallIcon("edit-copy"), i18n("&Copy Here"), 11 );
             popMenu.insertSeparator(-1);
             popMenu.insertItem( SmallIcon("cancel"), i18n("C&ancel") );
 
@@ -1441,7 +1441,7 @@ void AlbumIconView::contentsDropEvent(TQDropEvent *event)
 
         TQPopupMenu popMenu(this);
         popMenu.insertItem( SmallIcon("goto"), i18n("&Move Here"),     10 );
-        popMenu.insertItem( SmallIcon("editcopy"), i18n("&Copy Here"), 11 );
+        popMenu.insertItem( SmallIcon("edit-copy"), i18n("&Copy Here"), 11 );
         popMenu.insertSeparator(-1);
         popMenu.insertItem( SmallIcon("cancel"), i18n("C&ancel") );
 
diff --git a/digikam/digikam/digikamapp.cpp b/digikam/digikam/digikamapp.cpp
index 642214d..7b83d7c 100644
--- a/digikam/digikam/digikamapp.cpp
+++ b/digikam/digikam/digikamapp.cpp
@@ -596,7 +596,7 @@ void DigikamApp::setupActions()
             TQT_TQOBJECT(this), TQT_SLOT(slotRecurseTags(bool)));
 
     d->deleteAction = new TDEAction(i18n("Delete"),
-                                    "editdelete",
+                                    "edit-delete",
                                     0,
                                     TQT_TQOBJECT(d->view),
                                     TQT_SLOT(slotDeleteAlbum()),
@@ -728,7 +728,7 @@ void DigikamApp::setupActions()
 
     // Pop up dialog to ask user whether to permanently delete
     d->imageDeletePermanentlyAction = new TDEAction(i18n("Delete permanently"),
-                                                "editdelete",
+                                                "edit-delete",
                                                 SHIFT+Key_Delete,
                                                 TQT_TQOBJECT(d->view),
                                                 TQT_SLOT(slotImageDeletePermanently()),
@@ -738,7 +738,7 @@ void DigikamApp::setupActions()
     // These two actions are hidden, no menu entry, no toolbar entry, no shortcut.
     // Power users may add them.
     d->imageDeletePermanentlyDirectlyAction = new TDEAction(i18n("Delete permanently without confirmation"),
-                                                        "editdelete",
+                                                        "edit-delete",
                                                         0,
                                                         TQT_TQOBJECT(d->view),
                                                         TQT_SLOT(slotImageDeletePermanentlyDirectly()),
diff --git a/digikam/digikam/searchfolderview.cpp b/digikam/digikam/searchfolderview.cpp
index af5c893..5fd23e9 100644
--- a/digikam/digikam/searchfolderview.cpp
+++ b/digikam/digikam/searchfolderview.cpp
@@ -430,7 +430,7 @@ void SearchFolderView::slotContextMenu(TQListViewItem* item, const TQPoint&, int
             popmenu.insertItem(SmallIcon("edit-find"), i18n("Edit as Advanced Search..."), 11);
 
         popmenu.insertSeparator(-1);
-        popmenu.insertItem(SmallIcon("editdelete"), i18n("Delete Search"), 12);
+        popmenu.insertItem(SmallIcon("edit-delete"), i18n("Delete Search"), 12);
 
         switch (popmenu.exec(TQCursor::pos()))
         {
diff --git a/digikam/digikam/tagfilterview.cpp b/digikam/digikam/tagfilterview.cpp
index 6157aeb..fe658c0 100644
--- a/digikam/digikam/tagfilterview.cpp
+++ b/digikam/digikam/tagfilterview.cpp
@@ -1246,7 +1246,7 @@ void TagFilterView::tagDelete(TagFilterViewItem* item)
     int result = KMessageBox::warningContinueCancel(0, message,
                                                     i18n("Delete Tag"),
                                                     KGuiItem(i18n("Delete"),
-                                                    "editdelete"));
+                                                    "edit-delete"));
 
     if (result == KMessageBox::Continue)
     {
diff --git a/digikam/digikam/tagfolderview.cpp b/digikam/digikam/tagfolderview.cpp
index 2b59aa6..13629b9 100644
--- a/digikam/digikam/tagfolderview.cpp
+++ b/digikam/digikam/tagfolderview.cpp
@@ -748,7 +748,7 @@ void TagFolderView::tagDelete(TagFolderViewItem *item)
     int result = KMessageBox::warningContinueCancel(0, message,
                                                     i18n("Delete Tag"),
                                                     KGuiItem(i18n("Delete"),
-                                                    "editdelete"));
+                                                    "edit-delete"));
 
     if(result == KMessageBox::Continue)
     {
diff --git a/digikam/digikam/timelinefolderview.cpp b/digikam/digikam/timelinefolderview.cpp
index 4028bc3..97225f7 100644
--- a/digikam/digikam/timelinefolderview.cpp
+++ b/digikam/digikam/timelinefolderview.cpp
@@ -272,7 +272,7 @@ void TimeLineFolderView::slotContextMenu(TQListViewItem* item, const TQPoint&, i
     TDEPopupMenu popmenu(this);
     popmenu.insertTitle(SmallIcon("digikam"), i18n("My Date Searches"));
     popmenu.insertItem(SmallIcon("pencil"), i18n("Rename..."), 10);
-    popmenu.insertItem(SmallIcon("editdelete"), i18n("Delete"), 11);
+    popmenu.insertItem(SmallIcon("edit-delete"), i18n("Delete"), 11);
 
     switch (popmenu.exec(TQCursor::pos()))
     {
diff --git a/digikam/digikam/timelineview.cpp b/digikam/digikam/timelineview.cpp
index 2436fb6..1951d43 100644
--- a/digikam/digikam/timelineview.cpp
+++ b/digikam/digikam/timelineview.cpp
@@ -204,7 +204,7 @@ TimeLineView::TimeLineView(TQWidget *parent)
                                       "\"My Date Searches\" view"));
 
     d->saveButton  = new TQPushButton(hbox2);
-    d->saveButton->setPixmap(SmallIcon("filesave"));
+    d->saveButton->setPixmap(SmallIcon("document-save"));
     d->saveButton->setEnabled(false);
     TQToolTip::add(d->saveButton, i18n("Save current selection to a new virtual Album"));
     TQWhatsThis::add(d->saveButton, i18n("<p>If you press this button, current "