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

1 files changed, 7 insertions, 0 deletions

diff --git a/kicker/applets/systemtray/systemtrayapplet.h b/kicker/applets/systemtray/systemtrayapplet.h
index c656cfe3d..a7a6a043d 100644
--- a/kicker/applets/systemtray/systemtrayapplet.h
+++ b/kicker/applets/systemtray/systemtrayapplet.h
@@ -28,12 +28,15 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqstringlist.h>
 #include <tqevent.h>
 #include <tqlayout.h>
+#include <tqcheckbox.h>
 #include <qxembed.h>
 
 #include <dcopobject.h>
 #include <kapplication.h>
 #include <kpanelapplet.h>
 
+#include "clock.h"
+
 #include "simplebutton.h"
 
 class TQGridLayout;
@@ -85,6 +88,7 @@ protected slots:
     void checkAutoRetract();
     void configure() { preferences(); }
     void setBackground();
+    void updateClockGeometry();
 
 private:
     void embedWindow( WId w, bool kde_tray );
@@ -108,11 +112,14 @@ private:
     SimpleArrowButton *m_expandButton;
     TQWidget *m_leftSpacer;
     TQWidget *m_rightSpacer;
+    ClockApplet *m_clockApplet;
     KDialogBase* m_settingsDialog;
     KActionSelector* m_iconSelector;
     TQTimer* m_autoRetractTimer;
     bool m_autoRetract;
     int m_iconSize;
+    bool m_showClockInTray;
+    TQCheckBox *m_showClockSettingCB;
     TQGridLayout* m_layout;
 };