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

20 files changed, 29 insertions, 29 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 "
diff --git a/digikam/libs/imageproperties/imagedescedittab.cpp b/digikam/libs/imageproperties/imagedescedittab.cpp
index cb01526..3c350b1 100644
--- a/digikam/libs/imageproperties/imagedescedittab.cpp
+++ b/digikam/libs/imageproperties/imagedescedittab.cpp
@@ -1153,7 +1153,7 @@ void ImageDescEditTab::tagDelete(TAlbum *album)
     int result = KMessageBox::warningContinueCancel(this, message,
                                                     i18n("Delete Tag"),
                                                     KGuiItem(i18n("Delete"),
-                                                    "editdelete"));
+                                                    "edit-delete"));
 
     if (result == KMessageBox::Continue)
     {
diff --git a/digikam/libs/widgets/metadata/metadatawidget.cpp b/digikam/libs/widgets/metadata/metadatawidget.cpp
index dadec35..4ccfbbf 100644
--- a/digikam/libs/widgets/metadata/metadatawidget.cpp
+++ b/digikam/libs/widgets/metadata/metadatawidget.cpp
@@ -126,19 +126,19 @@ MetadataWidget::MetadataWidget(TQWidget* parent, const char* name)
     d->toolButtons->setFrameShape(TQFrame::NoFrame);
 
     TQPushButton *saveMetadata = new TQPushButton( d->toolButtons );
-    saveMetadata->setPixmap( iconLoader->loadIcon( "filesave", (TDEIcon::Group)TDEIcon::Toolbar ) );
+    saveMetadata->setPixmap( iconLoader->loadIcon( "document-save", (TDEIcon::Group)TDEIcon::Toolbar ) );
     TQWhatsThis::add( saveMetadata, i18n( "Save metadata to a binary file" ) );
     TQToolTip::add( saveMetadata, i18n( "Save metadata" ));
     d->toolButtons->insert(saveMetadata);
     
     TQPushButton *printMetadata = new TQPushButton( d->toolButtons );
-    printMetadata->setPixmap( iconLoader->loadIcon( "fileprint", (TDEIcon::Group)TDEIcon::Toolbar ) );
+    printMetadata->setPixmap( iconLoader->loadIcon( "document-print", (TDEIcon::Group)TDEIcon::Toolbar ) );
     TQWhatsThis::add( printMetadata, i18n( "Print metadata to printer" ) );
     TQToolTip::add( printMetadata, i18n( "Print metadata" ));
     d->toolButtons->insert(printMetadata);
 
     TQPushButton *copy2ClipBoard = new TQPushButton( d->toolButtons );
-    copy2ClipBoard->setPixmap( iconLoader->loadIcon( "editcopy", (TDEIcon::Group)TDEIcon::Toolbar ) );
+    copy2ClipBoard->setPixmap( iconLoader->loadIcon( "edit-copy", (TDEIcon::Group)TDEIcon::Toolbar ) );
     TQWhatsThis::add( copy2ClipBoard, i18n( "Copy metadata to clipboard" ) );
     TQToolTip::add( copy2ClipBoard, i18n( "Copy metadata to clipboard" ));
     d->toolButtons->insert(copy2ClipBoard);
diff --git a/digikam/showfoto/setup/setup.cpp b/digikam/showfoto/setup/setup.cpp
index 6261ac5..698fb20 100644
--- a/digikam/showfoto/setup/setup.cpp
+++ b/digikam/showfoto/setup/setup.cpp
@@ -108,7 +108,7 @@ Setup::Setup(TQWidget* parent, const char* name, Setup::Page page)
     d->iccPage = new Digikam::SetupICC(d->page_icc, this);
 
     d->page_iofiles = addPage(i18n("Save Images"), i18n("Save Images' Files' Settings"),
-                              BarIcon("filesave", TDEIcon::SizeMedium));
+                              BarIcon("document-save", TDEIcon::SizeMedium));
     d->iofilesPage = new Digikam::SetupIOFiles(d->page_iofiles);
     
     d->page_slideshow = addPage(i18n("Slide Show"), i18n("Slide Show Settings"),
diff --git a/digikam/showfoto/showfoto.cpp b/digikam/showfoto/showfoto.cpp
index 0b1b5f2..bae1dae 100644
--- a/digikam/showfoto/showfoto.cpp
+++ b/digikam/showfoto/showfoto.cpp
@@ -561,7 +561,7 @@ void ShowFoto::applySettings()
     }
     else
     {
-        m_fileDeleteAction->setIcon("editdelete");
+        m_fileDeleteAction->setIcon("edit-delete");
         m_fileDeleteAction->setText(i18n("Delete File"));
     }
 
