From 2e14c26fc3c8a15e1e8af756ffabc4ccfd39df33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= <l.lunak@kde.org>
Date: Tue, 5 Aug 2008 12:42:02 +0000
Subject: [PATCH] Sync r815426 from oxygen.

svn path=/trunk/KDE/kdebase/workspace/; revision=842503
---
 clients/ozone/oxygen.cpp       | 1 +
 clients/ozone/oxygenbutton.cpp | 5 +++++
 clients/ozone/oxygenclient.cpp | 9 ++++-----
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/clients/ozone/oxygen.cpp b/clients/ozone/oxygen.cpp
index efedefd675..2e85e31000 100644
--- a/clients/ozone/oxygen.cpp
+++ b/clients/ozone/oxygen.cpp
@@ -142,6 +142,7 @@ bool OxygenFactory::supports( Ability ability ) const
         case AbilityButtonMinimize:
         case AbilityButtonMaximize:
         case AbilityButtonClose:
+        case AbilityButtonOnAllDesktops:
         case AbilityButtonAboveOthers:
         case AbilityButtonBelowOthers:
         case AbilityButtonSpacer:
diff --git a/clients/ozone/oxygenbutton.cpp b/clients/ozone/oxygenbutton.cpp
index 811e6181e2..64c6a5dd5a 100644
--- a/clients/ozone/oxygenbutton.cpp
+++ b/clients/ozone/oxygenbutton.cpp
@@ -234,6 +234,11 @@ void OxygenButton::drawIcon(QPainter *p, QPalette &pal, ButtonType &type)
     switch(type)
     {
         case ButtonSticky:
+            if(isChecked()) {
+                QPen newPen = p->pen();
+                newPen.setColor(KColorScheme(pal.currentColorGroup()).decoration(KColorScheme::HoverColor).color());
+                p->setPen(newPen);
+            }
             p->drawPoint(QPointF(10.5,10.5));
             break;
         case ButtonHelp:
diff --git a/clients/ozone/oxygenclient.cpp b/clients/ozone/oxygenclient.cpp
index bb511ee2e7..86e50678cf 100644
--- a/clients/ozone/oxygenclient.cpp
+++ b/clients/ozone/oxygenclient.cpp
@@ -193,15 +193,14 @@ KCommonDecorationButton *OxygenClient::createButton(::ButtonType type)
             return new OxygenButton(*this, i18n("Close"), ButtonClose);
 
         case AboveButton:
-            return new OxygenButton(*this, i18n("Keep above others"), ButtonAbove);
+            return new OxygenButton(*this, i18n("Keep Above Others"), ButtonAbove);
 
         case BelowButton:
-            return new OxygenButton(*this, i18n("Keep below others"), ButtonBelow);
+            return new OxygenButton(*this, i18n("Keep Below Others"), ButtonBelow);
 
-/*
         case OnAllDesktopsButton:
-            return new OxygenButton(*this, i18n("All Desktops"), ButtonSticky);
-*/
+            return new OxygenButton(*this, i18n("On All Desktops"), ButtonSticky);
+
         default:
             return 0;
     }