diff options
Diffstat (limited to 'style')
| -rw-r--r-- | style/qtcurve.cpp | 56 | ||||
| -rw-r--r-- | style/qtcurve.h | 2 |
2 files changed, 29 insertions, 29 deletions
diff --git a/style/qtcurve.cpp b/style/qtcurve.cpp index bc96111..3cc01c3 100644 --- a/style/qtcurve.cpp +++ b/style/qtcurve.cpp @@ -1168,7 +1168,7 @@ void TQtCurveStyle::polish(TQApplication *app) else if ("kontact"==appName) itsThemedApp=APP_KONTACT; else if ("konqueror"==appName) - itsThemedApp=APP_KONTQUEROR; + itsThemedApp=APP_KONQUEROR; else if ("kate"==appName) itsThemedApp=APP_KATE; else if ("kpresenter"==appName) @@ -1516,7 +1516,7 @@ void TQtCurveStyle::polish(TQWidget *widget) widget->installEventFilter(this); #endif - if ((opts.square&STQUARE_SCROLLVIEW) && widget && + if ((opts.square&SQUARE_SCROLLVIEW) && widget && (::tqqt_cast<const TQScrollView *>(widget) || (widget->parentWidget() && ::tqqt_cast<const TQFrame *>(widget) && widget->parentWidget()->inherits("KateView"))) && @@ -3076,7 +3076,7 @@ void TQtCurveStyle::drawEntryField(TQPainter *p, const TQRect &rx, const TQColor doEtch(!itsFormMode && opts.etchEntry && (!isSpin || opts.unifySpin) && WIDGET_COMBO!=w && DO_EFFECT), reverse(TQApplication::reverseLayout()); - if(WIDGET_SCROLLVIEW!=w && (opts.square&STQUARE_ENTRY)) + if(WIDGET_SCROLLVIEW!=w && (opts.square&SQUARE_ENTRY)) round=ROUNDED_NONE; TQRect r(rx); @@ -3811,7 +3811,7 @@ void TQtCurveStyle::tqdrawPrimitive(TQ_PrimitiveElement pe, TQPainter *p, const const TQColor *use(backgroundColors(cg)); drawBorder(cg.background(), p, r, cg, (SFlags)(flags|Style_Horizontal), - opts.square&STQUARE_FRAME ? ROUNDED_NONE : ROUNDED_ALL, use, WIDGET_OTHER, true, BORDER_FLAT); + opts.square&SQUARE_FRAME ? ROUNDED_NONE : ROUNDED_ALL, use, WIDGET_OTHER, true, BORDER_FLAT); } else TQCommonStyle::tqdrawPrimitive(pe, p, r, cg, flags, data); @@ -3830,7 +3830,7 @@ void TQtCurveStyle::tqdrawPrimitive(TQ_PrimitiveElement pe, TQPainter *p, const { const TQWidget *widget=p && p->device() ? dynamic_cast<const TQWidget *>(p->device()) : 0L; bool sv(widget && ::tqqt_cast<const TQScrollView *>(widget)), - square((opts.square&STQUARE_SCROLLVIEW) && + square((opts.square&SQUARE_SCROLLVIEW) && (sv || (widget && widget->parentWidget() && ::tqqt_cast<const TQFrame *>(widget) && widget->parentWidget()->inherits("KateView")))); @@ -3879,7 +3879,7 @@ void TQtCurveStyle::tqdrawPrimitive(TQ_PrimitiveElement pe, TQPainter *p, const drawBorder(cg.background(), p, r, cg, (SFlags)(flags|Style_Horizontal|Style_Enabled), - opts.square&STQUARE_TAB_FRAME ? ROUNDED_NONE : ROUNDED_ALL, use, WIDGET_OTHER, true, + opts.square&SQUARE_TAB_FRAME ? ROUNDED_NONE : ROUNDED_ALL, use, WIDGET_OTHER, true, opts.borderTab ? BORDER_LIGHT : BORDER_RAISED, false); break; } @@ -4203,7 +4203,7 @@ void TQtCurveStyle::tqdrawPrimitive(TQ_PrimitiveElement pe, TQPainter *p, const const TQWidget *widget=p && p->device() ? dynamic_cast<const TQWidget *>(p->device()) : 0L; bool scrollView=widget && ::tqqt_cast<const TQScrollView *>(widget); -// if((opts.square&STQUARE_SCROLLVIEW) && scrollView) +// if((opts.square&SQUARE_SCROLLVIEW) && scrollView) // { // const TQColor *use(backgroundColors(cg)); // @@ -4253,7 +4253,7 @@ void TQtCurveStyle::tqdrawPrimitive(TQ_PrimitiveElement pe, TQPainter *p, const ? ENTRY_FOCUS : ENTRY_NONE : ENTRY_NONE, - (opts.square&STQUARE_SCROLLVIEW) && scrollView ? ROUNDED_NONE : ROUNDED_ALL, + (opts.square&SQUARE_SCROLLVIEW) && scrollView ? ROUNDED_NONE : ROUNDED_ALL, scrollView ? WIDGET_SCROLLVIEW : WIDGET_ENTRY); itsFormMode=false; break; @@ -4609,7 +4609,7 @@ void TQtCurveStyle::drawControl(ControlElement control, TQPainter *p, const TQWi int x(reverse ? r.x()+r.width()-1 : r.x()), x2(reverse ? x-1 : x+1); - p->setPen(itsBackgroundCols[!active && TAB_MO_GLOW==opts.tabMouseOver && opts.round>ROUND_SLIGHT && !(opts.square&STQUARE_TAB_FRAME) + p->setPen(itsBackgroundCols[!active && TAB_MO_GLOW==opts.tabMouseOver && opts.round>ROUND_SLIGHT && !(opts.square&SQUARE_TAB_FRAME) ? ORIGINAL_SHADE : STD_BORDER]); p->drawLine(x, r.y()+r.height()-1, x, r.height()-2); if(active) @@ -4634,7 +4634,7 @@ void TQtCurveStyle::drawControl(ControlElement control, TQPainter *p, const TQWi } // Round top-left corner... - if(!(opts.square&STQUARE_TAB_FRAME) && FULLLY_ROUNDED && APP_TORA!=itsThemedApp && firstTab && !active && !cornerWidget && !reverse) // && !isFirstKTabCtlTab) + if(!(opts.square&SQUARE_TAB_FRAME) && FULLLY_ROUNDED && APP_TORA!=itsThemedApp && firstTab && !active && !cornerWidget && !reverse) // && !isFirstKTabCtlTab) { p->setPen(itsBackgroundCols[STD_BORDER]); p->drawPoint(r.x()+1, r.y()+r.height()-1); @@ -4671,7 +4671,7 @@ void TQtCurveStyle::drawControl(ControlElement control, TQPainter *p, const TQWi cg, true, TAB_MO_TOP==opts.tabMouseOver); } - if(TAB_MO_GLOW==opts.tabMouseOver && opts.round<=ROUND_SLIGHT && !(opts.square&STQUARE_TAB_FRAME) && !reverse && firstTab && !cornerWidget) + if(TAB_MO_GLOW==opts.tabMouseOver && opts.round<=ROUND_SLIGHT && !(opts.square&SQUARE_TAB_FRAME) && !reverse && firstTab && !cornerWidget) { p->setPen(itsBackgroundCols[STD_BORDER]); p->drawPoint(r.x(), r.y()); @@ -4690,7 +4690,7 @@ void TQtCurveStyle::drawControl(ControlElement control, TQPainter *p, const TQWi p->setClipping(false); } - if(!(opts.square&STQUARE_TAB_FRAME) && FULLLY_ROUNDED && APP_TORA!=itsThemedApp && firstTab && !bottomCornerWidget)// && !isFirstKTabCtlTab) + if(!(opts.square&SQUARE_TAB_FRAME) && FULLLY_ROUNDED && APP_TORA!=itsThemedApp && firstTab && !bottomCornerWidget)// && !isFirstKTabCtlTab) { p->setPen(itsBackgroundCols[STD_BORDER]); p->drawPoint(r.x(), reverse ? r.y()+r.width()-1 : r.y()); @@ -5112,7 +5112,7 @@ void TQtCurveStyle::drawControl(ControlElement control, TQPainter *p, const TQWi if(opts.borderProgress) drawBorder(cg.background(), p, rx, cg, (SFlags)(flags|Style_Horizontal), - (opts.square&STQUARE_PROGRESS) ? ROUNDED_NONE : ROUNDED_ALL, use, WIDGET_OTHER, true, + (opts.square&SQUARE_PROGRESS) ? ROUNDED_NONE : ROUNDED_ALL, use, WIDGET_OTHER, true, IS_FLAT(opts.progressGrooveAppearance) && ECOLOR_DARK!=opts.progressGrooveColor ? BORDER_SUNKEN : BORDER_FLAT); else { @@ -5122,7 +5122,7 @@ void TQtCurveStyle::drawControl(ControlElement control, TQPainter *p, const TQWi } if(doEtch) - drawEtch(p, r, cg, false, (opts.square&STQUARE_PROGRESS)); + drawEtch(p, r, cg, false, (opts.square&SQUARE_PROGRESS)); break; } @@ -5143,7 +5143,7 @@ void TQtCurveStyle::drawControl(ControlElement control, TQPainter *p, const TQWi progress = (r.width()-barWidth)-(progress-(r.width()-barWidth)); drawProgress(p, TQRect(r.x()+progress, r.y(), barWidth, r.height()), cg, flags, - (opts.square&STQUARE_PROGRESS) ? ROUNDED_NONE : ROUNDED_ALL, widget); + (opts.square&SQUARE_PROGRESS) ? ROUNDED_NONE : ROUNDED_ALL, widget); } else { @@ -5157,10 +5157,10 @@ void TQtCurveStyle::drawControl(ControlElement control, TQPainter *p, const TQWi if(TQApplication::reverseLayout()) drawProgress(p, TQRect(cr.x()+(cr.width()-width), cr.y(), width, cr.height()), cg, flags, - width==cr.width() || (opts.square&STQUARE_PROGRESS) ? ROUNDED_NONE : ROUNDED_ALL, widget); + width==cr.width() || (opts.square&SQUARE_PROGRESS) ? ROUNDED_NONE : ROUNDED_ALL, widget); else drawProgress(p, TQRect(cr.x(), cr.y(), width, cr.height()), cg, flags, - width==cr.width() || (opts.square&STQUARE_PROGRESS) ? ROUNDED_NONE : ROUNDED_ALL, widget); + width==cr.width() || (opts.square&SQUARE_PROGRESS) ? ROUNDED_NONE : ROUNDED_ALL, widget); } } break; @@ -5717,7 +5717,7 @@ void TQtCurveStyle::drawComplexControl(ComplexControl control, TQPainter *p, con ? ENTRY_FOCUS : ENTRY_NONE : ENTRY_NONE, - (opts.square&STQUARE_ENTRY) + (opts.square&SQUARE_ENTRY) ? ROUNDED_NONE : opts.unifyCombo ? ROUNDED_ALL @@ -5808,7 +5808,7 @@ void TQtCurveStyle::drawComplexControl(ComplexControl control, TQPainter *p, con drawGlow(p, widget ? TQT_TQRECT_OBJECT(widget->rect()) : r, cg, WIDGET_COMBO, glowFocus ? itsFocusCols : NULL); else drawEtch(p, widget ? TQT_TQRECT_OBJECT(widget->rect()) : r, cg, - !editable && EFFECT_SHADOW==opts.buttonEffect && !sunken, editable && (opts.square&STQUARE_ENTRY)); + !editable && EFFECT_SHADOW==opts.buttonEffect && !sunken, editable && (opts.square&SQUARE_ENTRY)); } p->setPen(cg.buttonText()); @@ -5941,7 +5941,7 @@ void TQtCurveStyle::drawComplexControl(ComplexControl control, TQPainter *p, con } if(doEtch) - drawEtch(p, spinwidget ? TQT_TQRECT_OBJECT(spinwidget->rect()) : r, cg, false, (opts.square&STQUARE_ENTRY)); + drawEtch(p, spinwidget ? TQT_TQRECT_OBJECT(spinwidget->rect()) : r, cg, false, (opts.square&SQUARE_ENTRY)); } itsFormMode=false; break; @@ -6090,7 +6090,7 @@ void TQtCurveStyle::drawComplexControl(ComplexControl control, TQPainter *p, con drawLightBevel(p, sbRect, cg, sflags/*|Style_Down*/, #ifndef SIMPLE_SCROLLBARS - !(opts.square&STQUARE_SB_SLIDER) && (SCROLLBAR_NONE==opts.scrollbarType || opts.flatSbarButtons) + !(opts.square&SQUARE_SB_SLIDER) && (SCROLLBAR_NONE==opts.scrollbarType || opts.flatSbarButtons) ? ROUNDED_ALL : #endif ROUNDED_NONE, @@ -6773,7 +6773,7 @@ int TQtCurveStyle::pixelMetric(PixelMetric metric, const TQWidget *widget) const ::tqqt_cast<const TQVBox *>(widget->parentWidget()->parentWidget())) return 0; - if ((opts.square&STQUARE_SCROLLVIEW) && widget && ::tqqt_cast<const TQScrollView *>(widget)) + if ((opts.square&SQUARE_SCROLLVIEW) && widget && ::tqqt_cast<const TQScrollView *>(widget)) return (opts.gtkScrollViews || opts.thinSbarGroove) && !opts.highlightScrollViews ? 1 : 2; if(DO_EFFECT && opts.etchEntry && widget && !isFormWidget(widget) && @@ -6816,7 +6816,7 @@ int TQtCurveStyle::pixelMetric(PixelMetric metric, const TQWidget *widget) const // See KHTML note at top of file return opts.sliderWidth+ (APP_KPRESENTER==itsThemedApp || - ((APP_KONTQUEROR==itsThemedApp || APP_KONTACT==itsThemedApp) && (!widget || isFormWidget(widget))) + ((APP_KONQUEROR==itsThemedApp || APP_KONTACT==itsThemedApp) && (!widget || isFormWidget(widget))) ? 1 : 0); case PM_MaximumDragDistance: return -1; @@ -7251,7 +7251,7 @@ void TQtCurveStyle::drawProgress(TQPainter *p, const TQRect &rx, const TQColorGr } if(opts.borderProgress) - drawBorder(cg.background(), p, r, cg, flags, !(opts.square&STQUARE_PROGRESS) && opts.fillProgress ? ROUNDED_ALL : round, + drawBorder(cg.background(), p, r, cg, flags, !(opts.square&SQUARE_PROGRESS) && opts.fillProgress ? ROUNDED_ALL : round, use, WIDGET_PROGRESSBAR, false, BORDER_FLAT, false, PBAR_BORDER); else { @@ -7443,9 +7443,9 @@ void TQtCurveStyle::drawSbSliderHandle(TQPainter *p, const TQRect &orig, const T flags|=Style_Horizontal; flags|=Style_Raised; - drawLightBevel(p, r, cg, flags, (slider && !(opts.square&STQUARE_SLIDER)) + drawLightBevel(p, r, cg, flags, (slider && !(opts.square&SQUARE_SLIDER)) #ifndef SIMPLE_SCROLLBARS - || (!slider && !(opts.square&STQUARE_SB_SLIDER) && (SCROLLBAR_NONE==opts.scrollbarType || opts.flatSbarButtons)) + || (!slider && !(opts.square&SQUARE_SB_SLIDER) && (SCROLLBAR_NONE==opts.scrollbarType || opts.flatSbarButtons)) #endif ? ROUNDED_ALL : ROUNDED_NONE, getFill(flags, use, false, SHADE_DARKEN==opts.shadeSliders), use, true, false, WIDGET_SB_SLIDER); @@ -7695,7 +7695,7 @@ void TQtCurveStyle::drawSliderGroove(TQPainter *p, const TQRect &r, const TQColo groove.addCoords(-1, 0, 1, 0); } - drawLightBevel(p, groove, cg, flags, opts.square&STQUARE_SLIDER ? ROUNDED_NONE : ROUNDED_ALL, + drawLightBevel(p, groove, cg, flags, opts.square&SQUARE_SLIDER ? ROUNDED_NONE : ROUNDED_ALL, itsBackgroundCols[flags&Style_Enabled ? 2 : ORIGINAL_SHADE], itsBackgroundCols, true, true, WIDGET_SLIDER_TROUGH); @@ -7724,7 +7724,7 @@ void TQtCurveStyle::drawSliderGroove(TQPainter *p, const TQRect &r, const TQColo used.addCoords(0, pos, 0, 0); } if(used.height()>0 && used.width()>0) - drawLightBevel(p, used, cg, flags, opts.square&STQUARE_SLIDER ? ROUNDED_NONE : ROUNDED_ALL, + drawLightBevel(p, used, cg, flags, opts.square&SQUARE_SLIDER ? ROUNDED_NONE : ROUNDED_ALL, usedCols[ORIGINAL_SHADE], usedCols, true, true, WIDGET_FILLED_SLIDER_TROUGH); } } diff --git a/style/qtcurve.h b/style/qtcurve.h index 3ab1182..3ac4764 100644 --- a/style/qtcurve.h +++ b/style/qtcurve.h @@ -88,7 +88,7 @@ class TQtCurveStyle : public BASE_STYLE APP_OPENOFFICE, APP_MACTOR, APP_KPRESENTER, - APP_KONTQUEROR, + APP_KONQUEROR, APP_SKIP_TASKBAR, APP_KPRINTER, APP_KDIALOG, |