diff --git a/digikam/utilities/cameragui/cameraiconview.cpp b/digikam/utilities/cameragui/cameraiconview.cpp
index b49426e..86b39e2 100644
--- a/digikam/utilities/cameragui/cameraiconview.cpp
+++ b/digikam/utilities/cameragui/cameraiconview.cpp
@@ -589,7 +589,7 @@ void CameraIconView::slotContextMenu(IconItem * item, const TQPoint&)
     menu.insertItem(SmallIcon("go-down"),i18n("Download && Delete"), 4);
     menu.insertItem(SmallIcon("encrypted"), i18n("Toggle lock"), 3);
     menu.insertSeparator(-1);
-    menu.insertItem(SmallIcon("editdelete"), i18n("Delete"), 2);
+    menu.insertItem(SmallIcon("edit-delete"), i18n("Delete"), 2);
 
     int result = menu.exec(TQCursor::pos());
 
diff --git a/digikam/utilities/cameragui/cameraui.cpp b/digikam/utilities/cameragui/cameraui.cpp
index 2fdaa84..7920d13 100644
--- a/digikam/utilities/cameragui/cameraui.cpp
+++ b/digikam/utilities/cameragui/cameraui.cpp
@@ -301,7 +301,7 @@ CameraUI::CameraUI(TQWidget* /*parent*/, const TQString& cameraTitle,
                      "E.g.: <i>Thu Aug 24 2006</i><p>"
                      "<b>Local Settings</b>: the date format depending on TDE control panel settings.<p>"));
 
