From 3fde3f12f4d0c03f6a6f98400a34ccc863927071 Mon Sep 17 00:00:00 2001 From: Hugo Pereira Da Costa Date: Wed, 9 Sep 2009 07:39:16 +0000 Subject: [PATCH] added 'No Side Border' border side option. It is intermediate between Tiny and No Border. svn path=/trunk/KDE/kdebase/workspace/; revision=1021437 --- clients/nitrogen/config/nitrogenconfigurationui.cpp | 1 + clients/nitrogen/config/nitrogenexceptiondialog.cpp | 1 + clients/nitrogen/nitrogenconfiguration.cpp | 2 ++ clients/nitrogen/nitrogenconfiguration.h | 1 + 4 files changed, 5 insertions(+) diff --git a/clients/nitrogen/config/nitrogenconfigurationui.cpp b/clients/nitrogen/config/nitrogenconfigurationui.cpp index e283c09bfc..22822a4dcc 100644 --- a/clients/nitrogen/config/nitrogenconfigurationui.cpp +++ b/clients/nitrogen/config/nitrogenconfigurationui.cpp @@ -86,6 +86,7 @@ namespace Nitrogen frameBorder->setObjectName(QString::fromUtf8("frameBorder")); frameBorder->insertItems(0, QStringList() << NitrogenConfiguration::frameBorderName( NitrogenConfiguration::BorderNone, true ) + << NitrogenConfiguration::frameBorderName( NitrogenConfiguration::BorderNoSide, true ) << NitrogenConfiguration::frameBorderName( NitrogenConfiguration::BorderTiny, true ) << NitrogenConfiguration::frameBorderName( NitrogenConfiguration::BorderDefault, true ) << NitrogenConfiguration::frameBorderName( NitrogenConfiguration::BorderLarge, true ) diff --git a/clients/nitrogen/config/nitrogenexceptiondialog.cpp b/clients/nitrogen/config/nitrogenexceptiondialog.cpp index d08be13149..18c385a477 100644 --- a/clients/nitrogen/config/nitrogenexceptiondialog.cpp +++ b/clients/nitrogen/config/nitrogenexceptiondialog.cpp @@ -97,6 +97,7 @@ namespace Nitrogen gridLayout->addWidget( frameBorder = new QComboBox(box), 0, 1, 1, 1 ); frameBorder->insertItems(0, QStringList() << NitrogenConfiguration::frameBorderName( NitrogenConfiguration::BorderNone, true ) + << NitrogenConfiguration::frameBorderName( NitrogenConfiguration::BorderNoSide, true ) << NitrogenConfiguration::frameBorderName( NitrogenConfiguration::BorderTiny, true ) << NitrogenConfiguration::frameBorderName( NitrogenConfiguration::BorderDefault, true ) << NitrogenConfiguration::frameBorderName( NitrogenConfiguration::BorderLarge, true ) diff --git a/clients/nitrogen/nitrogenconfiguration.cpp b/clients/nitrogen/nitrogenconfiguration.cpp index 8dc900c23a..e010fcd804 100644 --- a/clients/nitrogen/nitrogenconfiguration.cpp +++ b/clients/nitrogen/nitrogenconfiguration.cpp @@ -183,6 +183,7 @@ namespace Nitrogen switch( value ) { case BorderNone: out = translated ? i18n( "No Border" ):"No Border"; break; + case BorderNoSide: out = translated ? i18n( "No Side Border" ):"No Side Border"; break; case BorderTiny: out = translated ? i18n( "Tiny" ):"Tiny"; break; case BorderDefault: out = translated ? i18n( "Normal" ):"Normal"; break; case BorderLarge: out = translated ? i18n( "Large" ):"Large"; break; @@ -201,6 +202,7 @@ namespace Nitrogen NitrogenConfiguration::FrameBorder NitrogenConfiguration::frameBorder( QString value, bool translated ) { if( value == frameBorderName( BorderNone, translated ) ) return BorderNone; + else if( value == frameBorderName( BorderNoSide, translated ) ) return BorderNoSide; else if( value == frameBorderName( BorderTiny, translated ) ) return BorderTiny; else if( value == frameBorderName( BorderDefault, translated ) ) return BorderDefault; else if( value == frameBorderName( BorderLarge, translated ) ) return BorderLarge; diff --git a/clients/nitrogen/nitrogenconfiguration.h b/clients/nitrogen/nitrogenconfiguration.h index 7a70c3a9d7..8b468f7e1a 100644 --- a/clients/nitrogen/nitrogenconfiguration.h +++ b/clients/nitrogen/nitrogenconfiguration.h @@ -63,6 +63,7 @@ namespace Nitrogen enum FrameBorder { BorderNone = 0, + BorderNoSide = 1, BorderTiny = 2, BorderDefault = 4, BorderLarge = 8,