From 064ccdd2ef9d1d54bf6ea4ca248c76e5ec30931f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= <l.lunak@kde.org>
Date: Mon, 30 Apr 2007 12:09:36 +0000
Subject: [PATCH] Merging from old trunk: r640669 | aseigo | 2007-03-08
 20:32:19 +0100 (Thu, 08 Mar 2007) | 2 lines

oxygen icon naming fixes from Luca Gugelmann


svn path=/trunk/KDE/kdebase/workspace/; revision=659556
---
 useractions.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/useractions.cpp b/useractions.cpp
index 5c665ae5e2..a16ebb0698 100644
--- a/useractions.cpp
+++ b/useractions.cpp
@@ -61,7 +61,7 @@ QMenu* Workspace::clientPopup()
         advanced_popup->setFont(KGlobalSettings::menuFont());
 
         mKeepAboveOpAction = advanced_popup->addAction( i18n("Keep &Above Others") );
-        mKeepAboveOpAction->setIcon( KIcon( "up" ) );
+        mKeepAboveOpAction->setIcon( KIcon( "go-up" ) );
         KAction *kaction = qobject_cast<KAction*>( keys->action("Window Above Other Windows") );
         if ( kaction!=0 )
             mKeepAboveOpAction->setShortcut( kaction->globalShortcut().primary() );
@@ -69,7 +69,7 @@ QMenu* Workspace::clientPopup()
         mKeepAboveOpAction->setData( Options::KeepAboveOp );
 
         mKeepBelowOpAction = advanced_popup->addAction( i18n("Keep &Below Others") );
-        mKeepBelowOpAction->setIcon( KIcon( "down" ) );
+        mKeepBelowOpAction->setIcon( KIcon( "go-down" ) );
         kaction = qobject_cast<KAction*>( keys->action("Window Below Other Windows") );
         if ( kaction!=0 )
             mKeepBelowOpAction->setShortcut( kaction->globalShortcut().primary() );
@@ -77,7 +77,7 @@ QMenu* Workspace::clientPopup()
         mKeepBelowOpAction->setData( Options::KeepBelowOp );
 
         mFullScreenOpAction = advanced_popup->addAction( i18n("&Fullscreen") );
-        mFullScreenOpAction->setIcon( KIcon( "window_fullscreen" ) );
+        mFullScreenOpAction->setIcon( KIcon( "view-fullscreen" ) );
         kaction = qobject_cast<KAction*>( keys->action("Window Fullscreen") );
         if ( kaction!=0 )
             mFullScreenOpAction->setShortcut( kaction->globalShortcut().primary() );
@@ -173,7 +173,7 @@ QMenu* Workspace::clientPopup()
             }
 
         mCloseOpAction = popup->addAction( i18n("&Close") );
-        mCloseOpAction->setIcon( KIcon( "fileclose" ) );
+        mCloseOpAction->setIcon( KIcon( "window-close" ) );
         kaction = qobject_cast<KAction*>( keys->action("Window Close") );
         if ( kaction!=0 )
             mCloseOpAction->setShortcut( kaction->globalShortcut().primary() );