diff --git a/lib/kcommondecoration.cpp b/lib/kcommondecoration.cpp index 6e7d682d85..31beec1a9d 100644 --- a/lib/kcommondecoration.cpp +++ b/lib/kcommondecoration.cpp @@ -58,6 +58,16 @@ KCommonDecoration::~KCommonDecoration() delete m_previewWidget; } +QString KCommonDecoration::defaultButtonsLeft() +{ + return KDecorationOptions::defaultTitleButtonsLeft(); +} + +QString KCommonDecoration::defaultButtonsRight() +{ + return KDecorationOptions::defaultTitleButtonsRight(); +} + bool KCommonDecoration::decorationBehaviour(DecorationBehaviour behaviour) const { switch (behaviour) { diff --git a/lib/kcommondecoration.h b/lib/kcommondecoration.h index 3a8e6ad14d..43964f9c54 100644 --- a/lib/kcommondecoration.h +++ b/lib/kcommondecoration.h @@ -138,13 +138,13 @@ class KWIN_EXPORT KCommonDecoration : public KDecoration * @see KDecoration::titleButtonsLeft() * @see KDecoration::titleButtonsRight() */ - virtual QString defaultButtonsLeft() const = 0; + virtual QString defaultButtonsLeft(); /** * The default title button order on the left. * @see KDecoration::titleButtonsLeft() * @see KDecoration::titleButtonsRight() */ - virtual QString defaultButtonsRight() const = 0; + virtual QString defaultButtonsRight(); /** * This controls whether some specific behaviour should be enabled or not. diff --git a/lib/kdecoration_p.cpp b/lib/kdecoration_p.cpp index 4c982e94e3..e319a995fa 100644 --- a/lib/kdecoration_p.cpp +++ b/lib/kdecoration_p.cpp @@ -52,8 +52,8 @@ KDecorationOptionsPrivate::~KDecorationOptionsPrivate() void KDecorationOptionsPrivate::defaultKWinSettings() { - title_buttons_left = "MS"; - title_buttons_right = "HIAX"; + title_buttons_left = KDecorationOptions::defaultTitleButtonsLeft(); + title_buttons_right = KDecorationOptions::defaultTitleButtonsRight(); custom_button_positions = false; show_tooltips = true; border_size = BorderNormal; @@ -172,13 +172,13 @@ unsigned long KDecorationOptionsPrivate::updateKWinSettings( KConfig* config ) custom_button_positions = styleConfig.readEntry("CustomButtonPositions", false); if (custom_button_positions) { - title_buttons_left = styleConfig.readEntry("ButtonsOnLeft", "MS"); - title_buttons_right = styleConfig.readEntry("ButtonsOnRight", "HIAX"); + title_buttons_left = styleConfig.readEntry("ButtonsOnLeft", KDecorationOptions::defaultTitleButtonsLeft()); + title_buttons_right = styleConfig.readEntry("ButtonsOnRight", KDecorationOptions::defaultTitleButtonsRight()); } else { - title_buttons_left = "MS"; - title_buttons_right = "HIAX"; + title_buttons_left = KDecorationOptions::defaultTitleButtonsLeft(); + title_buttons_right = KDecorationOptions::defaultTitleButtonsRight(); } if( old_custom_button_positions != custom_button_positions || ( custom_button_positions &&