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

5 files changed, 16 insertions, 16 deletions

diff --git a/juk/playlist.cpp b/juk/playlist.cpp
index 51ccb61c..7dce3bb3 100644
--- a/juk/playlist.cpp
+++ b/juk/playlist.cpp
@@ -2105,7 +2105,7 @@ void Playlist::slotShowRMBMenu(TQListViewItem *item, const TQPoint &point, int c
 	m_rmbMenu->insertSeparator();
 
 	m_rmbMenu->insertItem(
-	    SmallIcon("folder_new"), i18n("Create Playlist From Selected Items..."), this, TQT_SLOT(slotCreateGroup()));
+	    SmallIcon("folder-new"), i18n("Create Playlist From Selected Items..."), this, TQT_SLOT(slotCreateGroup()));
 
 	K3bExporter *exporter = new K3bExporter(this);
 	TDEAction *k3bAction = exporter->action();
diff --git a/juk/playlistcollection.cpp b/juk/playlistcollection.cpp
index 998cde81..4bbe5081 100644
--- a/juk/playlistcollection.cpp
+++ b/juk/playlistcollection.cpp
@@ -840,14 +840,14 @@ PlaylistCollection::ActionHandler::ActionHandler(PlaylistCollection *collection)
 
     // "New" menu
 
-    menu = new TDEActionMenu(i18n("&New"), "filenew", actions(), "file_new");
+    menu = new TDEActionMenu(i18n("&New"), "document-new", actions(), "file_new");
 
     menu->insert(createAction(i18n("&Empty Playlist..."), TQT_SLOT(slotCreatePlaylist()),
                               "newPlaylist", "window_new", "CTRL+n"));
     menu->insert(createAction(i18n("&Search Playlist..."), TQT_SLOT(slotCreateSearchPlaylist()),
                               "newSearchPlaylist", "edit-find", "CTRL+f"));
     menu->insert(createAction(i18n("Playlist From &Folder..."), TQT_SLOT(slotCreateFolderPlaylist()),
-                              "newDirectoryPlaylist", "fileopen", "CTRL+d"));
+                              "newDirectoryPlaylist", "document-open", "CTRL+d"));
 
     // Guess tag info menu
 
@@ -868,19 +868,19 @@ PlaylistCollection::ActionHandler::ActionHandler(PlaylistCollection *collection)
     createAction(i18n("Play First Track"),TQT_SLOT(slotPlayFirst()),     "playFirst");
     createAction(i18n("Play Next Album"), TQT_SLOT(slotPlayNextAlbum()), "forwardAlbum", "next");
 
-    createAction(i18n("Open..."),         TQT_SLOT(slotOpen()),         "file_open", "fileopen", "CTRL+o");
-    createAction(i18n("Add &Folder..."),  TQT_SLOT(slotAddFolder()),    "openDirectory", "fileopen");
+    createAction(i18n("Open..."),         TQT_SLOT(slotOpen()),         "file_open", "document-open", "CTRL+o");
+    createAction(i18n("Add &Folder..."),  TQT_SLOT(slotAddFolder()),    "openDirectory", "document-open");
     createAction(i18n("&Rename..."),      TQT_SLOT(slotRename()),       "renamePlaylist", "lineedit");
-    createAction(i18n("D&uplicate..."),   TQT_SLOT(slotDuplicate()),    "duplicatePlaylist", "editcopy");
-    createAction(i18n("Save"),            TQT_SLOT(slotSave()),         "file_save", "filesave", "CTRL+s");
-    createAction(i18n("Save As..."),      TQT_SLOT(slotSaveAs()),       "file_save_as", "filesaveas");
+    createAction(i18n("D&uplicate..."),   TQT_SLOT(slotDuplicate()),    "duplicatePlaylist", "edit-copy");
+    createAction(i18n("Save"),            TQT_SLOT(slotSave()),         "file_save", "document-save", "CTRL+s");
+    createAction(i18n("Save As..."),      TQT_SLOT(slotSaveAs()),       "file_save_as", "document-save-as");
     createAction(i18n("R&emove"),         TQT_SLOT(slotRemove()),       "deleteItemPlaylist", "edittrash");
     createAction(i18n("Reload"),          TQT_SLOT(slotReload()),       "reloadPlaylist", "reload");
-    createAction(i18n("Edit Search..."),  TQT_SLOT(slotEditSearch()),   "editSearch", "editclear");
+    createAction(i18n("Edit Search..."),  TQT_SLOT(slotEditSearch()),   "editSearch", "edit-clear");
 
-    createAction(i18n("&Delete"),         TQT_SLOT(slotRemoveItems()),  "removeItem", "editdelete");
+    createAction(i18n("&Delete"),         TQT_SLOT(slotRemoveItems()),  "removeItem", "edit-delete");
     createAction(i18n("Refresh"),         TQT_SLOT(slotRefreshItems()), "refresh", "reload");
