yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of git.kde.org:/kde-workspace

Browse source
This commit is contained in:
Philipp Knechtges 2011-08-27 19:07:50 +02:00
commit 362357deae
5 changed files with 36 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
clients/tabstrip/config/tabstripconfig.cpp
View file

@ -49,6 +49,7 @@ TabstripConfig::TabstripConfig( KConfig *c, QWidget *parent )
connect( ui->center, SIGNAL(clicked()), SIGNAL(changed()) );
connect( ui->right, SIGNAL(clicked()), SIGNAL(changed()) );
connect( ui->showIcon, SIGNAL(clicked()), SIGNAL(changed()) );
connect( ui->outlineColor, SIGNAL(clicked()), SIGNAL(changed()) );
load( cg );
ui->show();
}
@ -67,6 +68,7 @@ void TabstripConfig::load( KConfigGroup &c )
ui->center->setChecked( align == "Center" );
ui->right->setChecked( align == "Right" );
ui->showIcon->setChecked( c.readEntry( "ShowIcon", true ) );
ui->outlineColor->setColor( c.readEntry( "OutlineColor", QColor( Qt::white ) ) );
}
void TabstripConfig::save( KConfigGroup &c )
@ -79,6 +81,7 @@ void TabstripConfig::save( KConfigGroup &c )
else
c.writeEntry( "TitleAlignment", "Right" );
c.writeEntry( "ShowIcon", ui->showIcon->isChecked() );
c.writeEntry( "OutlineColor", ui->outlineColor->color() );
config->sync();
}
@ -88,5 +91,6 @@ void TabstripConfig::defaults()
ui->center->setChecked( true );
ui->right->setChecked( false );
ui->showIcon->setChecked( true );
ui->outlineColor->setColor( Qt::white );
emit changed();
}

20
clients/tabstrip/config/tabstripconfig.ui
View file

@ -51,6 +51,26 @@
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="outlineColorLayout">
<item>
<widget class="QLabel" name="outline">
<property name="text">
<string>O&amp;utline Color:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="buddy">
<cstring>outlineColor</cstring>
</property>
</widget>
</item>
<item>
<widget class="KColorButton" name="outlineColor"/>
</item>
</layout>
</item>
</layout>
</widget>
<resources/>

8
clients/tabstrip/tabstripdecoration.cpp
View file

@ -81,7 +81,7 @@ void TabstripDecoration::paintTab( QPainter &painter, const QRect &geom, ClientG
// Draw border around the tab
painter.setPen( Qt::black );
painter.drawRect( geom.adjusted( 0, 0, -1, -1 ));
painter.setPen( Qt::white );
painter.setPen( TabstripFactory::outlineColor() );
painter.drawRect( geom.adjusted( 1, 1, -2, -2 ));
// Background
@ -132,7 +132,7 @@ void TabstripDecoration::paintEvent( QPaintEvent * )
// Draw black/white border around the main window
painter.setPen( Qt::black );
painter.drawRect( 0, titlebar.height() - 1, frame.width() - 1, frame.height() - titlebar.height() );
painter.setPen( Qt::white );
painter.setPen( TabstripFactory::outlineColor() );
painter.drawRect( 1, titlebar.height(), frame.width() - 3, frame.height() - titlebar.height() - 2 );
QList< ClientGroupItem > tabList = clientGroupItems();
@ -176,7 +176,7 @@ void TabstripDecoration::paintEvent( QPaintEvent * )
painter.setPen( Qt::black );
painter.drawRect( 0, 0, allTabGeom.left(), allTabGeom.height() - 1 );
painter.drawRect( allTabGeom.right() - 1, 0, frame.width() - allTabGeom.right(), allTabGeom.height() - 1 );
painter.setPen( Qt::white );
painter.setPen( TabstripFactory::outlineColor() );
painter.drawRect( 1, 1, allTabGeom.left() - 2, allTabGeom.height() - 3 );
painter.drawRect( allTabGeom.right(), 1, frame.width() - allTabGeom.right() - 2, allTabGeom.height() - 3 );
@ -189,7 +189,7 @@ void TabstripDecoration::paintEvent( QPaintEvent * )
// Draw border around the titlebar
painter.setPen( Qt::black );
painter.drawRect( titlebar.adjusted( 0, 0, -1, -1 ));
painter.setPen( Qt::white );
painter.setPen( TabstripFactory::outlineColor() );
painter.drawRect( titlebar.adjusted( 1, 1, -2, -2 ));
// Background

2
clients/tabstrip/tabstripfactory.cpp
View file

@ -36,6 +36,7 @@ extern "C"
Qt::AlignmentFlag TabstripFactory::titlealign = Qt::AlignCenter;
bool TabstripFactory::show_icon = true;
QColor TabstripFactory::outline_color = Qt::white;
TabstripFactory::TabstripFactory()
{
@ -88,6 +89,7 @@ bool TabstripFactory::readConfig()
else if( align == "Right" )
titlealign = Qt::AlignRight;
show_icon = cg.readEntry( "ShowIcon", true );
outline_color = cg.readEntry( "OutlineColor", QColor( Qt::white ) );
return ( titlealign != oldalign );
}

6
clients/tabstrip/tabstripfactory.h
View file

@ -37,11 +37,13 @@ class TabstripFactory : public KDecorationFactoryUnstable
QList< KDecorationDefines::BorderSize > borderSizes() const;
static Qt::AlignmentFlag titleAlign();
static bool showIcon();
static QColor &outlineColor();
private:
bool readConfig();
bool initialized;
static Qt::AlignmentFlag titlealign;
static bool show_icon;
static QColor outline_color;
};
inline Qt::AlignmentFlag TabstripFactory::titleAlign()
@ -53,5 +55,9 @@ inline bool TabstripFactory::showIcon()
{
return show_icon;
}
inline QColor &TabstripFactory::outlineColor()
{
return outline_color;
}
#endif