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

13 files changed, 51 insertions, 51 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);
diff --git a/kaboodle/view.cpp b/kaboodle/view.cpp
index 2fe044d4..7cf14afc 100644
--- a/kaboodle/view.cpp
+++ b/kaboodle/view.cpp
@@ -86,8 +86,8 @@ Kaboodle::View::View(TQWidget *parent, const char *name, Player *p)
 	layout->setAutoAdd(true);
 
 	playButton = createButton(BarIconSet("1rightarrow"), i18n("Play"), player, TQT_SLOT(play()), sliderBox);
-	pauseButton = createButton(BarIconSet("player_pause"), i18n("Pause"), player, TQT_SLOT(pause()), sliderBox);
-	stopButton = createButton(BarIconSet("player_stop"), i18n("Stop"), player, TQT_SLOT(stop()), sliderBox);
+	pauseButton = createButton(BarIconSet("media-playback-pause"), i18n("Pause"), player, TQT_SLOT(pause()), sliderBox);
+	stopButton = createButton(BarIconSet("media-playback-stop"), i18n("Stop"), player, TQT_SLOT(stop()), sliderBox);
 
 	slider = new L33tSlider(0, 1000, 10, 0, Qt::Horizontal, sliderBox);
 	slider->setTickmarks(TQSlider::NoMarks);
diff --git a/kaudiocreator/jobqueimp.cpp b/kaudiocreator/jobqueimp.cpp
index 5ea164e3..a800aea3 100644
--- a/kaudiocreator/jobqueimp.cpp
+++ b/kaudiocreator/jobqueimp.cpp
@@ -93,7 +93,7 @@ void JobQueImp::addJob(Job*job, const TQString &name ){
 		return;
 	job->id = ++currentId;
 	QueListViewItem *currentItem = new QueListViewItem(todoQue, TQString("%1%2").arg(getStringFromNumber(currentId)).arg(currentId), "0", name);
-	currentItem->setPixmap(ICON_LOC, SmallIcon("player_pause", currentItem->height()-2));
+	currentItem->setPixmap(ICON_LOC, SmallIcon("media-playback-pause", currentItem->height()-2));
 	queLabel->setText(i18n("Number of jobs in the queue: %1").arg(todoQue->childCount()));
 }
 
