diff --git a/kicker/applets/clock/clock.cpp b/kicker/applets/clock/clock.cpp index be8dfed75..90b88437c 100644 --- a/kicker/applets/clock/clock.cpp +++ b/kicker/applets/clock/clock.cpp @@ -276,8 +276,8 @@ void PlainClock::paintEvent(TQPaintEvent *) void PlainClock::drawContents(TQPainter *p) { TQRect tr(0, 0, width(), height()); - - if (!KickerSettings::transparent()) + + if (!KickerSettings::transparent() || !_prefs->transparentUseShadow()) p->drawText(tr, AlignCenter, _timeStr); else _applet->shadowEngine()->drawText(*p, tr, AlignCenter, _timeStr, size()); @@ -851,9 +851,9 @@ void FuzzyClock::drawContents(TQPainter *p) p->setFont(_prefs->fuzzyFont()); p->setPen(_prefs->fuzzyForegroundColor()); - + TQRect tr; - + if (_applet->getOrientation() == Qt::Vertical) { p->rotate(90); @@ -861,12 +861,12 @@ void FuzzyClock::drawContents(TQPainter *p) } else tr = TQRect(4, 2, width() - 8, height() - 4); - - if (!KickerSettings::transparent()) + + if (!KickerSettings::transparent() || !_prefs->transparentUseShadow()) p->drawText(tr, AlignCenter, _timeStr); else _applet->shadowEngine()->drawText(*p, tr, AlignCenter, _timeStr, size()); - + alreadyDrawing = false; } diff --git a/kicker/applets/clock/clockapplet.kcfg b/kicker/applets/clock/clockapplet.kcfg index e1f41c52e..e004ec45a 100644 --- a/kicker/applets/clock/clockapplet.kcfg +++ b/kicker/applets/clock/clockapplet.kcfg @@ -52,6 +52,10 @@ defFont.setPointSize(8); false + + + false + diff --git a/kicker/applets/clock/settings.ui b/kicker/applets/clock/settings.ui index 6f63694a4..0be13e9a9 100644 --- a/kicker/applets/clock/settings.ui +++ b/kicker/applets/clock/settings.ui @@ -178,6 +178,14 @@ &Frame + + + kcfg_TransparentUseShadow + + + &Shadow + + spacer14 diff --git a/kicker/applets/systemtray/systemtrayapplet.cpp b/kicker/applets/systemtray/systemtrayapplet.cpp index 707f4b74d..f9d490162 100644 --- a/kicker/applets/systemtray/systemtrayapplet.cpp +++ b/kicker/applets/systemtray/systemtrayapplet.cpp @@ -34,6 +34,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include #include +#include #include #include