From daf1fbd23e5435c11adc6017795c17a617431bc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= Date: Thu, 29 Nov 2007 19:28:07 +0000 Subject: [PATCH] Add spacers before the close button to make it stand alone, but don't alter the layout otherwise. svn path=/trunk/KDE/kdebase/workspace/; revision=743055 --- clients/kde2/kde2.cpp | 10 ---------- clients/kde2/kde2.h | 2 -- clients/quartz/quartz.cpp | 2 +- clients/web/Web.cpp | 2 +- lib/kdecoration.cpp | 4 ++-- 5 files changed, 4 insertions(+), 16 deletions(-) diff --git a/clients/kde2/kde2.cpp b/clients/kde2/kde2.cpp index 975d6d0724..03d5730de6 100644 --- a/clients/kde2/kde2.cpp +++ b/clients/kde2/kde2.cpp @@ -776,16 +776,6 @@ QString KDE2Client::visibleName() const return i18n("KDE 2"); } -QString KDE2Client::defaultButtonsLeft() const -{ - return "MS"; -} - -QString KDE2Client::defaultButtonsRight() const -{ - return "HIAX"; -} - bool KDE2Client::decorationBehaviour(DecorationBehaviour behaviour) const { switch (behaviour) { diff --git a/clients/kde2/kde2.h b/clients/kde2/kde2.h index ff29a781ff..46872a65a6 100644 --- a/clients/kde2/kde2.h +++ b/clients/kde2/kde2.h @@ -86,8 +86,6 @@ class KDE2Client : public KCommonDecoration ~KDE2Client() {;} virtual QString visibleName() const; - virtual QString defaultButtonsLeft() const; - virtual QString defaultButtonsRight() const; virtual bool decorationBehaviour(DecorationBehaviour behaviour) const; virtual int layoutMetric(LayoutMetric lm, bool respectWindowState = true, const KCommonDecorationButton * = 0) const; virtual KCommonDecorationButton *createButton(ButtonType type); diff --git a/clients/quartz/quartz.cpp b/clients/quartz/quartz.cpp index e03870cd8d..5ee214647a 100644 --- a/clients/quartz/quartz.cpp +++ b/clients/quartz/quartz.cpp @@ -565,7 +565,7 @@ QString QuartzClient::defaultButtonsLeft() const QString QuartzClient::defaultButtonsRight() const { - return "HIAX"; + return "HIA__X"; } bool QuartzClient::decorationBehaviour(DecorationBehaviour behaviour) const diff --git a/clients/web/Web.cpp b/clients/web/Web.cpp index d46e1c3f66..b6882e9c1b 100644 --- a/clients/web/Web.cpp +++ b/clients/web/Web.cpp @@ -62,7 +62,7 @@ QString WebClient::defaultButtonsLeft() const QString WebClient::defaultButtonsRight() const { - return "HIAX"; + return "HIA__X"; } bool WebClient::decorationBehaviour(DecorationBehaviour behaviour) const diff --git a/lib/kdecoration.cpp b/lib/kdecoration.cpp index a27188947a..3dcc8e1542 100644 --- a/lib/kdecoration.cpp +++ b/lib/kdecoration.cpp @@ -434,7 +434,7 @@ QString KDecorationOptions::titleButtonsLeft() const QString KDecorationOptions::defaultTitleButtonsLeft() { - return "MS"; //aseigo: proposed new default "AIS__HM"; + return "MS"; } QString KDecorationOptions::titleButtonsRight() const @@ -444,7 +444,7 @@ QString KDecorationOptions::titleButtonsRight() const QString KDecorationOptions::defaultTitleButtonsRight() { - return "HIAX"; //aseigo: proposed new default "X" + return "HIA__X"; } bool KDecorationOptions::showTooltips() const