diff --git a/krec/krecord.cpp b/krec/krecord.cpp
index 8228ef13..5c14882f 100644
--- a/krec/krecord.cpp
+++ b/krec/krecord.cpp
@@ -206,8 +206,8 @@ void KRecPrivate::playthru( bool yes ){
 
 void KRecPrivate::checkActions(){
 	_impl->actionCollection()->action( "player_record" )->setEnabled( false );
-	_impl->actionCollection()->action( "player_play" )->setEnabled( false );
-	_impl->actionCollection()->action( "player_stop" )->setEnabled( false );
+	_impl->actionCollection()->action( "media-playback-start" )->setEnabled( false );
+	_impl->actionCollection()->action( "media-playback-stop" )->setEnabled( false );
 	_impl->actionCollection()->action( "player_gobegin" )->setEnabled( false );
 	_impl->actionCollection()->action( "player_goend" )->setEnabled( false );
 	_impl->actionCollection()->action( "export_file" )->setEnabled( false );
@@ -218,10 +218,10 @@ void KRecPrivate::checkActions(){
 		if ( !_exportitem || ( _exportitem && !_exportitem->running() ) ) {
 			if ( !m_recStream->running() && !m_playStream->running() ) {
 				_impl->actionCollection()->action( "player_record" )->setEnabled( true );
-				_impl->actionCollection()->action( "player_play" )->setEnabled( true );
+				_impl->actionCollection()->action( "media-playback-start" )->setEnabled( true );
 			}
 			if ( m_playStream->running() || m_recStream->running() )
-				_impl->actionCollection()->action( "player_stop" )->setEnabled( true );
+				_impl->actionCollection()->action( "media-playback-stop" )->setEnabled( true );
 			if ( _currentFile->position() != 0 )
 				_impl->actionCollection()->action( "player_gobegin" )->setEnabled( true );
 			if ( _currentFile->position() != _currentFile->size() )
@@ -300,9 +300,9 @@ KRecord::KRecord(TQWidget *parent, const char *name )
 	d->aRecord = new TDEAction( i18n( "&Record" ), TDEShortcut( Key_R ),
 	                          TQT_TQOBJECT(this), TQT_SLOT( startRec() ), actionCollection(), "player_record" );
 	d->aPlay = new TDEAction( i18n( "&Play" ), TDEShortcut( Key_P ),
-	                        TQT_TQOBJECT(this), TQT_SLOT( startPlay() ), actionCollection(), "player_play" );
+	                        TQT_TQOBJECT(this), TQT_SLOT( startPlay() ), actionCollection(), "media-playback-start" );
 	d->aStop = new TDEAction( i18n( "&Stop" ), TDEShortcut( Key_S ),
-	                        TQT_TQOBJECT(this), TQT_SLOT( stopRec() ), actionCollection(), "player_stop" );
+	                        TQT_TQOBJECT(this), TQT_SLOT( stopRec() ), actionCollection(), "media-playback-stop" );
 	d->aThru = new TDEToggleAction( i18n( "Play Through" ), TDEShortcut( CTRL + Key_P), actionCollection(), "play_thru" );
 	connect( d->aThru, TQT_SIGNAL( toggled( bool ) ), d, TQT_SLOT( playthru( bool ) ) );
 
diff --git a/kscd/docking.cpp b/kscd/docking.cpp
index 8d6cb859..e6689b8d 100644
--- a/kscd/docking.cpp
+++ b/kscd/docking.cpp
@@ -47,16 +47,16 @@ DockWidget::DockWidget( KSCD* parent, const char *name)
     TDEActionCollection* actionCollection = parent->actionCollection();
     m_backAction = actionCollection->action("Previous");
     m_forwardAction = actionCollection->action("Next");
-    m_backPix = loadIcon("player_start");
-    m_forwardPix = loadIcon("player_end");
+    m_backPix = loadIcon("media-skip-backward");
+    m_forwardPix = loadIcon("media-skip-forward");
 
     // popup menu for right mouse button
     TQPopupMenu* popup = contextMenu();
 
-    popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("player_play", TDEIcon::Small), i18n("Play/Pause"), parent, TQT_SLOT(playClicked()));
-    popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("player_stop", TDEIcon::Small), i18n("Stop"), parent, TQT_SLOT(stopClicked()));
-    popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("player_end", TDEIcon::Small), i18n("Next"), parent, TQT_SLOT(nextClicked()));
-    popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("player_start", TDEIcon::Small), i18n("Previous"), parent, TQT_SLOT(prevClicked()));
+    popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("media-playback-start", TDEIcon::Small), i18n("Play/Pause"), parent, TQT_SLOT(playClicked()));
+    popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("media-playback-stop", TDEIcon::Small), i18n("Stop"), parent, TQT_SLOT(stopClicked()));
+    popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("media-skip-forward", TDEIcon::Small), i18n("Next"), parent, TQT_SLOT(nextClicked()));
+    popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("media-skip-backward", TDEIcon::Small), i18n("Previous"), parent, TQT_SLOT(prevClicked()));
     popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("player_eject", TDEIcon::Small), i18n("Eject"), parent, TQT_SLOT(ejectClicked()));
 
     TQToolTip::add(this, kapp->aboutData()->programName());
diff --git a/kscd/kscd.cpp b/kscd/kscd.cpp
index 8b8463e9..7fb011c0 100644
--- a/kscd/kscd.cpp
+++ b/kscd/kscd.cpp
@@ -331,11 +331,11 @@ void KSCD::drawPanel()
 
 void KSCD::setIcons()
 {
-  playPB->setIconSet(SmallIconSet("player_play"));
-  stopPB->setIconSet(SmallIconSet("player_stop"));
+  playPB->setIconSet(SmallIconSet("media-playback-start"));
+  stopPB->setIconSet(SmallIconSet("media-playback-stop"));
   ejectPB->setIconSet(SmallIconSet("player_eject"));
-  prevPB->setIconSet(SmallIconSet("player_start"));
-  nextPB->setIconSet(SmallIconSet("player_end"));
+  prevPB->setIconSet(SmallIconSet("media-skip-backward"));
+  nextPB->setIconSet(SmallIconSet("media-skip-forward"));
   cddbPB->setIconSet(SmallIconSet("view_text"));
   infoPB->setIconSet(SmallIconSet("system-run"));
 }
