Fix up a few Deep Buttons glitches

Add an option to include the clock in the system tray applet
Majorly enhance the Quick Launch Kicker applet


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1245129 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

3 files changed, 6 insertions, 24 deletions

diff --git a/kicker/kicker/core/container_extension.cpp b/kicker/kicker/core/container_extension.cpp
index 0deb57a35..a4e9f0634 100644
--- a/kicker/kicker/core/container_extension.cpp
+++ b/kicker/kicker/core/container_extension.cpp
@@ -1400,7 +1400,7 @@ void ExtensionContainer::paintEvent(TQPaintEvent *e)
 
     if (KickerSettings::useResizeHandle())
     {
-        // draw resize handle [RAJA]
+        // draw resize handle
         TQRect rect;
         TQPainter p( this );
 
diff --git a/kicker/kicker/core/containerarea.cpp b/kicker/kicker/core/containerarea.cpp
index 7b2b98b7b..412eeec1e 100644
--- a/kicker/kicker/core/containerarea.cpp
+++ b/kicker/kicker/core/containerarea.cpp
@@ -1513,24 +1513,6 @@ void ContainerArea::setBackground()
             TQTimer::singleShot(0, this, TQT_SLOT(updateContainersBackground()));
         }
     }
-//     else {		// RAJA
-//         TQRect rect;
-//         TQImage bgImage;
-//         TQPixmap bgPixmap(size().width(), size().height());
-//         bgPixmap.fill(tqcolorGroup().background());
-//         TQPainter p( TQT_TQPAINTDEVICE(&bgPixmap) );
-// 
-// // FIXME This should change the rectangle based on the container's location on the screen (top, bottom, etc.)
-// rect = TQRect(0,0,size().width(),2);
-// tqstyle().tqdrawPrimitive( TQStyle::PE_DockWindowSeparator, &p, rect, tqcolorGroup(), TQStyle::Style_Default );
-// 
-// printf("[RAJA DEBUG 100.0] Hi there!\n\r"); fflush(stdout);
-// p.fillRect(0,0,100,100,TQColor(0,0,0));
-// 
-//         bgImage = bgPixmap;
-//         setPaletteBackgroundPixmap(TQPixmap(bgImage));
-//         TQTimer::singleShot(0, this, TQT_SLOT(updateContainersBackground()));
-//     }
 
     _bgSet = true;
 }
diff --git a/kicker/kicker/ui/popupmenutitle.h b/kicker/kicker/ui/popupmenutitle.h
index e5f565c1a..c9e545417 100644
--- a/kicker/kicker/ui/popupmenutitle.h
+++ b/kicker/kicker/ui/popupmenutitle.h
@@ -40,13 +40,13 @@ public:
 
     bool fullSpan () const { return true; }
 
-    void paint(TQPainter* p, const TQColorGroup& cg, 
-               bool /* act */, bool /*enabled*/, 
+    void paint(TQPainter* p, const TQColorGroup& cg,
+               bool /* act */, bool /*enabled*/,
                int x, int y, int w, int h)
     {
         p->save();
         TQRect r(x, y, w, h);
-        kapp->tqstyle().tqdrawPrimitive(TQStyle::PE_HeaderSection, 
+        kapp->tqstyle().tqdrawPrimitive(TQStyle::PE_HeaderSectionMenu,
                                     p, r, cg);
 
         if (!m_desktopName.isEmpty())
@@ -54,7 +54,7 @@ public:
             p->setPen(cg.buttonText());
             p->setFont(m_font);
             p->drawText(x, y, w, h,
-                        AlignCenter | SingleLine, 
+                        AlignCenter | SingleLine,
                         m_desktopName);
         }
 
@@ -72,7 +72,7 @@ public:
     TQSize tqsizeHint()
     {
       TQSize size = TQFontMetrics(m_font).size(AlignHCenter, m_desktopName);
-      size.setHeight(size.height() + 
+      size.setHeight(size.height() +
                      (kapp->tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth) * 2 + 1));
       return size;
     }