* Massive set of changes to bring in all fixes and enhancements from the Enterprise PIM branch

* Ensured that the Trinity changes were applied on top of those enhancements, and any redundancy removed
* Added journal read support to the CalDAV resource
* Fixed CalDAV resource to use events URL for tasks and journals when separate URL checkbox unchecked


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

1 files changed, 25 insertions, 11 deletions

diff --git a/kmail/vacationdialog.cpp b/kmail/vacationdialog.cpp
index a2dabe9b..50dea24e 100644
--- a/kmail/vacationdialog.cpp
+++ b/kmail/vacationdialog.cpp
@@ -71,7 +71,9 @@ namespace KMail {
 
     // "Resent only after" spinbox and label:
     ++row;
-    mIntervalSpin = new KIntSpinBox( 1, 356, 1, 7, 10, plainPage(), "mIntervalSpin" );
+    int defDayInterval = 7; //default day interval
+    mIntervalSpin = new KIntSpinBox( 1, 356, 1, defDayInterval, 10, plainPage(), "mIntervalSpin" );
+    mIntervalSpin->setSuffix( i18n(" day", " days", defDayInterval) );
     connect(mIntervalSpin, TQT_SIGNAL( valueChanged( int )), TQT_SLOT( slotIntervalSpinChanged( int ) ) );
     glay->addWidget( new TQLabel( mIntervalSpin, i18n("&Resend notification only after:"), plainPage() ), row, 0 );
     glay->addWidget( mIntervalSpin, row, 1 );
@@ -168,28 +170,40 @@ namespace KMail {
   }
 
   void VacationDialog::setDomainName( const TQString & domain ) {
-    mDomainEdit->setText( domain );
-    if ( !domain.isEmpty() )
+    if ( !domain.isEmpty() ) {
+      mDomainEdit->setText( domain );
       mDomainCheck->setChecked( true );
+    }
+  }
+
+  bool VacationDialog::domainCheck() const
+  {
+    return mDomainCheck->isChecked();
+  }
+
+  void VacationDialog::setDomainCheck( bool check )
+  {
+    mDomainCheck->setChecked( check );
   }
 
-  bool VacationDialog::sendForSpam() const {
+  bool VacationDialog::sendForSpam() const
+  {
     return !mSpamCheck->isChecked();
   }
 
-  void VacationDialog::setSendForSpam( bool enable ) {
+  void VacationDialog::setSendForSpam( bool enable )
+  {
     mSpamCheck->setChecked( !enable );
   }
 
-
   /* virtual*/
-  void KMail::VacationDialog::enableDomainAndSendForSpam( bool enable ) {
-      mDomainCheck->setEnabled( enable );
-      mDomainEdit->setEnabled( enable );
-      mSpamCheck->setEnabled( enable );
+  void KMail::VacationDialog::enableDomainAndSendForSpam( bool enable )
+  {
+    mDomainCheck->setEnabled( enable );
+    mDomainEdit->setEnabled( enable && mDomainCheck->isChecked() );
+    mSpamCheck->setEnabled( enable );
   }
 
-
 } // namespace KMail
 
 #include "vacationdialog.moc"