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

2 files changed, 11 insertions, 11 deletions

diff --git a/noatun/library/noatunstdaction.cpp b/noatun/library/noatunstdaction.cpp
index 212fdc31..de05590c 100644
--- a/noatun/library/noatunstdaction.cpp
+++ b/noatun/library/noatunstdaction.cpp
@@ -35,13 +35,13 @@ PlayAction::PlayAction(TQObject *parent, const char *name)
 
 void PlayAction::playing()
 {
-	setIconSet(TQIconSet(SmallIcon("player_pause")));
+	setIconSet(TQIconSet(SmallIcon("media-playback-pause")));
 	setText(i18n("Pause"));
 }
 
 void PlayAction::notplaying()
 {
-	setIconSet(TQIconSet(SmallIcon("player_play")));
+	setIconSet(TQIconSet(SmallIcon("media-playback-start")));
 	setText(i18n("Play"));
 }
 /////////////////////////////////////////////////////
@@ -249,12 +249,12 @@ TDEAction *equalizer(TQObject *parent, const char *name)
 
 TDEAction *back(TQObject *parent, const char *name)
 {
-	return new TDEAction(i18n("&Back"), "player_start", 0, TQT_TQOBJECT(napp->player()), TQT_SLOT(back()), parent, name);
+	return new TDEAction(i18n("&Back"), "media-skip-backward", 0, TQT_TQOBJECT(napp->player()), TQT_SLOT(back()), parent, name);
 }
 
 TDEAction *stop(TQObject *parent, const char *name)
 {
-	StereoButtonAction *action = new StereoButtonAction(i18n("Stop"), "player_stop", 0, napp->player(), TQT_SLOT(stop()), parent, name);
+	StereoButtonAction *action = new StereoButtonAction(i18n("Stop"), "media-playback-stop", 0, napp->player(), TQT_SLOT(stop()), parent, name);
 	TQObject::connect(napp->player(), TQT_SIGNAL(playing()), action, TQT_SLOT(enable()));
 	TQObject::connect(napp->player(), TQT_SIGNAL(paused()), action, TQT_SLOT(enable()));
 	TQObject::connect(napp->player(), TQT_SIGNAL(stopped()), action, TQT_SLOT(disable()));
@@ -267,12 +267,12 @@ TDEAction *stop(TQObject *parent, const char *name)
 
 TDEAction *forward(TQObject *parent, const char *name)
 {
-	return new TDEAction(i18n("&Forward"), "player_end", 0, napp->player(), TQT_SLOT(forward()), parent, name);
+	return new TDEAction(i18n("&Forward"), "media-skip-forward", 0, napp->player(), TQT_SLOT(forward()), parent, name);
 }
 
 TDEAction *play(TQObject *parent, const char *name)
 {
-	StereoButtonAction *action = new StereoButtonAction(i18n("&Play"), "player_play", 0, napp->player(), TQT_SLOT(playpause()), parent, name);
+	StereoButtonAction *action = new StereoButtonAction(i18n("&Play"), "media-playback-start", 0, napp->player(), TQT_SLOT(playpause()), parent, name);
 	TQObject::connect(napp->player(), TQT_SIGNAL(playing()), action, TQT_SLOT(disable()));
 	TQObject::connect(napp->player(), TQT_SIGNAL(paused()), action, TQT_SLOT(enable()));
 	TQObject::connect(napp->player(), TQT_SIGNAL(stopped()), action, TQT_SLOT(enable()));
@@ -285,7 +285,7 @@ TDEAction *play(TQObject *parent, const char *name)
 
 TDEAction *pause(TQObject *parent, const char *name)
 {
-	StereoButtonAction *action = new StereoButtonAction(i18n("&Pause"), "player_pause", 0, napp->player(), TQT_SLOT(playpause()), parent, name);
+	StereoButtonAction *action = new StereoButtonAction(i18n("&Pause"), "media-playback-pause", 0, napp->player(), TQT_SLOT(playpause()), parent, name);
 	TQObject::connect(napp->player(), TQT_SIGNAL(playing()), action, TQT_SLOT(enable()));
 	TQObject::connect(napp->player(), TQT_SIGNAL(paused()), action, TQT_SLOT(disable()));
 	TQObject::connect(napp->player(), TQT_SIGNAL(stopped()), action, TQT_SLOT(disable()));
diff --git a/noatun/modules/systray/systray.cpp b/noatun/modules/systray/systray.cpp
index 7f7cf7dc..da0590ce 100644
--- a/noatun/modules/systray/systray.cpp
+++ b/noatun/modules/systray/systray.cpp
@@ -118,7 +118,7 @@ NoatunSystray::NoatunSystray() : TDEMainWindow(0, "NoatunSystray"), Plugin(),
 	mTray->show();
 
 	trayBase = renderIcon(BASEICON, TQString());
-	trayStatus = renderIcon(BASEICON, "player_stop");
+	trayStatus = renderIcon(BASEICON, "media-playback-stop");
 
 	mTray->changeTitle(*trayBase, i18n("Noatun"));
 	showingTrayStatus = false;
@@ -198,12 +198,12 @@ void NoatunSystray::slotPlayPause()
 
 	if(napp->player()->isPaused())
 	{
-		changeTray("player_pause");
+		changeTray("media-playback-pause");
 		status = i18n("Noatun - Paused");
 	}
 	else
 	{
-		changeTray("player_play");
+		changeTray("media-playback-start");
 		status = i18n("Noatun - Playing");
 	}
 
@@ -255,7 +255,7 @@ void NoatunSystray::slotStopped()
 {
 	if(!napp->player()->current())
 		return;
-	changeTray("player_stop");
+	changeTray("media-playback-stop");
 	setTipText(TQString("<qt><nobr><h4>%1</h4></nobr></qt>").arg(i18n("Noatun - Stopped")));
 }