fixes

15 files changed, 86 insertions, 20 deletions

diff --git a/bin/kdepim/kaddressbook/germantranslation.txt b/bin/kdepim/kaddressbook/germantranslation.txt
index 0884a83..85aed43 100644
--- a/bin/kdepim/kaddressbook/germantranslation.txt
+++ b/bin/kdepim/kaddressbook/germantranslation.txt
@@ -455,9 +455,9 @@
 { "2004-03-24 (%Y-%m-%d|%A %Y %B %d)","2004-03-24 (%Y-%m-%d|%A %Y %B %d)" },

 { "User defined","Benutzerdefiniert" },

 { "User long date:","Format langes Datum:" },

 { "User short date:","Format kurzes Datum:" },

-{ "Daylight start:","Sommerzeit Beginn:" },

+{ "Daylight start:","Sommerzeit Start:" },

 { "Daylight end:","Sommerzeit Ende:" },

 { "Actual start and end is the\nsunday before this date.","Tatsächlicher Beginn/Ende ist der\nSonntag vor diesem Datum!" },

 { "Monday 19 April 2004: %A %d %B %Y","Monday 19 April 2004: %A %d %B %Y" },

 { "Mon 19.04.04: %a %d.%m.%y","Mon 19.04.04: %a %d.%m.%y" },

diff --git a/bin/kdepim/kopiemail/germantranslation.txt b/bin/kdepim/kopiemail/germantranslation.txt
index 903abdf..75fdd11 100644
--- a/bin/kdepim/kopiemail/germantranslation.txt
+++ b/bin/kdepim/kopiemail/germantranslation.txt
@@ -36,9 +36,9 @@
 { "Add 30 min to selected Timezone","Addiere 30 min zur Zeitzone" },
 { "Timezone has daylight saving","Zeitzone hat Sommerzeit" },
 { "Actual start and end is the\nsunday before this date.","Tatsächlicher Beginn/Ende ist der\nSonntag vor diesem Datum!" },
 { "The year in the date is ignored.","Das Jahr vom Datum wird ignoriert." },
-{ "Daylight start:","Sommerzeit Beginn:" },
+{ "Daylight start:","Sommerzeit Start:" },
 { "Mon","Mo" },
 { "Tue","Di" },
 { "Wed","Mi" },
 { "Thu","Do" },
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index 5693112..fa18304 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -444,9 +444,9 @@
 { "Full menu bar(nr)","Volle Menuleiste(bn)" },
 { "Timezone has daylight saving","Zeitzone hat Sommerzeit" },
 { "Actual start and end is the\nsunday before this date.","Tatsächlicher Beginn/Ende ist der\nSonntag vor diesem Datum!" },
 { "The year in the date is ignored.","Das Jahr vom Datum wird ignoriert." },
-{ "Daylight start:","Sommerzeit Beginn:" },
+{ "Daylight start:","Sommerzeit Start:" },
 { "Daylight end:","Sommerzeit Ende:" },
 { "Time Zone","Zeitzone" },
 { "Monday 19 April 2004: %A %d %B %Y","Montag 19 April 2004: %A %d %B %Y" },
 { "%A: Monday --- %a: Mon","%A: Montag --- %a: Mon" },
diff --git a/bin/kdepim/pwmanager/germantranslation.txt b/bin/kdepim/pwmanager/germantranslation.txt
index beb066e..a50dd04 100644
--- a/bin/kdepim/pwmanager/germantranslation.txt
+++ b/bin/kdepim/pwmanager/germantranslation.txt
@@ -132,9 +132,9 @@
 { "Add 30 min to selected Timezone","Addiere 30 min zur Zeitzone" },

 { "Timezone has daylight saving","Zeitzone hat Sommerzeit" },

 { "Actual start and end is the\nsunday before this date.","Tatsächlicher Beginn/Ende ist der\nSonntag vor diesem Datum!" },

 { "The year in the date is ignored.","Das Jahr vom Datum wird ignoriert." },

-{ "Daylight start:","Sommerzeit Beginn:" },

+{ "Daylight start:","Sommerzeit Start:" },

 { "Mon","Mo" },

 { "Tue","Di" },

 { "Wed","Mi" },

 { "Thu","Do" },

diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index df606d0..c32a2a4 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -62,9 +62,9 @@ DynamicTip::DynamicTip( QWidget * parent )
 class KODaymatrixWhatsThis :public QWhatsThis
 {
 public:
     KODaymatrixWhatsThis( KODayMatrix* view ) : QWhatsThis( view ),_view (view) { ;};
-    ~KODaymatrixWhatsThis() { ;  };
+    ~KODaymatrixWhatsThis() { qDebug("DELETE KODaymatrixWhatsThis ");  };
 
 protected:
   virtual QString text( const QPoint& p )
   {
@@ -104,13 +104,11 @@ const int KODayMatrix::NUMDAYS = 42;
 
 KODayMatrix::KODayMatrix( QWidget *parent, const char *name )
     : QFrame( parent, name , Qt::WRepaintNoErase ), mCalendar( 0 )
 
-#if 0
-KODayMatrix::KODayMatrix(QWidget *parent, Calendar* calendar, QDate date, const char *name) :
-  QFrame(parent, name)
-#endif
+
 { 
+    mLastView = -1;
     oldW = 0;
     oldH = 0;
     myPix.resize( 150, 120 );
     mRedrawNeeded = true;
@@ -243,8 +241,14 @@ QColor KODayMatrix::getShadedColor(QColor color)
 }
 
 KODayMatrix::~KODayMatrix()
 {
+#if QT_VERSION >= 0x030000
+
+#else
+   delete mKODaymatrixWhatsThis;
+#endif 
+
     //  delete mKODaymatrixWhatsThis;
   delete [] days;
   delete [] daylbls;
   //delete [] events;
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index d9d7924..e4bee63 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -1027,12 +1027,8 @@ dummy =
     topLayout->addWidget(dummyBox,iii++,0);
 
 
 
-
-
-
-
     QHBox* hbo = new QHBox ( topFrame );
     mDefaultAlarmFile = new QLineEdit(hbo);
     QPushButton * loadTemplate = new QPushButton(hbo); 
     QPixmap icon;
diff --git a/libkcal/icalformatimpl.cpp b/libkcal/icalformatimpl.cpp
index fe7413f..2405682 100644
--- a/libkcal/icalformatimpl.cpp
+++ b/libkcal/icalformatimpl.cpp
@@ -694,14 +694,16 @@ icalcomponent *ICalFormatImpl::writeAlarm(Alarm *alarm)
       icalcomponent_add_property(a,icalproperty_new_attach(attach));
       if (!alarm->programArguments().isEmpty()) {
         icalcomponent_add_property(a,icalproperty_new_description(alarm->programArguments().utf8()));
       }
+      icalattach_unref( attach );
       break;
     case Alarm::Audio:
       action = ICAL_ACTION_AUDIO;
       if (!alarm->audioFile().isEmpty()) {
           attach = icalattach_new_from_url(QFile::encodeName( alarm->audioFile() ).data());
         icalcomponent_add_property(a,icalproperty_new_attach(attach));
+          icalattach_unref( attach );
       }
       break;
     case Alarm::Email: {
       action = ICAL_ACTION_EMAIL;
@@ -719,8 +721,9 @@ icalcomponent *ICalFormatImpl::writeAlarm(Alarm *alarm)
       if (attachments.count() > 0) {
         for (QStringList::Iterator at = attachments.begin();  at != attachments.end();  ++at) {
             attach = icalattach_new_from_url(QFile::encodeName( *at ).data());
           icalcomponent_add_property(a,icalproperty_new_attach(attach));
+            icalattach_unref( attach );
         }
       }
       break;
     }
diff --git a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp
index 753d90a..fbfbc45 100644
--- a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp
+++ b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp
@@ -34,16 +34,19 @@ $Id$
 #include <qgroupbox.h>
 #include <qlabel.h>
 #include <qlineedit.h>
 #include <qbuttongroup.h>
+#include <qcheckbox.h>
 #include <qfile.h>
 #include <qvbox.h>
 #include <qdir.h>
 #include <qregexp.h>
+#include <qspinbox.h>
 
 #include <kdialog.h>
 #include <kprefsdialog.h>
 #include <klocale.h>
+#include <kglobalsettings.h>
 #include <kdateedit.h>
 #include <kglobal.h>
 #include <stdlib.h>
 
@@ -108,14 +111,50 @@ KDEPIMConfigWidget::KDEPIMConfigWidget(KPimGlobalPrefs *prefs, QWidget *parent,
   setupLocaleDateTab();
   setupTimeZoneTab();
   setupExternalAppTab();
   setupStoreTab();
-
+  setupBackupTab();
 }
 void KDEPIMConfigWidget::showTimeZoneTab()
 {
     tabWidget->setCurrentPage ( 3 ) ;
 }
+void KDEPIMConfigWidget::setupBackupTab()
+{
+    QVBox *colorPage = new QVBox( this );
+    tabWidget->addTab( colorPage, i18n( "Backup" ) );
+    QWidget* topFrame = new QWidget( colorPage ); 
+    QVBoxLayout *topLayout = new QVBoxLayout(topFrame);
+    KPrefsWidBool *sb = addWidBool(i18n("Backup enabled"),
+                      &(KPimGlobalPrefs::instance()->mBackupEnabled),topFrame);
+    topLayout->addWidget((QWidget*)sb->checkBox());
+    QWidget* bupFrame = new QWidget( topFrame ); 
+    topLayout->addWidget((bupFrame));
+    QObject::connect ( sb->checkBox(), SIGNAL (toggled ( bool ) ), bupFrame, SLOT ( setEnabled( bool ) ) );
+    QVBoxLayout *bupLayout = new QVBoxLayout(bupFrame);
+    sb = addWidBool(i18n("Use standard backup dir"),
+                      &(KPimGlobalPrefs::instance()->mBackupEnabled),bupFrame);
+    bupLayout->addWidget((QWidget*)sb->checkBox());
+    mBackupUrl = new KURLRequester( bupFrame );
+    mBackupUrl->setURL( KGlobalSettings::backupDataDir() );
+    QObject::connect ( sb->checkBox(), SIGNAL (toggled ( bool ) ), mBackupUrl ,SLOT ( setDisabled( bool ) ) );
+    bupLayout->addWidget( mBackupUrl );
+
+
+    QHBox *dummy = new QHBox(bupFrame);
+    new QLabel(i18n("Number of Backups:"),dummy);
+    mBackupNumbersSpin = new QSpinBox(1,21,1,dummy);
+    new QLabel(i18n(" "),dummy);
+    bupLayout->addWidget( dummy );
+
+    dummy = new QHBox(bupFrame);
+    new QLabel(i18n("Make backup every "),dummy);
+    mBackupDayCountSpin = new QSpinBox(1,28,1,dummy);
+    new QLabel(i18n(" days"),dummy);
+    new QLabel(i18n(" "),dummy);
+    bupLayout->addWidget( dummy );
+
+}
 void KDEPIMConfigWidget::setupStoreTab()
 {
     QVBox *colorPage = new QVBox( this );
     tabWidget->addTab( colorPage, i18n( "Colors" ) );
diff --git a/libkdepim/kcmconfigs/kdepimconfigwidget.h b/libkdepim/kcmconfigs/kdepimconfigwidget.h
index 984e4e0..c0b92a9 100644
--- a/libkdepim/kcmconfigs/kdepimconfigwidget.h
+++ b/libkdepim/kcmconfigs/kdepimconfigwidget.h
@@ -78,8 +78,9 @@ class KDEPIMConfigWidget : public KPrefsWidget
     void setupLocaleDateTab();
     void setupLocaleTab();
     void setupTimeZoneTab();
     void setupStoreTab();
+    void setupBackupTab();
     KURLRequester* mStoreUrl;
 
     void setCombo(QComboBox *combo,const QString & text, const QStringList *tags = 0);
 
@@ -151,9 +152,10 @@ class KDEPIMConfigWidget : public KPrefsWidget
     QString mSipOtherMessage;
     QString mSipOtherMessageParameters;
 
 
-
+    KURLRequester* mBackupUrl;
+    QSpinBox* mBackupDayCountSpin, *mBackupNumbersSpin   ;
     QMap<ExternalAppHandler::Types, QString> mExternalAppsMap;
 
 //    AddresseeWidget *mAddresseeWidget;
 };
diff --git a/libkdepim/kpimglobalprefs.cpp b/libkdepim/kpimglobalprefs.cpp
index 873f0eb..90321b2 100644
--- a/libkdepim/kpimglobalprefs.cpp
+++ b/libkdepim/kpimglobalprefs.cpp
@@ -110,8 +110,15 @@ KPimGlobalPrefs::KPimGlobalPrefs( const QString &name )
   addItemString("Ex2PhoneDevice",&mEx2PhoneDevice,"/dev/ircomm");
   addItemString("Ex2PhoneConnection",&mEx2PhoneConnection,"irda");
   addItemString("Ex2PhoneModel",&mEx2PhoneModel,"6310i");
 
+  KPrefs::setCurrentGroup( "BackupSettings" );
+  addItemString("BackupDatadir",&mBackupDatadir,KGlobalSettings::backupDataDir());
+  addItemInt( "BackupNumbers", &mBackupNumbers, 3 );
+  addItemInt( "BackupDayCount", &mBackupDayCount, 2 );
+  addItemBool( "BackupUseDefaultDir",&mBackupUseDefaultDir, true );
+  addItemBool( "BackupEnabled",&mBackupEnabled, false );
+
 }
 
 void KPimGlobalPrefs::setGlobalConfig()
 {
diff --git a/libkdepim/kpimglobalprefs.h b/libkdepim/kpimglobalprefs.h
index 36cc25a..94ac8ae 100644
--- a/libkdepim/kpimglobalprefs.h
+++ b/libkdepim/kpimglobalprefs.h
@@ -139,7 +139,13 @@ class KPimGlobalPrefs : public KPrefs
     QString mEx2PhoneDevice;
     QString mEx2PhoneConnection;
     QString mEx2PhoneModel;
 
+
+    bool mBackupEnabled;
+    QString mBackupDatadir;
+    bool mBackupUseDefaultDir;
+    int mBackupNumbers;
+    int mBackupDayCount;
 };
 
 #endif
diff --git a/libkdepim/kprefsdialog.cpp b/libkdepim/kprefsdialog.cpp
index dd9a602..b6ae775 100644
--- a/libkdepim/kprefsdialog.cpp
+++ b/libkdepim/kprefsdialog.cpp
@@ -279,9 +279,9 @@ KPrefsDialog::KPrefsDialog(KPrefs *prefs,QWidget *parent,char *name,bool modal)
 {
   mPrefs = prefs;
 
 // This seems to cause a crash on exit. Investigate later.
-//  mPrefsWids.setAutoDelete(true);
+  mPrefsWids.setAutoDelete(true);
 
   connect(this,SIGNAL(defaultClicked()),SLOT(slotDefault()));
   //connect(this,SIGNAL(cancelClicked()),SLOT(slotDefault()));
   //connect(this,SIGNAL(cancelClicked()),SLOT(reject()));
diff --git a/libkdepim/kprefsdialog.h b/libkdepim/kprefsdialog.h
index ad13b78..efcb86a 100644
--- a/libkdepim/kprefsdialog.h
+++ b/libkdepim/kprefsdialog.h
@@ -45,9 +45,9 @@ class QButtonGroup;
 
   This class provides the interface for the preferences widgets used by
   KPrefsDialog.
 */
-class KPrefsDialogWid
+class KPrefsDialogWid : public QObject
 {
   public:
     /**
       This function is called to read value of the setting from the
@@ -135,11 +135,10 @@ class KPrefsDialogWidTime : public KPrefsDialogWid
   
   This class provides a widget for configuring color values. It is meant to be
   used by KPrefsDialog. The user is responsible for the layout management.
 */
-class KPrefsDialogWidColor : public QObject, public KPrefsDialogWid
+class KPrefsDialogWidColor : public KPrefsDialogWid
 {
-    Q_OBJECT
   public:
     /**
       Create a color widget consisting of a test field and a button for opening
       a color dialog.
@@ -178,9 +177,9 @@ class KPrefsDialogWidColor : public QObject, public KPrefsDialogWid
   
   This class provides a widget for configuring font values. It is meant to be
   used by KPrefsDialog. The user is responsible for the layout management.
 */
-class KPrefsDialogWidFont : public QObject, public KPrefsDialogWid
+class KPrefsDialogWidFont : public KPrefsDialogWid
 {
     Q_OBJECT
   public:
     /**
diff --git a/microkde/kglobalsettings.cpp b/microkde/kglobalsettings.cpp
index 5976aae..3f8a630 100644
--- a/microkde/kglobalsettings.cpp
+++ b/microkde/kglobalsettings.cpp
@@ -53,8 +53,17 @@ QString KGlobalSettings::timeTrackerDir()
         dir = dir.left ( dir.length() - 5);
     }
     return dir;
 }
+QString KGlobalSettings::backupDataDir()
+{
+    static QString dir;
+    if ( dir.isEmpty() ) {
+        dir = locateLocal( "data", "backupdir/d.ttl" );
+        dir = dir.left ( dir.length() - 5);
+    }
+    return dir;
+}
 
 QFont KGlobalSettings::toolBarFont()
 {
     return  QApplication::font();
diff --git a/microkde/kglobalsettings.h b/microkde/kglobalsettings.h
index 05ef279..4e4d87c 100644
--- a/microkde/kglobalsettings.h
+++ b/microkde/kglobalsettings.h
@@ -20,8 +20,9 @@ class KGlobalSettings
     static QColor alternateBackgroundColor();
     static void  setAlternateBackgroundColor(QColor);
     static QRect desktopGeometry( QWidget * );
     static QString timeTrackerDir();
+    static QString backupDataDir();
     
     /**
      * Returns whether KDE runs in single (default) or double click
      * mode.