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

11 files changed, 20 insertions, 20 deletions

diff --git a/kgeography/src/kgeography.cpp b/kgeography/src/kgeography.cpp
index a1387a00..c3970a3e 100644
--- a/kgeography/src/kgeography.cpp
+++ b/kgeography/src/kgeography.cpp
@@ -76,10 +76,10 @@ kgeography::kgeography() : TDEMainWindow(), p_firstShow(true), p_mustShowResults
 	a -> setText(i18n("&Open Map..."));
 	KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection(), "quit");
 
-	p_zoom = new TDEToggleAction(i18n("&Zoom"), "viewmagfit", 0, 0, 0, actionCollection(), "zoom_select");
+	p_zoom = new TDEToggleAction(i18n("&Zoom"), "zoom-fit-best", 0, 0, 0, actionCollection(), "zoom_select");
 	p_zoom -> setEnabled(false);
 	
-	p_zoomOriginal = new TDEAction(i18n("&Original Size"), "viewmag1", 0, 0, 0, actionCollection(), "zoom_original");
+	p_zoomOriginal = new TDEAction(i18n("&Original Size"), "zoom-original", 0, 0, 0, actionCollection(), "zoom_original");
 	p_zoomOriginal -> setEnabled(false);
 
 	p_move = new TDEToggleAction(i18n("&Move"), "move", 0, 0, 0, actionCollection(), "move");
diff --git a/kig/kig/kig_part.cpp b/kig/kig/kig_part.cpp
index af62d3b2..ef4de909 100644
--- a/kig/kig/kig_part.cpp
+++ b/kig/kig/kig_part.cpp
@@ -283,7 +283,7 @@ void KigPart::setupActions()
 #ifdef KIG_PART_CPP_STD_FULLSCREEN_ACTION
   a = KStdAction::fullScreen( TQT_TQOBJECT(m_widget), TQT_SLOT( toggleFullScreen() ), actionCollection(), (TQWidget*)(widget()->parent()),"fullscreen" );
 #else
-  tmp = l->loadIcon( "window_fullscreen", TDEIcon::Toolbar );
+  tmp = l->loadIcon( "view-fullscreen", TDEIcon::Toolbar );
   a = new TDEAction(
     i18n( "Full Screen" ), tmp, CTRL+SHIFT+Key_F,
     m_widget, TQT_SLOT( toggleFullScreen() ),
@@ -294,7 +294,7 @@ void KigPart::setupActions()
 
   // TODO: an icon for this..
   a = new TDEAction(
-    i18n( "&Select Shown Area" ), "viewmagfit", 0, TQT_TQOBJECT(m_widget), TQT_SLOT( zoomRect() ),
+    i18n( "&Select Shown Area" ), "zoom-fit-best", 0, TQT_TQOBJECT(m_widget), TQT_SLOT( zoomRect() ),
     actionCollection(), "view_select_shown_rect" );
   a->setToolTip( i18n( "Select the area that you want to be shown in the window." ) );
   a->setWhatsThis( i18n( "Select the area that you want to be shown in the window." ) );
diff --git a/klettres/klettres/klettres.cpp b/klettres/klettres/klettres.cpp
index 871056d2..f65d7697 100644
--- a/klettres/klettres/klettres.cpp
+++ b/klettres/klettres/klettres.cpp
@@ -199,7 +199,7 @@ void KLettres::setupActions()
     m_newAction->setToolTip(i18n("Play a new sound"));
     m_newAction->setWhatsThis(i18n("You can play a new sound by clicking this button or using the File menu, New Sound.")); 
     new TDEAction( i18n("Get Alphabet in New Language..."), "knewstuff", 0, TQT_TQOBJECT(this), TQT_SLOT( slotDownloadNewStuff() ), actionCollection(), "downloadnewstuff" );
-    TDEAction *m_playAgainAction = new TDEAction(i18n("Replay Sound"),"player_play", CTRL+Key_P, TQT_TQOBJECT(m_view), TQT_SLOT(slotPlayAgain()), actionCollection(), "play_again");
+    TDEAction *m_playAgainAction = new TDEAction(i18n("Replay Sound"),"media-playback-start", CTRL+Key_P, TQT_TQOBJECT(m_view), TQT_SLOT(slotPlayAgain()), actionCollection(), "play_again");
     m_playAgainAction->setToolTip(i18n("Play the same sound again"));
     m_playAgainAction->setWhatsThis(i18n("You can replay the same sound again by clicking this button or using the File menu, Replay Sound."));
     KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection());