@@ -414,7 +414,7 @@ void KSCD::playClicked()
 
         // Update UI to allow a subsequent pause.
         statuslabel->setText(i18n("Play"));
-        playPB->setIconSet(SmallIconSet("player_pause"));
+        playPB->setIconSet(SmallIconSet("media-playback-pause"));
         playPB->setText(i18n("Pause"));
     }
     else
@@ -423,7 +423,7 @@ void KSCD::playClicked()
 
         // Update UI to allow a subsequent play.
         statuslabel->setText(i18n("Pause"));
-        playPB->setIconSet(SmallIconSet("player_play"));
+        playPB->setIconSet(SmallIconSet("media-playback-start"));
         playPB->setText(i18n("Play"));
     }
 
@@ -1041,7 +1041,7 @@ void KSCD::discStopped()
     
     statuslabel->setText(i18n("Stopped"));
     playPB->setText(i18n("Play"));
-    playPB->setIconSet(SmallIconSet("player_play"));
+    playPB->setIconSet(SmallIconSet("media-playback-start"));
 
     /* reset to initial value, only stopclicked() sets this to true */
     stoppedByUser = false;
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")));
 }
 
diff --git a/tdemid/tdemid_part.cpp b/tdemid/tdemid_part.cpp
index b6e5b63e..81c31973 100644
--- a/tdemid/tdemid_part.cpp
+++ b/tdemid/tdemid_part.cpp
@@ -77,11 +77,11 @@ TDEInstance *KMidFactory::instance()
   setWidget(widget);
 
   // create and connect our actions
-   (void)new TDEAction(i18n("Play"), "player_play", 0, this,
+   (void)new TDEAction(i18n("Play"), "media-playback-start", 0, this,
       TQT_SLOT(slotPlay()), actionCollection(),
       "play");
 
-   (void)new TDEAction(i18n("Stop"), "player_stop", 0, this,
+   (void)new TDEAction(i18n("Stop"), "media-playback-stop", 0, this,
       TQT_SLOT(slotStop()), actionCollection(),
       "stop");
 
diff --git a/tdemid/tdemidframe.cpp b/tdemid/tdemidframe.cpp
index 870a1db1..fbfaa4c0 100644
--- a/tdemid/tdemidframe.cpp
+++ b/tdemid/tdemidframe.cpp
@@ -91,17 +91,17 @@ tdemidFrame::tdemidFrame(const char *name)
 	TQT_SLOT(file_SaveLyrics()), actionCollection(), "file_save_lyrics");
     KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection());
 
-    (void)new TDEAction(i18n("&Play"), "player_play", TQt::Key_Space,
+    (void)new TDEAction(i18n("&Play"), "media-playback-start", TQt::Key_Space,
 		TQT_TQOBJECT(tdemidclient), TQT_SLOT(slotPlay()), actionCollection(), "song_play");
-    (void)new TDEAction(i18n("P&ause"), "player_pause", TQt::Key_P, TQT_TQOBJECT(tdemidclient),
+    (void)new TDEAction(i18n("P&ause"), "media-playback-pause", TQt::Key_P, TQT_TQOBJECT(tdemidclient),
 			TQT_SLOT(slotPause()), actionCollection(), "song_pause");
-    (void)new TDEAction(i18n("&Stop"), "player_stop", TQt::Key_Backspace,
+    (void)new TDEAction(i18n("&Stop"), "media-playback-stop", TQt::Key_Backspace,
 		TQT_TQOBJECT(tdemidclient), TQT_SLOT(slotStop()), actionCollection(), "song_stop");
 
-    (void)new TDEAction(i18n("P&revious Song"), "player_start", Key_Left,
+    (void)new TDEAction(i18n("P&revious Song"), "media-skip-backward", Key_Left,
 		TQT_TQOBJECT(tdemidclient), TQT_SLOT(slotPrevSong()), actionCollection(),
 		"song_previous");
-    (void)new TDEAction(i18n("&Next Song"), "player_end", Key_Right,
+    (void)new TDEAction(i18n("&Next Song"), "media-skip-forward", Key_Right,
 		TQT_TQOBJECT(tdemidclient), TQT_SLOT(slotNextSong()), actionCollection(),
 		"song_next");
     (void)new TDEToggleAction(i18n("&Loop"), 0, TQT_TQOBJECT(this), TQT_SLOT(song_Loop()),