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

3 files changed, 19 insertions, 19 deletions

diff --git a/src/k3baudioplayer.cpp b/src/k3baudioplayer.cpp
index f96ce93..04f569f 100644
--- a/src/k3baudioplayer.cpp
+++ b/src/k3baudioplayer.cpp
@@ -181,13 +181,13 @@ K3bAudioPlayer::K3bAudioPlayer( TQWidget* parent, const char* name )
   m_buttonPlay = new TQToolButton( this );
   m_buttonPause = new TQToolButton( this );
   m_buttonStop = new TQToolButton( this );
-  m_buttonPlay->setIconSet( SmallIconSet("player_play") );
-  m_buttonPause->setIconSet( SmallIconSet("player_pause") );
-  m_buttonStop->setIconSet( SmallIconSet("player_stop") );
+  m_buttonPlay->setIconSet( SmallIconSet("media-playback-start") );
+  m_buttonPause->setIconSet( SmallIconSet("media-playback-pause") );
+  m_buttonStop->setIconSet( SmallIconSet("media-playback-stop") );
   m_buttonForward = new TQToolButton( this );
   m_buttonBack = new TQToolButton( this );
-  m_buttonForward->setIconSet( SmallIconSet("player_end") );
-  m_buttonBack->setIconSet( SmallIconSet("player_start") );
+  m_buttonForward->setIconSet( SmallIconSet("media-skip-forward") );
+  m_buttonBack->setIconSet( SmallIconSet("media-skip-backward") );
 
   m_seekSlider = new TQSlider( TQSlider::Horizontal, this );
 
diff --git a/src/projects/k3baudiotrackplayer.cpp b/src/projects/k3baudiotrackplayer.cpp
index 8cb7633..2118791 100644
--- a/src/projects/k3baudiotrackplayer.cpp
+++ b/src/projects/k3baudiotrackplayer.cpp
@@ -68,38 +68,38 @@ K3bAudioTrackPlayer::K3bAudioTrackPlayer( K3bAudioDoc* doc, TQObject* parent, co
   // create the actions
   // TODO: create shortcuts (is there a way to let the user change them?)
   d->actionPlay = new TDEAction( i18n("Play"), 
-			       "player_play", 
+			       "media-playback-start", 
 			       TDEShortcut(), 
 			       this, TQT_SLOT(playPause()), 
 			       d->actionCollection,
 			       "play" );
   d->actionPause = new TDEAction( i18n("Pause"), 
-				"player_pause", 
+				"media-playback-pause", 
 				TDEShortcut(), 
 				this, TQT_SLOT(playPause()), 
 				d->actionCollection,
 				"pause" );
   d->actionPlayPause = new TDEAction( i18n("Play/Pause"), 
-				    "player_play", 
+				    "media-playback-start", 
 				    TDEShortcut(), 
 				    this, TQT_SLOT(playPause()), 
 				    d->actionCollection,
 				    "play_pause" );
 
   d->actionStop = new TDEAction( i18n("Stop"), 
-			       "player_stop", 
+			       "media-playback-stop", 
 			       TDEShortcut(), 
 			       this, TQT_SLOT(stop()), 
 			       d->actionCollection,
 			       "stop" );
   d->actionNext = new TDEAction( i18n("Next"), 
-			       "player_end", 
+			       "media-skip-forward", 
 			       TDEShortcut(), 
 			       this, TQT_SLOT(next()), 
 			       d->actionCollection,
 			       "next" );
   d->actionPrev = new TDEAction( i18n("Prev"), 
-			       "player_start", 
+			       "media-skip-backward", 
 			       TDEShortcut(), 
 			       this, TQT_SLOT(prev()), 
 			       d->actionCollection,
@@ -212,7 +212,7 @@ void K3bAudioTrackPlayer::playPause()
     if( !d->playing ) {
       seek( m_currentPosition );
       d->playing = true;
-      d->actionPlayPause->setIcon( "player_pause" );
+      d->actionPlayPause->setIcon( "media-playback-pause" );
       d->actionPause->setEnabled(true);
       d->actionPlay->setEnabled(false);
       d->actionSeek->setEnabled(true);
@@ -221,7 +221,7 @@ void K3bAudioTrackPlayer::playPause()
     }
     else if( d->paused ) {
       d->paused = false;
-      d->actionPlayPause->setIcon( "player_pause" );
+      d->actionPlayPause->setIcon( "media-playback-pause" );
       d->actionPause->setEnabled(true);
       d->actionPlay->setEnabled(false);
       startStreaming();
@@ -231,7 +231,7 @@ void K3bAudioTrackPlayer::playPause()
     }
     else {
       d->paused = true;
-      d->actionPlayPause->setIcon( "player_play" );
+      d->actionPlayPause->setIcon( "media-playback-start" );
       d->actionPause->setEnabled(false);
       d->actionPlay->setEnabled(true);
       stopStreaming();
@@ -259,7 +259,7 @@ void K3bAudioTrackPlayer::stop()
   d->actionNext->setEnabled(false);
   d->actionPrev->setEnabled(false);
 
-  d->actionPlayPause->setIcon( "player_play" );
+  d->actionPlayPause->setIcon( "media-playback-start" );
 
   emit stopped();
 }
diff --git a/src/projects/k3baudiotrackview.cpp b/src/projects/k3baudiotrackview.cpp
index 63bd4a7..5eaf550 100644
--- a/src/projects/k3baudiotrackview.cpp
+++ b/src/projects/k3baudiotrackview.cpp
@@ -176,7 +176,7 @@ void K3bAudioTrackView::setupActions()
   m_actionEditSource = new TDEAction( i18n("Edit Source..."), 0,
 				    TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotEditSource()),
 				    actionCollection(), "source_edit" );
-  m_actionPlayTrack = new TDEAction( i18n("Play Track"), "player_play",
+  m_actionPlayTrack = new TDEAction( i18n("Play Track"), "media-playback-start",
 				   TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotPlayTrack()),
 				   actionCollection(), "track_play" );
 #ifdef HAVE_MUSICBRAINZ
@@ -954,7 +954,7 @@ void K3bAudioTrackView::showPlayerIndicator( K3bAudioTrack* track )
   removePlayerIndicator();
   m_currentlyPlayingTrack = track;
   K3bAudioTrackViewItem* item = getTrackViewItem( track );
-  item->setPixmap( 1, SmallIcon( "player_play" ) );
+  item->setPixmap( 1, SmallIcon( "media-playback-start" ) );
   m_playerItemAnimator->setItem( item, 1 );
 }
 
@@ -963,9 +963,9 @@ void K3bAudioTrackView::togglePauseIndicator( bool b )
 {
   if( m_currentlyPlayingTrack ) {
     if( b )
-      m_playerItemAnimator->setPixmap( SmallIcon( "player_pause" ) );
+      m_playerItemAnimator->setPixmap( SmallIcon( "media-playback-pause" ) );
     else
-      m_playerItemAnimator->setPixmap( SmallIcon( "player_play" ) );
+      m_playerItemAnimator->setPixmap( SmallIcon( "media-playback-start" ) );
   }
 }