From 48c5586497dc6a9d6caf84d48c164da49e060e06 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Wed, 3 Apr 2013 21:10:30 -0500
Subject: Add option to enable the clock shadow in transparent mode This closes
 Bug 387

---
 kicker/applets/clock/clock.cpp                 | 14 +++++++-------
 kicker/applets/clock/clockapplet.kcfg          |  4 ++++
 kicker/applets/clock/settings.ui               |  8 ++++++++
 kicker/applets/systemtray/systemtrayapplet.cpp |  1 +
 4 files changed, 20 insertions(+), 7 deletions(-)

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);
       <label>Show frame.</label>
       <default>false</default>
     </entry>
+    <entry name="TransparentUseShadow" type="Bool" key="Use_Shadow">
+      <label>Use shadow.</label>
+      <default>false</default>
+    </entry>
     <entry name="PlainFont" type="Font" key="Font">
       <label>Font for the clock.</label>
       <code>
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 @@
                                                 <string>&amp;Frame</string>
                                             </property>
                                         </widget>
+                                        <widget class="TQCheckBox">
+                                            <property name="name">
+                                                <cstring>kcfg_TransparentUseShadow</cstring>
+                                            </property>
+                                            <property name="text">
+                                                <string>&amp;Shadow</string>
+                                            </property>
+                                        </widget>
                                         <spacer>
                                             <property name="name">
                                                 <cstring>spacer14</cstring>
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 <tqstyle.h>
 #include <tqgrid.h>
 #include <tqpainter.h>
+#include <tqimage.h>
 
 #include <dcopclient.h>
 #include <tdeapplication.h>
-- 
cgit v1.2.1