From 5a2f9d53190b9d28c3ddadd73a0725e1a5f3e9e6 Mon Sep 17 00:00:00 2001 From: Hugo Pereira Da Costa Date: Mon, 7 Sep 2009 18:23:18 +0000 Subject: [PATCH] moved 'outline title' and 'draw separator' from general to advanced tab (suggested by Lucas, and I think it would make Nuno happy, and I like it). Also moved interlock between 'title highlight' and 'draw separator' from config to nitrogenconfigurationui svn path=/trunk/KDE/kdebase/workspace/; revision=1020968 --- .../config/nitrogenconfigurationui.cpp | 30 ++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/clients/nitrogen/config/nitrogenconfigurationui.cpp b/clients/nitrogen/config/nitrogenconfigurationui.cpp index c4ec2d1657..103cc8b113 100644 --- a/clients/nitrogen/config/nitrogenconfigurationui.cpp +++ b/clients/nitrogen/config/nitrogenconfigurationui.cpp @@ -123,19 +123,9 @@ namespace Nitrogen label->setAlignment( Qt::AlignRight|Qt::AlignVCenter ); label->setBuddy( buttonSize ); - - // active window title outline - vboxLayout->addWidget( titleOutline = new QCheckBox( i18n("Outline active window title"), basicWidget) ); - titleOutline->setObjectName(QString::fromUtf8("titleOutline")); - titleOutline->setWhatsThis(i18n( - "When enabled, an additional frame is shown around the active window as well as its title")); - - // draw separator - vboxLayout->addWidget( drawSeparator = new QCheckBox( i18n("Draw separator between title bar and active window contents"), basicWidget ) ); - drawSeparator->setObjectName(QString::fromUtf8("drawSeparator")); - drawSeparator->setWhatsThis(i18n( - "When enabled, this option makes an horizontal separator appear between the window title bar and the window contents.")); - + + vboxLayout->addStretch(1); + } @@ -186,13 +176,25 @@ namespace Nitrogen label->setAlignment( Qt::AlignRight|Qt::AlignVCenter ); label->setBuddy( sizeGripMode ); + // active window title outline + vboxLayout->addWidget( titleOutline = new QCheckBox( i18n("Outline active window title"), advancedWidget) ); + titleOutline->setObjectName(QString::fromUtf8("titleOutline")); + titleOutline->setWhatsThis(i18n( + "When enabled, an additional frame is shown around the active window as well as its title")); + + // draw separator + vboxLayout->addWidget( drawSeparator = new QCheckBox( i18n("Draw separator between title bar and active window contents"), advancedWidget ) ); + drawSeparator->setObjectName(QString::fromUtf8("drawSeparator")); + drawSeparator->setWhatsThis(i18n( + "When enabled, this option makes an horizontal separator appear between the window title bar and the window contents.")); + // oxygen shadow vboxLayout->addWidget( useOxygenShadows = new QCheckBox( i18n("Glow active window" ), advancedWidget ) ); useOxygenShadows->setObjectName(QString::fromUtf8("useOxygenShadows")); useOxygenShadows->setWhatsThis(i18n( "When this option is enabled, oxygen signature blue glow is used for the active window shadow.")); - vboxLayout->addStretch(1); + connect( titleOutline, SIGNAL(toggled( bool )), drawSeparator, SLOT( setDisabled( bool ) ) ); }