-    d->advBox->insertItem(CameraUIPriv::AUTOALBUMPAGE, albumBox, SmallIconSet("folder_new"),
+    d->advBox->insertItem(CameraUIPriv::AUTOALBUMPAGE, albumBox, SmallIconSet("folder-new"),
                           i18n("Auto-creation of Albums"));
 
     // -- On the Fly options ---------------------------------------------------
diff --git a/digikam/utilities/imageeditor/editor/editorwindow.cpp b/digikam/utilities/imageeditor/editor/editorwindow.cpp
index 8c2a122..585fa9f 100644
--- a/digikam/utilities/imageeditor/editor/editorwindow.cpp
+++ b/digikam/utilities/imageeditor/editor/editorwindow.cpp
@@ -287,7 +287,7 @@ void EditorWindow::setupStandardActions()
     m_saveAsAction->setEnabled(false);
     m_revertAction->setEnabled(false);
 
-    d->filePrintAction = new TDEAction(i18n("Print Image..."), "fileprint",
+    d->filePrintAction = new TDEAction(i18n("Print Image..."), "document-print",
                                      CTRL+Key_P,
                                      TQT_TQOBJECT(this), TQT_SLOT(slotFilePrint()),
                                      actionCollection(), "editorwindow_print");
diff --git a/digikam/utilities/imageeditor/editor/imagewindow.cpp b/digikam/utilities/imageeditor/editor/imagewindow.cpp
index 5c5df5e..5b54935 100644
--- a/digikam/utilities/imageeditor/editor/imagewindow.cpp
+++ b/digikam/utilities/imageeditor/editor/imagewindow.cpp
@@ -334,7 +334,7 @@ void ImageWindow::setupActions()
 
     // Pop up dialog to ask user whether to permanently delete
     d->fileDeletePermanentlyAction = new TDEAction(i18n("Delete File Permanently"),
-            "editdelete",
+            "edit-delete",
             SHIFT+Key_Delete,
             TQT_TQOBJECT(this),
             TQT_SLOT(slotDeleteCurrentItemPermanently()),
@@ -344,7 +344,7 @@ void ImageWindow::setupActions()
     // These two actions are hidden, no menu entry, no toolbar entry, no shortcut.
     // Power users may add them.
     d->fileDeletePermanentlyDirectlyAction = new TDEAction(i18n("Delete Permanently without Confirmation"),
-            "editdelete",
+            "edit-delete",
             0,
             TQT_TQOBJECT(this),
             TQT_SLOT(slotDeleteCurrentItemPermanentlyDirectly()),
diff --git a/digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp b/digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp
index 318c2b7..2618162 100644
--- a/digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp
+++ b/digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp
@@ -390,7 +390,7 @@ RawSettingsBox::RawSettingsBox(const KURL& url, TQWidget *parent)
     TQToolTip::add(button(Ok), i18n("<p>Import image to editor using current settings."));
 
     button(Cancel)->setText(i18n("Use Default"));
-    button(Cancel)->setIconSet(SmallIconSet("gohome"));
+    button(Cancel)->setIconSet(SmallIconSet("go-home"));
     TQToolTip::add(button(Cancel), i18n("<p>Use general Raw decoding settings to load this image in editor."));
 
     // ---------------------------------------------------------------
diff --git a/digikam/utilities/lighttable/lighttablebar.cpp b/digikam/utilities/lighttable/lighttablebar.cpp
index 14a35cb..e20f7be 100644
--- a/digikam/utilities/lighttable/lighttablebar.cpp
+++ b/digikam/utilities/lighttable/lighttablebar.cpp
@@ -182,7 +182,7 @@ void LightTableBar::contentsMouseReleaseEvent(TQMouseEvent *e)
             }
 
             popmenu.insertSeparator();
-            popmenu.insertItem(SmallIcon("fileclose"), i18n("Remove item"), 13);
+            popmenu.insertItem(SmallIcon("window-close"), i18n("Remove item"), 13);
         }
 
         int totalItems = itemsURLs().count();
diff --git a/digikam/utilities/lighttable/lighttablewindow.cpp b/digikam/utilities/lighttable/lighttablewindow.cpp
index 712dffb..44767fa 100644
--- a/digikam/utilities/lighttable/lighttablewindow.cpp
+++ b/digikam/utilities/lighttable/lighttablewindow.cpp
@@ -365,7 +365,7 @@ void LightTableWindow::setupActions()
                                        actionCollection(), "lighttable_edititem");
     d->editItemAction->setEnabled(false);
 
-    d->removeItemAction = new TDEAction(i18n("Remove item from LightTable"), "fileclose",
+    d->removeItemAction = new TDEAction(i18n("Remove item from LightTable"), "window-close",
                                        CTRL+Key_K, TQT_TQOBJECT(this), TQT_SLOT(slotRemoveItem()),
                                        actionCollection(), "lighttable_removeitem");
     d->removeItemAction->setEnabled(false);
diff --git a/digikam/utilities/setup/setup.cpp b/digikam/utilities/setup/setup.cpp
index cc40267..1c6665d 100644
--- a/digikam/utilities/setup/setup.cpp
+++ b/digikam/utilities/setup/setup.cpp
@@ -144,7 +144,7 @@ Setup::Setup(TQWidget* parent, const char* name, Setup::Page page)
     d->generalPage = new SetupGeneral(d->page_general, this);
 
     d->page_collections = addPage(i18n("Collections"), i18n("Album Collections"),
-                                  BarIcon("fileopen", TDEIcon::SizeMedium));
+                                  BarIcon("document-open", TDEIcon::SizeMedium));
     d->collectionsPage = new SetupCollections(d->page_collections);
 
     d->page_identity = addPage(i18n("Identity"), i18n("Default IPTC identity information"),
@@ -172,7 +172,7 @@ Setup::Setup(TQWidget* parent, const char* name, Setup::Page page)
     d->editorPage = new SetupEditor(d->page_editor);
 
     d->page_iofiles = addPage(i18n("Save Images"), i18n("Image Editor: Settings for Saving Images Files"),
-                              BarIcon("filesave", TDEIcon::SizeMedium));
+                              BarIcon("document-save", TDEIcon::SizeMedium));
     d->iofilesPage = new SetupIOFiles(d->page_iofiles);
 
     d->page_dcraw = addPage(i18n("RAW decoding"), i18n("RAW Files Decoding Settings"),