config dialog fixes

2 files changed, 56 insertions, 0 deletions

diff --git a/libkdepim/kprefsdialog.cpp b/libkdepim/kprefsdialog.cpp
index b6ae775..6dc741d 100644
--- a/libkdepim/kprefsdialog.cpp
+++ b/libkdepim/kprefsdialog.cpp
@@ -46,14 +46,16 @@
 #include <kcolorbutton.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kglobal.h>
+#include <kglobalsettings.h>
 #include <kfontdialog.h>
 #include <kmessagebox.h>
 #include <kcolordialog.h>
 #include <kiconloader.h>
 
 #include "kprefs.h"
+#include "kpimglobalprefs.h"
 
 #include "kprefsdialog.h"
 //#include "kprefsdialog.moc"
 
@@ -407,4 +409,32 @@ void KPrefsDialog::slotDefault()
       "custom modifications will be lost."),i18n("Setting Default Preferences"),
       i18n("Continue"))
     == KMessageBox::Continue) setDefaults(); 
 }
+
+KPimPrefsGlobalDialog::KPimPrefsGlobalDialog(QWidget *parent,char *name,bool modal): KPrefsDialog( KPimGlobalPrefs::instance() ,parent, name, modal )
+{
+    setFont( KGlobalSettings::generalMaxFont() );
+    kdelibcfg = new KDEPIMConfigWidget(  KPimGlobalPrefs::instance(), this, "KPrefsGlobalDialog" );
+    setMainWidget( kdelibcfg );
+    setCaption( i18n("KDE-Pim Global Settings"));
+    kdelibcfg->readConfig();
+#ifndef DESKTOP_VERSION
+    if ( QApplication::desktop()->height() <= 480 )
+         hideButtons(); 
+    showMaximized();
+#endif
+}
+void KPimPrefsGlobalDialog::showTZconfig()
+{
+    kdelibcfg->showTimeZoneTab() ;
+}    
+void KPimPrefsGlobalDialog::usrReadConfig() 
+{
+    kdelibcfg->readConfig();
+}
+
+void KPimPrefsGlobalDialog::usrWriteConfig() 
+{
+    kdelibcfg->writeConfig();
+}
+
diff --git a/libkdepim/kprefsdialog.h b/libkdepim/kprefsdialog.h
index efcb86a..52ec809 100644
--- a/libkdepim/kprefsdialog.h
+++ b/libkdepim/kprefsdialog.h
@@ -441,5 +441,31 @@ class KPrefsDialog : public KDialogBase
 
     QPtrList<KPrefsDialogWid> mPrefsWids;
 };
 
+
+#include "kcmconfigs/kdepimconfigwidget.h"
+class KPimPrefsGlobalDialog : public KPrefsDialog
+{
+    Q_OBJECT
+        public:
+    KPimPrefsGlobalDialog(QWidget *parent=0,char *name=0,bool modal=true);
+        /**
+           Destructor.
+        */
+        void showTZconfig();
+
+        public slots:
+
+ signals:
+        protected slots:
+        
+ protected:
+        void usrReadConfig();
+        virtual void usrWriteConfig() ;
+
+ private:
+        KDEPIMConfigWidget* kdelibcfg;
+    
+};
+
 #endif