Put in changes reverted by r732026 again.
svn path=/trunk/KDE/kdebase/workspace/; revision=733454
This commit is contained in:
parent
9c23fc6033
commit
222d60acf8
1 changed files with 3 additions and 3 deletions
|
@ -55,8 +55,8 @@ void renderDot(QPainter *p, const QPointF &point, qreal diameter)
|
||||||
|
|
||||||
OxygenClient::OxygenClient(KDecorationBridge *b, KDecorationFactory *f)
|
OxygenClient::OxygenClient(KDecorationBridge *b, KDecorationFactory *f)
|
||||||
: KCommonDecoration(b, f)
|
: KCommonDecoration(b, f)
|
||||||
, helper_(*globalHelper)
|
|
||||||
, colorCacheInvalid_(true)
|
, colorCacheInvalid_(true)
|
||||||
|
, helper_(*globalHelper)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -184,10 +184,10 @@ KCommonDecorationButton *OxygenClient::createButton(::ButtonType type)
|
||||||
return new OxygenButton(*this, i18n("Minimize"), ButtonMin);
|
return new OxygenButton(*this, i18n("Minimize"), ButtonMin);
|
||||||
|
|
||||||
case MaxButton:
|
case MaxButton:
|
||||||
return new OxygenButton(*this, i18n("Minimize"), ButtonMax);
|
return new OxygenButton(*this, i18n("Maximize"), ButtonMax);
|
||||||
|
|
||||||
case CloseButton:
|
case CloseButton:
|
||||||
return new OxygenButton(*this, i18n("Minimize"), ButtonClose);
|
return new OxygenButton(*this, i18n("Close"), ButtonClose);
|
||||||
|
|
||||||
default:
|
default:
|
||||||
return 0;
|
return 0;
|
||||||
|
|
Loading…
Reference in a new issue