diff options
Diffstat (limited to 'twin-styles/openlook/OpenLook.cpp')
| -rw-r--r-- | twin-styles/openlook/OpenLook.cpp | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/twin-styles/openlook/OpenLook.cpp b/twin-styles/openlook/OpenLook.cpp index 46398e30..af3e5291 100644 --- a/twin-styles/openlook/OpenLook.cpp +++ b/twin-styles/openlook/OpenLook.cpp @@ -215,7 +215,7 @@ OpenLook::shadeChange() { } -TQSize OpenLook::tqminimumSize() const +TQSize OpenLook::minimumSize() const { int left, right, top, bottom; borders(left, right, top, bottom); @@ -252,9 +252,9 @@ OpenLook::paintEvent(TQPaintEvent * pe) TQBrush titleBackground(options()->color(KDecoration::ColorTitleBar, true)); if (isActive()) - qDrawShadePanel(&p, tr, widget()->tqcolorGroup(), true, 1, &titleBackground); + qDrawShadePanel(&p, tr, widget()->colorGroup(), true, 1, &titleBackground); else - p.fillRect(tr, widget()->tqcolorGroup().brush(TQColorGroup::Background)); + p.fillRect(tr, widget()->colorGroup().brush(TQColorGroup::Background)); p.setClipRegion(clipRegion); @@ -482,7 +482,7 @@ OpenLook::paintTopLeftRect(TQPainter & p) const int x2(r.right()); int y2(r.bottom()); - p.setPen(widget()->tqcolorGroup().light()); + p.setPen(widget()->colorGroup().light()); p.drawLine(x1, y1, x2, y1); p.drawLine(x1, y1 + 1, x1, y2); @@ -490,7 +490,7 @@ OpenLook::paintTopLeftRect(TQPainter & p) const p.fillRect(x1 + 1, y1 + 1, r.width()-2, openLookMargin-2, handleColour); p.fillRect(x1 + 1, y1 + 1, openLookMargin-2, r.height()-2, handleColour); - p.setPen(widget()->tqcolorGroup().dark()); + p.setPen(widget()->colorGroup().dark()); p.drawLine(x2, y1 + 1, x2, y1 + openLookMargin-1); @@ -513,7 +513,7 @@ OpenLook::paintTopRightRect(TQPainter & p) const int x2(r.right()); int y2(r.bottom()); - p.setPen(widget()->tqcolorGroup().light()); + p.setPen(widget()->colorGroup().light()); p.drawLine(x1, y1, x2, y1); p.drawLine(x1, y1 + 1, x1, y1 + openLookMargin-1); @@ -522,7 +522,7 @@ OpenLook::paintTopRightRect(TQPainter & p) const p.fillRect(x1 + 1, y1 + 1, r.width()-2, openLookMargin-2, handleColour); p.fillRect(x2 - openLookMargin + 2, y1 + 1, openLookMargin-2, r.height()-2, handleColour); - p.setPen(widget()->tqcolorGroup().dark()); + p.setPen(widget()->colorGroup().dark()); p.drawLine(x1 + 1, y1 + openLookMargin-1, x2 - openLookMargin+1, y1 + openLookMargin-1); p.drawLine(x2, y1 + 1, x2, y2); @@ -541,7 +541,7 @@ OpenLook::paintBottomLeftRect(TQPainter & p) const int x2(r.right()); int y2(r.bottom()); - p.setPen(widget()->tqcolorGroup().light()); + p.setPen(widget()->colorGroup().light()); p.drawLine(x1, y1, x1 + openLookMargin-1, y1); p.drawLine(x1, y1 + 1, x1, y2); @@ -550,7 +550,7 @@ OpenLook::paintBottomLeftRect(TQPainter & p) const p.fillRect(x1 + 1, y2 - openLookMargin + 2, r.width()-2, openLookMargin-2, handleColour); p.fillRect(x1 + 1, y1 + 1, openLookMargin-2, r.height()-2, handleColour); - p.setPen(widget()->tqcolorGroup().dark()); + p.setPen(widget()->colorGroup().dark()); p.drawLine(x1 + openLookMargin-1, y1 + 1, x1 + openLookMargin-1, y2 - openLookMargin); p.drawLine(x1 + 1, y2, x2, y2); @@ -569,7 +569,7 @@ OpenLook::paintBottomRightRect(TQPainter & p) const int x2(r.right()); int y2(r.bottom()); - p.setPen(widget()->tqcolorGroup().light()); + p.setPen(widget()->colorGroup().light()); p.drawLine(x1, y2 - openLookMargin+1, x1, y2); p.drawLine(x1 + 1, y2 - openLookMargin+1, x2 - openLookMargin+1, y2 - openLookMargin+1); @@ -579,7 +579,7 @@ OpenLook::paintBottomRightRect(TQPainter & p) const p.fillRect(x1 + 1, y2 - openLookMargin + 2, r.width()-2, openLookMargin-2, handleColour); p.fillRect(x2 - openLookMargin + 2, y1 + 1, openLookMargin-2, r.height()-2, handleColour); - p.setPen(widget()->tqcolorGroup().dark()); + p.setPen(widget()->colorGroup().dark()); p.drawLine(x1 + 1, y2, x2, y2); p.drawLine(x2, y1 + 1, x2, y2 - 1); @@ -609,16 +609,16 @@ OpenLook::paintButton(TQPainter & p) const r.width() - 2, r.height() - 2, buttonDown_ - ? widget()->tqcolorGroup().dark() + ? widget()->colorGroup().dark() : options()->color(KDecoration::ColorButtonBg, isActive()) ); - p.setPen(buttonDown_ ? widget()->tqcolorGroup().dark() : widget()->tqcolorGroup().light()); + p.setPen(buttonDown_ ? widget()->colorGroup().dark() : widget()->colorGroup().light()); p.drawLine(r.left() + 1, r.top(), r.right() - 1, r.top()); p.drawLine(r.left(), r.top() + 1, r.left(), r.bottom() - 1); - p.setPen(buttonDown_ ? widget()->tqcolorGroup().light() : widget()->tqcolorGroup().dark()); + p.setPen(buttonDown_ ? widget()->colorGroup().light() : widget()->colorGroup().dark()); p.drawLine(r.right(), r.top() + 1, r.right(), r.bottom() - 1); p.drawLine(r.left() + 1, r.bottom(), r.right() - 1, r.bottom()); @@ -638,7 +638,7 @@ OpenLook::paintArrow(TQPainter & p) const TQPointArray poly(3); - p.setBrush(widget()->tqcolorGroup().mid()); + p.setBrush(widget()->colorGroup().mid()); poly.setPoint(0, x, y); poly.setPoint(1, x + w - 1, y); @@ -646,13 +646,13 @@ OpenLook::paintArrow(TQPainter & p) const p.drawPolygon(poly); - p.setPen(widget()->tqcolorGroup().dark()); + p.setPen(widget()->colorGroup().dark()); p.drawLine(x, y, x + w - 1, y); p.drawLine(x, y, x + (w / 2), y + h - 1); - p.setPen(widget()->tqcolorGroup().light()); + p.setPen(widget()->colorGroup().light()); p.drawLine(x + (w / 2), y + h - 1, x + w - 1, y); } @@ -669,10 +669,10 @@ OpenLook::paintBorder(TQPainter & p) const uint r = widget()->rect().right(); uint b = widget()->rect().bottom(); - p.fillRect(x + cs, y, w - cs - cs, 2, widget()->tqcolorGroup().shadow()); - p.fillRect(x + cs, b - 1, w - cs - cs, 2, widget()->tqcolorGroup().shadow()); - p.fillRect(x, y + cs, 2, h - cs - cs, widget()->tqcolorGroup().shadow()); - p.fillRect(r - 1, y + cs, 2, h - cs - cs, widget()->tqcolorGroup().shadow()); + p.fillRect(x + cs, y, w - cs - cs, 2, widget()->colorGroup().shadow()); + p.fillRect(x + cs, b - 1, w - cs - cs, 2, widget()->colorGroup().shadow()); + p.fillRect(x, y + cs, 2, h - cs - cs, widget()->colorGroup().shadow()); + p.fillRect(r - 1, y + cs, 2, h - cs - cs, widget()->colorGroup().shadow()); TQColor frameColour(options()->color(KDecoration::ColorFrame, isActive())); @@ -687,7 +687,7 @@ OpenLook::paintBorder(TQPainter & p) const titleRect().bottom() + 1, width() - 2 * openLookMargin, 2, - widget()->tqcolorGroup().background() + widget()->colorGroup().background() ); } |