diff --git a/kmplot/kmplot/MainDlg.cpp b/kmplot/kmplot/MainDlg.cpp
index 7533518c..6b8ebc10 100644
--- a/kmplot/kmplot/MainDlg.cpp
+++ b/kmplot/kmplot/MainDlg.cpp
@@ -141,9 +141,9 @@ void MainDlg::setupActions()
 
 	//zoom menu
 	m_mnuNoZoom = new TDERadioAction(i18n("&No Zoom") ,"CTRL+0",TQT_TQOBJECT(view), TQT_SLOT( mnuNoZoom_clicked() ),actionCollection(),"no_zoom" );
-	TDERadioAction * mnuRectangular = new TDERadioAction(i18n("Zoom &Rectangular"), "viewmagfit", "CTRL+1",TQT_TQOBJECT(view), TQT_SLOT( mnuRectangular_clicked() ),actionCollection(),"zoom_rectangular" );
-	TDERadioAction * mnuZoomIn = new TDERadioAction(i18n("Zoom &In"), "viewmag+", "CTRL+2",TQT_TQOBJECT(view), TQT_SLOT( mnuZoomIn_clicked() ),actionCollection(),"zoom_in" );
-	TDERadioAction * mnuZoomOut = new TDERadioAction(i18n("Zoom &Out"), "viewmag-", "CTRL+3",TQT_TQOBJECT(view), TQT_SLOT( mnuZoomOut_clicked() ),actionCollection(),"zoom_out" );
+	TDERadioAction * mnuRectangular = new TDERadioAction(i18n("Zoom &Rectangular"), "zoom-fit-best", "CTRL+1",TQT_TQOBJECT(view), TQT_SLOT( mnuRectangular_clicked() ),actionCollection(),"zoom_rectangular" );
+	TDERadioAction * mnuZoomIn = new TDERadioAction(i18n("Zoom &In"), "zoom-in", "CTRL+2",TQT_TQOBJECT(view), TQT_SLOT( mnuZoomIn_clicked() ),actionCollection(),"zoom_in" );
+	TDERadioAction * mnuZoomOut = new TDERadioAction(i18n("Zoom &Out"), "zoom-out", "CTRL+3",TQT_TQOBJECT(view), TQT_SLOT( mnuZoomOut_clicked() ),actionCollection(),"zoom_out" );
 	TDERadioAction * mnuZoomCenter = new TDERadioAction(i18n("&Center Point") ,"CTRL+4",TQT_TQOBJECT(view), TQT_SLOT( mnuCenter_clicked() ),actionCollection(),"zoom_center" );
 	(void ) new TDEAction(i18n("&Fit Widget to Trigonometric Functions") ,0,TQT_TQOBJECT(view), TQT_SLOT( mnuTrig_clicked() ),actionCollection(),"zoom_trig" );
 	m_mnuNoZoom->setExclusiveGroup("zoom_modes");
diff --git a/kstars/kstars/ccdpreviewwg.cpp b/kstars/kstars/ccdpreviewwg.cpp
index a2b168f3..6d86c413 100644
--- a/kstars/kstars/ccdpreviewwg.cpp
+++ b/kstars/kstars/ccdpreviewwg.cpp
@@ -67,8 +67,8 @@ FILE *CCDwfp;
 	 
   TDEIconLoader *icons = TDEGlobal::iconLoader();
   
-  playPix    = icons->loadIcon( "player_play", TDEIcon::Toolbar );
-  pausePix   = icons->loadIcon( "player_pause", TDEIcon::Toolbar );
+  playPix    = icons->loadIcon( "media-playback-start", TDEIcon::Toolbar );
+  pausePix   = icons->loadIcon( "media-playback-pause", TDEIcon::Toolbar );
   capturePix = icons->loadIcon( "frame_image", TDEIcon::Toolbar );
   
   playB->setPixmap(pausePix);	