-    createAction(i18n("&Rename File"),    TQT_SLOT(slotRenameItems()),  "renameFile", "filesaveas", "CTRL+r");
+    createAction(i18n("&Rename File"),    TQT_SLOT(slotRenameItems()),  "renameFile", "document-save-as", "CTRL+r");
 
     menu = new TDEActionMenu(i18n("Cover Manager"), TQString(), actions(), "coverManager");
     menu->setIconSet(SmallIconSet("image"));
@@ -893,7 +893,7 @@ PlaylistCollection::ActionHandler::ActionHandler(PlaylistCollection *collection)
     menu->insert(createAction(i18n("Get Cover From &Internet..."),
         TQT_SLOT(slotAddInternetCover()), "googleCover", "connect_established", "CTRL+SHIFT+g"));
     menu->insert(createAction(i18n("&Delete Cover"),
-        TQT_SLOT(slotRemoveCovers()), "removeCover", "editdelete"));
+        TQT_SLOT(slotRemoveCovers()), "removeCover", "edit-delete"));
     menu->insert(createAction(i18n("Show Cover &Manager"),
         TQT_SLOT(slotShowCoverManager()), "showCoverManager"));
 
diff --git a/juk/tageditor.cpp b/juk/tageditor.cpp
index fc2835ea..b4e1d866 100644
--- a/juk/tageditor.cpp
+++ b/juk/tageditor.cpp
@@ -473,7 +473,7 @@ void TagEditor::setupActions()
     show->setCheckedState(i18n("Hide &Tag Editor"));
     connect(show, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setShown(bool)));
 
-    new TDEAction(i18n("&Save"), "filesave", "CTRL+t", TQT_TQOBJECT(this), TQT_SLOT(slotSave()), ActionCollection::actions(), "saveItem");
+    new TDEAction(i18n("&Save"), "document-save", "CTRL+t", TQT_TQOBJECT(this), TQT_SLOT(slotSave()), ActionCollection::actions(), "saveItem");
 }
 
 void TagEditor::setupLayout()
diff --git a/noatun/modules/htmlexport/htmlexport.cpp b/noatun/modules/htmlexport/htmlexport.cpp
index 77e832df..f665e014 100644
--- a/noatun/modules/htmlexport/htmlexport.cpp
+++ b/noatun/modules/htmlexport/htmlexport.cpp
@@ -17,7 +17,7 @@ HTMLExport::HTMLExport(): TQObject(0, "HTMLExport"), Plugin()
 {
 	NOATUNPLUGINC(HTMLExport);
 
-	mAction = new TDEAction(i18n("&Export Playlist..."), "filesaveas", 0,
+	mAction = new TDEAction(i18n("&Export Playlist..."), "document-save-as", 0,
 		this, TQT_SLOT(slotExport()), this, "exportlist");
 	napp->pluginActionMenu()->insert(mAction);
 
diff --git a/noatun/modules/splitplaylist/view.cpp b/noatun/modules/splitplaylist/view.cpp
index b7257505..bfdd0112 100644
--- a/noatun/modules/splitplaylist/view.cpp
+++ b/noatun/modules/splitplaylist/view.cpp
@@ -644,7 +644,7 @@ View::View(SplitPlaylist *)
 
 	mOpen=new TDEAction(i18n("Add &Files..."), "queue", 0, TQT_TQOBJECT(this), TQT_SLOT(addFiles()), actionCollection(), "add_files");
 	(void) new TDEAction(i18n("Add Fol&ders..."), "folder", 0, TQT_TQOBJECT(this), TQT_SLOT(addDirectory()),  actionCollection(), "add_dir");
-	mDelete=new TDEAction(i18n("Delete"), "editdelete", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(deleteSelected()),  actionCollection(), "delete");
+	mDelete=new TDEAction(i18n("Delete"), "edit-delete", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(deleteSelected()),  actionCollection(), "delete");
 
 	mClose=KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
 	mFind=KStdAction::find(TQT_TQOBJECT(this), TQT_SLOT(find()), actionCollection());
@@ -656,7 +656,7 @@ View::View(SplitPlaylist *)
 	mSaveAs=KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(saveAs()), actionCollection());
 
 	(void) new TDEAction(i18n("Shuffle"), "misc", 0, TQT_TQOBJECT(SPL), TQT_SLOT( randomize() ), actionCollection(), "shuffle");
-	(void) new TDEAction(i18n("Clear"), "editclear", 0, TQT_TQOBJECT(list), TQT_SLOT( clear() ), actionCollection(), "clear");
+	(void) new TDEAction(i18n("Clear"), "edit-clear", 0, TQT_TQOBJECT(list), TQT_SLOT( clear() ), actionCollection(), "clear");
 
 	createGUI("splui.rc");