Bring mail_forward, mail_new, mail_replyall, mail_reply, mail_send, player_pause, player_play, player_stop, player_rew, player_fwd, player_start, player_end, rotate_ccw, rotate_cw, window_fullscreen, window_nofullscreen, window_new, viewmagfit, viewmag+, viewmag1, and viewmag- icons into XDG compliance

4 files changed, 11 insertions, 11 deletions

diff --git a/juk/juk.cpp b/juk/juk.cpp
index 80a8a7a8..c66c19fc 100644
--- a/juk/juk.cpp
+++ b/juk/juk.cpp
@@ -138,12 +138,12 @@ void JuK::setupActions()
     connect(ka, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotCheckAlbumNextAction(bool)));
     actionMenu->insert(ka);
 
-    new TDEAction(i18n("&Play"),  "player_play",  0, TQT_TQOBJECT(m_player), TQT_SLOT(play()),  ActionCollection::actions(), "play");
-    new TDEAction(i18n("P&ause"), "player_pause", 0, TQT_TQOBJECT(m_player), TQT_SLOT(pause()), ActionCollection::actions(), "pause");
-    new TDEAction(i18n("&Stop"),  "player_stop",  0, TQT_TQOBJECT(m_player), TQT_SLOT(stop()),  ActionCollection::actions(), "stop");
+    new TDEAction(i18n("&Play"),  "media-playback-start",  0, TQT_TQOBJECT(m_player), TQT_SLOT(play()),  ActionCollection::actions(), "play");
+    new TDEAction(i18n("P&ause"), "media-playback-pause", 0, TQT_TQOBJECT(m_player), TQT_SLOT(pause()), ActionCollection::actions(), "pause");
+    new TDEAction(i18n("&Stop"),  "media-playback-stop",  0, TQT_TQOBJECT(m_player), TQT_SLOT(stop()),  ActionCollection::actions(), "stop");
 
-    new TDEToolBarPopupAction(i18n("previous track", "Previous"), "player_start", TDEShortcut(), TQT_TQOBJECT(m_player), TQT_SLOT(back()), ActionCollection::actions(), "back");
-    new TDEAction(i18n("next track", "&Next"), "player_end", TDEShortcut(), TQT_TQOBJECT(m_player), TQT_SLOT(forward()), ActionCollection::actions(), "forward");
+    new TDEToolBarPopupAction(i18n("previous track", "Previous"), "media-skip-backward", TDEShortcut(), TQT_TQOBJECT(m_player), TQT_SLOT(back()), ActionCollection::actions(), "back");
+    new TDEAction(i18n("next track", "&Next"), "media-skip-forward", TDEShortcut(), TQT_TQOBJECT(m_player), TQT_SLOT(forward()), ActionCollection::actions(), "forward");
     new TDEToggleAction(i18n("&Loop Playlist"), 0, TDEShortcut(), ActionCollection::actions(), "loopPlaylist");
     TDEToggleAction *resizeColumnAction =
         new TDEToggleAction(i18n("&Resize Playlist Columns Manually"),
diff --git a/juk/playlistcollection.cpp b/juk/playlistcollection.cpp
index 4bbe5081..d70b36e9 100644
--- a/juk/playlistcollection.cpp
+++ b/juk/playlistcollection.cpp
@@ -843,7 +843,7 @@ PlaylistCollection::ActionHandler::ActionHandler(PlaylistCollection *collection)
     menu = new TDEActionMenu(i18n("&New"), "document-new", actions(), "file_new");
 
     menu->insert(createAction(i18n("&Empty Playlist..."), TQT_SLOT(slotCreatePlaylist()),
-                              "newPlaylist", "window_new", "CTRL+n"));
+                              "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()),
diff --git a/juk/systemtray.cpp b/juk/systemtray.cpp
index 92d14081..c2e0f686 100644
--- a/juk/systemtray.cpp
+++ b/juk/systemtray.cpp
@@ -149,11 +149,11 @@ SystemTray::SystemTray(TQWidget *parent, const char *name) : KSystemTray(parent,
 
     m_appPix = loadIcon("juk_dock");
 
-    m_playPix = createPixmap("player_play");
-    m_pausePix = createPixmap("player_pause");
+    m_playPix = createPixmap("media-playback-start");
+    m_pausePix = createPixmap("media-playback-pause");
 
-    m_forwardPix = loadIcon("player_end");
-    m_backPix = loadIcon("player_start");
+    m_forwardPix = loadIcon("media-skip-forward");
+    m_backPix = loadIcon("media-skip-backward");
 
     setPixmap(m_appPix);
 
diff --git a/juk/tageditor.cpp b/juk/tageditor.cpp
index b4e1d866..321f0131 100644
--- a/juk/tageditor.cpp
+++ b/juk/tageditor.cpp
@@ -502,7 +502,7 @@ void TagEditor::setupLayout()
 	addItem(i18n("&Artist name:"), m_artistNameBox, leftColumnLayout, "personal");
 
         m_trackNameBox = new KLineEdit(this, "trackNameBox");
-	addItem(i18n("&Track name:"), m_trackNameBox, leftColumnLayout, "player_play");
+	addItem(i18n("&Track name:"), m_trackNameBox, leftColumnLayout, "media-playback-start");
 
 	m_albumNameBox = new KComboBox(true, this, "albumNameBox");
 	m_albumNameBox->setCompletionMode(TDEGlobalSettings::CompletionAuto);