From 85c5c9e3a5630de45810c20306272019a21733c1 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Mon, 13 Oct 2014 12:46:57 -0500
Subject: [PATCH] Bring undo, redo, find, and revert icons into XDG compliance

---
 digikam/digikam/digikamview.cpp                       | 2 +-
 digikam/digikam/searchfolderview.cpp                  | 6 +++---
 digikam/digikam/timelinefolderview.cpp                | 2 +-
 digikam/utilities/imageeditor/editor/editorwindow.cpp | 4 ++--
 digikam/utilities/setup/setupcamera.cpp               | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/digikam/digikam/digikamview.cpp b/digikam/digikam/digikamview.cpp
index 33fd19f..48dc1d2 100644
--- a/digikam/digikam/digikamview.cpp
+++ b/digikam/digikam/digikamview.cpp
@@ -216,7 +216,7 @@ DigikamView::DigikamView(TQWidget *parent)
     d->leftSideBar->appendTab(d->dateFolderView, SmallIcon("date"), i18n("Calendar"));
     d->leftSideBar->appendTab(d->tagBox, SmallIcon("tag"), i18n("Tags"));
     d->leftSideBar->appendTab(d->timeLineView, SmallIcon("clock"), i18n("Timeline"));
-    d->leftSideBar->appendTab(d->searchBox, SmallIcon("find"), i18n("Searches"));
+    d->leftSideBar->appendTab(d->searchBox, SmallIcon("edit-find"), i18n("Searches"));
 
     // To the right.
 
diff --git a/digikam/digikam/searchfolderview.cpp b/digikam/digikam/searchfolderview.cpp
index 9591da7..af5c893 100644
--- a/digikam/digikam/searchfolderview.cpp
+++ b/digikam/digikam/searchfolderview.cpp
@@ -345,7 +345,7 @@ void SearchFolderView::slotAlbumAdded(Album* a)
     if (type == TQString("datesearch")) return;
 
     SearchFolderItem* item = new SearchFolderItem(this, album);
-    item->setPixmap(0, SmallIcon("find", AlbumSettings::instance()->getDefaultTreeIconSize()));
+    item->setPixmap(0, SmallIcon("edit-find", AlbumSettings::instance()->getDefaultTreeIconSize()));
     m_lastAddedItem = item;
 }
 
@@ -400,7 +400,7 @@ void SearchFolderView::slotContextMenu(TQListViewItem* item, const TQPoint&, int
         TDEPopupMenu popmenu(this);
         popmenu.insertTitle(SmallIcon("digikam"), i18n("My Searches"));
         popmenu.insertItem(SmallIcon("filefind"), i18n("New Simple Search..."), 10);
-        popmenu.insertItem(SmallIcon("find"),     i18n("New Advanced Search..."), 11);
+        popmenu.insertItem(SmallIcon("edit-find"),     i18n("New Advanced Search..."), 11);
 
         switch (popmenu.exec(TQCursor::pos()))
         {
@@ -427,7 +427,7 @@ void SearchFolderView::slotContextMenu(TQListViewItem* item, const TQPoint&, int
         popmenu.insertItem(SmallIcon("filefind"), i18n("Edit Search..."), 10);
 
         if ( sItem->album()->isSimple() )
-            popmenu.insertItem(SmallIcon("find"), i18n("Edit as Advanced Search..."), 11);
+            popmenu.insertItem(SmallIcon("edit-find"), i18n("Edit as Advanced Search..."), 11);
 
         popmenu.insertSeparator(-1);
         popmenu.insertItem(SmallIcon("editdelete"), i18n("Delete Search"), 12);
diff --git a/digikam/digikam/timelinefolderview.cpp b/digikam/digikam/timelinefolderview.cpp
index 9fd1926..4028bc3 100644
--- a/digikam/digikam/timelinefolderview.cpp
+++ b/digikam/digikam/timelinefolderview.cpp
@@ -205,7 +205,7 @@ void TimeLineFolderView::slotAlbumAdded(Album* a)
     if (name == currentTimeLineSearchName()) return;
 
     TimeLineFolderItem* item = new TimeLineFolderItem(this, salbum);
-    item->setPixmap(0, SmallIcon("find", AlbumSettings::instance()->getDefaultTreeIconSize()));
+    item->setPixmap(0, SmallIcon("edit-find", AlbumSettings::instance()->getDefaultTreeIconSize()));
 }
 
 void TimeLineFolderView::slotAlbumDeleted(Album* a)
diff --git a/digikam/utilities/imageeditor/editor/editorwindow.cpp b/digikam/utilities/imageeditor/editor/editorwindow.cpp
index 8e4c5f4..8c2a122 100644
--- a/digikam/utilities/imageeditor/editor/editorwindow.cpp
+++ b/digikam/utilities/imageeditor/editor/editorwindow.cpp
@@ -306,7 +306,7 @@ void EditorWindow::setupStandardActions()
 
     d->copyAction->setEnabled(false);
 
-    m_undoAction = new TDEToolBarPopupAction(i18n("Undo"), "undo",
+    m_undoAction = new TDEToolBarPopupAction(i18n("Undo"), "edit-undo",
                                            TDEStdAccel::shortcut(TDEStdAccel::Undo),
                                            TQT_TQOBJECT(m_canvas), TQT_SLOT(slotUndo()),
                                            actionCollection(), "editorwindow_undo");
@@ -319,7 +319,7 @@ void EditorWindow::setupStandardActions()
 
     m_undoAction->setEnabled(false);
 
-    m_redoAction = new TDEToolBarPopupAction(i18n("Redo"), "redo",
+    m_redoAction = new TDEToolBarPopupAction(i18n("Redo"), "edit-redo",
                                            TDEStdAccel::shortcut(TDEStdAccel::Redo),
                                            TQT_TQOBJECT(m_canvas), TQT_SLOT(slotRedo()),
                                            actionCollection(), "editorwindow_redo");
diff --git a/digikam/utilities/setup/setupcamera.cpp b/digikam/utilities/setup/setupcamera.cpp
index f3f275c..214a1df 100644
--- a/digikam/utilities/setup/setupcamera.cpp
+++ b/digikam/utilities/setup/setupcamera.cpp
@@ -107,7 +107,7 @@ SetupCamera::SetupCamera( TQWidget* parent )
     d->editButton->setText( i18n( "&Edit..." ) );
     d->editButton->setIconSet(SmallIcon("configure"));
     d->autoDetectButton->setText( i18n( "Auto-&Detect" ) );
-    d->autoDetectButton->setIconSet(SmallIcon("find"));
+    d->autoDetectButton->setIconSet(SmallIcon("edit-find"));
     d->removeButton->setEnabled(false);
     d->editButton->setEnabled(false);