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

diff --git a/src/app/configdialog.cpp b/src/app/configdialog.cpp
index 792a7a2..baba390 100644
--- a/src/app/configdialog.cpp
+++ b/src/app/configdialog.cpp
@@ -129,7 +129,7 @@
 	d->mManagers << new TDEConfigDialogManager(d->mImageViewPage, ImageViewConfig::self());
 	
 	d->mFullScreenPage = addConfigPage<ConfigFullScreenPage>(
-		this, i18n("Configure Full Screen Mode"), i18n("Full Screen"), "window_fullscreen");
+		this, i18n("Configure Full Screen Mode"), i18n("Full Screen"), "view-fullscreen");
 	d->mManagers << new TDEConfigDialogManager(d->mFullScreenPage, FullScreenConfig::self());
 
 	d->mFileOperationsPage = addConfigPage<ConfigFileOperationsPage>(
diff --git a/src/gvcore/fileviewcontroller.cpp b/src/gvcore/fileviewcontroller.cpp
index 7e33f05..9cd11ee 100644
--- a/src/gvcore/fileviewcontroller.cpp
+++ b/src/gvcore/fileviewcontroller.cpp
@@ -291,11 +291,11 @@
 		TQT_TQOBJECT(this),TQT_SLOT(slotSelectNext()), actionCollection, "next");
 
 	mSelectPreviousDir=new TDEAction(i18n("&Previous Folder"),
-		TQApplication::reverseLayout() ? "player_fwd":"player_rew", ALT + Key_BackSpace,
+		TQApplication::reverseLayout() ? "media-seek-forward":"media-seek-backward", ALT + Key_BackSpace,
 		TQT_TQOBJECT(this),TQT_SLOT(slotSelectPreviousDir()), actionCollection, "previous_folder");
 
 	mSelectNextDir=new TDEAction(i18n("&Next Folder"),
-		TQApplication::reverseLayout() ? "player_rew":"player_fwd", ALT + Key_Space,
+		TQApplication::reverseLayout() ? "media-seek-backward":"media-seek-forward", ALT + Key_Space,
 		TQT_TQOBJECT(this),TQT_SLOT(slotSelectNextDir()), actionCollection, "next_folder");
 
 	mSelectFirstSubDir=new TDEAction(i18n("&First Sub Folder"), "go-down", ALT + Key_Down,
diff --git a/src/gvcore/imageview.cpp b/src/gvcore/imageview.cpp
index 9330308..ed7fcd8 100644
--- a/src/gvcore/imageview.cpp
+++ b/src/gvcore/imageview.cpp
@@ -325,7 +325,7 @@
 	d->mTools[d->mToolID]->updateCursor();
 
 	// Create actions
-	d->mZoomToFit=new TDEToggleAction(i18n("Fit to &Window"),"viewmagfit",0,d->mActionCollection,"view_zoom_to_fit");
+	d->mZoomToFit=new TDEToggleAction(i18n("Fit to &Window"),"zoom-fit-best",0,d->mActionCollection,"view_zoom_to_fit");
 	connect(d->mZoomToFit,TQT_SIGNAL(toggled(bool)),
 		TQT_TQOBJECT(this), TQT_SLOT(setZoomToFit(bool)) );
 	d->mZoomToWidth=new TDEToggleAction(i18n("Fit to &Width"),0,0,d->mActionCollection,"view_zoom_to_width");
@@ -340,7 +340,7 @@
 	d->mZoomOut=KStdAction::zoomOut(TQT_TQOBJECT(this),TQT_SLOT(slotZoomOut()),d->mActionCollection);
 
 	d->mResetZoom=KStdAction::actualSize(TQT_TQOBJECT(this),TQT_SLOT(slotResetZoom()),d->mActionCollection);
-	d->mResetZoom->setIcon("viewmag1");
+	d->mResetZoom->setIcon("zoom-original");
 
 	d->mLockZoom=new TDEToggleAction(i18n("&Lock Zoom"),"system-lock-screen",0,d->mActionCollection,"view_zoom_lock");
 	d->mLockZoom->setChecked(ImageViewConfig::lockZoom());
diff --git a/src/gvdirpart/gvdirpart.cpp b/src/gvdirpart/gvdirpart.cpp
index 26578a0..beb3d9d 100644
--- a/src/gvdirpart/gvdirpart.cpp
+++ b/src/gvdirpart/gvdirpart.cpp
@@ -87,8 +87,8 @@
 	setWidget(mSplitter);
 
 	KStdAction::saveAs( mDocument, TQT_SLOT(saveAs()), actionCollection(), "saveAs" );
-	new TDEAction(i18n("Rotate &Left"), "rotate_ccw", CTRL + Key_L, this, TQT_SLOT(rotateLeft()), actionCollection(), "rotate_left");
-	new TDEAction(i18n("Rotate &Right"), "rotate_cw", CTRL + Key_R, this, TQT_SLOT(rotateRight()), actionCollection(), "rotate_right");
+	new TDEAction(i18n("Rotate &Left"), "object-rotate-left", CTRL + Key_L, this, TQT_SLOT(rotateLeft()), actionCollection(), "rotate_left");
+	new TDEAction(i18n("Rotate &Right"), "object-rotate-right", CTRL + Key_R, this, TQT_SLOT(rotateRight()), actionCollection(), "rotate_right");
 
 	connect(mFileViewController, TQT_SIGNAL(requestContextMenu(const TQPoint&, bool)),
 		mBrowserExtension, TQT_SLOT(openFileViewContextMenu(const TQPoint&, bool)) );
diff --git a/src/gvimagepart/gvimagepart.cpp b/src/gvimagepart/gvimagepart.cpp
index 91ec7a0..0988efd 100644
--- a/src/gvimagepart/gvimagepart.cpp
+++ b/src/gvimagepart/gvimagepart.cpp
@@ -116,8 +116,8 @@
 	updateNextPrevious();
 
 	KStdAction::saveAs( this, TQT_SLOT(saveAs()), actionCollection(), "saveAs" );
-	new TDEAction(i18n("Rotate &Left"), "rotate_ccw", CTRL + Key_L, this, TQT_SLOT(rotateLeft()), actionCollection(), "rotate_left");
-	new TDEAction(i18n("Rotate &Right"), "rotate_cw", CTRL + Key_R, this, TQT_SLOT(rotateRight()), actionCollection(), "rotate_right");
+	new TDEAction(i18n("Rotate &Left"), "object-rotate-left", CTRL + Key_L, this, TQT_SLOT(rotateLeft()), actionCollection(), "rotate_left");
+	new TDEAction(i18n("Rotate &Right"), "object-rotate-right", CTRL + Key_R, this, TQT_SLOT(rotateRight()), actionCollection(), "rotate_right");
 
 	setXMLFile( "gvimagepart/gvimagepart.rc" );
 }

Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/gwenview

diff --git a/cmake b/cmake
index 08c6f54..47d7755 160000
--- a/cmake
+++ b/cmake
-Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c
+Subproject commit 47d775518c382c77f663a70bb23fad93e6810090