added 'No Side Border' border side option. It is intermediate between Tiny and No Border.
svn path=/trunk/KDE/kdebase/workspace/; revision=1021437
This commit is contained in:
parent
4208b2bf54
commit
3fde3f12f4
4 changed files with 5 additions and 0 deletions
|
@ -86,6 +86,7 @@ namespace Nitrogen
|
||||||
frameBorder->setObjectName(QString::fromUtf8("frameBorder"));
|
frameBorder->setObjectName(QString::fromUtf8("frameBorder"));
|
||||||
frameBorder->insertItems(0, QStringList()
|
frameBorder->insertItems(0, QStringList()
|
||||||
<< NitrogenConfiguration::frameBorderName( NitrogenConfiguration::BorderNone, true )
|
<< NitrogenConfiguration::frameBorderName( NitrogenConfiguration::BorderNone, true )
|
||||||
|
<< NitrogenConfiguration::frameBorderName( NitrogenConfiguration::BorderNoSide, true )
|
||||||
<< NitrogenConfiguration::frameBorderName( NitrogenConfiguration::BorderTiny, true )
|
<< NitrogenConfiguration::frameBorderName( NitrogenConfiguration::BorderTiny, true )
|
||||||
<< NitrogenConfiguration::frameBorderName( NitrogenConfiguration::BorderDefault, true )
|
<< NitrogenConfiguration::frameBorderName( NitrogenConfiguration::BorderDefault, true )
|
||||||
<< NitrogenConfiguration::frameBorderName( NitrogenConfiguration::BorderLarge, true )
|
<< NitrogenConfiguration::frameBorderName( NitrogenConfiguration::BorderLarge, true )
|
||||||
|
|
|
@ -97,6 +97,7 @@ namespace Nitrogen
|
||||||
gridLayout->addWidget( frameBorder = new QComboBox(box), 0, 1, 1, 1 );
|
gridLayout->addWidget( frameBorder = new QComboBox(box), 0, 1, 1, 1 );
|
||||||
frameBorder->insertItems(0, QStringList()
|
frameBorder->insertItems(0, QStringList()
|
||||||
<< NitrogenConfiguration::frameBorderName( NitrogenConfiguration::BorderNone, true )
|
<< NitrogenConfiguration::frameBorderName( NitrogenConfiguration::BorderNone, true )
|
||||||
|
<< NitrogenConfiguration::frameBorderName( NitrogenConfiguration::BorderNoSide, true )
|
||||||
<< NitrogenConfiguration::frameBorderName( NitrogenConfiguration::BorderTiny, true )
|
<< NitrogenConfiguration::frameBorderName( NitrogenConfiguration::BorderTiny, true )
|
||||||
<< NitrogenConfiguration::frameBorderName( NitrogenConfiguration::BorderDefault, true )
|
<< NitrogenConfiguration::frameBorderName( NitrogenConfiguration::BorderDefault, true )
|
||||||
<< NitrogenConfiguration::frameBorderName( NitrogenConfiguration::BorderLarge, true )
|
<< NitrogenConfiguration::frameBorderName( NitrogenConfiguration::BorderLarge, true )
|
||||||
|
|
|
@ -183,6 +183,7 @@ namespace Nitrogen
|
||||||
switch( value )
|
switch( value )
|
||||||
{
|
{
|
||||||
case BorderNone: out = translated ? i18n( "No Border" ):"No Border"; break;
|
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 BorderTiny: out = translated ? i18n( "Tiny" ):"Tiny"; break;
|
||||||
case BorderDefault: out = translated ? i18n( "Normal" ):"Normal"; break;
|
case BorderDefault: out = translated ? i18n( "Normal" ):"Normal"; break;
|
||||||
case BorderLarge: out = translated ? i18n( "Large" ):"Large"; break;
|
case BorderLarge: out = translated ? i18n( "Large" ):"Large"; break;
|
||||||
|
@ -201,6 +202,7 @@ namespace Nitrogen
|
||||||
NitrogenConfiguration::FrameBorder NitrogenConfiguration::frameBorder( QString value, bool translated )
|
NitrogenConfiguration::FrameBorder NitrogenConfiguration::frameBorder( QString value, bool translated )
|
||||||
{
|
{
|
||||||
if( value == frameBorderName( BorderNone, translated ) ) return BorderNone;
|
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( BorderTiny, translated ) ) return BorderTiny;
|
||||||
else if( value == frameBorderName( BorderDefault, translated ) ) return BorderDefault;
|
else if( value == frameBorderName( BorderDefault, translated ) ) return BorderDefault;
|
||||||
else if( value == frameBorderName( BorderLarge, translated ) ) return BorderLarge;
|
else if( value == frameBorderName( BorderLarge, translated ) ) return BorderLarge;
|
||||||
|
|
|
@ -63,6 +63,7 @@ namespace Nitrogen
|
||||||
enum FrameBorder
|
enum FrameBorder
|
||||||
{
|
{
|
||||||
BorderNone = 0,
|
BorderNone = 0,
|
||||||
|
BorderNoSide = 1,
|
||||||
BorderTiny = 2,
|
BorderTiny = 2,
|
||||||
BorderDefault = 4,
|
BorderDefault = 4,
|
||||||
BorderLarge = 8,
|
BorderLarge = 8,
|
||||||
|
|
Loading…
Reference in a new issue