Sync r815426 from oxygen.

svn path=/trunk/KDE/kdebase/workspace/; revision=842503

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:

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:

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;
     }