diff --git a/kstars/kstars/kstarsinit.cpp b/kstars/kstars/kstarsinit.cpp
index 456c18a6..71ff520b 100644
--- a/kstars/kstars/kstarsinit.cpp
+++ b/kstars/kstars/kstarsinit.cpp
@@ -48,7 +48,7 @@
 
 void KStars::initActions() {
 //File Menu:
-	new TDEAction(i18n("&New Window"), "window_new", TDEShortcut( "Ctrl+N"  ),
+	new TDEAction(i18n("&New Window"), "window-new", TDEShortcut( "Ctrl+N"  ),
 			TQT_TQOBJECT(this), TQT_SLOT( newWindow() ), actionCollection(), "new_window");
 	new TDEAction(i18n("&Close Window"), "window-close", TDEShortcut( "Ctrl+W"  ),
 			TQT_TQOBJECT(this), TQT_SLOT( closeWindow() ), actionCollection(), "close_window");
@@ -67,7 +67,7 @@ void KStars::initActions() {
 		TQT_TQOBJECT(this), TQT_SLOT( slotSetTimeToNow() ), actionCollection(), "time_to_now" );
 	new TDEAction( i18n( "set Clock to New Time", "&Set Time..." ), "clock", TDEShortcut( "Ctrl+S"  ),
 		TQT_TQOBJECT(this), TQT_SLOT( slotSetTime() ), actionCollection(), "time_dialog" );
-	ToggleAction *actTimeRun = new ToggleAction( i18n( "Stop &Clock" ), BarIcon("player_pause"),
+	ToggleAction *actTimeRun = new ToggleAction( i18n( "Stop &Clock" ), BarIcon("media-playback-pause"),
 				i18n("Start &Clock"), BarIcon("1rightarrow"),
 				0, TQT_TQOBJECT(this), TQT_SLOT( slotToggleTimer() ), actionCollection(), "timer_control" );
 	actTimeRun->setOffToolTip( i18n( "Start Clock" ) );
diff --git a/kstars/kstars/streamwg.cpp b/kstars/kstars/streamwg.cpp
index 7235d02c..696f3468 100644
--- a/kstars/kstars/streamwg.cpp
+++ b/kstars/kstars/streamwg.cpp
@@ -54,8 +54,8 @@ FILE *wfp;
       
   TDEIconLoader *icons = TDEGlobal::iconLoader();
   
-  playPix    = icons->loadIcon( "player_play", TDEIcon::Toolbar );
-  pausePix   = icons->loadIcon( "player_pause", TDEIcon::Toolbar );
+  playPix    = icons->loadIcon( "media-playback-start", TDEIcon::Toolbar );
+  pausePix   = icons->loadIcon( "media-playback-pause", TDEIcon::Toolbar );
   capturePix = icons->loadIcon( "frame_image", TDEIcon::Toolbar );
   
   playB->setPixmap(pausePix);	
diff --git a/kstars/kstars/tools/observinglist.cpp b/kstars/kstars/tools/observinglist.cpp
index d3b921ea..025fb574 100644
--- a/kstars/kstars/tools/observinglist.cpp
+++ b/kstars/kstars/tools/observinglist.cpp
@@ -110,7 +110,7 @@ ObservingList::ObservingList( KStars *_ks, TQWidget* parent )
 	ui->SaveButton->setPixmap( icons->loadIcon( "document-save", TDEIcon::Toolbar ) );
 	ui->SaveAsButton->setPixmap( icons->loadIcon( "document-save-as", TDEIcon::Toolbar ) );
 	ui->WizardButton->setPixmap( icons->loadIcon( "wizard", TDEIcon::Toolbar ) );
-	ui->MiniButton->setPixmap( icons->loadIcon( "window_nofullscreen", TDEIcon::Toolbar ) );
+	ui->MiniButton->setPixmap( icons->loadIcon( "view-restore", TDEIcon::Toolbar ) );
 
 	ui->CenterButton->setEnabled( false );
 	ui->ScopeButton->setEnabled( false );
@@ -676,7 +676,7 @@ void ObservingList::slotWizard() {
 
 void ObservingList::slotToggleSize() {
 	if ( isLarge() ) {
-		ui->MiniButton->setPixmap( TDEGlobal::iconLoader()->loadIcon( "window_fullscreen", TDEIcon::Toolbar ) );
+		ui->MiniButton->setPixmap( TDEGlobal::iconLoader()->loadIcon( "view-fullscreen", TDEIcon::Toolbar ) );
 
 		//switch widget stack to show TinyTable
 		ui->TableStack->raiseWidget( ui->TinyTable );
@@ -697,7 +697,7 @@ void ObservingList::slotToggleSize() {
 		bIsLarge = false;
 
 	} else {
-		ui->MiniButton->setPixmap( TDEGlobal::iconLoader()->loadIcon( "window_nofullscreen", TDEIcon::Toolbar ) );
+		ui->MiniButton->setPixmap( TDEGlobal::iconLoader()->loadIcon( "view-restore", TDEIcon::Toolbar ) );
 
 		//switch widget stack to show FullTable
 		ui->TableStack->raiseWidget( ui->FullTable );
diff --git a/kstars/kstars/tools/planetviewer.cpp b/kstars/kstars/tools/planetviewer.cpp
index 64ed25b9..a3f00266 100644
--- a/kstars/kstars/tools/planetviewer.cpp
+++ b/kstars/kstars/tools/planetviewer.cpp
@@ -115,7 +115,7 @@ void PlanetViewer::slotRunClock() {
 	isClockRunning = !isClockRunning;
 	
 	if ( isClockRunning ) {
-		pw->RunButton->setPixmap( TDEGlobal::iconLoader()->loadIcon( "player_pause", TDEIcon::Toolbar ) );
+		pw->RunButton->setPixmap( TDEGlobal::iconLoader()->loadIcon( "media-playback-pause", TDEIcon::Toolbar ) );
 		tmr.start( 100 );
 //		pw->dateBox->setEnabled( false );
 	} else {
diff --git a/ktouch/src/ktouch.cpp b/ktouch/src/ktouch.cpp
index a92c0b4e..09c07f58 100644
--- a/ktouch/src/ktouch.cpp
+++ b/ktouch/src/ktouch.cpp
@@ -696,7 +696,7 @@ void KTouch::setupActions() {
 	// *** Training menu ***
     new TDEAction(i18n("&Start New Session"), "launch", 0,
         TQT_TQOBJECT(this), TQT_SLOT(trainingNewSession()), actionCollection(), "training_newsession");
-    m_trainingPause = new TDEAction(i18n("&Pause Session"), "player_pause", 0,
+    m_trainingPause = new TDEAction(i18n("&Pause Session"), "media-playback-pause", 0,
         TQT_TQOBJECT(this), TQT_SLOT(trainingPause()), actionCollection(), "training_pause");
     new TDEAction(i18n("&Lecture Statistics"), "kalarm", 0,
         TQT_TQOBJECT(this), TQT_SLOT(trainingStatistics()), actionCollection(), "training_stats");
diff --git a/kturtle/src/kturtle.cpp b/kturtle/src/kturtle.cpp
index 7170c742..085b0175 100644
--- a/kturtle/src/kturtle.cpp
+++ b/kturtle/src/kturtle.cpp
@@ -135,7 +135,7 @@ void MainWindow::setupActions()
 	speed->setItems(speeds);
 	speed->setCurrentItem(0);
 	run = new TDEAction(i18n("&Execute Commands"), "gear", ALT+Key_Return, TQT_TQOBJECT(this), TQT_SLOT( slotExecute() ), ac, "run");
-	pause = new TDEToggleAction(i18n("Pause E&xecution"), "player_pause", Key_Pause, TQT_TQOBJECT(this), TQT_SLOT( slotPauseExecution() ), ac, "pause");
+	pause = new TDEToggleAction(i18n("Pause E&xecution"), "media-playback-pause", Key_Pause, TQT_TQOBJECT(this), TQT_SLOT( slotPauseExecution() ), ac, "pause");
 	pause->setChecked(false);
 	pause->setEnabled(false);
 	stop = new TDEAction(i18n("Stop E&xecution"), "process-stop", Key_Escape, TQT_TQOBJECT(this), TQT_SLOT( slotAbortExecution() ), ac, "stop");