diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-07 04:10:07 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-07 04:10:07 +0000 |
commit | fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf (patch) | |
tree | 9eda848e56fcb862fdfdf479adeccd95b6fe387a /kicker/libkicker/kickertip.cpp | |
parent | 02f67d0e1355b79b1806746efb0f2f640e57f13d (diff) | |
download | tdebase-fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf.tar.gz tdebase-fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf.zip |
Revert automated changes
Sorry guys, they are just not ready for prime time
Work will continue as always
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1212480 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kicker/libkicker/kickertip.cpp')
-rw-r--r-- | kicker/libkicker/kickertip.cpp | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/kicker/libkicker/kickertip.cpp b/kicker/libkicker/kickertip.cpp index 8af29d33d..586360904 100644 --- a/kicker/libkicker/kickertip.cpp +++ b/kicker/libkicker/kickertip.cpp @@ -129,7 +129,7 @@ void KickerTip::display() // Declare interchange object and define defaults. Data data; - data.tqmaskEffect = Dissolve; + data.maskEffect = Dissolve; data.duration = 2000; data.direction = KPanelApplet::Up; data.mimeFactory = m_mimeFactory; @@ -165,7 +165,7 @@ void KickerTip::display() return; } - m_tqmaskEffect = isVisible() ? Plain : data.tqmaskEffect; + m_maskEffect = isVisible() ? Plain : data.maskEffect; m_dissolveSize = 24; m_dissolveDelta = -1; @@ -281,34 +281,34 @@ static void drawRoundRect(TQPainter &p, const TQRect &r) void KickerTip::plainMask() { - TQPainter tqmaskPainter(&m_tqmask); + TQPainter maskPainter(&m_mask); - m_tqmask.fill(Qt::black); + m_mask.fill(Qt::black); - tqmaskPainter.setBrush(Qt::white); - tqmaskPainter.setPen(Qt::NoPen); - //tqmaskPainter.drawRoundRect(m_tqmask.rect(), 1600 / m_tqmask.rect().width(), 1600 / m_tqmask.rect().height()); - drawRoundRect(tqmaskPainter, m_tqmask.rect()); - setMask(m_tqmask); + maskPainter.setBrush(Qt::white); + maskPainter.setPen(Qt::NoPen); + //maskPainter.drawRoundRect(m_mask.rect(), 1600 / m_mask.rect().width(), 1600 / m_mask.rect().height()); + drawRoundRect(maskPainter, m_mask.rect()); + setMask(m_mask); m_frameTimer.stop(); } void KickerTip::dissolveMask() { - TQPainter tqmaskPainter(&m_tqmask); + TQPainter maskPainter(&m_mask); - m_tqmask.fill(Qt::black); + m_mask.fill(Qt::black); - tqmaskPainter.setBrush(Qt::white); - tqmaskPainter.setPen(Qt::NoPen); - //tqmaskPainter.drawRoundRect(m_tqmask.rect(), 1600 / m_tqmask.rect().width(), 1600 / m_tqmask.rect().height()); - drawRoundRect(tqmaskPainter, m_tqmask.rect()); + maskPainter.setBrush(Qt::white); + maskPainter.setPen(Qt::NoPen); + //maskPainter.drawRoundRect(m_mask.rect(), 1600 / m_mask.rect().width(), 1600 / m_mask.rect().height()); + drawRoundRect(maskPainter, m_mask.rect()); m_dissolveSize += m_dissolveDelta; if (m_dissolveSize > 0) { - tqmaskPainter.setRasterOp(Qt::EraseROP); + maskPainter.setRasterOp(Qt::EraseROP); int x, y, s; const int size = 16; @@ -323,7 +323,7 @@ void KickerTip::dissolveMask() { break; } - tqmaskPainter.drawEllipse(x - s / 2, y - s / 2, s, s); + maskPainter.drawEllipse(x - s / 2, y - s / 2, s, s); } } } @@ -333,7 +333,7 @@ void KickerTip::dissolveMask() m_dissolveDelta = 1; } - setMask(m_tqmask); + setMask(m_mask); } void KickerTip::displayInternal() @@ -361,11 +361,11 @@ void KickerTip::displayInternal() int width = textX + textRect.width() + margin; int textY = (height - textRect.height()) / 2; - // resize pixmap, tqmask and widget + // resize pixmap, mask and widget bool firstTime = m_dissolveSize == 24; if (firstTime) { - m_tqmask.resize(width, height); + m_mask.resize(width, height); m_pixmap.resize(width, height); resize(width, height); if (isVisible()) @@ -378,8 +378,8 @@ void KickerTip::displayInternal() } } - // create and set transparency tqmask - switch(m_tqmaskEffect) + // create and set transparency mask + switch(m_maskEffect) { case Plain: plainMask(); @@ -392,8 +392,8 @@ void KickerTip::displayInternal() // draw background TQPainter bufferPainter(&m_pixmap); - bufferPainter.setPen(tqcolorGroup().foreground()); - bufferPainter.setBrush(tqcolorGroup().background()); + bufferPainter.setPen(colorGroup().foreground()); + bufferPainter.setBrush(colorGroup().background()); //bufferPainter.drawRoundRect(0, 0, width, height, 1600 / width, 1600 / height); drawRoundRect(bufferPainter, TQRect(0, 0, width, height)); @@ -409,13 +409,13 @@ void KickerTip::displayInternal() if (KickerSettings::mouseOversShowText()) { // draw text shadow - TQColorGroup cg = tqcolorGroup(); + TQColorGroup cg = colorGroup(); cg.setColor(TQColorGroup::Text, cg.background().dark(115)); int shadowOffset = TQApplication::reverseLayout() ? -1 : 1; m_richText->draw(&bufferPainter, textX + shadowOffset, textY + 1, TQRect(), cg); // draw text - cg = tqcolorGroup(); + cg = colorGroup(); m_richText->draw(&bufferPainter, textX, textY, rect(), cg); } } @@ -458,7 +458,7 @@ void KickerTip::tipperDestroyed(TQObject* o) void KickerTip::internalUpdate() { m_dirty = true; - tqrepaint(false); + repaint(false); } void KickerTip::enableTipping(bool tip) @@ -519,7 +519,7 @@ bool KickerTip::eventFilter(TQObject *object, TQEvent *event) } if (!mouseGrabber() && - !tqApp->activePopupWidget() && + !qApp->activePopupWidget() && !isTippingFor(widget)) { TQToolTip::setGloballyEnabled(false); |