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, 18 insertions, 13 deletions

diff --git a/kicker/applets/clock/CMakeLists.txt b/kicker/applets/clock/CMakeLists.txt
index 7b2925dbf..35093523e 100644
--- a/kicker/applets/clock/CMakeLists.txt
+++ b/kicker/applets/clock/CMakeLists.txt
@@ -29,7 +29,7 @@ install( FILES clockapplet.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/applet
 install( FILES lcd.png DESTINATION ${DATA_INSTALL_DIR}/clockapplet/pics )
 
 
-##### clock_panelapplet (module) ################
+##### clock_panelapplet (static) ######################
 
 set( target clock_panelapplet )
 
@@ -38,6 +38,19 @@ set( ${target}_SRCS
   analog.ui digital.ui fuzzy.ui settings.ui prefs.kcfgc
 )
 
+tde_add_library( ${target} STATIC AUTOMOC
+  SOURCES ${${target}_SRCS}
+)
+
+##### clock_panelapplet (module) ################
+
+set( target clock_panelapplet )
+
+set( ${target}_SRCS
+  clock.skel clock.cpp datepicker.cpp zone.cpp
+  analog.ui digital.ui fuzzy.ui settings.ui prefs.kcfgc init.cpp
+)
+
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
   LINK kickermain-shared
diff --git a/kicker/applets/clock/clock.cpp b/kicker/applets/clock/clock.cpp
index 79f627833..2265f801b 100644
--- a/kicker/applets/clock/clock.cpp
+++ b/kicker/applets/clock/clock.cpp
@@ -66,17 +66,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "fuzzy.h"
 #include "prefs.h"
 
-extern "C"
-{
-    KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
-    {
-        KGlobal::locale()->insertCatalogue("clockapplet");
-        KGlobal::locale()->insertCatalogue("timezones"); // For time zone translations
-        return new ClockApplet(configFile, KPanelApplet::Normal,
-                               KPanelApplet::Preferences, parent, "clockapplet");
-    }
-}
-
 // Settings
 
 KConfigDialogSingle::KConfigDialogSingle(Zone *zone, TQWidget *parent,
diff --git a/kicker/applets/clock/clock.h b/kicker/applets/clock/clock.h
index 498ce4b9d..c5295d87b 100644
--- a/kicker/applets/clock/clock.h
+++ b/kicker/applets/clock/clock.h
@@ -290,7 +290,7 @@ class ClockApplet : public KPanelApplet, public KickerTip::Client, public DCOPOb
         void reconfigure();
 
     protected slots:
-        void slotReconfigure() { reconfigure(); }
+        void slotReconfigure() { reconfigure(); emit clockReconfigured(); }
         void slotUpdate();
         void slotCalendarDeleted();
         void slotEnableCalendar();
@@ -301,6 +301,9 @@ class ClockApplet : public KPanelApplet, public KickerTip::Client, public DCOPOb
         void globalPaletteChange();
         void setTimerTo60();
 
+    signals:
+        void clockReconfigured();
+
     protected:
         void toggleCalendar();
         void openContextMenu();