TDE
/
tdelibs
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs
0
0
Fork 0
Code Issues Releases Wiki Activity

Drop compatibility code for TQPalette

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/215/head
Michele Calgaro 1 year ago
parent 36c049e135
commit f662761025
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
8 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File

12
tdeio/tdefile/kurlbar.cpp
Unescape View File

@ -455,12 +455,12 @@ void KURLBar::resizeEvent( TQResizeEvent *e )
void KURLBar::paletteChange( const TQPalette & ) void KURLBar::paletteChange( const TQPalette & )
{ {
TQPalette pal = palette(); TQPalette pal = palette();
TQColor gray = pal.color( TQPalette::Normal, TQColorGroup::Background ); TQColor gray = pal.color( TQPalette::Active, TQColorGroup::Background );
TQColor selectedTextColor = pal.color( TQPalette::Normal, TQColorGroup::BrightText ); TQColor selectedTextColor = pal.color( TQPalette::Active, TQColorGroup::BrightText );
TQColor foreground = pal.color( TQPalette::Normal, TQColorGroup::Foreground ); TQColor foreground = pal.color( TQPalette::Active, TQColorGroup::Foreground );
pal.setColor( TQPalette::Normal, TQColorGroup::Base, gray ); pal.setColor( TQPalette::Active, TQColorGroup::Base, gray );
pal.setColor( TQPalette::Normal, TQColorGroup::HighlightedText, selectedTextColor ); pal.setColor( TQPalette::Active, TQColorGroup::HighlightedText, selectedTextColor );
pal.setColor( TQPalette::Normal, TQColorGroup::Text, foreground ); pal.setColor( TQPalette::Active, TQColorGroup::Text, foreground );
pal.setColor( TQPalette::Inactive, TQColorGroup::Base, gray ); pal.setColor( TQPalette::Inactive, TQColorGroup::Base, gray );
pal.setColor( TQPalette::Inactive, TQColorGroup::HighlightedText, selectedTextColor ); pal.setColor( TQPalette::Inactive, TQColorGroup::HighlightedText, selectedTextColor );
pal.setColor( TQPalette::Inactive, TQColorGroup::Text, foreground ); pal.setColor( TQPalette::Inactive, TQColorGroup::Text, foreground );

6
tdestyles/keramik/keramik.cpp
Unescape View File

@ -2812,7 +2812,7 @@ bool KeramikStyle::objectEventHandler( const TQStyleControlElementData &ceData,
TQWidget* widget = TQT_TQWIDGET( object ); TQWidget* widget = TQT_TQWIDGET( object );
TQPainter p( widget ); TQPainter p( widget );
Keramik::RectTilePainter( keramik_frame_shadow, false, false, 2, 2 ).draw( &p, ceData.rect, Keramik::RectTilePainter( keramik_frame_shadow, false, false, 2, 2 ).draw( &p, ceData.rect,
widget->palette().color( TQPalette::Normal, TQColorGroup::Button ), widget->palette().color( TQPalette::Active, TQColorGroup::Button ),
Qt::black, false, Keramik::TilePainter::PaintFullBlend); Qt::black, false, Keramik::TilePainter::PaintFullBlend);
recursion = false; recursion = false;
return true; return true;
@ -2859,8 +2859,8 @@ bool KeramikStyle::objectEventHandler( const TQStyleControlElementData &ceData,
{ {
TQPainter p( listbox ); TQPainter p( listbox );
Keramik::RectTilePainter( keramik_combobox_list, false, false ).draw( &p, 0, 0, listbox->width(), listbox->height(), Keramik::RectTilePainter( keramik_combobox_list, false, false ).draw( &p, 0, 0, listbox->width(), listbox->height(),
listbox->palette().color( TQPalette::Normal, TQColorGroup::Button ), listbox->palette().color( TQPalette::Active, TQColorGroup::Button ),
listbox->palette().color( TQPalette::Normal, TQColorGroup::Background ) ); listbox->palette().color( TQPalette::Active, TQColorGroup::Background ) );
TQPaintEvent newpaint( paint->region().intersect( listbox->contentsRect() ), paint->erased() ); TQPaintEvent newpaint( paint->region().intersect( listbox->contentsRect() ), paint->erased() );
recursion = true; recursion = true;

12
tdestyles/klegacy/klegacystyle.cpp
Unescape View File

@ -1819,9 +1819,9 @@ void KLegacyStyle::polish(TQApplication *app) {
brush.setColor(gobj->backColor(KLegacy::Active)); brush.setColor(gobj->backColor(KLegacy::Active));
pal.setBrush(TQPalette::Active, TQColorGroup::Button, brush); pal.setBrush(TQPalette::Active, TQColorGroup::Button, brush);
brush = pal.brush(TQPalette::Normal, TQColorGroup::Button); brush = pal.brush(TQPalette::Active, TQColorGroup::Button);
brush.setColor(gobj->backColor(KLegacy::Normal)); brush.setColor(gobj->backColor(KLegacy::Normal));
pal.setBrush(TQPalette::Normal, TQColorGroup::Button, brush); pal.setBrush(TQPalette::Active, TQColorGroup::Button, brush);
brush = pal.brush(TQPalette::Disabled, TQColorGroup::Button); brush = pal.brush(TQPalette::Disabled, TQColorGroup::Button);
brush.setColor(gobj->backColor(KLegacy::Insensitive)); brush.setColor(gobj->backColor(KLegacy::Insensitive));
@ -3275,11 +3275,11 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) {
if (pix && (! pix->isNull())) { if (pix && (! pix->isNull())) {
TQPalette pal = w->palette(); TQPalette pal = w->palette();
TQBrush brush = pal.brush(TQPalette::Normal, TQBrush brush = pal.brush(TQPalette::Active,
TQColorGroup::Background); TQColorGroup::Background);
brush.setPixmap(*pix); brush.setPixmap(*pix);
pal.setBrush(TQPalette::Normal, pal.setBrush(TQPalette::Active,
TQColorGroup::Background, brush); TQColorGroup::Background, brush);
w->setPalette(pal); w->setPalette(pal);
@ -3303,11 +3303,11 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) {
if (pix && (! pix->isNull())) { if (pix && (! pix->isNull())) {
TQPalette pal = w->palette(); TQPalette pal = w->palette();
TQBrush brush = pal.brush(TQPalette::Normal, TQBrush brush = pal.brush(TQPalette::Active,
TQColorGroup::Background); TQColorGroup::Background);
brush.setPixmap(*pix); brush.setPixmap(*pix);
pal.setBrush(TQPalette::Normal, pal.setBrush(TQPalette::Active,
TQColorGroup::Background, brush); TQColorGroup::Background, brush);
w->setPalette(pal); w->setPalette(pal);

6
tdestyles/kthemestyle/kthemestyle.cpp
Unescape View File

@ -450,7 +450,7 @@ void KThemeStyle::polish( TQPalette &p )
if ( isPixmap( Background ) ) if ( isPixmap( Background ) )
{ {
TQBrush bgBrush( p.color( TQPalette::Normal, TQBrush bgBrush( p.color( TQPalette::Active,
TQColorGroup::Background ), TQColorGroup::Background ),
*uncached( Background ) ); *uncached( Background ) );
brushHandle = uncached( Background )->handle(); brushHandle = uncached( Background )->handle();
@ -499,7 +499,7 @@ bool KThemeStyle::objectEventHandler( const TQStyleControlElementData &ceData, C
pos.x(), pos.y()); pos.x(), pos.y());
p.end(); p.end();
TQPalette pal(w->palette()); TQPalette pal(w->palette());
TQBrush brush( pal.color( TQPalette::Normal, TQBrush brush( pal.color( TQPalette::Active,
TQColorGroup::Background), TQColorGroup::Background),
pix ); pix );
pal.setBrush(TQColorGroup::Base, brush); pal.setBrush(TQColorGroup::Base, brush);
@ -524,7 +524,7 @@ void KThemeStyle::polish( const TQStyleControlElementData &ceData, ControlElemen
TQWidget *w = reinterpret_cast<TQWidget*>(ptr); TQWidget *w = reinterpret_cast<TQWidget*>(ptr);
if (::tqqt_cast<TQStatusBar*>(w)) if (::tqqt_cast<TQStatusBar*>(w))
w->setPaletteBackgroundColor(TQApplication::palette().color(TQPalette::Normal, TQColorGroup::Background)); w->setPaletteBackgroundColor(TQApplication::palette().color(TQPalette::Active, TQColorGroup::Background));
if (::tqqt_cast<TQLabel*>(w) && !qstrcmp(w->name(), "tde toolbar widget")) if (::tqqt_cast<TQLabel*>(w) && !qstrcmp(w->name(), "tde toolbar widget"))
installObjectEventHandler(ceData, elementFlags, ptr, this); installObjectEventHandler(ceData, elementFlags, ptr, this);

4
tdeui/kactivelabel.cpp
Unescape View File

@ -59,8 +59,8 @@ void KActiveLabel::init()
void KActiveLabel::paletteChanged() void KActiveLabel::paletteChanged()
{ {
TQPalette p = kapp ? kapp->palette() : palette(); TQPalette p = kapp ? kapp->palette() : palette();
p.setBrush(TQColorGroup::Base, p.brush(TQPalette::Normal, TQColorGroup::Background)); p.setBrush(TQColorGroup::Base, p.brush(TQPalette::Active, TQColorGroup::Background));
p.setColor(TQColorGroup::Text, p.color(TQPalette::Normal, TQColorGroup::Foreground)); p.setColor(TQColorGroup::Text, p.color(TQPalette::Active, TQColorGroup::Foreground));
setPalette(p); setPalette(p);
} }

4
tdeui/klineedit.cpp
Unescape View File

@ -140,9 +140,9 @@ void KLineEdit::init()
TQPalette p = palette(); TQPalette p = palette();
if ( !d->previousHighlightedTextColor.isValid() ) if ( !d->previousHighlightedTextColor.isValid() )
d->previousHighlightedTextColor=p.color(TQPalette::Normal,TQColorGroup::HighlightedText); d->previousHighlightedTextColor=p.color(TQPalette::Active,TQColorGroup::HighlightedText);
if ( !d->previousHighlightColor.isValid() ) if ( !d->previousHighlightColor.isValid() )
d->previousHighlightColor=p.color(TQPalette::Normal,TQColorGroup::Highlight); d->previousHighlightColor=p.color(TQPalette::Active,TQColorGroup::Highlight);
d->drawClickMsg = false; d->drawClickMsg = false;
} }

2
tdeui/ktextedit.cpp
Unescape View File

@ -332,7 +332,7 @@ void KTextEdit::setReadOnly(bool readOnly)
if ( d->customPalette ) if ( d->customPalette )
{ {
TQPalette p = palette(); TQPalette p = palette();
TQColor color = p.color(TQPalette::Normal, TQColorGroup::Base); TQColor color = p.color(TQPalette::Active, TQColorGroup::Base);
p.setColor(TQColorGroup::Base, color); p.setColor(TQColorGroup::Base, color);
p.setColor(TQColorGroup::Background, color); p.setColor(TQColorGroup::Background, color);
setPalette( p ); setPalette( p );

2
tdeui/kurllabel.cpp
Unescape View File

@ -355,7 +355,7 @@ bool KURLLabel::event (TQEvent *e)
{ {
// use parentWidget() unless you are a toplevel widget, then try qAapp // use parentWidget() unless you are a toplevel widget, then try qAapp
TQPalette p = parentWidget() ? parentWidget()->palette() : tqApp->palette(); TQPalette p = parentWidget() ? parentWidget()->palette() : tqApp->palette();
p.setBrush(TQColorGroup::Base, p.brush(TQPalette::Normal, TQColorGroup::Background)); p.setBrush(TQColorGroup::Base, p.brush(TQPalette::Active, TQColorGroup::Background));
p.setColor(TQColorGroup::Foreground, palette().active().foreground()); p.setColor(TQColorGroup::Foreground, palette().active().foreground());
setPalette(p); setPalette(p);
d->LinkColor = TDEGlobalSettings::linkColor(); d->LinkColor = TDEGlobalSettings::linkColor();

Write Preview
Loading…
Cancel
Save