TDE
/
tde-style-qtcurve
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tde-style-qtcurve
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename a few stragglers

Browse Source 
(cherry picked from commit db4b84ac8a)
v3.5.13-sru
Timothy Pearson 13 years ago committed by Slávek Banko
parent fdbcf1aabe
commit 923f45e8cc
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File

24
style/qtcurve.cpp
Unescape View File

@ -511,7 +511,7 @@ static bool readKdeGlobals()
return false; return false;
TQColor highlight(TQApplication::tqpalette().active().highlight()); TQColor highlight(TQApplication::palette().active().highlight());
bool inactiveEnabled(false), bool inactiveEnabled(false),
changeSelectionColor(false), changeSelectionColor(false),
useTQt3(useTQt3Settings()); useTQt3(useTQt3Settings());
@ -867,7 +867,7 @@ TQtCurveStyle::TQtCurveStyle()
itsPixmapCache.setAutoDelete(true); itsPixmapCache.setAutoDelete(true);
shadeColors(TQApplication::tqpalette().active().highlight(), itsHighlightCols); shadeColors(TQApplication::palette().active().highlight(), itsHighlightCols);
shadeColors(TQApplication::palette().active().background(), itsBackgroundCols); shadeColors(TQApplication::palette().active().background(), itsBackgroundCols);
shadeColors(TQApplication::palette().active().button(), itsButtonCols); shadeColors(TQApplication::palette().active().button(), itsButtonCols);
@ -1093,7 +1093,7 @@ TQtCurveStyle::TQtCurveStyle()
break; break;
case SHADE_BLEND_SELECTED: case SHADE_BLEND_SELECTED:
case SHADE_SELECTED: case SHADE_SELECTED:
itsCheckRadioCol=TQApplication::tqpalette().active().highlight(); itsCheckRadioCol=TQApplication::palette().active().highlight();
break; break;
case SHADE_CUSTOM: case SHADE_CUSTOM:
itsCheckRadioCol=opts.customCheckRadioColor; itsCheckRadioCol=opts.customCheckRadioColor;
@ -1292,13 +1292,13 @@ void TQtCurveStyle::polish(TQPalette &pal)
{ {
pal.setColor(TQPalette::Inactive, TQColorGroup::Highlight, pal.setColor(TQPalette::Inactive, TQColorGroup::Highlight,
tint(TQApplication::palette().active().background(), tint(TQApplication::palette().active().background(),
TQApplication::tqpalette().active().highlight(), 0.4)); TQApplication::palette().active().highlight(), 0.4));
// KDE4 does not set text colour :-( // KDE4 does not set text colour :-(
//pal.setColor(TQPalette::Inactive, TQColorGroup::HighlightedText, pal.color(TQPalette::Active, TQColorGroup::Foreground)); //pal.setColor(TQPalette::Inactive, TQColorGroup::HighlightedText, pal.color(TQPalette::Active, TQColorGroup::Foreground));
} }
bool newMenu(newContrast || bool newMenu(newContrast ||
itsHighlightCols[ORIGINAL_SHADE]!=TQApplication::tqpalette().active().highlight()), itsHighlightCols[ORIGINAL_SHADE]!=TQApplication::palette().active().highlight()),
newGray(newContrast || newGray(newContrast ||
itsBackgroundCols[ORIGINAL_SHADE]!=TQApplication::palette().active().background()), itsBackgroundCols[ORIGINAL_SHADE]!=TQApplication::palette().active().background()),
newButton(newContrast || newButton(newContrast ||
@ -1333,7 +1333,7 @@ void TQtCurveStyle::polish(TQPalette &pal)
shadeColors(TQApplication::palette().active().button(), itsButtonCols); shadeColors(TQApplication::palette().active().button(), itsButtonCols);
if(newMenu) if(newMenu)
shadeColors(TQApplication::tqpalette().active().highlight(), itsHighlightCols); shadeColors(TQApplication::palette().active().highlight(), itsHighlightCols);
setDecorationColors(); setDecorationColors();
@ -1390,7 +1390,7 @@ void TQtCurveStyle::polish(TQPalette &pal)
break; break;
case SHADE_SELECTED: case SHADE_SELECTED:
case SHADE_BLEND_SELECTED: case SHADE_BLEND_SELECTED:
itsCheckRadioCol=TQApplication::tqpalette().active().highlight(); itsCheckRadioCol=TQApplication::palette().active().highlight();
break; break;
case SHADE_CUSTOM: case SHADE_CUSTOM:
itsCheckRadioCol=opts.customCheckRadioColor; itsCheckRadioCol=opts.customCheckRadioColor;
@ -1625,7 +1625,7 @@ void TQtCurveStyle::polish(TQWidget *widget)
act.setColor(TQColorGroup::Foreground, opts.customMenuTextColor act.setColor(TQColorGroup::Foreground, opts.customMenuTextColor
? opts.customMenuNormTextColor ? opts.customMenuNormTextColor
: TQApplication::tqpalette().active().highlightedText()); : TQApplication::palette().active().highlightedText());
if(!opts.shadeMenubarOnlyWhenActive) if(!opts.shadeMenubarOnlyWhenActive)
{ {
@ -1724,7 +1724,7 @@ void TQtCurveStyle::polish(TQWidget *widget)
} }
else if(::tqqt_cast<TQProgressBar *>(widget)) else if(::tqqt_cast<TQProgressBar *>(widget))
{ {
if(widget->tqpalette().inactive().highlightedText()!=widget->tqpalette().active().highlightedText()) if(widget->palette().inactive().highlightedText()!=widget->palette().active().highlightedText())
{ {
TQPalette pal(widget->palette()); TQPalette pal(widget->palette());
pal.setInactive(widget->palette().active()); pal.setInactive(widget->palette().active());
@ -2181,7 +2181,7 @@ bool TQtCurveStyle::eventFilter(TQObject *object, TQEvent *event)
if((opts.customMenuTextColor && col!=opts.customMenuNormTextColor) || if((opts.customMenuTextColor && col!=opts.customMenuNormTextColor) ||
( (SHADE_BLEND_SELECTED==opts.shadeMenubars || SHADE_SELECTED==opts.shadeMenubars || ( (SHADE_BLEND_SELECTED==opts.shadeMenubars || SHADE_SELECTED==opts.shadeMenubars ||
(SHADE_CUSTOM==opts.shadeMenubars && TOO_DARK(itsMenubarCols[ORIGINAL_SHADE]))) && (SHADE_CUSTOM==opts.shadeMenubars && TOO_DARK(itsMenubarCols[ORIGINAL_SHADE]))) &&
col!=TQApplication::tqpalette().active().highlightedText())) col!=TQApplication::palette().active().highlightedText()))
{ {
TQPalette pal(((TQWidget *)object)->palette()); TQPalette pal(((TQWidget *)object)->palette());
TQColorGroup act(pal.active()); TQColorGroup act(pal.active());
@ -2190,7 +2190,7 @@ bool TQtCurveStyle::eventFilter(TQObject *object, TQEvent *event)
? itsActiveMdiTextColor ? itsActiveMdiTextColor
: opts.customMenuTextColor : opts.customMenuTextColor
? opts.customMenuNormTextColor ? opts.customMenuNormTextColor
: TQApplication::tqpalette().active().highlightedText()); : TQApplication::palette().active().highlightedText());
if(!opts.shadeMenubarOnlyWhenActive || useWindowCols) if(!opts.shadeMenubarOnlyWhenActive || useWindowCols)
{ {
@ -4862,7 +4862,7 @@ void TQtCurveStyle::drawControl(ControlElement control, TQPainter *p, const TQWi
(button->parentWidget() && button->inherits("Ideal::Button") && (button->parentWidget() && button->inherits("Ideal::Button") &&
button->parentWidget()->inherits("Ideal::ButtonBar")))); button->parentWidget()->inherits("Ideal::ButtonBar"))));
const TQColor &textCol(sidebar && (button->isOn() || flags&Style_On) const TQColor &textCol(sidebar && (button->isOn() || flags&Style_On)
? TQApplication::tqpalette().active().highlightedText() ? TQApplication::palette().active().highlightedText()
: button->colorGroup().buttonText()); : button->colorGroup().buttonText());
for(i=0; i<j; i++) for(i=0; i<j; i++)

Write Preview
Loading…
Cancel
Save